vmstat: call fold_vm_zone_numa_events() before show per zone NUMA event

commit 2ea80b039b9af0b71c00378523b71c254fb99c23 upstream.

Since 5.14-rc1, NUMA events will only be folded from per-CPU statistics to
per zone and global statistics when the user actually needs it.

Currently, the kernel has performs the fold operation when reading
/proc/vmstat, but does not perform the fold operation in /proc/zoneinfo.
This can lead to inaccuracies in the following statistics in zoneinfo:
- numa_hit
- numa_miss
- numa_foreign
- numa_interleave
- numa_local
- numa_other

Therefore, before printing per-zone vm_numa_event when reading
/proc/zoneinfo, we should also perform the fold operation.

Link: https://lkml.kernel.org/r/1730433998-10461-1-git-send-email-mengensun@tencent.com
Fixes: f19298b9516c ("mm/vmstat: convert NUMA statistics to basic NUMA counters")
Signed-off-by: MengEn Sun <mengensun@tencent.com>
Reviewed-by: JinLiang Zheng <alexjlzheng@tencent.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 8ce2620344b2f8b4e673c8f48e92945b874ef36d..a105c7f358ba5aa79adc25173a455b045e9d4bc8 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1690,6 +1690,7 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
                           zone_page_state(zone, i));
 
 #ifdef CONFIG_NUMA
+       fold_vm_zone_numa_events(zone);
        for (i = 0; i < NR_VM_NUMA_EVENT_ITEMS; i++)
                seq_printf(m, "\n      %-12s %lu", numa_stat_name(i),
                           zone_numa_event_state(zone, i));