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

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

smaps: pass pte size argument in to smaps_pte_entry() 



Add an argument to the new smaps_pte_entry() function to let it account in
things other than PAGE_SIZE units.  I changed all of the PAGE_SIZE sites,
even though not all of them can be reached for transparent huge pages,
just so this will continue to work without changes as THPs are improved.

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 ae11c4d9

fs/proc/task_mmu.c

+12 −12
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ struct mem_size_stats { 




static void smaps_pte_entry(pte_t ptent, unsigned long addr,

		struct mm_walk *walk)

		unsigned long ptent_size, struct mm_walk *walk)

{

	struct mem_size_stats *mss = walk->private;

	struct vm_area_struct *vma = mss->vma;
@@ -343,7 +343,7 @@ static void smaps_pte_entry(pte_t ptent, unsigned long addr, 
	int mapcount;



	if (is_swap_pte(ptent)) {

		mss->swap += PAGE_SIZE;

		mss->swap += ptent_size;

		return;

	}
@@ -355,25 +355,25 @@ static void smaps_pte_entry(pte_t ptent, unsigned long addr, 
		return;



	if (PageAnon(page))

		mss->anonymous += PAGE_SIZE;

		mss->anonymous += ptent_size;



	mss->resident += PAGE_SIZE;

	mss->resident += ptent_size;

	/* Accumulate the size in pages that have been accessed. */

	if (pte_young(ptent) || PageReferenced(page))

		mss->referenced += PAGE_SIZE;

		mss->referenced += ptent_size;

	mapcount = page_mapcount(page);

	if (mapcount >= 2) {

		if (pte_dirty(ptent) || PageDirty(page))

			mss->shared_dirty += PAGE_SIZE;

			mss->shared_dirty += ptent_size;

		else

			mss->shared_clean += PAGE_SIZE;

		mss->pss += (PAGE_SIZE << PSS_SHIFT) / mapcount;

			mss->shared_clean += ptent_size;

		mss->pss += (ptent_size << PSS_SHIFT) / mapcount;

	} else {

		if (pte_dirty(ptent) || PageDirty(page))

			mss->private_dirty += PAGE_SIZE;

			mss->private_dirty += ptent_size;

		else

			mss->private_clean += PAGE_SIZE;

		mss->pss += (PAGE_SIZE << PSS_SHIFT);

			mss->private_clean += ptent_size;

		mss->pss += (ptent_size << PSS_SHIFT);

	}

}
@@ -389,7 +389,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 


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

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

		smaps_pte_entry(*pte, addr, walk);

		smaps_pte_entry(*pte, addr, PAGE_SIZE, walk);

	pte_unmap_unlock(pte - 1, ptl);

	cond_resched();

	return 0;