Skip to contentSkip to conversation

swap-add-a-limit-for-readahead-page-cluster-value.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Nov 9, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: swap: add a limit for readahead page-cluster value
has been removed from the -mm tree. Its filename was
swap-add-a-limit-for-readahead-page-cluster-value.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: swap: add a limit for readahead page-cluster value
Date: Mon, 24 Oct 2022 00:25:33 +0800

Currenty there is no upper limit for /proc/sys/vm/page-cluster, and it's a bit shift value, so it could result in overflow of the 32-bit integer. Add a reasonable upper limit for it, read-in at most 2**31 pages, which is a large enough value for readahead.

---

 include/linux/mm.h |    1 +
 kernel/sysctl.c    |    1 +
 mm/swap.c          |    3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
include/linux/mm.h renamed from include/linux/mm.h~swap-add-a-limit-for-readahead-page-cluster-value +1 -0
@@ -74,6 +74,7 @@ static inline void totalram_pages_add(lo
 
 extern void * high_memory;
 extern int page_cluster;
+extern const int page_cluster_max;
 
 #ifdef CONFIG_SYSCTL
 extern int sysctl_legacy_va_layout;
kernel/sysctl.c renamed from kernel/sysctl.c~swap-add-a-limit-for-readahead-page-cluster-value +1 -0
@@ -2125,6 +2125,7 @@ static struct ctl_table vm_table[] = {
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec_minmax,
 		.extra1		= SYSCTL_ZERO,
+		.extra2		= (void *)&page_cluster_max,
 	},
 	{
 		.procname	= "dirtytime_expire_seconds",
mm/swap.c renamed from mm/swap.c~swap-add-a-limit-for-readahead-page-cluster-value +2 -1
@@ -43,8 +43,9 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/pagemap.h>
 
-/* How many pages do we try to swap or page in/out together? */
+/* How many pages do we try to swap or page in/out together? As a power of 2 */
 int page_cluster;
+const int page_cluster_max = 31;
 
 /* Protecting only lru_rotate.fbatch which requires disabling interrupts */
 struct lru_rotate {

_

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