Count non-page-fault events as page-cache numa hints instead of
fault hints in vmstat.
Signed-off-by: Gregory Price <gourry@xxxxxxxxxx>
---
include/linux/vm_event_item.h | 2 ++
mm/memory.c | 15 ++++++++++-----
mm/vmstat.c | 2 ++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index f70d0958095c..9fee15d9ba48 100644
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -63,6 +63,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
NUMA_HUGE_PTE_UPDATES,
NUMA_HINT_FAULTS,
NUMA_HINT_FAULTS_LOCAL,
+ NUMA_HINT_PAGE_CACHE,
+ NUMA_HINT_PAGE_CACHE_LOCAL,
NUMA_PAGE_MIGRATE,
#endif
#ifdef CONFIG_MIGRATION
diff --git a/mm/memory.c b/mm/memory.c
index a373b6ad0b34..35b72a1cfbd5 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5507,11 +5507,16 @@ int numa_migrate_check(struct folio *folio, struct vm_fault *vmf,
*last_cpupid = folio_last_cpupid(folio);
#ifdef CONFIG_NUMA_BALANCING
- count_vm_numa_event(NUMA_HINT_FAULTS);
- count_memcg_folio_events(folio, NUMA_HINT_FAULTS, 1);
- if (folio_nid(folio) == numa_node_id()) {
- count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL);
- *flags |= TNF_FAULT_LOCAL;
+ if (vmf) {
+ count_vm_numa_event(NUMA_HINT_FAULTS);
+ count_memcg_folio_events(folio, NUMA_HINT_FAULTS, 1);
+ if (folio_nid(folio) == numa_node_id()) {
+ count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL);
+ *flags |= TNF_FAULT_LOCAL;
+ }
+ } else {
+ count_vm_numa_event(NUMA_HINT_PAGE_CACHE);
+ count_memcg_folio_events(folio, NUMA_HINT_PAGE_CACHE, 1);
}
#endif
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 4d016314a56c..bcd9be11e957 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1338,6 +1338,8 @@ const char * const vmstat_text[] = {
"numa_huge_pte_updates",
"numa_hint_faults",
"numa_hint_faults_local",
+ "numa_hint_page_cache",
+ "numa_hint_page_cache_local",
"numa_pages_migrated",
#endif
#ifdef CONFIG_MIGRATION
--
2.43.0
