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 11/18] mm/swap: remove available list
Date: Fri, 20 Nov 2026 04:36:42 +0000 [thread overview]
Message-ID: <13f1e8fe71c2de81b9d87b824561414f48b41c00@linux.dev> (raw)
In-Reply-To: <3bb9571ebf783db7a86a0ee2e7b00883c1de850b.1794666741.git.lianux.mm@gmail.com>
Reviewed-by: Kunwu Chan <kunwu.chan@gmail.com>
Thanks,
Kunwu
>
> From: Kairui Song <kasong@tencent.com>
>
> The allocator now selects devices from the priority queue. Move the
> remaining block-cgroup throttle traversal from swap_avail_head to
> swap_active_head under swapon_rwsem. Check SWP_WRITEOK, the off-list
> state and the backing block device to retain priority-ordered target
> selection.
>
> Remove swap_avail_head, swap_avail_lock, the per-device avail_list field
> and their maintenance now that no consumer needs the available plist.
> Queue masking and the embedded availability state remain serialized by
> swap_queue_update_lock.
>
> Signed-off-by: Kairui Song <kasong@tencent.com>
> Signed-off-by: Lian Wang <lianux.mm@gmail.com>
> ---
> include/linux/swap.h | 1 -
> mm/swapfile.c | 33 ++++++---------------------------
> 2 files changed, 6 insertions(+), 28 deletions(-)
>
> diff --git a/include/linux/swap.h b/include/linux/swap.h
> index 6f32de173fb9..d31f3f023d36 100644
> --- a/include/linux/swap.h
> +++ b/include/linux/swap.h
> @@ -289,7 +289,6 @@ struct swap_info_struct {
> struct work_struct discard_work; /* discard worker */
> struct work_struct reclaim_work; /* reclaim worker */
> struct list_head discard_clusters; /* discard clusters list */
> - struct plist_node avail_list; /* entry in swap_avail_head */
> const struct swap_ops *ops;
> };
>
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index 21d27da95898..5c5e449e9da3 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -96,21 +96,6 @@ static const char Bad_offset[] = "Bad swap offset entry ";
> */
> static PLIST_HEAD(swap_active_head);
>
> -/*
> - * all available (active, not full) swap_info_structs
> - * protected with swap_avail_lock, ordered by priority.
> - * This is used by folio_alloc_swap() instead of swap_active_head
> - * because swap_active_head includes all swap_info_structs,
> - * but folio_alloc_swap() doesn't need to look at full ones.
> - * This uses its own lock instead of swapon_rwsem because when a
> - * swap_info_struct changes between not-full/full, it needs to
> - * add/remove itself to/from this list, but the swap_info_struct->lock
> - * is held and the locking order requires swapon_rwsem to be taken
> - * before any swap_info_struct->lock.
> - */
> -static PLIST_HEAD(swap_avail_head);
> -static DEFINE_SPINLOCK(swap_avail_lock);
> -
> static inline struct swap_info_struct *__swap_iter(int *i, unsigned long flag)
> {
> lockdep_assert_held(&swapon_rwsem);
> @@ -1713,7 +1698,6 @@ static void del_from_avail_list(struct swap_info_struct *si, bool swapoff)
> {
> unsigned long pages;
>
> - spin_lock(&swap_avail_lock);
> spin_lock(&swap_queue_update_lock);
>
> /*
> @@ -1736,10 +1720,8 @@ static void del_from_avail_list(struct swap_info_struct *si, bool swapoff)
> }
>
> swap_queue_mask(si);
> - plist_del(&si->avail_list, &swap_avail_head);
> skip:
> spin_unlock(&swap_queue_update_lock);
> - spin_unlock(&swap_avail_lock);
> }
>
> /* SWAP_USAGE_OFFLIST_BIT can only be cleared by this helper. */
> @@ -1748,7 +1730,6 @@ static void add_to_avail_list(struct swap_info_struct *si)
> long val;
> unsigned long pages;
>
> - spin_lock(&swap_avail_lock);
> spin_lock(&swap_queue_update_lock);
>
> /*
> @@ -1779,10 +1760,8 @@ static void add_to_avail_list(struct swap_info_struct *si)
> }
>
> swap_queue_unmask(si);
> - plist_add(&si->avail_list, &swap_avail_head);
> skip:
> spin_unlock(&swap_queue_update_lock);
> - spin_unlock(&swap_avail_lock);
> }
>
> /*
> @@ -3910,7 +3889,6 @@ static struct swap_info_struct *alloc_swap_info(void)
> }
> p->swap_extent_root = RB_ROOT;
> plist_node_init(&p->list, 0);
> - plist_node_init(&p->avail_list, 0);
> p->flags = SWP_USED;
> percpu_up_write(&swapon_rwsem);
> if (defer) {
> @@ -4326,7 +4304,6 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
> */
> si->prio = prio;
> si->list.prio = -si->prio;
> - si->avail_list.prio = -si->prio;
>
> /*
> * Publish swap_file before making the percpu ref live, then add the device
> @@ -4475,14 +4452,16 @@ void __folio_throttle_swaprate(struct folio *folio, gfp_t gfp)
> if (current->throttle_disk)
> return;
>
> - spin_lock(&swap_avail_lock);
> - plist_for_each_entry(si, &swap_avail_head, avail_list) {
> - if (si->bdev) {
> + percpu_down_read(&swapon_rwsem);
> + plist_for_each_entry(si, &swap_active_head, list) {
> + if ((si->flags & SWP_WRITEOK) &&
> + !(atomic_long_read(&si->inuse_pages) &
> + SWAP_USAGE_OFFLIST_BIT) && si->bdev) {
> blkcg_schedule_throttle(si->bdev->bd_disk, true);
> break;
> }
> }
> - spin_unlock(&swap_avail_lock);
> + percpu_up_read(&swapon_rwsem);
> }
> #endif
>
next prev parent reply other threads:[~2026-11-20 4:36 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 [this message]
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
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=13f1e8fe71c2de81b9d87b824561414f48b41c00@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.