mm-swap-dont-update-the-counter-up-front.patch removed from -mm tree
The quilt patch titled
Subject: mm, swap: don't update the counter up-front
has been removed from the -mm tree. Its filename was
mm-swap-dont-update-the-counter-up-front.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kairui Song <[email protected]>
Subject: mm, swap: don't update the counter up-front
Date: Fri, 14 Mar 2025 00:59:32 +0800
The counter update before allocation design was useful to avoid unnecessary scan when device is full, so it will abort early if the counter indicates the device is full. But that is an uncommon case, and now scanning of a full device is very fast, so the up-front update is not helpful any more.
Remove it and simplify the slot allocation logic.
---
mm/swapfile.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-dont-update-the-counter-up-front +2 -16
@@ -1201,22 +1201,10 @@ int get_swap_pages(int n_goal, swp_entryint order =swap_entry_order (entry_order);unsigned long size =1 << order;struct swap_info_struct *si, *next; -long avail_pgs;int n_ret =0 ;int node;spin_lock (&swap_avail_lock); - - avail_pgs =atomic_long_read (&nr_swap_pages) / size; -if (avail_pgs <=0 ) { -spin_unlock (&swap_avail_lock); - goto noswap; - } - - n_goal =min3 ((long )n_goal, (long )SWAP_BATCH , avail_pgs); - -atomic_long_sub (n_goal * size, &nr_swap_pages); - start_over: node =numa_node_id ();plist_for_each_entry_safe (si, next, &swap_avail_heads[node], avail_lists[node]) {
@@ -1250,10 +1238,8 @@ start_over:spin_unlock (&swap_avail_lock); check_out: -if (n_ret < n_goal) -atomic_long_add ((long )(n_goal - n_ret) * size, - &nr_swap_pages); -noswap: +atomic_long_sub (n_ret * size, &nr_swap_pages); +return n_ret; }
_
Patches currently in -mm which might be from [email protected] are