mm: introduce vma_interval_tree_foreach_stab()
Subsystems (12)
PATCH 1/1 mm: introduce vma_interval_tree_foreach_stab()
This documents better the nature of the stab lookup/query.
In addition, this is a step that will make the conversion of interval tree nodes from [a,b] to [a,b[ easier to review.
For symmetry with vma_interval_tree, the anon equivalent is also introduced, albeit a single user. This patch does not change any semantics.
Signed-off-by Davidlohr Bueso <[email protected]>
--- arch/arm/mm/fault-armv.c | 2 +- arch/arm/mm/flush.c | 2 +- arch/nios2/mm/cacheflush.c | 2 +- arch/parisc/kernel/cache.c | 2 +- fs/dax.c | 2 +- include/linux/mm.h | 6 ++++++ kernel/events/uprobes.c | 2 +- mm/hugetlb.c | 4 ++-- mm/khugepaged.c | 2 +- mm/memory-failure.c | 6 ++---- 10 files changed, 17 insertions(+), 13 deletions(-)
arch/arm/mm/fault-armv.c +1 -1
@@ -143,7 +143,7 @@ make_coherent(struct address_space *mapping, struct vm_area_struct *vma,* cache coherency. */ flush_dcache_mmap_lock (mapping); - vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { + vma_interval_tree_foreach_stab(mpnt, &mapping->i_mmap, pgoff) {/* * If this VMA is not in our MM, we can ignore it. * Note that we intentionally mask out the VMA
arch/arm/mm/flush.c +1 -1
@@ -249,7 +249,7 @@ static void __flush_dcache_aliases(struct address_space *mapping, struct page *p pgoff = page->index;flush_dcache_mmap_lock (mapping); - vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { + vma_interval_tree_foreach_stab(mpnt, &mapping->i_mmap, pgoff) {unsigned long offset;/*
arch/nios2/mm/cacheflush.c +1 -1
@@ -79,7 +79,7 @@ static void flush_aliases(struct address_space *mapping, struct page *page) pgoff = page->index;flush_dcache_mmap_lock (mapping); - vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { + vma_interval_tree_foreach_stab(mpnt, &mapping->i_mmap, pgoff) {unsigned long offset;if (mpnt->vm_mm != mm)
arch/parisc/kernel/cache.c +1 -1
@@ -348,7 +348,7 @@ void flush_dcache_page(struct page *page)* to flush one address here for them all to become coherent */ flush_dcache_mmap_lock (mapping); - vma_interval_tree_foreach(mpnt, &mapping->i_mmap, pgoff, pgoff) { + vma_interval_tree_foreach_stab(mpnt, &mapping->i_mmap, pgoff) { offset = (pgoff - mpnt->vm_pgoff) <<PAGE_SHIFT ; addr = mpnt->vm_start + offset;
fs/dax.c +1 -1
@@ -781,7 +781,7 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,spinlock_t *ptl;i_mmap_lock_read (mapping); - vma_interval_tree_foreach(vma, &mapping->i_mmap, index, index) { + vma_interval_tree_foreach_stab(vma, &mapping->i_mmap, index) {struct mmu_notifier_range range;unsigned long address;
include/linux/mm.h +6 -0
@@ -2244,6 +2244,9 @@ struct vm_area_struct *vma_interval_tree_iter_next(struct vm_area_struct *node,for (vma =vma_interval_tree_iter_first (root, start, last); \ vma; vma = vma_interval_tree_iter_next(vma, start, last)) +#define vma_interval_tree_foreach_stab (vma, root, start) \ + vma_interval_tree_foreach(vma, root, start, start) +void anon_vma_interval_tree_insert (struct anon_vma_chain *node,struct rb_root_cached *root); void anon_vma_interval_tree_remove(struct anon_vma_chain *node,
@@ -2261,6 +2264,9 @@ void anon_vma_interval_tree_verify(struct anon_vma_chain *node);for (avc =anon_vma_interval_tree_iter_first (root, start, last); \ avc; avc = anon_vma_interval_tree_iter_next(avc, start, last)) +#define anon_vma_interval_tree_foreach_stab (vma, root, start) \ + anon_vma_interval_tree_foreach(vma, root, start, start) +/* mmap.c */ extern int __vm_enough_memory (struct mm_struct *mm,long pages,int cap_sys_admin); extern int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
kernel/events/uprobes.c +1 -1
@@ -975,7 +975,7 @@ build_map_info(struct address_space *mapping, loff_t offset, bool is_register) again:i_mmap_lock_read (mapping); - vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) { + vma_interval_tree_foreach_stab(vma, &mapping->i_mmap, pgoff) {if (!valid_vma (vma, is_register))continue ;
mm/hugetlb.c +2 -2
@@ -3643,7 +3643,7 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,* __unmap_hugepage_range() is called as the lock is already held */ i_mmap_lock_write (mapping); - vma_interval_tree_foreach(iter_vma, &mapping->i_mmap, pgoff, pgoff) { + vma_interval_tree_foreach_stab(iter_vma, &mapping->i_mmap, pgoff) {/* Do not unmap the current VMA */ if (iter_vma == vma)continue ;
@@ -4844,7 +4844,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)return (pte_t *)pmd_alloc (mm, pud, addr);i_mmap_lock_write (mapping); - vma_interval_tree_foreach(svma, &mapping->i_mmap, idx, idx) { + vma_interval_tree_foreach_stab(svma, &mapping->i_mmap, idx) {if (svma == vma)continue ;
mm/khugepaged.c +1 -1
@@ -1420,7 +1420,7 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff)pmd_t *pmd, _pmd;i_mmap_lock_write (mapping); - vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) { + vma_interval_tree_foreach_stab(vma, &mapping->i_mmap, pgoff) {/* * Check vma->anon_vma to exclude MAP_PRIVATE mappings that * got written to. These VMAs are likely not worth investing
mm/memory-failure.c +2 -4
@@ -451,8 +451,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill,if (!t)continue ; -anon_vma_interval_tree_foreach (vmac, &av->rb_root, - pgoff, pgoff) { + anon_vma_interval_tree_foreach_stab(vmac, &av->rb_root, pgoff) { vma = vmac->vma;if (!page_mapped_in_vma (page, vma))continue ;
@@ -482,8 +481,7 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,if (!t)continue ; -vma_interval_tree_foreach (vma, &mapping->i_mmap, pgoff, - pgoff) { + vma_interval_tree_foreach_stab(vma, &mapping->i_mmap, pgoff) {/* * Send early kill signal to tasks where a vma covers * the page but the corrupted page is not necessarily
Signature · 1 line
2.16.4