Commit 4031a219 authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds

smaps: have smaps show transparent huge pages

Now that the mere act of _looking_ at /proc/$pid/smaps will not destroy
transparent huge pages, tell how much of the VMA is actually mapped with
them.

This way, we can make sure that we're getting THPs where we
expect to see them.
Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarEric B Munson <emunson@mgebm.net>
Tested-by: default avatarEric B Munson <emunson@mgebm.net>
Cc: Michael J Wolf <mjwolf@us.ibm.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22e057c5
...@@ -331,6 +331,7 @@ struct mem_size_stats { ...@@ -331,6 +331,7 @@ struct mem_size_stats {
unsigned long private_dirty; unsigned long private_dirty;
unsigned long referenced; unsigned long referenced;
unsigned long anonymous; unsigned long anonymous;
unsigned long anonymous_thp;
unsigned long swap; unsigned long swap;
u64 pss; u64 pss;
}; };
...@@ -396,6 +397,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, ...@@ -396,6 +397,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
smaps_pte_entry(*(pte_t *)pmd, addr, smaps_pte_entry(*(pte_t *)pmd, addr,
HPAGE_PMD_SIZE, walk); HPAGE_PMD_SIZE, walk);
spin_unlock(&walk->mm->page_table_lock); spin_unlock(&walk->mm->page_table_lock);
mss->anonymous_thp += HPAGE_PMD_SIZE;
return 0; return 0;
} }
} else { } else {
...@@ -444,6 +446,7 @@ static int show_smap(struct seq_file *m, void *v) ...@@ -444,6 +446,7 @@ static int show_smap(struct seq_file *m, void *v)
"Private_Dirty: %8lu kB\n" "Private_Dirty: %8lu kB\n"
"Referenced: %8lu kB\n" "Referenced: %8lu kB\n"
"Anonymous: %8lu kB\n" "Anonymous: %8lu kB\n"
"AnonHugePages: %8lu kB\n"
"Swap: %8lu kB\n" "Swap: %8lu kB\n"
"KernelPageSize: %8lu kB\n" "KernelPageSize: %8lu kB\n"
"MMUPageSize: %8lu kB\n" "MMUPageSize: %8lu kB\n"
...@@ -457,6 +460,7 @@ static int show_smap(struct seq_file *m, void *v) ...@@ -457,6 +460,7 @@ static int show_smap(struct seq_file *m, void *v)
mss.private_dirty >> 10, mss.private_dirty >> 10,
mss.referenced >> 10, mss.referenced >> 10,
mss.anonymous >> 10, mss.anonymous >> 10,
mss.anonymous_thp >> 10,
mss.swap >> 10, mss.swap >> 10,
vma_kernel_pagesize(vma) >> 10, vma_kernel_pagesize(vma) >> 10,
vma_mmu_pagesize(vma) >> 10, vma_mmu_pagesize(vma) >> 10,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment