From 5e861d550f851040c4d0458ebd3f0fd8fe94dadd Mon Sep 17 00:00:00 2001 From: Fengwei Yin Date: Thu, 9 Oct 2014 22:20:58 +0800 Subject: [PATCH] smaps should deal with huge zero page exactly same as normal zero page. Signed-off-by: Fengwei Yin --- fs/proc/task_mmu.c | 5 +++-- include/linux/huge_mm.h | 4 ++++ mm/huge_memory.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 80ca4fb..8550b27 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -476,7 +476,7 @@ static void smaps_pte_entry(pte_t ptent, unsigned long addr, mss->nonlinear += ptent_size; } - if (!page) + if (!page || is_huge_zero_page(page)) return; if (PageAnon(page)) @@ -516,7 +516,8 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) { smaps_pte_entry(*(pte_t *)pmd, addr, HPAGE_PMD_SIZE, walk); spin_unlock(ptl); - mss->anonymous_thp += HPAGE_PMD_SIZE; + if (!is_huge_zero_pmd(*pmd)) + mss->anonymous_thp += HPAGE_PMD_SIZE; return 0; } diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 63579cb..758f569 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -34,6 +34,10 @@ extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long addr, pgprot_t newprot, int prot_numa); +extern bool is_huge_zero_page(struct page *page); + +extern bool is_huge_zero_pmd(pmd_t pmd); + enum transparent_hugepage_flag { TRANSPARENT_HUGEPAGE_FLAG, TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index d9a21d06..bedc3ae 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -173,12 +173,12 @@ static int start_khugepaged(void) static atomic_t huge_zero_refcount; static struct page *huge_zero_page __read_mostly; -static inline bool is_huge_zero_page(struct page *page) +bool is_huge_zero_page(struct page *page) { return ACCESS_ONCE(huge_zero_page) == page; } -static inline bool is_huge_zero_pmd(pmd_t pmd) +bool is_huge_zero_pmd(pmd_t pmd) { return is_huge_zero_page(pmd_page(pmd)); } -- 2.0.1