thp, vmstats: add counters for huge file pages

THP_FILE_ALLOC: how many times huge page was allocated and put page
cache.

THP_FILE_MAPPED: how many times file huge page was mapped.

Link: http://lkml.kernel.org/r/1466021202-61880-13-git-send-email-kirill.shutemov@linux.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index ec084321fe092cac05d0c8c003c8448a4188c795..42604173f122423303d06371e7e8bfb45774df6d 100644 (file)
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -70,6 +70,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
                THP_FAULT_FALLBACK,
                THP_COLLAPSE_ALLOC,
                THP_COLLAPSE_ALLOC_FAILED,
+               THP_FILE_ALLOC,
+               THP_FILE_MAPPED,
                THP_SPLIT_PAGE,
                THP_SPLIT_PAGE_FAILED,
                THP_DEFERRED_SPLIT_PAGE,
@@ -100,4 +102,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
                NR_VM_EVENT_ITEMS
 };
 
+#ifndef CONFIG_TRANSPARENT_HUGEPAGE
+#define THP_FILE_ALLOC ({ BUILD_BUG(); 0; })
+#define THP_FILE_MAPPED ({ BUILD_BUG(); 0; })
+#endif
+
 #endif         /* VM_EVENT_ITEM_H_INCLUDED */

diff --git a/mm/memory.c b/mm/memory.c
index 650622a3a0a1a4f957f847158806fded4fe2ddc2..10a424eca8a470c8c1bfb14ed1186be803c5fb3b 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2968,6 +2968,7 @@ static int do_set_pmd(struct fault_env *fe, struct page *page)
 
        /* fault is handled */
        ret = 0;
+       count_vm_event(THP_FILE_MAPPED);
 out:
        spin_unlock(fe->ptl);
        return ret;

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 2a0f26bdae394137007cbb6f123646958f5901bf..cff2f4ec9ccec47ef6f7103ac8fd7baafeb002aa 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -817,6 +817,8 @@ const char * const vmstat_text[] = {
        "thp_fault_fallback",
        "thp_collapse_alloc",
        "thp_collapse_alloc_failed",
+       "thp_file_alloc",
+       "thp_file_mapped",
        "thp_split_page",
        "thp_split_page_failed",
        "thp_deferred_split_page",