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

Commit d85f4d6d authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds
Browse files

numa_maps: remove numa_maps->vma 



pagewalk.c can handle vma in itself, so we don't have to pass vma via
walk->private.  And show_numa_map() walks pages on vma basis, so using
walk_page_vma() is preferable.

Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 632fd60f

fs/proc/task_mmu.c

+13 −16
Original line number Diff line number Diff line
@@ -1283,7 +1283,6 @@ const struct file_operations proc_pagemap_operations = { 
#ifdef CONFIG_NUMA



struct numa_maps {

	struct vm_area_struct *vma;

	unsigned long pages;

	unsigned long anon;

	unsigned long active;
@@ -1352,18 +1351,17 @@ static struct page *can_gather_numa_stats(pte_t pte, struct vm_area_struct *vma, 
static int gather_pte_stats(pmd_t *pmd, unsigned long addr,

		unsigned long end, struct mm_walk *walk)

{

	struct numa_maps *md;

	struct numa_maps *md = walk->private;

	struct vm_area_struct *vma = walk->vma;

	spinlock_t *ptl;

	pte_t *orig_pte;

	pte_t *pte;



	md = walk->private;



	if (pmd_trans_huge_lock(pmd, md->vma, &ptl) == 1) {

	if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) {

		pte_t huge_pte = *(pte_t *)pmd;

		struct page *page;



		page = can_gather_numa_stats(huge_pte, md->vma, addr);

		page = can_gather_numa_stats(huge_pte, vma, addr);

		if (page)

			gather_stats(page, md, pte_dirty(huge_pte),

				     HPAGE_PMD_SIZE/PAGE_SIZE);
@@ -1375,7 +1373,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, 
		return 0;

	orig_pte = pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);

	do {

		struct page *page = can_gather_numa_stats(*pte, md->vma, addr);

		struct page *page = can_gather_numa_stats(*pte, vma, addr);

		if (!page)

			continue;

		gather_stats(page, md, pte_dirty(*pte), 1);
@@ -1422,7 +1420,12 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) 
	struct numa_maps *md = &numa_priv->md;

	struct file *file = vma->vm_file;

	struct mm_struct *mm = vma->vm_mm;

	struct mm_walk walk = {};

	struct mm_walk walk = {

		.hugetlb_entry = gather_hugetlb_stats,

		.pmd_entry = gather_pte_stats,

		.private = md,

		.mm = mm,

	};

	struct mempolicy *pol;

	char buffer[64];

	int nid;
@@ -1433,13 +1436,6 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) 
	/* Ensure we start with an empty set of numa_maps statistics. */

	memset(md, 0, sizeof(*md));



	md->vma = vma;



	walk.hugetlb_entry = gather_hugetlb_stats;

	walk.pmd_entry = gather_pte_stats;

	walk.private = md;

	walk.mm = mm;



	pol = __get_vma_policy(vma, vma->vm_start);

	if (pol) {

		mpol_to_str(buffer, sizeof(buffer), pol);
@@ -1473,7 +1469,8 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) 
	if (is_vm_hugetlb_page(vma))

		seq_puts(m, " huge");



	walk_page_range(vma->vm_start, vma->vm_end, &walk);

	/* mmap_sem is held by m_start */

	walk_page_vma(vma, &walk);



	if (!md->pages)

		goto out;