Re: [RFC PATCH v4 11/18] mm/swap: remove available list
From: Kunwu Chan
Date: Thu Nov 19 2026 - 23:36:49 EST
Reviewed-by: Kunwu Chan <kunwu.chan@xxxxxxxxx>
Thanks,
Kunwu
>
> From: Kairui Song <kasong@xxxxxxxxxxx>
>
> 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@xxxxxxxxxxx>
> Signed-off-by: Lian Wang <lianux.mm@xxxxxxxxx>
> ---
> 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
>