[01/11] mm: introduce vma_interval_tree_foreach_stab()

Message ID	20191003201858.11666-2-dave@stgolabs.net (mailing list archive)
State	RFC
Headers	show Return-Path: <SRS0=0boT=X4=vger.kernel.org=linux-rdma-owner@kernel.org> From: Davidlohr Bueso <dave@stgolabs.net> To: akpm@linux-foundation.org Cc: walken@google.com, peterz@infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, dave@stgolabs.net, Davidlohr Bueso <dbueso@suse.de> Subject: [PATCH 01/11] mm: introduce vma_interval_tree_foreach_stab() Date: Thu, 3 Oct 2019 13:18:48 -0700 Message-Id: <20191003201858.11666-2-dave@stgolabs.net> In-Reply-To: <20191003201858.11666-1-dave@stgolabs.net> References: <20191003201858.11666-1-dave@stgolabs.net> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk
Series	lib/interval-tree: move to half closed intervals \| expand [-next,00/11] lib/interval-tree: move to half closed intervals [01/11] mm: introduce vma_interval_tree_foreach_stab() [02/11] lib/interval-tree: add an equivalent tree with [a,b) intervals [03/11] drm/amdgpu: convert amdgpu_vm_it to half closed intervals [04/11] drm: convert drm_mm_interval_tree to half closed intervals [05/11] IB/hfi1: convert __mmu_int_rb to half closed intervals [06/11] IB,usnic: convert usnic_uiom_interval_tree to half closed intervals [07/11] vhost: convert vhost_umem_interval_tree to half closed intervals [08/11] mm: convert vma_interval_tree to half closed intervals [09/11] lib/interval-tree: convert interval_tree to half closed intervals [10/11] lib: drop interval_tree_generic.h [11/11] x86/mm, pat: convert pat tree to generic interval tree

diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c index ae857f41f68d..85bb69f1decb 100644 --- a/arch/arm/mm/fault-armv.c +++ b/arch/arm/mm/fault-armv.c @@ -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 diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c index 6d89db7895d1..b04384406c0f 100644 --- a/arch/arm/mm/flush.c +++ b/arch/arm/mm/flush.c @@ -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; /* diff --git a/arch/nios2/mm/cacheflush.c b/arch/nios2/mm/cacheflush.c index 65de1bd6a760..8abe26b8e29d 100644 --- a/arch/nios2/mm/cacheflush.c +++ b/arch/nios2/mm/cacheflush.c @@ -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) diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index a82b3eaa5398..c5f8aab749c1 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -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; diff --git a/fs/dax.c b/fs/dax.c index 6bf81f931de3..f24c035defb7 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -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; diff --git a/include/linux/mm.h b/include/linux/mm.h index cc292273e6ba..53f9784d917d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2248,6 +2248,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, @@ -2265,6 +2268,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, diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 94d38a39d72e..6a70dbe0b4b2 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -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; diff --git a/mm/hugetlb.c b/mm/hugetlb.c index ef37c85423a5..1a6b133ca66d 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -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; diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 0a1b4b484ac5..24b66416fde0 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -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 diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 7ef849da8278..79934fd00146 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -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

[01/11] mm: introduce vma_interval_tree_foreach_stab()

Commit Message

Patch