Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae11c4d9 authored by Dave Hansen's avatar Dave Hansen Committed by Linus Torvalds
Browse files

smaps: break out smaps_pte_entry() from smaps_pte_range() 



We will use smaps_pte_entry() in a moment to handle both small and
transparent large pages.  But, we must break it out of smaps_pte_range()
first.

Signed-off-by: default avatarDave Hansen <dave@linux.vnet.ibm.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
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: 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 03319327

fs/proc/task_mmu.c

+47 −40
Original line number Diff line number Diff line
@@ -333,33 +333,26 @@ struct mem_size_stats { 
	u64 pss;

};



static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,



static void smaps_pte_entry(pte_t ptent, unsigned long addr,

		struct mm_walk *walk)

{

	struct mem_size_stats *mss = walk->private;

	struct vm_area_struct *vma = mss->vma;

	pte_t *pte, ptent;

	spinlock_t *ptl;

	struct page *page;

	int mapcount;



	split_huge_page_pmd(walk->mm, pmd);



	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);

	for (; addr != end; pte++, addr += PAGE_SIZE) {

		ptent = *pte;



	if (is_swap_pte(ptent)) {

		mss->swap += PAGE_SIZE;

			continue;

		return;

	}



	if (!pte_present(ptent))

			continue;

		return;



	page = vm_normal_page(vma, addr, ptent);

	if (!page)

			continue;

		return;



	if (PageAnon(page))

		mss->anonymous += PAGE_SIZE;
@@ -383,6 +376,20 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 
		mss->pss += (PAGE_SIZE << PSS_SHIFT);

	}

}



static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,

			   struct mm_walk *walk)

{

	struct mem_size_stats *mss = walk->private;

	struct vm_area_struct *vma = mss->vma;

	pte_t *pte;

	spinlock_t *ptl;



	split_huge_page_pmd(walk->mm, pmd);



	pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);

	for (; addr != end; pte++, addr += PAGE_SIZE)

		smaps_pte_entry(*pte, addr, walk);

	pte_unmap_unlock(pte - 1, ptl);

	cond_resched();

	return 0;