* [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE
@ 2022-06-09 10:40 Muchun Song
2022-06-09 11:43 ` Michal Hocko
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Muchun Song @ 2022-06-09 10:40 UTC (permalink / raw)
To: mcgrof, keescook, yzaikin, akpm, vbabka, mgorman, peterz,
dhowells, willy, Liam.Howlett, mhocko
Cc: linux-kernel, linux-fsdevel, linux-mm, Muchun Song, stable
"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 <songmuchun@bytedance.com>
Cc: <stable@vger.kernel.org>
---
v2:
- Simplify the fix, thanks to Michal.
kernel/sysctl.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 50a2c29efc94..485d2b1bc873 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -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",
--
2.11.0
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE
2022-06-09 10:40 [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE Muchun Song
@ 2022-06-09 11:43 ` Michal Hocko
2022-06-09 13:53 ` Luis Chamberlain
2022-06-09 15:15 ` Mel Gorman
2 siblings, 0 replies; 4+ messages in thread
From: Michal Hocko @ 2022-06-09 11:43 UTC (permalink / raw)
To: Muchun Song
Cc: mcgrof, keescook, yzaikin, akpm, vbabka, mgorman, peterz,
dhowells, willy, Liam.Howlett, linux-kernel, linux-fsdevel,
linux-mm, stable
On Thu 09-06-22 18:40:32, Muchun Song wrote:
> "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 <songmuchun@bytedance.com>
> Cc: <stable@vger.kernel.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Thanks!
> ---
> v2:
> - Simplify the fix, thanks to Michal.
>
> kernel/sysctl.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index 50a2c29efc94..485d2b1bc873 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -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",
> --
> 2.11.0
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE
2022-06-09 10:40 [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE Muchun Song
2022-06-09 11:43 ` Michal Hocko
@ 2022-06-09 13:53 ` Luis Chamberlain
2022-06-09 15:15 ` Mel Gorman
2 siblings, 0 replies; 4+ messages in thread
From: Luis Chamberlain @ 2022-06-09 13:53 UTC (permalink / raw)
To: Muchun Song
Cc: keescook, yzaikin, akpm, vbabka, mgorman, peterz, dhowells,
willy, Liam.Howlett, mhocko, linux-kernel, linux-fsdevel,
linux-mm, stable
On Thu, Jun 09, 2022 at 06:40:32PM +0800, Muchun Song wrote:
> "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 <songmuchun@bytedance.com>
> Cc: <stable@vger.kernel.org>
Thanks! Queued onto sysctl-fixes.
Luis
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE
2022-06-09 10:40 [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE Muchun Song
2022-06-09 11:43 ` Michal Hocko
2022-06-09 13:53 ` Luis Chamberlain
@ 2022-06-09 15:15 ` Mel Gorman
2 siblings, 0 replies; 4+ messages in thread
From: Mel Gorman @ 2022-06-09 15:15 UTC (permalink / raw)
To: Muchun Song
Cc: mcgrof, keescook, yzaikin, akpm, vbabka, peterz, dhowells, willy,
Liam.Howlett, mhocko, linux-kernel, linux-fsdevel, linux-mm,
stable
On Thu, Jun 09, 2022 at 06:40:32PM +0800, Muchun Song wrote:
> "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 <songmuchun@bytedance.com>
> Cc: <stable@vger.kernel.org>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
--
Mel Gorman
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-06-09 15:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-09 10:40 [PATCH v2] mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE Muchun Song
2022-06-09 11:43 ` Michal Hocko
2022-06-09 13:53 ` Luis Chamberlain
2022-06-09 15:15 ` Mel Gorman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox