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 70E4EC3DA64 for ; Sun, 4 Aug 2024 06:56:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 03D266B0085; Sun, 4 Aug 2024 02:56:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F2FE56B0088; Sun, 4 Aug 2024 02:56:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD0406B0089; Sun, 4 Aug 2024 02:56:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id BE8196B0085 for ; Sun, 4 Aug 2024 02:56:09 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 407E5417D2 for ; Sun, 4 Aug 2024 06:56:09 +0000 (UTC) X-FDA: 82413653658.15.958D9D0 Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by imf18.hostedemail.com (Postfix) with ESMTP id 67F711C000E for ; Sun, 4 Aug 2024 06:56:07 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=S7YIRc26; spf=pass (imf18.hostedemail.com: domain of hughd@google.com designates 209.85.210.46 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722754487; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SqaxZlgtJoYb0bs+SvkOFaofwuMyGM4QmSsTX2Hd1N0=; b=UGqcmhM3YhXeCZIC7DozzxBRfmdLwMXY8NgmTZU15zpwm4FVwziodAQgyCeyTHThfJx20x LGjYzqoIBn8X6bLcFyRWGkaZFtdd3qqWLZTn4Om4W21v28QSxXoS7niKiiFY83Ldipx/TA qZWFXuX9q3dgv7tNB1v0Yz21e2skKSI= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=S7YIRc26; spf=pass (imf18.hostedemail.com: domain of hughd@google.com designates 209.85.210.46 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722754487; a=rsa-sha256; cv=none; b=RuCg+E7mW9Y6EHlIcI1Su8hv5Le8qRAohYKZgodH2glEuJDJ69MrbteYzdq0lD5YVhmR+Q 7Igm63bl6/y0MjqUlE/dUXKheYWhassu6/KxVBgl37c7OdK4XyW4VDR/RG/8/xl7p70u2H w1ASAMjh6EGfEPnxqk9ZV/bgV8BtdbM= Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-70930f8eabbso3886205a34.1 for ; Sat, 03 Aug 2024 23:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722754566; x=1723359366; darn=kvack.org; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=SqaxZlgtJoYb0bs+SvkOFaofwuMyGM4QmSsTX2Hd1N0=; b=S7YIRc26vDHpQoVf4oqxRDPrjA7dgd0lsXA9y3vWq3Qe8nzpGYKIdy+igxHjRaiQCo JrS9wGF6mdOou/uFHlY7UwNRlw9WlrUhXVQOq0ELhmJowoY8D8YkGg7mhgcXYE5IbrJH Pj5RzqWONlxX/GD+Ri6Y24ZYiZp9/pbVkO6DgGTJxpeL16AZ65IzY3Xs1hJPqQB2WPtF KOv6sr8u7ZZnvIGtQ/MnfjAqMrmaGFe/kmpmNvNMpoH2IdNMttRr+ZGvDog7faAUjMKn RU5Y6v2Rnag3fUpdci7iDR8Wb9XXheaQWXfZ/aKuyGTNWWqHvJ8gpk9CrzfnNYCzNCzk uaWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722754566; x=1723359366; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SqaxZlgtJoYb0bs+SvkOFaofwuMyGM4QmSsTX2Hd1N0=; b=gmCOci0Cyxzj2I0d6mY/wuiVKrbLZGeCIrFILOl2RKOBnr4Wg/Edx4R3i1ymzTTOfB +ITw5Woe5sEoHfd/rT3GvaMqA7sjyjn931bXhOO31lPrs6TkvFwE6MXvujySPJ5C3NyR b3FeSneETdUcDIhzx97T1hs8HMvSp5bWbNlvfm0QG0jLSkFJTOIvSS7Kk247HqRKF/zQ EqM1hceFgO1kGsnoasyMQs2nvIbupwU9r71GNS+O16YrV/G7MVGiJLrsy/fRAUQN0lNK h15VHqC4i5k4xXmamamRUrtYRZUG4gTtA2d4q6j2oxQm9hcOJvXVKD6ix5XCiWY7X1tr +Isw== X-Forwarded-Encrypted: i=1; AJvYcCUNenHOhzb8EkeU5MQdO7ZqXIjJwh3ToScwtrg6Mf29Q/2av8djAcPHe2KqGy495zFlf41dDzozx2v6ffPMtx/m+bY= X-Gm-Message-State: AOJu0Yxmze5G1m3y0RnlmsZh0EP5GpDGwtMFPzgsc2zD1kViX0G+0/C6 rx1aZeamMRU9s1tkiqtuD4wR7MQo3f4DZdp6dfQN9FKu0sEdJTbqtegUNTLCyA== X-Google-Smtp-Source: AGHT+IEt3PhlbkyOB9RpcniTETIy8QYNjVGaa7vEV0FVGxmmNgCHetEsf+xx9siB51kbRTujgPqcOg== X-Received: by 2002:a05:6830:618b:b0:70a:988a:b5fd with SMTP id 46e09a7af769-70a988abd5cmr7893673a34.24.1722754566139; Sat, 03 Aug 2024 23:56:06 -0700 (PDT) Received: from darker.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5d762052af1sm1319639eaf.28.2024.08.03.23.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Aug 2024 23:56:04 -0700 (PDT) Date: Sat, 3 Aug 2024 23:55:51 -0700 (PDT) From: Hugh Dickins To: Andrew Morton cc: Yu Zhao , Barry Song <21cnbao@gmail.com>, Hugh Dickins , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH mm-unstable v1 5/5] mm/swap: remove boilerplate In-Reply-To: <20240711021317.596178-6-yuzhao@google.com> Message-ID: <714e77d3-f629-bc06-4808-f7f33ac6872d@google.com> References: <20240711021317.596178-1-yuzhao@google.com> <20240711021317.596178-6-yuzhao@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 67F711C000E X-Stat-Signature: d4u8th7wy3djgy57t5zk9o4tshh954in X-Rspam-User: X-HE-Tag: 1722754567-895752 X-HE-Meta: U2FsdGVkX1/JZJvNWAT32wtvhtioX+e8BUgW2nd/WXanmHHe+6Zhj0UQyMFMWpIg6pn9iC4JI2JqyRT0nxNUr5WZP3H/BZmBWzuH/ZLr3mXRY+HubPyiGRYiJ+4GCcnNdtp3FzAAE8o81psjXIK8GNmi8K47zyJipQYorB8cVMBL7IHN8mrE2ySeI0w5aGGuB4gY2YvMClcyhJBVKf2ATaNZy9mGcHEeTCPQfr6tfWKVXlpSkRVXEPqmI795JLBC0pF4IBaqrRUi2lgLb9QKHLOhslCDpGI2JPZJ12s+BMLG360GTdVcVSeIppO1JWP54Fd/7mbJ+LpkXDTedTKbLehkKalUV4/xM4fmknL5QNBMayx7nGx0gwrUtFBQyYQJz1K1Ldx51K+SGJvEANbuI1IYbeQwJTZkrNLI5GGSWQbbJF1ajYl/K5Unc6TRLv7Mqd18wBdD2Uvwqxyd845Rcli0CPga4HT53hSFtcSQPoT8rHLuCMczkO1xWjXuVYtYCmzvbSZ5rx+kgUtz3ZMRyeNl3mb9vJ9le+luaH5W4jnn9nzAR+oIJ+7b2lul4scg6U2qOI5AxNrluZJytd2CgaGmT9wNhzgmizy9drmcL5vjLl1dokacQvbo/7agtxrxQBFiwaqdZRk/PLtTZ7FTPMDqB1SP04usi4YrYDVp4Ov62Poko6Q0mI6NbEdIeEukwahGyWHFXq+kuOsNBvaJJqgrJ+MQ7/IHm5K7LszG035K4gPv7m1/IihZcuYMFrS5c+Rwah1yr/uwTriXcqRt+3zy+wS8EnjaV+KdLG74arnjdq1TaxT5ViYQ4M0bN8wbvWkbvou7yJtrWr/oIxeafdFu7cg3wJuamQ4rw7n5SlFLXfXhAvwKQZ3qcil0grg2vtHLuYU/w6qs4D5H+NantIM0Q7U50d10aFGI3LN0MdwWv2vwGGa1hb6kSyuNi4kveqkWP954rDmBw4hlebm Y2HVi69r Knsr94DSFjVEI+7qN2Y9W5A5zdn9u/wjxPyYdFY2AIcVjDqFmk1TU6rabhS2DU3h/FmjlmjEpMkUZRESPtVQ4pBFv9iXSY3EY2PIu4vp8PSYteGfoyOjENNzHR+/whYn5ahzCYxqP5cpeqiFM7m9aqX+KFd8hoOvQfYJIX6kGrEMykdn+d4Inqs9t9UKGIcACpr5xwBEl0ZmxIJkFnmT6S+jWPUKmSySf6PLGnCrCtwNZK2DknOBQ0kjGqYdFFMMsUqVYCbWmoS9jfY2GiB2KusD8T3kHe20Oh16IAFDzPLiSFyBwhpLCTqj7xhVKMCoQd2i1 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 Wed, 10 Jul 2024, 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 Andrew, please revert this "remove boilerplate" patch (and of course its followup fix) from mm-unstable. From the title I presume it was intended to make no functional change, but that's far from so. Under tmpfs swapping load, on different runs I see various badnesses: "Bad page" in __free_one_page(), Oops in __run_timer_base(), WARNING at kernel/workqueue.c:790 in set_work_data(), PageBuddy BUG at page-flags.h:1009 from __del_page_from_freelist(), something (I'd given up taking better notes by this time) in __queue_work(), others. All those were including the fix to Barry's report: without that fix, the boot is drowned in warnings scrolling past too fast to be read. (All the above were on the HP workstation, swapping to SSD; whereas on this ThinkPad, swapping to NVMe, no problem seen at all - I mention the swapping medium, but have no idea whether that's a relevant difference. In each case, MGLRU compiled in but not enabled. THPs and 64kTHPs active.) Sorry, but I've put no effort whatsoever into debugging this: "remove boilerplate" didn't seem worth the effort, and my personal preference is for readable boilerplate over hiding in a macro. If you prefer the macro, I expect Yu can soon come up with a fix (which I could test here): but for now please revert "remove boilerplate", since its issues get in the way of further mm testing. Thanks, Hugh > --- > 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_fbatches, lock_irq) \ > + ) > + > 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, struct 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 = 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 = 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 = 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 = 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 = 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 = 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