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 04/18] mm/swap: introduce swap device iteration helper
Date: Fri, 20 Nov 2026 03:59:47 +0000 [thread overview]
Message-ID: <01e78c2f91fa0320a5bee69f6cb47a1dcacab31f@linux.dev> (raw)
In-Reply-To: <8e1766da4ddbf22e36f8689360dfea64377269fd.1794666741.git.lianux.mm@gmail.com>
Reviewed-by: Kunwu Chan <kunwu.chan@gmail.com>
Thanks,
Kunwu
>
> From: Kairui Song <kasong@tencent.com>
>
> Several swap users scan the swap_info array to find in-use or writable
> devices. Add for_each_swap() and for_each_avail_swap() with SWP_USED and
> SWP_USED | SWP_WRITEOK filtering, and use them for hibernation lookups,
> drain_mmlist() and si_swapinfo(). Keep the swap_lock requirement for
> iteration.
>
> Move the live-reference warning from __swap_type_to_info() into
> __swap_entry_to_info(). The iterator must inspect descriptors before
> applying its flag filter, including descriptors whose device reference
> is dead; entry-based lookup retains the warning.
>
> Signed-off-by: Kairui Song <kasong@tencent.com>
> Signed-off-by: Lian Wang <lianux.mm@gmail.com>
> ---
> mm/swap.h | 12 ++++----
> mm/swapfile.c | 77 +++++++++++++++++++++++++++++++--------------------
> 2 files changed, 53 insertions(+), 36 deletions(-)
>
> diff --git a/mm/swap.h b/mm/swap.h
> index d488a69c2809..70fd3ab655ff 100644
> --- a/mm/swap.h
> +++ b/mm/swap.h
> @@ -108,16 +108,16 @@ static inline unsigned int swp_cluster_offset(swp_entry_t entry)
> */
> static inline struct swap_info_struct *__swap_type_to_info(int type)
> {
> - struct swap_info_struct *si;
> -
> - si = READ_ONCE(swap_info[type]); /* rcu_dereference() */
> - VM_WARN_ON_ONCE(percpu_ref_is_zero(&si->users)); /* race with swapoff */
> - return si;
> + return READ_ONCE(swap_info[type]); /* rcu_dereference() */
> }
>
> static inline struct swap_info_struct *__swap_entry_to_info(swp_entry_t entry)
> {
> - return __swap_type_to_info(swp_type(entry));
> + struct swap_info_struct *si;
> +
> + si = __swap_type_to_info(swp_type(entry)); /* rcu_dereference() */
> + VM_WARN_ON_ONCE(percpu_ref_is_zero(&si->users)); /* race with swapoff */
> + return si;
> }
>
> static inline struct swap_cluster_info *__swap_offset_to_cluster(
> diff --git a/mm/swapfile.c b/mm/swapfile.c
> index 6485c8020d3a..1669a46515cd 100644
> --- a/mm/swapfile.c
> +++ b/mm/swapfile.c
> @@ -106,6 +106,34 @@ static DEFINE_SPINLOCK(swap_avail_lock);
>
> struct swap_info_struct *swap_info[MAX_SWAPFILES];
>
> +static inline struct swap_info_struct *__swap_iter(int *i, unsigned long flag)
> +{
> + lockdep_assert_held(&swap_lock);
> + while (*i < nr_swapfiles) {
> + struct swap_info_struct *si = __swap_type_to_info(*i);
> +
> + VM_WARN_ON(!si);
> + (*i)++;
> + if (flag && !((si->flags & flag) == flag))
> + continue;
> + return si;
> + }
> + return NULL;
> +}
> +
> +#define __for_each_swap(si, flag) \
> + for (int __i = 0; ((si) = __swap_iter(&__i, flag));)
> +
> +/*
> + * for_each_swap - iterate through all allocated and inuse swap devices
> + * @si: the iterator
> + *
> + * Context: The caller must hold swap_lock. The lock may be dropped during
> + * the loop body but must be re-acquired before the next iteration.
> + */
> +#define for_each_swap(si) __for_each_swap(si, SWP_USED)
> +#define for_each_avail_swap(si) __for_each_swap(si, SWP_USED | SWP_WRITEOK)
> +
> static struct kmem_cache *swap_table_cachep;
>
> /* Protects si->swap_file for /proc/swaps usage */
> @@ -2284,26 +2312,18 @@ void swap_free_hibernation_slot(swp_entry_t entry)
>
> static int __find_hibernation_swap_type(dev_t device, sector_t offset)
> {
> - int type;
> -
> - lockdep_assert_held(&swap_lock);
> + struct swap_info_struct *si;
>
> if (!device)
> return -EINVAL;
>
> - for (type = 0; type < nr_swapfiles; type++) {
> - struct swap_info_struct *sis = swap_info[type];
> -
> - if (!(sis->flags & SWP_WRITEOK))
> - continue;
> -
> - if (device == sis->bdev->bd_dev) {
> - struct swap_extent *se = first_se(sis);
> -
> - if (se->start_block == offset)
> - return type;
> + for_each_avail_swap(si) {
> + if (device == si->bdev->bd_dev) {
> + if (first_se(si)->start_block == offset)
> + return si->type;
> }
> }
> +
> return -ENODEV;
> }
>
> @@ -2470,16 +2490,13 @@ int find_hibernation_swap_type(dev_t device, sector_t offset)
>
> int find_first_swap(dev_t *device)
> {
> - int type, ret = -ENODEV;
> + int ret = -ENODEV;
> + struct swap_info_struct *si;
>
> spin_lock(&swap_lock);
> - for (type = 0; type < nr_swapfiles; type++) {
> - struct swap_info_struct *sis = swap_info[type];
> -
> - if (!(sis->flags & SWP_WRITEOK))
> - continue;
> - *device = sis->bdev->bd_dev;
> - ret = type;
> + for_each_avail_swap(si) {
> + *device = si->bdev->bd_dev;
> + ret = si->type;
> break;
> }
> spin_unlock(&swap_lock);
> @@ -2996,12 +3013,14 @@ static int try_to_unuse(unsigned int type)
> */
> static void drain_mmlist(void)
> {
> + struct swap_info_struct *si;
> struct list_head *p, *next;
> - unsigned int type;
>
> - for (type = 0; type < nr_swapfiles; type++)
> - if (swap_usage_in_pages(swap_info[type]))
> + for_each_swap(si) {
> + if (swap_usage_in_pages(si))
> return;
> + }
> +
> spin_lock(&mmlist_lock);
> list_for_each_safe(p, next, &init_mm.mmlist)
> list_del_init(p);
> @@ -3997,14 +4016,12 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
>
> void si_swapinfo(struct sysinfo *val)
> {
> - unsigned int type;
> + struct swap_info_struct *si;
> unsigned long nr_to_be_unused = 0;
>
> spin_lock(&swap_lock);
> - for (type = 0; type < nr_swapfiles; type++) {
> - struct swap_info_struct *si = swap_info[type];
> -
> - if ((si->flags & SWP_USED) && !(si->flags & SWP_WRITEOK))
> + for_each_swap(si) {
> + if (!(si->flags & SWP_WRITEOK))
> nr_to_be_unused += swap_usage_in_pages(si);
> }
> val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused;
>
next prev parent reply other threads:[~2026-11-20 3:59 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 [this message]
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
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=01e78c2f91fa0320a5bee69f6cb47a1dcacab31f@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.