summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2016-07-26 18:25:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-26 19:19:19 -0400
commit95ecedcd6abbb05d8177331e2fa697888dcd634b (patch)
tree7635af0727ac5adec84761793f441f8862d0091c
parent1010245964415bb7403463115bab2cd26244b445 (diff)
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>
-rw-r--r--include/linux/vm_event_item.h7
-rw-r--r--mm/memory.c1
-rw-r--r--mm/vmstat.c2
3 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index ec084321fe09..42604173f122 100644
--- 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,
70 THP_FAULT_FALLBACK, 70 THP_FAULT_FALLBACK,
71 THP_COLLAPSE_ALLOC, 71 THP_COLLAPSE_ALLOC,
72 THP_COLLAPSE_ALLOC_FAILED, 72 THP_COLLAPSE_ALLOC_FAILED,
73 THP_FILE_ALLOC,
74 THP_FILE_MAPPED,
73 THP_SPLIT_PAGE, 75 THP_SPLIT_PAGE,
74 THP_SPLIT_PAGE_FAILED, 76 THP_SPLIT_PAGE_FAILED,
75 THP_DEFERRED_SPLIT_PAGE, 77 THP_DEFERRED_SPLIT_PAGE,
@@ -100,4 +102,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
100 NR_VM_EVENT_ITEMS 102 NR_VM_EVENT_ITEMS
101}; 103};
102 104
105#ifndef CONFIG_TRANSPARENT_HUGEPAGE
106#define THP_FILE_ALLOC ({ BUILD_BUG(); 0; })
107#define THP_FILE_MAPPED ({ BUILD_BUG(); 0; })
108#endif
109
103#endif /* VM_EVENT_ITEM_H_INCLUDED */ 110#endif /* VM_EVENT_ITEM_H_INCLUDED */
diff --git a/mm/memory.c b/mm/memory.c
index 650622a3a0a1..10a424eca8a4 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2968,6 +2968,7 @@ static int do_set_pmd(struct fault_env *fe, struct page *page)
2968 2968
2969 /* fault is handled */ 2969 /* fault is handled */
2970 ret = 0; 2970 ret = 0;
2971 count_vm_event(THP_FILE_MAPPED);
2971out: 2972out:
2972 spin_unlock(fe->ptl); 2973 spin_unlock(fe->ptl);
2973 return ret; 2974 return ret;
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 2a0f26bdae39..cff2f4ec9cce 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -817,6 +817,8 @@ const char * const vmstat_text[] = {
817 "thp_fault_fallback", 817 "thp_fault_fallback",
818 "thp_collapse_alloc", 818 "thp_collapse_alloc",
819 "thp_collapse_alloc_failed", 819 "thp_collapse_alloc_failed",
820 "thp_file_alloc",
821 "thp_file_mapped",
820 "thp_split_page", 822 "thp_split_page",
821 "thp_split_page_failed", 823 "thp_split_page_failed",
822 "thp_deferred_split_page", 824 "thp_deferred_split_page",