1 files changed, 17 insertions, 8 deletions

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index e7e92c8f4883..e65d91c02e30 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -114,6 +114,20 @@ struct zone_padding {
 #define ZONE_PADDING(name)
 #endif
 
+#ifdef CONFIG_NUMA
+enum numa_stat_item {
+        NUMA_HIT,               /* allocated in intended node */
+        NUMA_MISS,              /* allocated in non intended node */
+        NUMA_FOREIGN,           /* was intended here, hit elsewhere */
+        NUMA_INTERLEAVE_HIT,    /* interleaver preferred this zone */
+        NUMA_LOCAL,             /* allocation from local node */
+        NUMA_OTHER,             /* allocation from other node */
+        NR_VM_NUMA_STAT_ITEMS
+};
+#else
+#define NR_VM_NUMA_STAT_ITEMS 0
+#endif
+
 enum zone_stat_item {
         /* First 128 byte cacheline (assuming 64 bit words) */
         NR_FREE_PAGES,
@@ -132,14 +146,6 @@ enum zone_stat_item {
 #if IS_ENABLED(CONFIG_ZSMALLOC)
         NR_ZSPAGES,             /* allocated in zsmalloc */
 #endif
-#ifdef CONFIG_NUMA
-        NUMA_HIT,               /* allocated in intended node */
-        NUMA_MISS,              /* allocated in non intended node */
-        NUMA_FOREIGN,           /* was intended here, hit elsewhere */
-        NUMA_INTERLEAVE_HIT,    /* interleaver preferred this zone */
-        NUMA_LOCAL,             /* allocation from local node */
-        NUMA_OTHER,             /* allocation from other node */
-#endif
         NR_FREE_CMA_PAGES,
         NR_VM_ZONE_STAT_ITEMS };
 
@@ -276,6 +282,8 @@ struct per_cpu_pageset {
         struct per_cpu_pages pcp;
 #ifdef CONFIG_NUMA
         s8 expire;
+        s8 numa_stat_threshold;
+        s8 vm_numa_stat_diff[NR_VM_NUMA_STAT_ITEMS];
 #endif
 #ifdef CONFIG_SMP
         s8 stat_threshold;
@@ -496,6 +504,7 @@ struct zone {
         ZONE_PADDING(_pad3_)
         /* Zone statistics */
         atomic_long_t           vm_stat[NR_VM_ZONE_STAT_ITEMS];
+        atomic_long_t           vm_numa_stat[NR_VM_NUMA_STAT_ITEMS];
 } ____cacheline_internodealigned_in_smp;
 
 enum pgdat_flags {