Skip to contentSkip to conversation

FAILED: patch "[PATCH] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE" failed to apply to 4.19-stable tree

PATCH [email protected] 1 participant 1 message Jul 18, 2022

Subsystems (2)
Stable branch Proc sysctl
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 43b5240ca6b33108998810593248186b1e3ae34a Mon Sep 17 00:00:00 2001
From: Muchun Song <[email protected]>
Date: Thu, 9 Jun 2022 18:40:32 +0800
Subject: [PATCH] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE

"numa_stat" should not be included in the scope of CONFIG_HUGETLB_PAGE, if CONFIG_HUGETLB_PAGE is not configured even if CONFIG_NUMA is configured, "numa_stat" is missed form /proc. Move it out of CONFIG_HUGETLB_PAGE to fix it.

Fixes 4518085e127d ("mm, sysctl: make NUMA stats configurable")
Signed-off-by Muchun Song <[email protected]>
Cc <[email protected]>
Acked-by Michal Hocko <[email protected]>
Acked-by Mel Gorman <[email protected]>
Signed-off-by Luis Chamberlain <[email protected]>
kernel/sysctl.c +11 -9
index e52b6e372c60..aaf0b1f1dc57 100644
@@ -2091,6 +2091,17 @@ static struct ctl_table vm_table[] = {
 		.extra1		= SYSCTL_ZERO,
 		.extra2		= SYSCTL_TWO_HUNDRED,
 	},
+#ifdef CONFIG_NUMA
+	{
+		.procname	= "numa_stat",
+		.data		= &sysctl_vm_numa_stat,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= sysctl_vm_numa_stat_handler,
+		.extra1		= SYSCTL_ZERO,
+		.extra2		= SYSCTL_ONE,
+	},
+#endif
 #ifdef CONFIG_HUGETLB_PAGE
 	{
 		.procname	= "nr_hugepages",

@@ -2107,15 +2118,6 @@ static struct ctl_table vm_table[] = {
 		.mode           = 0644,
 		.proc_handler   = &hugetlb_mempolicy_sysctl_handler,
 	},
-	{
-		.procname		= "numa_stat",
-		.data			= &sysctl_vm_numa_stat,
-		.maxlen			= sizeof(int),
-		.mode			= 0644,
-		.proc_handler	= sysctl_vm_numa_stat_handler,
-		.extra1			= SYSCTL_ZERO,
-		.extra2			= SYSCTL_ONE,
-	},
 #endif
 	 {
 		.procname	= "hugetlb_shm_group",