Most code of gather_(pte|pmd|hugetlb)_stats() are duplicate, so let's clean
them up with a single function.
vm_normal_page() doesn't calculate pgoff correctly for hugetlbfs, so this
patch also fixes it.
Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 58 ++++++------------------------------------------------
mm/memory.c | 5 ++---
2 files changed, 8 insertions(+), 55 deletions(-)
diff --git mmotm-2014-05-21-16-57.orig/fs/proc/task_mmu.c mmotm-2014-05-21-16-57/fs/proc/task_mmu.c
index 1f2eab58ae14..27ad736c6b30 100644
--- mmotm-2014-05-21-16-57.orig/fs/proc/task_mmu.c
+++ mmotm-2014-05-21-16-57/fs/proc/task_mmu.c
@@ -1243,63 +1243,17 @@ static struct page *can_gather_numa_stats(pte_t pte, struct vm_area_struct *vma,
return page;
}
-static int gather_pte_stats(void *entry, unsigned long addr,
+static int gather_stats_entry(void *entry, unsigned long addr,
unsigned long end, struct mm_walk *walk)
{
pte_t *pte = entry;
struct numa_maps *md = walk->private;
-
struct page *page = can_gather_numa_stats(*pte, walk->vma, addr);
- if (!page)
- return 0;
- gather_stats(page, md, pte_dirty(*pte), 1);
- return 0;
-}
-
-static int gather_pmd_stats(void *entry, unsigned long addr,
- unsigned long end, struct mm_walk *walk)
-{
- struct numa_maps *md = walk->private;
- struct vm_area_struct *vma = walk->vma;
- pte_t huge_pte = *(pte_t *)entry;
- struct page *page;
-
- page = can_gather_numa_stats(huge_pte, vma, addr);
if (page)
- gather_stats(page, md, pte_dirty(huge_pte),
- HPAGE_PMD_SIZE/PAGE_SIZE);
+ gather_stats(page, md, pte_dirty(*pte),
+ walk->size >> PAGE_SHIFT);
return 0;
}
-#ifdef CONFIG_HUGETLB_PAGE
-static int gather_hugetlb_stats(void *entry, unsigned long addr,
- unsigned long end, struct mm_walk *walk)
-{
- pte_t *pte = entry;
- struct numa_maps *md;
- struct page *page;
-
- if (pte_none(*pte))
- return 0;
-
- if (!pte_present(*pte))
- return 0;
-
- page = pte_page(*pte);
- if (!page)
- return 0;
-
- md = walk->private;
- gather_stats(page, md, pte_dirty(*pte), 1);
- return 0;
-}
-
-#else
-static int gather_hugetlb_stats(void *entry, unsigned long addr,
- unsigned long end, struct mm_walk *walk)
-{
- return 0;
-}
-#endif
/*
* Display pages allocated per node and memory policy via /proc.
@@ -1324,9 +1278,9 @@ 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));
- walk.hugetlb_entry = gather_hugetlb_stats;
- walk.pmd_entry = gather_pmd_stats;
- walk.pte_entry = gather_pte_stats;
+ walk.hugetlb_entry = gather_stats_entry;
+ walk.pmd_entry = gather_stats_entry;
+ walk.pte_entry = gather_stats_entry;
walk.private = md;
walk.mm = mm;
walk.vma = vma;
diff --git mmotm-2014-05-21-16-57.orig/mm/memory.c mmotm-2014-05-21-16-57/mm/memory.c
index fd16b767dd68..7389dd04370f 100644
--- mmotm-2014-05-21-16-57.orig/mm/memory.c
+++ mmotm-2014-05-21-16-57/mm/memory.c
@@ -768,9 +768,8 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
return NULL;
goto out;
} else {
- unsigned long off;
- off = (addr - vma->vm_start) >> PAGE_SHIFT;
- if (pfn == vma->vm_pgoff + off)
+ unsigned long off = linear_page_index(vma, addr);
+ if (pfn == off)
return NULL;
if (!is_cow_mapping(vma->vm_flags))
return NULL;
--
1.9.3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>