The patch titled
maps: add callbacks for each level to page walker
has been added to the -mm tree. Its filename is
maps2-add-callbacks-for-each-level-to-page-walker.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: maps: add callbacks for each level to page walker
From: Matt Mackall <mpm@xxxxxxxxxxx>
This allows iterating over all levels of the page tables. Recursion continues
to the depth of the lowest supplied callback.
This makes the page walker nearly completely generic and should allow it to
replace some other hand-rolled page table walkers.
Signed-off-by: Matt Mackall <mpm@xxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/proc/task_mmu.c | 89 +++++++++++++++++++++++++++++++------------
1 file changed, 66 insertions(+), 23 deletions(-)
diff -puN fs/proc/task_mmu.c~maps2-add-callbacks-for-each-level-to-page-walker fs/proc/task_mmu.c
--- a/fs/proc/task_mmu.c~maps2-add-callbacks-for-each-level-to-page-walker
+++ a/fs/proc/task_mmu.c
@@ -276,10 +276,35 @@ static int clear_refs_pte_range(pmd_t *p
return 0;
}
+struct mm_walk {
+ int (*pgd_entry)(pgd_t *, unsigned long, unsigned long, void *);
+ int (*pud_entry)(pud_t *, unsigned long, unsigned long, void *);
+ int (*pmd_entry)(pmd_t *, unsigned long, unsigned long, void *);
+ int (*pte_entry)(pte_t *, unsigned long, unsigned long, void *);
+};
+
+static int walk_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
+ struct mm_walk *walk, void *private)
+{
+ pte_t *pte;
+ int err;
+
+ for (pte = pte_offset_map(pmd, addr); addr != end;
+ addr += PAGE_SIZE, pte++) {
+ if (pte_none(*pte))
+ continue;
+ err = walk->pte_entry(pte, addr, addr, private);
+ if (err) {
+ pte_unmap(pte);
+ return err;
+ }
+ }
+ pte_unmap(pte);
+ return 0;
+}
+
static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
- int (*action)(pmd_t *, unsigned long,
- unsigned long, void *),
- void *private)
+ struct mm_walk *walk, void *private)
{
pmd_t *pmd;
unsigned long next;
@@ -290,18 +315,22 @@ static int walk_pmd_range(pud_t *pud, un
next = pmd_addr_end(addr, end);
if (pmd_none_or_clear_bad(pmd))
continue;
- err = action(pmd, addr, next, private);
- if (err)
- return err;
+ if (walk->pmd_entry) {
+ err = walk->pmd_entry(pmd, addr, next, private);
+ if (err)
+ return err;
+ }
+ if (walk->pte_entry) {
+ err = walk_pte_range(pmd, addr, next, walk, private);
+ if (err)
+ return err;
+ }
}
-
return 0;
}
static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end,
- int (*action)(pmd_t *, unsigned long,
- unsigned long, void *),
- void *private)
+ struct mm_walk *walk, void *private)
{
pud_t *pud;
unsigned long next;
@@ -312,11 +341,17 @@ static int walk_pud_range(pgd_t *pgd, un
next = pud_addr_end(addr, end);
if (pud_none_or_clear_bad(pud))
continue;
- err = walk_pmd_range(pud, addr, next, action, private);
- if (err)
- return err;
+ if (walk->pud_entry) {
+ err = walk->pud_entry(pud, addr, next, private);
+ if (err)
+ return err;
+ }
+ if (walk->pmd_entry || walk->pte_entry) {
+ err = walk_pmd_range(pud, addr, next, walk, private);
+ if (err)
+ return err;
+ }
}
-
return 0;
}
@@ -333,9 +368,7 @@ static int walk_pud_range(pgd_t *pgd, un
*/
static int walk_page_range(struct mm_struct *mm,
unsigned long addr, unsigned long end,
- int (*action)(pmd_t *, unsigned long,
- unsigned long, void *),
- void *private)
+ struct mm_walk *walk, void *private)
{
pgd_t *pgd;
unsigned long next;
@@ -346,14 +379,22 @@ static int walk_page_range(struct mm_str
next = pgd_addr_end(addr, end);
if (pgd_none_or_clear_bad(pgd))
continue;
- err = walk_pud_range(pgd, addr, next, action, private);
- if (err)
- return err;
+ if (walk->pgd_entry) {
+ err = walk->pgd_entry(pgd, addr, next, private);
+ if (err)
+ return err;
+ }
+ if (walk->pud_entry || walk->pmd_entry || walk->pte_entry) {
+ err = walk_pud_range(pgd, addr, next, walk, private);
+ if (err)
+ return err;
+ }
}
-
return 0;
}
+static struct mm_walk smaps_walk = { .pmd_entry = smaps_pte_range };
+
static int show_smap(struct seq_file *m, void *v)
{
struct vm_area_struct *vma = v;
@@ -363,10 +404,12 @@ static int show_smap(struct seq_file *m,
mss.vma = vma;
if (vma->vm_mm && !is_vm_hugetlb_page(vma))
walk_page_range(vma->vm_mm, vma->vm_start, vma->vm_end,
- smaps_pte_range, &mss);
+ &smaps_walk, &mss);
return show_map_internal(m, v, &mss);
}
+static struct mm_walk clear_refs_walk = { .pmd_entry = clear_refs_pte_range };
+
void clear_refs_smap(struct mm_struct *mm)
{
struct vm_area_struct *vma;
@@ -375,7 +418,7 @@ void clear_refs_smap(struct mm_struct *m
for (vma = mm->mmap; vma; vma = vma->vm_next)
if (vma->vm_mm && !is_vm_hugetlb_page(vma))
walk_page_range(vma->vm_mm, vma->vm_start, vma->vm_end,
- clear_refs_pte_range, vma);
+ &clear_refs_walk, vma);
flush_tlb_mm(mm);
up_read(&mm->mmap_sem);
}
_
Patches currently in -mm which might be from mpm@xxxxxxxxxxx are
slab-introduce-krealloc.patch
slab-introduce-krealloc-fix.patch
smaps-add-clear_refs-file-to-clear-reference-cleanup.patch
maps2-uninline-some-functions-in-the-page-walker.patch
maps2-eliminate-the-pmd_walker-struct-in-the-page-walker.patch
maps2-remove-vma-from-args-in-the-page-walker.patch
maps2-propagate-errors-from-callback-in-page-walker.patch
maps2-add-callbacks-for-each-level-to-page-walker.patch
maps2-move-the-page-walker-code-to-lib.patch
maps2-simplify-interdependence-of-proc-pid-maps-and-smaps.patch
maps2-move-clear_refs-code-to-task_mmuc.patch
maps2-regroup-task_mmu-by-interface.patch
maps2-make-proc-pid-smaps-optional-under-config_embedded.patch
maps2-make-proc-pid-clear_refs-option-under-config_embedded.patch
maps2-add-proc-pid-pagemap-interface.patch
maps2-add-proc-kpagemap-interface.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
