From: "Kunwu Chan" <kunwu.chan@linux.dev>
To: "Lian Wang" <lianux.mm@gmail.com>, linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org,
"Andrew Morton" <akpm@linux-foundation.org>,
"Chris Li" <chrisl@kernel.org>, "Nhat Pham" <nphamcs@gmail.com>,
"Baoquan He" <baoquan.he@linux.dev>,
"Barry Song" <baohua@kernel.org>,
"Youngjun Park" <youngjun.park@lge.com>,
"Kemeng Shi" <shikemeng@huaweicloud.com>,
"Kairui Song" <kasong@tencent.com>,
"Jihan LIN" <linjh22s@gmail.com>, "Kees Cook" <kees@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
"Thomas Gleixner" <tglx@kernel.org>,
linux-hardening@vger.kernel.org
Subject: Re: [RFC PATCH v4 15/18] mm/swap: reuse per-CPU queue readers across priority changes
Date: Fri, 20 Nov 2026 04:37:59 +0000 [thread overview]
Message-ID: <cf699b4c6b1ef0e34316d9b67a19082ee996aba7@linux.dev> (raw)
In-Reply-To: <c7ee52cc6aa423b40c67d4c24dcb9d30b7e07824.1794666741.git.lianux.mm@gmail.com>
Reviewed-by: Kunwu Chan <kunwu.chan@gmail.com>
Thanks,
Kunwu
>
> Inserting a new priority allocates a replacement per-CPU reader array
> even when earlier ring removal left enough storage. An unnecessary
> allocation can add swapon work or fail despite sufficient capacity.
>
> Track the installed reader capacity and retain its high-water mark
> until the queue becomes empty. Reuse existing storage when the new ring
> fits, initializing every valid ring index for the new topology. Prepare
> larger storage outside the writer only when growth is required and
> recheck capacity under the writer before publishing.
>
> Preserve the existing prepare/install ownership and failure rollback
> protocol. Device removal continues to avoid per-CPU shrinking allocation
> under the writer.
>
> Signed-off-by: Lian Wang <lianux.mm@gmail.com>
> ---
> mm/swapfile.c | 28 ++++++++++++++++++----------
> 1 file changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index bd098114ee4b..5e5c1aef010f 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -202,6 +202,8 @@ struct swap_queue_cursor {
> };
>
> static __percpu struct swap_queue_reader *swap_queue_readers;
> +/* Keep the high-water capacity until the last priority ring is removed. */
> +static unsigned int swap_queue_readers_capacity;
>
> static inline bool swap_device_masked(struct swap_info_struct *si)
> {
> @@ -241,7 +243,7 @@ static bool swap_queue_needs_readers(int prio)
> return false;
> }
>
> - return true;
> + return swap_queue_len >= swap_queue_readers_capacity;
> }
>
> /*
> @@ -289,13 +291,15 @@ static void swap_queue_reset_readers(void)
> }
> }
>
> -static void swap_queue_install_readers(struct swap_queue_reader __percpu *readers)
> +static void swap_queue_install_readers(struct swap_queue_reader __percpu *readers,
> + unsigned int capacity)
> {
> int cpu;
>
> lockdep_assert_held_write(&swapon_rwsem);
> free_percpu(swap_queue_readers);
> swap_queue_readers = readers;
> + swap_queue_readers_capacity = capacity;
> if (!readers)
> return;
>
> @@ -432,7 +436,8 @@ static int swap_queue_add(struct swap_info_struct *si,
> }
>
> /* No ring at this priority: insert a new one at pos. */
> - if (!*readers || nr_readers <= swap_queue_len)
> + if (swap_queue_len >= swap_queue_readers_capacity &&
> + (!*readers || nr_readers <= swap_queue_len))
> goto failed;
> new_queue = kmalloc_array(swap_queue_len + 1, sizeof(*swap_queue), gfp);
> if (!new_queue)
> @@ -460,8 +465,12 @@ static int swap_queue_add(struct swap_info_struct *si,
> memalloc_noreclaim_restore(noreclaim_flag);
> kfree(old_queue);
>
> - swap_queue_install_readers(*readers);
> - *readers = NULL;
> + if (swap_queue_len > swap_queue_readers_capacity) {
> + swap_queue_install_readers(*readers, nr_readers);
> + *readers = NULL;
> + } else {
> + swap_queue_reset_readers();
> + }
> return 0;
>
> add_to_ring:
> @@ -504,10 +513,9 @@ static void swap_queue_del(struct swap_info_struct *si)
> }
>
> /*
> - * Shrinking the small topology arrays is optional. Keep reader storage
> - * until a new priority is inserted or the queue is empty: per-CPU
> - * allocation must not run under this writer's noreclaim scope, which
> - * can grant backing pages reserve access.
> + * Shrinking the small topology arrays is optional. Keep reader capacity
> + * until the queue is empty: per-CPU allocation must not run under this
> + * writer's noreclaim scope, which can grant backing pages reserve access.
> */
> gfp = GFP_NOIO | __GFP_HIGH | __GFP_NOMEMALLOC;
> noreclaim_flag = memalloc_noreclaim_save();
> @@ -550,7 +558,7 @@ static void swap_queue_del(struct swap_info_struct *si)
> swap_queue = NULL;
> }
> if (!swap_queue_len)
> - swap_queue_install_readers(NULL);
> + swap_queue_install_readers(NULL, 0);
> }
> spin_unlock(&swap_queue_update_lock);
>
next prev parent reply other threads:[~2026-11-20 4:38 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-14 14:47 [RFC PATCH v4 00/18] mm/swap: introduce priority queues for swap device allocation Lian Wang
2026-11-14 14:48 ` [RFC PATCH v4 01/18] mm/swap: remove unused parameter for reading swap header Lian Wang
2026-11-19 15:56 ` Kunwu Chan
2026-11-14 14:49 ` [RFC PATCH v4 02/18] mm/swap: clean up hibernation error handling Lian Wang
2026-11-19 15:57 ` Kunwu Chan
2026-11-14 14:49 ` [RFC PATCH v4 03/18] mm/swap: cleanup and document swap device availability flag usage Lian Wang
2026-11-20 3:58 ` Kunwu Chan
2026-11-14 14:49 ` [RFC PATCH v4 04/18] mm/swap: introduce swap device iteration helper Lian Wang
2026-11-20 3:59 ` Kunwu Chan
2026-11-14 14:49 ` [RFC PATCH v4 05/18] mm/swap: change the swapon lock into a percpu rwsem Lian Wang
2026-11-20 4:12 ` Kunwu Chan
2026-11-14 14:49 ` [RFC PATCH v4 06/18] mm/swap: serialize swap publication before removing swapon mutex Lian Wang
2026-11-20 4:30 ` Kunwu Chan
2026-11-14 14:50 ` [RFC PATCH v4 07/18] mm/swap: consolidate swap inuse accounting helpers Lian Wang
2026-11-20 4:30 ` Kunwu Chan
2026-11-14 14:50 ` [RFC PATCH v4 08/18] mm/swap: change back to use each swap device's percpu cluster Lian Wang
2026-11-20 4:31 ` Kunwu Chan
2026-11-14 14:50 ` [RFC PATCH v4 09/18] mm/swap: avoid direct reclaim when populating swap cluster metadata Lian Wang
2026-11-20 4:31 ` Kunwu Chan
2026-11-14 14:50 ` [RFC PATCH v4 10/18] mm/swap: add priority queue for swap device allocation Lian Wang
2026-11-16 3:51 ` Kairui Song
2026-11-16 11:11 ` Lian Wang
2026-11-20 4:34 ` Kunwu Chan
2026-11-14 14:51 ` [RFC PATCH v4 11/18] mm/swap: remove available list Lian Wang
2026-11-20 4:36 ` Kunwu Chan
2026-11-14 14:51 ` [RFC PATCH v4 12/18] mm/swap: bound synchronous discard outside the allocation reader Lian Wang
2026-11-20 4:36 ` Kunwu Chan
2026-11-14 14:51 ` [RFC PATCH v4 13/18] mm/swap: drop swap active plist Lian Wang
2026-11-20 4:37 ` Kunwu Chan
2026-11-14 14:51 ` [RFC PATCH v4 14/18] lib/plist.c: remove requeue function Lian Wang
2026-11-14 14:52 ` [RFC PATCH v4 15/18] mm/swap: reuse per-CPU queue readers across priority changes Lian Wang
2026-11-20 4:37 ` Kunwu Chan [this message]
2026-11-14 14:52 ` [RFC PATCH v4 16/18] mm/swap: advance the global queue cursor directly between priority rings Lian Wang
2026-11-20 4:38 ` Kunwu Chan
2026-11-14 14:52 ` [RFC PATCH v4 17/18] mm/swap: skip reader rotation for single-device " Lian Wang
2026-11-20 4:38 ` Kunwu Chan
2026-11-14 14:52 ` [RFC PATCH v4 18/18] mm/swap: redistribute queue readers after membership changes Lian Wang
2026-11-16 3:29 ` Kairui Song
2026-11-20 4:38 ` Kunwu Chan
2026-11-16 3:52 ` [RFC PATCH v4 00/18] mm/swap: introduce priority queues for swap device allocation Kairui Song
2026-11-16 11:10 ` Lian Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cf699b4c6b1ef0e34316d9b67a19082ee996aba7@linux.dev \
--to=kunwu.chan@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=baohua@kernel.org \
--cc=baoquan.he@linux.dev \
--cc=chrisl@kernel.org \
--cc=gustavoars@kernel.org \
--cc=kasong@tencent.com \
--cc=kees@kernel.org \
--cc=lianux.mm@gmail.com \
--cc=linjh22s@gmail.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=nphamcs@gmail.com \
--cc=shikemeng@huaweicloud.com \
--cc=tglx@kernel.org \
--cc=youngjun.park@lge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox