Re: [RFC PATCH v4 04/18] mm/swap: introduce swap device iteration helper
From: Kunwu Chan
Date: Thu Nov 19 2026 - 23:00:00 EST
Reviewed-by: Kunwu Chan <kunwu.chan@xxxxxxxxx>
Thanks,
Kunwu
>
> From: Kairui Song <kasong@xxxxxxxxxxx>
>
> 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@xxxxxxxxxxx>
> Signed-off-by: Lian Wang <lianux.mm@xxxxxxxxx>
> ---
> 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;
>