mm: introduce per-VMA lock statistics

Add a new CONFIG_PER_VMA_LOCK_STATS config option to dump extra statistics
about handling page fault under VMA lock.

Link: https://lkml.kernel.org/r/20230227173632.3292573-29-surenb@google.com
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index 7f5d1caf5890e4c0cc97058640ff9e92bdc113aa..8abfa124004003cb14d83083306cca68ab070086 100644 (file)
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -149,6 +149,12 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
 #ifdef CONFIG_X86
                DIRECT_MAP_LEVEL2_SPLIT,
                DIRECT_MAP_LEVEL3_SPLIT,
+#endif
+#ifdef CONFIG_PER_VMA_LOCK_STATS
+               VMA_LOCK_SUCCESS,
+               VMA_LOCK_ABORT,
+               VMA_LOCK_RETRY,
+               VMA_LOCK_MISS,
 #endif
                NR_VM_EVENT_ITEMS
 };

diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 19cf5b6892ceba12c9f8acfa0a7910b4a2e726d4..fed855bae6d8e88956064f85f1260bca522bb5fb 100644 (file)
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -125,6 +125,12 @@ static inline void vm_events_fold_cpu(int cpu)
 #define count_vm_tlb_events(x, y) do { (void)(y); } while (0)
 #endif
 
+#ifdef CONFIG_PER_VMA_LOCK_STATS
+#define count_vm_vma_lock_event(x) count_vm_event(x)
+#else
+#define count_vm_vma_lock_event(x) do {} while (0)
+#endif
+
 #define __count_zid_vm_events(item, zid, delta) \
        __count_vm_events(item##_NORMAL - ZONE_NORMAL + zid, delta)
 

diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index c3547a373c9cafdc73e5c7b2353600c23a8f5a2c..4965a7333a3f44666e2d52d1cecce552ecaf2d6b 100644 (file)
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -279,3 +279,9 @@ config DEBUG_KMEMLEAK_AUTO_SCAN
 
          If unsure, say Y.
 
+config PER_VMA_LOCK_STATS
+       bool "Statistics for per-vma locks"
+       depends on PER_VMA_LOCK
+       default y
+       help
+         Statistics for per-vma locks.

diff --git a/mm/memory.c b/mm/memory.c
index 55ac9cdfd3983d4e5c4f1aebe6ea5a58fd69b92c..9999574a963653f7ea131a591384facfca64c465 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5284,6 +5284,7 @@ retry:
        /* Check if the VMA got isolated after we found it */
        if (vma->detached) {
                vma_end_read(vma);
+               count_vm_vma_lock_event(VMA_LOCK_MISS);
                /* The area was replaced with another one */
                goto retry;
        }
@@ -5292,6 +5293,7 @@ retry:
        return vma;
 inval:
        rcu_read_unlock();
+       count_vm_vma_lock_event(VMA_LOCK_ABORT);
        return NULL;
 }
 #endif /* CONFIG_PER_VMA_LOCK */

diff --git a/mm/vmstat.c b/mm/vmstat.c
index b7307627772d7f6b21fec2cf53b1c08fb692792a..c28046371b451e0562951e64942e27bb5268fdbe 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1399,6 +1399,12 @@ const char * const vmstat_text[] = {
        "direct_map_level2_splits",
        "direct_map_level3_splits",
 #endif
+#ifdef CONFIG_PER_VMA_LOCK_STATS
+       "vma_lock_success",
+       "vma_lock_abort",
+       "vma_lock_retry",
+       "vma_lock_miss",
+#endif
 #endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */
 };
 #endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA || CONFIG_MEMCG */