Skip to contentSkip to conversation

mm-swap-simplify-percpu-cluster-updating.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 16, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm, swap: simplify percpu cluster updating
has been removed from the -mm tree. Its filename was
mm-swap-simplify-percpu-cluster-updating.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: simplify percpu cluster updating
Date: Tue, 14 Jan 2025 01:57:29 +0800

Instead of using a returning argument, we can simply store the next cluster offset to the fixed percpu location, which reduce the stack usage and simplify the function:

Object size:
./scripts/bloat-o-meter mm/swapfile.o mm/swapfile.o.new add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-271 (-271)
Function old new delta
get_swap_pages 2847 2733 -114
alloc_swap_scan_cluster 894 737 -157
Total: Before=30833, After=30562, chg -0.88%

Stack usage:
Before:
swapfile.c:1190:5:get_swap_pages 240 static

After:
swapfile.c:1185:5:get_swap_pages 216 static

Cc Baoquan He <[email protected]>
Cc Barry Song <[email protected]>
Cc Chis Li <[email protected]>
Cc "Huang, Ying" <[email protected]>
Cc Hugh Dickens <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Kalesh Singh <[email protected]>
Cc Nhat Pham <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Yosry Ahmed <[email protected]>

---

 include/linux/swap.h |    4 +-
 mm/swapfile.c        |   66 ++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 39 deletions(-)
include/linux/swap.h renamed from include/linux/swap.h~mm-swap-simplify-percpu-cluster-updating +2 -2
@@ -274,9 +274,9 @@ enum swap_cluster_flags {
  * The first page in the swap file is the swap header, which is always marked
  * bad to prevent it from being allocated as an entry. This also prevents the
  * cluster to which it belongs being marked free. Therefore 0 is safe to use as
- * a sentinel to indicate next is not valid in percpu_cluster.
+ * a sentinel to indicate an entry is not valid.
  */
-#define SWAP_NEXT_INVALID	0
+#define SWAP_ENTRY_INVALID	0
 
 #ifdef CONFIG_THP_SWAP
 #define SWAP_NR_ORDERS		(PMD_ORDER + 1)
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-simplify-percpu-cluster-updating +29 -37

146 lines not on this page · raw message

_

Patches currently in -mm which might be from [email protected] are