diff mbox series

[17/94] mm/ksm: Use vma_lookup() in find_mergeable_vma()

Message ID	20210428153542.2814175-18-Liam.Howlett@Oracle.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=wPXd=JZ=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F921610FA From: Liam Howlett <liam.howlett@oracle.com> To: "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>, "linux-mm@kvack.org" <linux-mm@kvack.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Andrew Morton <akpm@linux-foundation.org> CC: Song Liu <songliubraving@fb.com>, Davidlohr Bueso <dave@stgolabs.net>, "Paul E . McKenney" <paulmck@kernel.org>, Matthew Wilcox <willy@infradead.org>, Laurent Dufour <ldufour@linux.ibm.com>, David Rientjes <rientjes@google.com>, Axel Rasmussen <axelrasmussen@google.com>, Suren Baghdasaryan <surenb@google.com>, Vlastimil Babka <vbabka@suse.cz>, Rik van Riel <riel@surriel.com>, Peter Zijlstra <peterz@infradead.org>, Michel Lespinasse <walken.cr@gmail.com>, Liam Howlett <liam.howlett@oracle.com> Subject: [PATCH 17/94] mm/ksm: Use vma_lookup() in find_mergeable_vma() Thread-Topic: [PATCH 17/94] mm/ksm: Use vma_lookup() in find_mergeable_vma() Thread-Index: AQHXPEQr8PhrPRAu5kGefREdnRv3CA== Date: Wed, 28 Apr 2021 15:35:51 +0000 Message-ID: <20210428153542.2814175-18-Liam.Howlett@Oracle.com> References: <20210428153542.2814175-1-Liam.Howlett@Oracle.com> In-Reply-To: <20210428153542.2814175-1-Liam.Howlett@Oracle.com> Accept-Language: en-US Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Received-SPF: none (oracle.com>: No applicable sender policy available) receiver=imf29; identity=mailfrom; envelope-from="<liam.howlett@oracle.com>"; helo=mx0b-00069f02.pphosted.com; client-ip=205.220.177.32 Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	Introducing the Maple Tree \| expand [00/94] Introducing the Maple Tree [01/94] mm: Add vma_lookup() [02/94] drm/i915/selftests: Use vma_lookup() in __igt_mmap() [03/94] arch/arc/kernel/troubleshoot: use vma_lookup() instead of find_vma_intersection() [04/94] arch/arm64/kvm: Use vma_lookup() instead of find_vma_intersection() [06/94] arch/powerpc/kvm/book3s: Use vma_lookup() in kvmppc_hv_setup_htab_rma() [05/94] arch/powerpc/kvm/book3s_hv_uvmem: Use vma_lookup() instead of find_vma_intersection() [07/94] arch/mips/kernel/traps: Use vma_lookup() instead of find_vma_intersection() [08/94] x86/sgx: Use vma_lookup() in sgx_encl_find() [09/94] virt/kvm: Use vma_lookup() instead of find_vma_intersection() [10/94] vfio: Use vma_lookup() instead of find_vma_intersection() [11/94] net/ipv5/tcp: Use vma_lookup() in tcp_zerocopy_receive() [12/94] drm/amdgpu: Use vma_lookup() in amdgpu_ttm_tt_get_user_pages() [13/94] media: videobuf2: Use vma_lookup() in get_vaddr_frames() [14/94] misc/sgi-gru/grufault: Use vma_lookup() in gru_find_vma() [15/94] kernel/events/uprobes: Use vma_lookup() in find_active_uprobe() [16/94] lib/test_hmm: Use vma_lookup() in dmirror_migrate() [17/94] mm/ksm: Use vma_lookup() in find_mergeable_vma() [18/94] mm/migrate: Use vma_lookup() in do_pages_stat_array() [19/94] mm/mremap: Use vma_lookup() in vma_to_resize() [20/94] mm/memory.c: Use vma_lookup() instead of find_vma_intersection() [21/94] radix tree test suite: Enhancements for Maple Tree [22/94] radix tree test suite: Add support for fallthrough attribute [23/94] radix tree test suite: Add support for kmem_cache_free_bulk [24/94] radix tree test suite: Add keme_cache_alloc_bulk() support [25/94] radix tree test suite: Add __must_be_array() support [26/94] Maple Tree: Add new data structure [28/94] mm/mmap: Introduce unlock_range() for code cleanup [27/94] mm: Start tracking VMAs with maple tree [29/94] mm/mmap: Change find_vma() to use the maple tree [30/94] mm/mmap: Change find_vma_prev() to use maple tree [31/94] mm/mmap: Change unmapped_area and unmapped_area_topdown to use maple tree [32/94] kernel/fork: Convert dup_mmap to use maple tree [33/94] mm: Remove rb tree. [34/94] arch/m68k/kernel/sys_m68k: Use vma_lookup() in sys_cacheflush() [35/94] xen/privcmd: Optimized privcmd_ioctl_mmap() by using vma_lookup() [36/94] mm: Optimize find_exact_vma() to use vma_lookup() [37/94] mm/khugepaged: Optimize collapse_pte_mapped_thp() by using vma_lookup() [38/94] mm/gup: Add mm_populate_vma() for use when the vma is known [39/94] mm/mmap: Change do_brk_flags() to expand existing VMA and add do_brk_munmap() [40/94] mm/mmap: Change vm_brk_flags() to use mm_populate_vma() [41/94] mm: Change find_vma_intersection() to maple tree and make find_vma() to inline. [42/94] mm/mmap: Change mmap_region() to use maple tree state [43/94] mm/mmap: Drop munmap_vma_range() [44/94] mm: Remove vmacache [45/94] mm/mmap: Change __do_munmap() to avoid unnecessary lookups. [46/94] mm/mmap: Move mmap_region() below do_munmap() [49/94] mmap: Remove __do_munmap() in favour of do_mas_munmap() [48/94] mmap: Use find_vma_intersection in do_mmap() for overlap [47/94] mm/mmap: Add do_mas_munmap() and wraper for __do_munmap() [50/94] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap() [51/94] mmap: make remove_vma_list() inline [52/94] mm: Introduce vma_next() and vma_prev() [53/94] arch/arm64: Remove mmap linked list from vdso. [54/94] arch/parisc: Remove mmap linked list from kernel/cache [55/94] arch/powerpc: Remove mmap linked list from mm/book3s32/tlb [56/94] arch/powerpc: Remove mmap linked list from mm/book3s64/subpage_prot [57/94] arch/s390: Use maple tree iterators instead of linked list. [58/94] arch/x86: Use maple tree iterators for vdso/vma [59/94] arch/xtensa: Use maple tree iterators for unmapped area [60/94] drivers/misc/cxl: Use maple tree iterators for cxl_prefault_vma() [61/94] drivers/tee/optee: Use maple tree iterators for __check_mem_type() [62/94] fs/binfmt_elf: Use maple tree iterators for fill_files_note() [64/94] fs/exec: Use vma_next() instead of linked list [63/94] fs/coredump: Use maple tree iterators in place of linked list [65/94] fs/proc/base: Use maple tree iterators in place of linked list [66/94] fs/proc/task_mmu: Stop using linked list and highest_vm_end [67/94] fs/userfaultfd: Stop using vma linked list. [68/94] ipc/shm: Stop using the vma linked list [69/94] kernel/acct: Use maple tree iterators instead of linked list [70/94] kernel/events/core: Use maple tree iterators instead of linked list [71/94] kernel/events/uprobes: Use maple tree iterators instead of linked list [72/94] kernel/sched/fair: Use maple tree iterators instead of linked list [73/94] kernel/sys: Use maple tree iterators instead of linked list [74/94] mm/gup: Use maple tree navigation instead of linked list [75/94] mm/huge_memory: Use vma_next() instead of vma linked list [76/94] mm/khugepaged: Use maple tree iterators instead of vma linked list [77/94] mm/ksm: Use maple tree iterators instead of vma linked list [78/94] mm/madvise: Use vma_next instead of vma linked list [79/94] mm/memcontrol: Stop using mm->highest_vm_end [80/94] mm/mempolicy: Use maple tree iterators instead of vma linked list [81/94] mm/mlock: Use maple tree iterators instead of vma linked list [82/94] mm/mprotect: Use maple tree navigation instead of vma linked list [84/94] mm/msync: Use vma_next() instead of vma linked list [83/94] mm/mremap: Use vma_next() instead of vma linked list [85/94] mm/oom_kill: Use maple tree iterators instead of vma linked list [86/94] mm/pagewalk: Use vma_next() instead of vma linked list [87/94] mm/swapfile: Use maple tree iterator instead of vma linked list [88/94] mm/util: Remove __vma_link_list() and __vma_unlink_list() [89/94] arch/um/kernel/tlb: Stop using linked list [90/94] bpf: Remove VMA linked list [91/94] mm: Remove vma linked list. [92/94] mm: Return a bool from anon_vma_interval_tree_verify() [93/94] mm/mmap: Add mas_split_vma() and use it for munmap() [94/94] mm: Move mas locking outside of munmap() path.

Commit Message

Liam R. Howlett April 28, 2021, 3:35 p.m. UTC

vma_lookup checks the limits of the vma so the code can be more readable
and clean.

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 mm/ksm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/mm/ksm.c b/mm/ksm.c
index 6bbe314c5260..ced6830d0ff4 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -521,10 +521,8 @@  static struct vm_area_struct *find_mergeable_vma(struct mm_struct *mm,
 	struct vm_area_struct *vma;
 	if (ksm_test_exit(mm))
 		return NULL;
-	vma = find_vma(mm, addr);
-	if (!vma || vma->vm_start > addr)
-		return NULL;
-	if (!(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
+	vma = vma_lookup(mm, addr);
+	if (!vma || !(vma->vm_flags & VM_MERGEABLE) || !vma->anon_vma)
 		return NULL;
 	return vma;
 }