From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F90BC3DA63 for ; Fri, 26 Jul 2024 05:48:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0111F6B0093; Fri, 26 Jul 2024 01:48:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F29D56B0099; Fri, 26 Jul 2024 01:48:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E192C6B009A; Fri, 26 Jul 2024 01:48:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C52576B0093 for ; Fri, 26 Jul 2024 01:48:37 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 67A921415C2 for ; Fri, 26 Jul 2024 05:48:37 +0000 (UTC) X-FDA: 82380824274.02.861B587 Received: from mail-vs1-f47.google.com (mail-vs1-f47.google.com [209.85.217.47]) by imf16.hostedemail.com (Postfix) with ESMTP id AA38B180002 for ; Fri, 26 Jul 2024 05:48:35 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ThdaJ8wf; spf=pass (imf16.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.217.47 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721972849; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Hy5D98gcl/1BnDRFM+BAfO5v9QO7gyFhD3TGX62j7pI=; b=mvgJrD+vALxBmEvIeE2U/Goc1JgiN5hrfsvAvLxPqV9KqQEoi9jkwYz557vVU3tR6nnhTc TZZxqvx1MRWXoMe3lNE8TIkutUoL5VNcE0M+5UUZAycfKgbKHdYxQcxuTlFETIISZfdhpQ nLefp88YOS6UBypKnYzOWI3Dhs28SFs= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=ThdaJ8wf; spf=pass (imf16.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.217.47 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721972849; a=rsa-sha256; cv=none; b=Lfe4sXx4qHf2vAecGzxSz/CihEEeVekHwI/BsK5JI6eGw969Ktnnc7b3WTyRaYSrkm//27 hieQBnFyAcpBQnh4NZ1rsuhuXLA90w44QnqqhuAX705sQdUWcPVljZ+soToSv5t8z5rDkL gJ4IkqJjGcZgtpkuqjLoU189l1Nxa8c= Received: by mail-vs1-f47.google.com with SMTP id ada2fe7eead31-492886d28e8so1569211137.0 for ; Thu, 25 Jul 2024 22:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721972915; x=1722577715; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Hy5D98gcl/1BnDRFM+BAfO5v9QO7gyFhD3TGX62j7pI=; b=ThdaJ8wfzrRSY0KCeeVlmqnxTEd4vOXuJWl4kBQUkgdGKoJ/gf+jpFkvJbhe63TEed 0cne0MvfadBWIZ6VDUn6Oqc9OylthaWKyIMwtX9cS/W/1qv4dWAFPOzoEMU11F00fbh3 vgLPshK+kz3foYAfmBfTk4cO0Q10crxkGvHWODw4HMw3qjEAKMi3QQKjVgKeZqhoWfEM vFZBrQVA/rNN2vlgI1l6N5IAonWIbXDefnn9Pyy1iB0DWq5YSSBssLu2BfaPYBs1x0ew EsnsZ7ipHQh2lJtfLYMLA2+tzfKeqdRSg8QNc7n4/o2+JsMrT3yi8cdM061iiCPytsDs +s+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721972915; x=1722577715; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Hy5D98gcl/1BnDRFM+BAfO5v9QO7gyFhD3TGX62j7pI=; b=Yc1SDEvzjZRBR4dFeAD8f0n53MMS1BpFqzd1JzzfobhtsHRlubEx5LAH4jN9DQj+ME XcJIf/HirBEEL8yYB4jIrOe+aJYa1huEqeWofu0bL9k5NiK+854ktRUYO2LiQF9vh6PM GKvA7rBlFIX2Sy1TKwu4ocdcxBwf+nh+Nk/Nvle4FqwU2er1+gzf7XTkwCc0NllG5u3q HknnqvVET/nShGtnsmyoOVPQdfhVIX8j8Y+hoe8LDl9C2DIvV7187rEVR1BLn38sgGbN 0uiQyjZzVrkvWGwttDyqQhVV38J17FxL3zYaCR3fivWyDDJOomNLAkYp7GGgKPC2bRqX zOjg== X-Forwarded-Encrypted: i=1; AJvYcCUQgqfDaKzuREKXJGLtpV94oIeGKzN7wQkYr83uglZjjrj5Hi1yYZs3TeVs9+g+WpcuKx2IamkrU0jUlB6bKm88rsE= X-Gm-Message-State: AOJu0YxpB7cVR1PfU9Ou6FT8kwOzJHMp2X2RW+waEl6DgG48cb/w1K/o 8986SZlmF2SUHiZLsCmvbZ/7aTyvy9ujedJDSjisR/JNGnzgJpE1u3ng0D1MdZi3rl+3gWlxkki uDrb7zNUreXMg6U/4dmcGx4q0h0o= X-Google-Smtp-Source: AGHT+IE9oeiL/wJOo0MKl9cc7tMnZ+Q6MfaeQ9IxdDIXNgdUTv6jZ8X3DZBEt0VIz/6ymTn0XeMNZp8fOOAGbNvPeL4= X-Received: by 2002:a05:6102:508e:b0:493:b1e1:9dd4 with SMTP id ada2fe7eead31-493c5a0f8f4mr5595324137.4.1721972914535; Thu, 25 Jul 2024 22:48:34 -0700 (PDT) MIME-Version: 1.0 References: <20240711021317.596178-1-yuzhao@google.com> <20240711021317.596178-6-yuzhao@google.com> In-Reply-To: <20240711021317.596178-6-yuzhao@google.com> From: Barry Song <21cnbao@gmail.com> Date: Fri, 26 Jul 2024 17:48:23 +1200 Message-ID: Subject: Re: [PATCH mm-unstable v1 5/5] mm/swap: remove boilerplate To: Yu Zhao Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: AA38B180002 X-Stat-Signature: 9yneumbafyciadnd469x4pp7ys13nyy7 X-Rspam-User: X-HE-Tag: 1721972915-89473 X-HE-Meta: U2FsdGVkX1/IO2nfwQDN2GlWWvUo0Nl2hNQv0oAQtVpxR0Kj+MoR8kaSL6H8vflcbz5tXL4VS28A9MGaeiIcxK1YfFEqIPV3h4HRGyMeZZTF3pT0U9BZJYblXm2IfHyM5k/KG43lJiHxOdgrT+OoFDW6+almX9+7OgJ9gMv1fSVixKcKdDIL7cDc9D6J4toADhCNgF22xlyD7bS0TgScJteaEgGhVqUP81SQZkNW9l84GYUIXNQAo/M//Rp83AktnI93KmuThYuqs2DdDHP0r4rt7MZi9RoZOG12hgMR2I6HJxi5D9x1KOLqRfoYEBCKrP8lPShArU2hFrjKDrvHzLJjAodj80DJsqJVcAPYmcnohJCrv2osAZ5aLnGeGfC1ob4Zs7UmocuU47UsXda3KPhNiuhLtFC+LuMCE0cuHazuJnawaPwgi07vpfFiz6OaQfhgMQT5zR2WXmeSPVDwPxWWMbMBsBocDaYliWVqnHSweMruHWnsURKSQHZ0ox1dfgcpw5X4CtB/nzh1BZHxRv+HeePPtmBSDIcwlaDhwlPnAWOHS3RXAHlQinErDL9GNPEgD3fnskZWJujnz43bv3JjscGDDrzf/BzqCLl/FdvYGh+y8scY3AFFe9k9vG/x4eEkW5vnI/FcGawXNls7A0RoSqcV327jICfZiWrJSWLLZ317tDNkLKXzliQcB3NuD2QEzwvkxRAumyOYj/K7IC57J/lBiSBQP96PoUKmsrV7Ncr0Ggs5TK7QDaIGydBwsF205npAIrnA+3PiS1uOWrYgxUMEZA6bYu94whgZxpsmnnvvPmBrOb/wMXsIVCtdW+A+ztH8MnRFNKlMk3jKoSyRnLKHcf+SzaDKm0RUFJVWElpiYjYKkRV58JiZrzkN2qKAyT19Cm+sMYAkFi07W9KENuxM8ZwQU7qjibJCKPyQB2rygg1y65QOFoYPXIYEVZ/jBNXaNJMe3pMk9gJ VImAtf28 ALhy9wF421UZJKrLn65v9CTEqN7QQZPUdDAeAUFAvzrdykl0cYjVe8/MLVrxeVDdp6iMEnWl729835tdAop5h8ItTHjvpNmjXSzmBb5gPvgjtGEwgzbL3rrwQlH6vLI3BHGUdXuQgYEZ910T9N9df/dCwZAMmKKSoXZilYWCyZLig3dF97Y0DzwmFv7bkLf+dtbSOJAsppjlM672ZiMNJ/wxPEJM16JQyaVMy5CJ6YFZ9j1MjIdFerq1641bzngjYh3M7PonMkQsgJJmELAkWQjeVxq86BkG37KLWPNYUOnawZ+RX/dhJzZRTWFysBaCkZ0eHW7iNBMcB5bBmRCiUfh81zx4cPpXOgvz85Jpd31I58F+Dfu8JnXiA5TkLZWLIjlmY4NmH/fbsagJfYnTtDj5fGw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Thu, Jul 11, 2024 at 2:15=E2=80=AFPM Yu Zhao wrote: > > Remove boilerplate by using a macro to choose the corresponding lock > and handler for each folio_batch in cpu_fbatches. > > Signed-off-by: Yu Zhao > --- > mm/swap.c | 107 +++++++++++++++++++----------------------------------- > 1 file changed, 37 insertions(+), 70 deletions(-) > > diff --git a/mm/swap.c b/mm/swap.c > index 4a66d2f87f26..342ff4e39ba4 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -220,16 +220,45 @@ static void folio_batch_move_lru(struct folio_batch= *fbatch, move_fn_t move_fn) > folios_put(fbatch); > } > > -static void folio_batch_add_and_move(struct folio_batch *fbatch, > - struct folio *folio, move_fn_t move_fn) > +static void __folio_batch_add_and_move(struct folio_batch *fbatch, > + struct folio *folio, move_fn_t move_fn, > + bool on_lru, bool disable_irq) > { > + unsigned long flags; > + > + folio_get(folio); > + > + if (on_lru && !folio_test_clear_lru(folio)) { > + folio_put(folio); > + return; > + } > + > if (folio_batch_add(fbatch, folio) && !folio_test_large(folio) && > !lru_cache_disabled()) > return; > > + if (disable_irq) > + local_lock_irqsave(&cpu_fbatches.lock_irq, flags); > + else > + local_lock(&cpu_fbatches.lock); > + > folio_batch_move_lru(fbatch, move_fn); > + > + if (disable_irq) > + local_unlock_irqrestore(&cpu_fbatches.lock_irq, flags); > + else > + local_unlock(&cpu_fbatches.lock); > } > > +#define folio_batch_add_and_move(folio, op, on_lru) = \ > + __folio_batch_add_and_move( = \ > + this_cpu_ptr(&cpu_fbatches.op), = \ > + folio, = \ > + op, = \ > + on_lru, = \ > + offsetof(struct cpu_fbatches, op) > offsetof(struct cpu_f= batches, lock_irq) \ > + ) I am running into this BUG, is it relevant? / # [ 64.908801] check_preemption_disabled: 1804 callbacks suppressed [ 64.908915] BUG: using smp_processor_id() in preemptible [00000000] code: jbd2/vda-8/96 [ 64.909912] caller is debug_smp_processor_id+0x20/0x30 [ 64.911743] CPU: 0 UID: 0 PID: 96 Comm: jbd2/vda-8 Not tainted 6.10.0-gef32eccacce2 #59 [ 64.912373] Hardware name: linux,dummy-virt (DT) [ 64.912741] Call trace: [ 64.913048] dump_backtrace+0x9c/0x100 [ 64.913414] show_stack+0x20/0x38 [ 64.913761] dump_stack_lvl+0xc4/0x150 [ 64.914197] dump_stack+0x18/0x28 [ 64.914557] check_preemption_disabled+0xd8/0x120 [ 64.914944] debug_smp_processor_id+0x20/0x30 [ 64.915321] folio_add_lru+0x30/0xa8 [ 64.915680] filemap_add_folio+0xe4/0x118 [ 64.916082] __filemap_get_folio+0x178/0x450 [ 64.916455] __getblk_slow+0xb0/0x310 [ 64.916816] bdev_getblk+0x94/0xc0 [ 64.917169] jbd2_journal_get_descriptor_buffer+0x6c/0x1b0 [ 64.917590] jbd2_journal_commit_transaction+0x7f0/0x1c88 [ 64.917994] kjournald2+0xd4/0x278 [ 64.918344] kthread+0x11c/0x128 [ 64.918693] ret_from_fork+0x10/0x20 [ 64.928277] BUG: using smp_processor_id() in preemptible [00000000] code: jbd2/vda-8/96 [ 64.928878] caller is debug_smp_processor_id+0x20/0x30 [ 64.929381] CPU: 0 UID: 0 PID: 96 Comm: jbd2/vda-8 Not tainted 6.10.0-gef32eccacce2 #59 [ 64.929886] Hardware name: linux,dummy-virt (DT) [ 64.930252] Call trace: [ 64.930544] dump_backtrace+0x9c/0x100 [ 64.930907] show_stack+0x20/0x38 [ 64.931255] dump_stack_lvl+0xc4/0x150 [ 64.931616] dump_stack+0x18/0x28 [ 64.932022] check_preemption_disabled+0xd8/0x120 [ 64.932486] debug_smp_processor_id+0x20/0x30 [ 64.933023] folio_add_lru+0x30/0xa8 [ 64.933523] filemap_add_folio+0xe4/0x118 [ 64.933892] __filemap_get_folio+0x178/0x450 [ 64.934265] __getblk_slow+0xb0/0x310 [ 64.934626] bdev_getblk+0x94/0xc0 [ 64.934977] jbd2_journal_get_descriptor_buffer+0x6c/0x1b0 [ 64.935418] journal_submit_commit_record.part.0.constprop.0+0x48/0x288 [ 64.935919] jbd2_journal_commit_transaction+0x1590/0x1c88 [ 64.936519] kjournald2+0xd4/0x278 [ 64.936908] kthread+0x11c/0x128 [ 64.937323] ret_from_fork+0x10/0x20 > + > static void lru_move_tail(struct lruvec *lruvec, struct folio *folio) > { > if (folio_test_unevictable(folio)) > @@ -250,23 +279,11 @@ static void lru_move_tail(struct lruvec *lruvec, st= ruct folio *folio) > */ > void folio_rotate_reclaimable(struct folio *folio) > { > - struct folio_batch *fbatch; > - unsigned long flags; > - > if (folio_test_locked(folio) || folio_test_dirty(folio) || > folio_test_unevictable(folio)) > return; > > - folio_get(folio); > - if (!folio_test_clear_lru(folio)) { > - folio_put(folio); > - return; > - } > - > - local_lock_irqsave(&cpu_fbatches.lock_irq, flags); > - fbatch =3D this_cpu_ptr(&cpu_fbatches.lru_move_tail); > - folio_batch_add_and_move(fbatch, folio, lru_move_tail); > - local_unlock_irqrestore(&cpu_fbatches.lock_irq, flags); > + folio_batch_add_and_move(folio, lru_move_tail, true); > } > > void lru_note_cost(struct lruvec *lruvec, bool file, > @@ -355,21 +372,10 @@ static void folio_activate_drain(int cpu) > > void folio_activate(struct folio *folio) > { > - struct folio_batch *fbatch; > - > if (folio_test_active(folio) || folio_test_unevictable(folio)) > return; > > - folio_get(folio); > - if (!folio_test_clear_lru(folio)) { > - folio_put(folio); > - return; > - } > - > - local_lock(&cpu_fbatches.lock); > - fbatch =3D this_cpu_ptr(&cpu_fbatches.lru_activate); > - folio_batch_add_and_move(fbatch, folio, lru_activate); > - local_unlock(&cpu_fbatches.lock); > + folio_batch_add_and_move(folio, lru_activate, true); > } > > #else > @@ -513,8 +519,6 @@ EXPORT_SYMBOL(folio_mark_accessed); > */ > void folio_add_lru(struct folio *folio) > { > - struct folio_batch *fbatch; > - > VM_BUG_ON_FOLIO(folio_test_active(folio) && > folio_test_unevictable(folio), folio); > VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); > @@ -524,11 +528,7 @@ void folio_add_lru(struct folio *folio) > lru_gen_in_fault() && !(current->flags & PF_MEMALLOC)) > folio_set_active(folio); > > - folio_get(folio); > - local_lock(&cpu_fbatches.lock); > - fbatch =3D this_cpu_ptr(&cpu_fbatches.lru_add); > - folio_batch_add_and_move(fbatch, folio, lru_add); > - local_unlock(&cpu_fbatches.lock); > + folio_batch_add_and_move(folio, lru_add, false); > } > EXPORT_SYMBOL(folio_add_lru); > > @@ -702,22 +702,11 @@ void lru_add_drain_cpu(int cpu) > */ > void deactivate_file_folio(struct folio *folio) > { > - struct folio_batch *fbatch; > - > /* Deactivating an unevictable folio will not accelerate reclaim = */ > if (folio_test_unevictable(folio)) > return; > > - folio_get(folio); > - if (!folio_test_clear_lru(folio)) { > - folio_put(folio); > - return; > - } > - > - local_lock(&cpu_fbatches.lock); > - fbatch =3D this_cpu_ptr(&cpu_fbatches.lru_deactivate_file); > - folio_batch_add_and_move(fbatch, folio, lru_deactivate_file); > - local_unlock(&cpu_fbatches.lock); > + folio_batch_add_and_move(folio, lru_deactivate_file, true); > } > > /* > @@ -730,21 +719,10 @@ void deactivate_file_folio(struct folio *folio) > */ > void folio_deactivate(struct folio *folio) > { > - struct folio_batch *fbatch; > - > if (folio_test_unevictable(folio) || !(folio_test_active(folio) |= | lru_gen_enabled())) > return; > > - folio_get(folio); > - if (!folio_test_clear_lru(folio)) { > - folio_put(folio); > - return; > - } > - > - local_lock(&cpu_fbatches.lock); > - fbatch =3D this_cpu_ptr(&cpu_fbatches.lru_deactivate); > - folio_batch_add_and_move(fbatch, folio, lru_deactivate); > - local_unlock(&cpu_fbatches.lock); > + folio_batch_add_and_move(folio, lru_deactivate, true); > } > > /** > @@ -756,22 +734,11 @@ void folio_deactivate(struct folio *folio) > */ > void folio_mark_lazyfree(struct folio *folio) > { > - struct folio_batch *fbatch; > - > if (!folio_test_anon(folio) || !folio_test_swapbacked(folio) || > folio_test_swapcache(folio) || folio_test_unevictable(folio)) > return; > > - folio_get(folio); > - if (!folio_test_clear_lru(folio)) { > - folio_put(folio); > - return; > - } > - > - local_lock(&cpu_fbatches.lock); > - fbatch =3D this_cpu_ptr(&cpu_fbatches.lru_lazyfree); > - folio_batch_add_and_move(fbatch, folio, lru_lazyfree); > - local_unlock(&cpu_fbatches.lock); > + folio_batch_add_and_move(folio, lru_lazyfree, true); > } > > void lru_add_drain(void) > -- > 2.45.2.803.g4e1b14247a-goog > > Thanks Barry