mm/vmstat: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
Subsystems (2)
PATCH 1/1 mm/vmstat: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
Commit 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") depends on skipping vmstat entries with empty name introduced in commit 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat") but reverted in commit b29940c1abd7 ("mm: rename and change semantics of nr_indirectly_reclaimable_bytes").
So, skipping no longer works and /proc/vmstat has misformatted lines " 0". This patch simply shows debug counters "nr_tlb_remote_*" for UP.
--- mm/vmstat.c | 5 ----- 1 file changed, 5 deletions(-)
mm/vmstat.c +0 -5
@@ -1274,13 +1274,8 @@ const char * const vmstat_text[] = {#endif #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH -#ifdef CONFIG_SMP"nr_tlb_remote_flush" ,"nr_tlb_remote_flush_received" , -#else - "", /* nr_tlb_remote_flush */ - "", /* nr_tlb_remote_flush_received */ -#endif /* CONFIG_SMP */"nr_tlb_local_flush_all" , "nr_tlb_local_flush_one", #endif /* CONFIG_DEBUG_TLBFLUSH */
Quoted 5 lines · Konstantin Khlebnikov
Commit
58bc4c34d249("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") depends on skipping vmstat entries with empty name introduced in commit7aaf77272358("mm: don't shownr_indirectly_reclaimablein/proc/vmstat") but reverted in commitb29940c1abd7("mm: rename and change semantics ofnr_indirectly_reclaimable_bytes").
Oops, good catch.
Quoted 2 lines
So, skipping no longer works and
/proc/vmstathas misformatted lines " 0". This patch simply shows debug counters "nr_tlb_remote_*" for UP.
Right, that's the the best solution IMHO.
Quoted 2 lines
Fixes 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")Signed-off-by Konstantin Khlebnikov <[email protected]>
Quoted 23 lines
--- mm/vmstat.c | 5 ----- 1 file changed, 5 deletions(-)mm/vmstat.c +0
-5@@ -1274,13 +1274,8 @@ const char * const vmstat_text[] = {#endif #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH -#ifdef CONFIG_SMP"nr_tlb_remote_flush" ,"nr_tlb_remote_flush_received" , -#else - "", /* nr_tlb_remote_flush */ - "", /* nr_tlb_remote_flush_received */ -#endif /* CONFIG_SMP */"nr_tlb_local_flush_all" , "nr_tlb_local_flush_one", #endif /* CONFIG_DEBUG_TLBFLUSH */
Quoted 8 lines · Vlastimil Babka
Quoted 5 lines · Konstantin Khlebnikov
Commit
58bc4c34d249("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") depends on skipping vmstat entries with empty name introduced in commit7aaf77272358("mm: don't shownr_indirectly_reclaimablein/proc/vmstat") but reverted in commitb29940c1abd7("mm: rename and change semantics ofnr_indirectly_reclaimable_bytes").Oops, good catch.
Also 4.19.y has broken format in /sys/devices/system/node/node*/vmstat and /proc/zoneinfo. Do you have any plans on pushing related slab changes into that stable branch?
Quoted 35 lines
Quoted 3 lines
So, skipping no longer works and
/proc/vmstathas misformatted lines " 0". This patch simply shows debug counters "nr_tlb_remote_*" for UP.Right, that's the the best solution IMHO.
Quoted 2 lines
Fixes 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")Signed-off-by Konstantin Khlebnikov <[email protected]>Acked-by Vlastimil Babka <[email protected]>Quoted 23 lines
--- mm/vmstat.c | 5 ----- 1 file changed, 5 deletions(-)mm/vmstat.c +0
-5@@ -1274,13 +1274,8 @@ const char * const vmstat_text[] = {#endif #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH -#ifdef CONFIG_SMP"nr_tlb_remote_flush" ,"nr_tlb_remote_flush_received" , -#else - "", /* nr_tlb_remote_flush */ - "", /* nr_tlb_remote_flush_received */ -#endif /* CONFIG_SMP */"nr_tlb_local_flush_all" , "nr_tlb_local_flush_one", #endif /* CONFIG_DEBUG_TLBFLUSH */
Quoted 8 lines · Konstantin Khlebnikov
Quoted 7 lines · Vlastimil Babka
Quoted 5 lines · Konstantin Khlebnikov
Commit
58bc4c34d249("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") depends on skipping vmstat entries with empty name introduced in commit7aaf77272358("mm: don't shownr_indirectly_reclaimablein/proc/vmstat") but reverted in commitb29940c1abd7("mm: rename and change semantics ofnr_indirectly_reclaimable_bytes").
Quoted 4 lines
Quoted 1 line
Oops, good catch.
Also 4.19.y has broken format in
/sys/devices/system/node/node*/vmstatand/proc/zoneinfo. Do you have any plans on pushing related slab changes into that stable branch?
Hmm do you mean this?
https://lore.kernel.org/linux-mm/[email protected]/
Looks like Roman marked it wrongly for # 4.14.x-4.18.x and I didn't notice, my slab changes are indeed 4.20, so we should resend for 4.19.
Quoted 36 lines
Quoted 35 lines
Quoted 3 lines
So, skipping no longer works and
/proc/vmstathas misformatted lines " 0". This patch simply shows debug counters "nr_tlb_remote_*" for UP.Right, that's the the best solution IMHO.
Quoted 2 lines
Fixes 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")Signed-off-by Konstantin Khlebnikov <[email protected]>Acked-by Vlastimil Babka <[email protected]>Quoted 23 lines
--- mm/vmstat.c | 5 ----- 1 file changed, 5 deletions(-)mm/vmstat.c +0
-5@@ -1274,13 +1274,8 @@ const char * const vmstat_text[] = {#endif #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH -#ifdef CONFIG_SMP"nr_tlb_remote_flush" ,"nr_tlb_remote_flush_received" , -#else - "", /* nr_tlb_remote_flush */ - "", /* nr_tlb_remote_flush_received */ -#endif /* CONFIG_SMP */"nr_tlb_local_flush_all" , "nr_tlb_local_flush_one", #endif /* CONFIG_DEBUG_TLBFLUSH */
Quoted 11 lines · Vlastimil Babka
Quoted 10 lines · Konstantin Khlebnikov
Quoted 8 lines · Vlastimil Babka
Quoted 5 lines · Konstantin Khlebnikov
Commit
58bc4c34d249("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") depends on skipping vmstat entries with empty name introduced in commit7aaf77272358("mm: don't shownr_indirectly_reclaimablein/proc/vmstat") but reverted in commitb29940c1abd7("mm: rename and change semantics ofnr_indirectly_reclaimable_bytes").Oops, good catch.
Quoted 8 lines
Quoted 2 lines
Also 4.19.y has broken format in
/sys/devices/system/node/node*/vmstatand/proc/zoneinfo. Do you have any plans on pushing related slab changes into that stable branch?Hmm do you mean this?
https://lore.kernel.org/linux-mm/[email protected]/Looks like Roman marked it wrongly for # 4.14.x-4.18.x and I didn't notice, my slab changes are indeed 4.20, so we should resend for 4.19.
Yep, this should fix zoneinfo
but /sys/devices/system/node/node*/vmstat needs yet another fix.
Quoted 38 lines
Quoted 37 lines
Quoted 36 lines
Quoted 4 lines
So, skipping no longer works and
/proc/vmstathas misformatted lines " 0". This patch simply shows debug counters "nr_tlb_remote_*" for UP.Right, that's the the best solution IMHO.
Quoted 2 lines
Fixes 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")Signed-off-by Konstantin Khlebnikov <[email protected]>Acked-by Vlastimil Babka <[email protected]>Quoted 23 lines
--- mm/vmstat.c | 5 ----- 1 file changed, 5 deletions(-)mm/vmstat.c +0
-5@@ -1274,13 +1274,8 @@ const char * const vmstat_text[] = {#endif #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH -#ifdef CONFIG_SMP"nr_tlb_remote_flush" ,"nr_tlb_remote_flush_received" , -#else - "", /* nr_tlb_remote_flush */ - "", /* nr_tlb_remote_flush_received */ -#endif /* CONFIG_SMP */"nr_tlb_local_flush_all" , "nr_tlb_local_flush_one", #endif /* CONFIG_DEBUG_TLBFLUSH */
Quoted 11 lines · Vlastimil Babka
Quoted 10 lines · Konstantin Khlebnikov
Quoted 8 lines · Vlastimil Babka
Quoted 5 lines · Konstantin Khlebnikov
Commit
58bc4c34d249("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") depends on skipping vmstat entries with empty name introduced in commit7aaf77272358("mm: don't shownr_indirectly_reclaimablein/proc/vmstat") but reverted in commitb29940c1abd7("mm: rename and change semantics ofnr_indirectly_reclaimable_bytes").Oops, good catch.
Quoted 8 lines
Quoted 2 lines
Also 4.19.y has broken format in
/sys/devices/system/node/node*/vmstatand/proc/zoneinfo. Do you have any plans on pushing related slab changes into that stable branch?Hmm do you mean this?
https://lore.kernel.org/linux-mm/[email protected]/Looks like Roman marked it wrongly for # 4.14.x-4.18.x and I didn't notice, my slab changes are indeed 4.20, so we should resend for 4.19.
Oops, my bad. I believe 4.19 hasn't been released at that time, so I missed it. Thanks for noticing!