mm: Add vma_lookup()
Subsystems (29)
v2 cover mm: Add vma_lookup()
Many places in the kernel use find_vma() to get a vma and then check the start address of the vma to ensure the next vma was not returned.
Other places use the find_vma_intersection() call with add, addr + 1 as the range; looking for just the vma at a specific address.
The third use of find_vma() is by developers who do not know that the function starts searching at the provided address upwards for the next vma. This results in a bug that is often overlooked for a long time.
Adding the new vma_lookup() function will allow for cleaner code by removing the find_vma() calls which check limits, making find_vma_intersection() calls of a single address to be shorter, and potentially reduce the incorrect uses of find_vma().
v2:
- Changed find_vma_intersection() comments and whitespace to be compliant. Thanks Davidlohr Bueso
- Moved vma_lookup() call in vma_to_resize() to be separate from the declaration as requested by Davidlohr Bueso
- Added Acked-by: Geert Uytterhoeven <[email protected]> for 08/22 "arch/m68k/kernel/sys_m68k: Use vma_lookup() in sys_cacheflush()"
- Added Reviewed-by: Laurent Dufour <[email protected]>
- Added Acked-by: Davidlohr Bueso <[email protected]>
This patch set was originally part of the maple tree patch set. Changes since being broken out on its own:
- Changed initial implementation of vma_lookup() to use find_vma() as requested by Michel Lespinasse.
- Updated commit comments to be more descriptive
These patches are based on next-20210506
Liam R. Howlett (22):
mm: Add vma_lookup(), update find_vma_intersection() comments drm/i915/selftests: Use vma_lookup() in __igt_mmap() arch/arc/kernel/troubleshoot: use vma_lookup() instead of find_vma() arch/arm64/kvm: Use vma_lookup() instead of find_vma_intersection() arch/powerpc/kvm/book3s_hv_uvmem: Use vma_lookup() instead of
find_vma_intersection()
arch/powerpc/kvm/book3s: Use vma_lookup() in
kvmppc_hv_setup_htab_rma()
arch/mips/kernel/traps: Use vma_lookup() instead of find_vma() arch/m68k/kernel/sys_m68k: Use vma_lookup() in sys_cacheflush() x86/sgx: Use vma_lookup() in sgx_encl_find()
virt/kvm: Use vma_lookup() instead of find_vma_intersection()
vfio: Use vma_lookup() instead of find_vma_intersection() net/ipv5/tcp: Use vma_lookup() in tcp_zerocopy_receive() drm/amdgpu: Use vma_lookup() in amdgpu_ttm_tt_get_user_pages()
media: videobuf2: Use vma_lookup() in get_vaddr_frames() misc/sgi-gru/grufault: Use vma_lookup() in gru_find_vma() kernel/events/uprobes: Use vma_lookup() in find_active_uprobe() lib/test_hmm: Use vma_lookup() in dmirror_migrate() mm/ksm: Use vma_lookup() in find_mergeable_vma() mm/migrate: Use vma_lookup() in do_pages_stat_array() mm/mremap: Use vma_lookup() in vma_to_resize() mm/memory.c: Use vma_lookup() in __access_remote_vm() mm/mempolicy: Use vma_lookup() in __access_remote_vm()
arch/arc/kernel/troubleshoot.c | 8 ++--- arch/arm64/kvm/mmu.c | 2 +- arch/m68k/kernel/sys_m68k.c | 4 +-- arch/mips/kernel/traps.c | 4 +-- arch/powerpc/kvm/book3s_hv.c | 4 +-- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- arch/x86/kernel/cpu/sgx/encl.h | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +-- .../drm/i915/gem/selftests/i915_gem_mman.c | 2 +- drivers/media/common/videobuf2/frame_vector.c | 2 +- drivers/misc/sgi-gru/grufault.c | 4 +-- drivers/vfio/vfio_iommu_type1.c | 2 +- include/linux/mm.h | 36 ++++++++++++++++--- kernel/events/uprobes.c | 4 +-- lib/test_hmm.c | 5 ++- mm/ksm.c | 6 ++-- mm/memory.c | 4 +-- mm/mempolicy.c | 2 +- mm/migrate.c | 4 +-- mm/mremap.c | 5 +-- net/ipv4/tcp.c | 4 +-- virt/kvm/kvm_main.c | 2 +- 22 files changed, 69 insertions(+), 45 deletions(-)
Signature · 1 line
2.30.2
PATCH v2 1/22 mm: Add vma_lookup(), update find_vma_intersection() comments
Many places in the kernel use find_vma() to get a vma and then check the start address of the vma to ensure the next vma was not returned.
Other places use the find_vma_intersection() call with add, addr + 1 as the range; looking for just the vma at a specific address.
The third use of find_vma() is by developers who do not know that the function starts searching at the provided address upwards for the next vma. This results in a bug that is often overlooked for a long time.
Adding the new vma_lookup() function will allow for cleaner code by removing the find_vma() calls which check limits, making find_vma_intersection() calls of a single address to be shorter, and potentially reduce the incorrect uses of find_vma().
Also change find_vma_intersection() comments and declaration to be of the correct length and add kernel documentation style comment.
--- include/linux/mm.h | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-)
include/linux/mm.h +32 -4
@@ -2678,17 +2678,45 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addextern struct vm_area_struct *find_vma_prev (struct mm_struct * mm,unsigned long addr,struct vm_area_struct **pprev); -/* Look up the first VMA which intersects the interval start_addr..end_addr-1, -NULL if none. Assume start_addr < end_addr. */ -static inline struct vm_area_struct *find_vma_intersection (struct mm_struct * mm,unsigned long start_addr,unsigned long end_addr) +/** +* find_vma_intersection() - Look up the first VMA which intersects the interval +* @mm: The process address space. +* @start_addr: The inclusive start user address. +* @end_addr: The exclusive end user address. +* +* Returns: The first VMA within the provided range, %NULL otherwise. Assumes +* start_addr < end_addr. +*/ +static inline +struct vm_area_struct *find_vma_intersection (struct mm_struct *mm, +unsigned long start_addr, +unsigned long end_addr) { -struct vm_area_struct * vma =find_vma (mm,start_addr); +struct vm_area_struct *vma =find_vma (mm, start_addr);if (vma && end_addr <= vma->vm_start) vma =NULL ;return vma; } +/** +* vma_lookup() - Find a VMA at a specific address +* @mm: The process address space. +* @addr: The user address. +* +* Return: The vm_area_struct at the given address, %NULL otherwise. +*/ +static inline +struct vm_area_struct *vma_lookup (struct mm_struct *mm,unsigned long addr) +{ +struct vm_area_struct *vma =find_vma (mm, addr); + +if (vma && addr < vma->vm_start) + vma =NULL ; + +return vma; +} +static inline unsigned long vm_start_gap (struct vm_area_struct *vma) {unsigned long vm_start = vma->vm_start;
Signature · 1 line
2.30.2
PATCH v2 2/22 drm/i915/selftests: Use vma_lookup() in __igt_mmap()
In reply to Liam Howlettvma_lookup() will look up the vma at a specific address. find_vma() will start the search for a specific address and continue upwards. This fixes an issue with the selftest as the returned vma may not be the newly created vma, but simply the vma at a higher address.
objects
--- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +1 -1
@@ -871,7 +871,7 @@ static int __igt_mmap(struct drm_i915_private *i915,pr_debug ("igt_mmap(%s, %d) @ %lx\n" , obj->mm.region->name, type, addr); - area =find_vma (current->mm, addr); + area =vma_lookup (current->mm, addr);if (!area) {pr_err ("%s: Did not create a vm_area_struct for the mmap\n" , obj->mm.region->name);
Signature · 1 line
2.30.2
PATCH v2 3/22 arch/arc/kernel/troubleshoot: use vma_lookup() instead of find_vma()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- arch/arc/kernel/troubleshoot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arc/kernel/troubleshoot.c +4 -4
@@ -83,12 +83,12 @@ static void show_faulting_vma(unsigned long address)* non-inclusive vma */ mmap_read_lock (active_mm); - vma =find_vma (active_mm, address); + vma =vma_lookup (active_mm, address); -/* check against the find_vma( ) behaviour which returns the next VMA -* if the container VMA is not found +/* Lookup the vma at the address and report if the container VMA is not +* found */ -if (vma && (vma->vm_start <= address)) { +if (vma) {char buf[ARC_PATH_MAX ];char *nm ="?" ;
Signature · 1 line
2.30.2
PATCH v2 4/22 arch/arm64/kvm: Use vma_lookup() instead of find_vma_intersection()
In reply to Liam Howlettvma_lookup() finds the vma of a specific address with a cleaner interface and is more readable.
--- arch/arm64/kvm/mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kvm/mmu.c +1 -1
@@ -855,7 +855,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,/* Let's check if we will get back a huge page backed by hugetlbfs */ mmap_read_lock (current->mm); - vma =find_vma_intersection (current->mm, hva, hva +1 ); + vma =vma_lookup (current->mm, hva);if (unlikely (!vma)) {kvm_err ("Failed to find VMA for hva 0x%lx\n" , hva);mmap_read_unlock (current->mm);
Signature · 1 line
2.30.2
PATCH v2 5/22 arch/powerpc/kvm/book3s_hv_uvmem: Use vma_lookup() instead of find_vma_intersection()
In reply to Liam Howlettvma_lookup() finds the vma of a specific address with a cleaner interface and is more readable.
--- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kvm/book3s_hv_uvmem.c +1 -1
@@ -614,7 +614,7 @@ void kvmppc_uvmem_drop_pages(const struct kvm_memory_slot *slot,/* Fetch the VMA if addr is not in the latest fetched one */ if (!vma || addr >= vma->vm_end) { - vma =find_vma_intersection (kvm->mm, addr, addr+1 ); + vma =vma_lookup (kvm->mm, addr);if (!vma) {pr_err ("Can't find VMA for gfn:0x%lx\n" , gfn);break ;
Signature · 1 line
2.30.2
PATCH v2 6/22 arch/powerpc/kvm/book3s: Use vma_lookup() in kvmppc_hv_setup_htab_rma()
In reply to Liam HowlettUsing vma_lookup() removes the requirement to check if the address is within the returned vma. The code is easier to understand and more compact.
--- arch/powerpc/kvm/book3s_hv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_hv.c +2 -2
@@ -4759,8 +4759,8 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)/* Look up the VMA for the start of this memory slot */ hva = memslot->userspace_addr;mmap_read_lock (kvm->mm); - vma =find_vma (kvm->mm, hva); -if (!vma || vma->vm_start > hva || (vma->vm_flags &VM_IO )) + vma =vma_lookup (kvm->mm, hva); +if (!vma || (vma->vm_flags &VM_IO )) goto up_out; psize =vma_kernel_pagesize (vma);
Signature · 1 line
2.30.2
PATCH v2 7/22 arch/mips/kernel/traps: Use vma_lookup() instead of find_vma()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- arch/mips/kernel/traps.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/mips/kernel/traps.c +1 -3
@@ -784,7 +784,6 @@ void force_fcr31_sig(unsigned long fcr31, void __user *fault_addr,int process_fpemu_return (int sig,void __user *fault_addr,unsigned long fcr31) {int si_code; -struct vm_area_struct *vma;switch (sig) {case 0 :
@@ -800,8 +799,7 @@ int process_fpemu_return(int sig, void __user *fault_addr, unsigned long fcr31)case SIGSEGV :mmap_read_lock (current->mm); - vma =find_vma (current->mm, (unsigned long )fault_addr); -if (vma && (vma->vm_start <= (unsigned long )fault_addr)) +if (vma_lookup (current->mm, (unsigned long )fault_addr)) si_code =SEGV_ACCERR ;else si_code =SEGV_MAPERR ;
Signature · 1 line
2.30.2
PATCH v2 8/22 arch/m68k/kernel/sys_m68k: Use vma_lookup() in sys_cacheflush()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- arch/m68k/kernel/sys_m68k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/m68k/kernel/sys_m68k.c +2 -2
@@ -402,8 +402,8 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)* to this process. */ mmap_read_lock (current->mm); - vma =find_vma (current->mm, addr); -if (!vma || addr < vma->vm_start || addr + len > vma->vm_end) + vma =vma_lookup (current->mm, addr); +if (!vma || addr + len > vma->vm_end) goto out_unlock; }
Signature · 1 line
2.30.2
PATCH v2 9/22 x86/sgx: Use vma_lookup() in sgx_encl_find()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- arch/x86/kernel/cpu/sgx/encl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/sgx/encl.h +2 -2
@@ -91,8 +91,8 @@ static inline int sgx_encl_find(struct mm_struct *mm, unsigned long addr, {struct vm_area_struct *result; - result =find_vma (mm, addr); -if (!result || result->vm_ops != &sgx_vm_ops || addr < result->vm_start) + result =vma_lookup (mm, addr); +if (!result || result->vm_ops != &sgx_vm_ops)return -EINVAL ; *vma = result;
Signature · 1 line
2.30.2
PATCH v2 10/22 virt/kvm: Use vma_lookup() instead of find_vma_intersection()
In reply to Liam Howlettvma_lookup() finds the vma of a specific address with a cleaner interface and is more readable.
--- virt/kvm/kvm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/kvm_main.c +1 -1
@@ -2154,7 +2154,7 @@ static kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async, } retry: - vma =find_vma_intersection (current->mm, addr, addr +1 ); + vma =vma_lookup (current->mm, addr);if (vma ==NULL ) pfn =KVM_PFN_ERR_FAULT ;
Signature · 1 line
2.30.2
PATCH v2 11/22 vfio: Use vma_lookup() instead of find_vma_intersection()
In reply to Liam Howlettvma_lookup() finds the vma of a specific address with a cleaner interface and is more readable.
--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/vfio_iommu_type1.c +1 -1
@@ -567,7 +567,7 @@ static int vaddr_get_pfns(struct mm_struct *mm, unsigned long vaddr, vaddr =untagged_addr (vaddr); retry: - vma =find_vma_intersection (mm, vaddr, vaddr +1 ); + vma =vma_lookup (mm, vaddr);if (vma && vma->vm_flags &VM_PFNMAP ) { ret =follow_fault_pfn (vma, mm, vaddr, pfn, prot &IOMMU_WRITE );
Signature · 1 line
2.30.2
PATCH v2 12/22 net/ipv5/tcp: Use vma_lookup() in tcp_zerocopy_receive()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- net/ipv4/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/ipv4/tcp.c +2 -2
@@ -2094,8 +2094,8 @@ static int tcp_zerocopy_receive(struct sock *sk,mmap_read_lock (current->mm); - vma =find_vma (current->mm, address); -if (!vma || vma->vm_start > address || vma->vm_ops != &tcp_vm_ops) { + vma =vma_lookup (current->mm, address); +if (!vma || vma->vm_ops != &tcp_vm_ops) {mmap_read_unlock (current->mm);return -EINVAL ; }
Signature · 1 line
2.30.2
PATCH v2 13/22 drm/amdgpu: Use vma_lookup() in amdgpu_ttm_tt_get_user_pages()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -2
@@ -694,9 +694,9 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages)return -ESRCH ;mmap_read_lock (mm); - vma =find_vma (mm, start); + vma =vma_lookup (mm, start);mmap_read_unlock (mm); -if (unlikely (!vma || start < vma->vm_start)) { +if (unlikely (!vma)) { r = -EFAULT ; goto out_putmm; }
Signature · 1 line
2.30.2
PATCH v2 14/22 media: videobuf2: Use vma_lookup() in get_vaddr_frames()
In reply to Liam Howlettvma_lookup() finds the vma of a specific address with a cleaner interface and is more readable.
--- drivers/media/common/videobuf2/frame_vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/common/videobuf2/frame_vector.c +1 -1
@@ -64,7 +64,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, do { unsigned long *nums = frame_vector_pfns(vec); - vma = find_vma_intersection(mm, start, start + 1); + vma = vma_lookup(mm, start); if (!vma) break;
Signature · 1 line
2.30.2
PATCH v2 15/22 misc/sgi-gru/grufault: Use vma_lookup() in gru_find_vma()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- drivers/misc/sgi-gru/grufault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/sgi-gru/grufault.c +2 -2
@@ -49,8 +49,8 @@ struct vm_area_struct *gru_find_vma(unsigned long vaddr) {struct vm_area_struct *vma; - vma =find_vma (current->mm, vaddr); -if (vma && vma->vm_start <= vaddr && vma->vm_ops == &gru_vm_ops) + vma =vma_lookup (current->mm, vaddr); +if (vma && vma->vm_ops == &gru_vm_ops)return vma;return NULL ; }
Signature · 1 line
2.30.2
PATCH v2 16/22 kernel/events/uprobes: Use vma_lookup() in find_active_uprobe()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- kernel/events/uprobes.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/events/uprobes.c +2 -2
@@ -2046,8 +2046,8 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp)struct vm_area_struct *vma;mmap_read_lock (mm); - vma =find_vma (mm, bp_vaddr); -if (vma && vma->vm_start <= bp_vaddr) { + vma =vma_lookup (mm, bp_vaddr); +if (vma) {if (valid_vma (vma, false)) {struct inode *inode =file_inode (vma->vm_file);loff_t offset =vaddr_to_offset (vma, bp_vaddr);
Signature · 1 line
2.30.2
PATCH v2 17/22 lib/test_hmm: Use vma_lookup() in dmirror_migrate()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- lib/test_hmm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
lib/test_hmm.c +2 -3
@@ -686,9 +686,8 @@ static int dmirror_migrate(struct dmirror *dmirror,mmap_read_lock (mm);for (addr = start; addr < end; addr = next) { - vma =find_vma (mm, addr); -if (!vma || addr < vma->vm_start || - !(vma->vm_flags &VM_READ )) { + vma =vma_lookup (mm, addr); +if (!vma || !(vma->vm_flags &VM_READ )) { ret = -EINVAL ; goto out; }
Signature · 1 line
2.30.2
PATCH v2 18/22 mm/ksm: Use vma_lookup() in find_mergeable_vma()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- mm/ksm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
mm/ksm.c +2 -4
@@ -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; }
Signature · 1 line
2.30.2
PATCH v2 19/22 mm/migrate: Use vma_lookup() in do_pages_stat_array()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- mm/migrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/migrate.c +2 -2
@@ -1833,8 +1833,8 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages,struct page *page;int err = -EFAULT ; - vma =find_vma (mm, addr); -if (!vma || addr < vma->vm_start) + vma =vma_lookup (mm, addr); +if (!vma) goto set_status;/* FOLL_DUMP to ignore special (like zero) pages */
Signature · 1 line
2.30.2
PATCH v2 20/22 mm/mremap: Use vma_lookup() in vma_to_resize()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- mm/mremap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
mm/mremap.c +3 -2
@@ -634,10 +634,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr, unsigned long *p) {struct mm_struct *mm = current->mm; -struct vm_area_struct *vma =find_vma (mm, addr); +struct vm_area_struct *vma;unsigned long pgoff; -if (!vma || vma->vm_start > addr) + vma =vma_lookup (mm, addr); +if (!vma)return ERR_PTR (-EFAULT );/*
Signature · 1 line
2.30.2
PATCH v2 21/22 mm/memory.c: Use vma_lookup() in __access_remote_vm()
In reply to Liam HowlettUse vma_lookup() to find the VMA at a specific address. As vma_lookup() will return NULL if the address is not within any VMA, the start address no longer needs to be validated.
--- mm/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/memory.c +2 -2
@@ -4954,8 +4954,8 @@ int __access_remote_vm(struct mm_struct *mm, unsigned long addr, void *buf,* Check if this is a VM_IO | VM_PFNMAP VMA, which * we can access using slightly different code. */ - vma =find_vma (mm, addr); -if (!vma || vma->vm_start > addr) + vma =vma_lookup (mm, addr); +if (!vma)break ;if (vma->vm_ops && vma->vm_ops->access) ret = vma->vm_ops->access(vma, addr, buf,
Signature · 1 line
2.30.2
PATCH v2 22/22 mm/mempolicy: Use vma_lookup() in __access_remote_vm()
In reply to Liam Howlettvma_lookup() finds the vma of a specific address with a cleaner interface and is more readable.
--- mm/mempolicy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mempolicy.c +1 -1
@@ -975,7 +975,7 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask,* want to return MPOL_DEFAULT in this case. */ mmap_read_lock (mm); - vma =find_vma_intersection (mm, addr, addr+1 ); + vma =vma_lookup (mm, addr);if (!vma) {mmap_read_unlock (mm);return -EFAULT ;
Signature · 1 line
2.30.2
Hello,
I missed David Hildenbrand on the CC list and in the v2 change log.
I added David Hildenbrand <[email protected]> to the Acked-By for the series as well.
Sorry for the oversight.
Thank you,
Liam
Quoted 85 lines · Liam Howlett
Many places in the kernel use
find_vma()to get a vma and then check the start address of the vma to ensure the next vma was not returned.Other places use the
find_vma_intersection()call with add, addr + 1 as the range; looking for just the vma at a specific address.The third use of
find_vma()is by developers who do not know that the function starts searching at the provided address upwards for the next vma. This results in a bug that is often overlooked for a long time.Adding the new
vma_lookup()function will allow for cleaner code by removing thefind_vma()calls which check limits, makingfind_vma_intersection()calls of a single address to be shorter, and potentially reduce the incorrect uses offind_vma().v2:
- Changedfind_vma_intersection()comments and whitespace to be compliant. Thanks Davidlohr Bueso
- Movedvma_lookup()call invma_to_resize()to be separate from the declaration as requested by Davidlohr Bueso
- Added Acked-by: Geert Uytterhoeven <[email protected]> for 08/22 "arch/m68k/kernel/sys_m68k: Usevma_lookup()insys_cacheflush()"
- Added Reviewed-by: Laurent Dufour <[email protected]>
- Added Acked-by: Davidlohr Bueso <[email protected]>This patch set was originally part of the maple tree patch set. Changes since being broken out on its own:
- Changed initial implementation ofvma_lookup()to usefind_vma()as requested by Michel Lespinasse.
- Updated commit comments to be more descriptiveThese patches are based on next-20210506
Liam R. Howlett (22):
mm: Addvma_lookup(), updatefind_vma_intersection()comments drm/i915/selftests: Usevma_lookup()in__igt_mmap()arch/arc/kernel/troubleshoot: usevma_lookup()instead offind_vma()arch/arm64/kvm: Usevma_lookup()instead offind_vma_intersection()arch/powerpc/kvm/book3s_hv_uvmem: Usevma_lookup()instead of
find_vma_intersection()
arch/powerpc/kvm/book3s: Usevma_lookup()in
kvmppc_hv_setup_htab_rma()
arch/mips/kernel/traps: Usevma_lookup()instead offind_vma()arch/m68k/kernel/sys_m68k: Usevma_lookup()insys_cacheflush()x86/sgx: Usevma_lookup()insgx_encl_find()
virt/kvm: Usevma_lookup()instead offind_vma_intersection()
vfio: Usevma_lookup()instead offind_vma_intersection()net/ipv5/tcp: Usevma_lookup()intcp_zerocopy_receive()drm/amdgpu: Usevma_lookup()inamdgpu_ttm_tt_get_user_pages()
media: videobuf2: Usevma_lookup()inget_vaddr_frames()misc/sgi-gru/grufault: Usevma_lookup()ingru_find_vma()kernel/events/uprobes: Usevma_lookup()infind_active_uprobe()lib/test_hmm: Usevma_lookup()indmirror_migrate()mm/ksm: Usevma_lookup()infind_mergeable_vma()mm/migrate: Usevma_lookup()indo_pages_stat_array()mm/mremap: Usevma_lookup()invma_to_resize()mm/memory.c: Usevma_lookup()in__access_remote_vm()mm/mempolicy: Usevma_lookup()in__access_remote_vm()arch/arc/kernel/troubleshoot.c | 8 ++--- arch/arm64/kvm/mmu.c | 2 +- arch/m68k/kernel/sys_m68k.c | 4 +-- arch/mips/kernel/traps.c | 4 +-- arch/powerpc/kvm/book3s_hv.c | 4 +-- arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- arch/x86/kernel/cpu/sgx/encl.h | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +-- .../drm/i915/gem/selftests/i915_gem_mman.c | 2 +- drivers/media/common/videobuf2/frame_vector.c | 2 +- drivers/misc/sgi-gru/grufault.c | 4 +-- drivers/vfio/vfio_iommu_type1.c | 2 +- include/linux/mm.h | 36 ++++++++++++++++--- kernel/events/uprobes.c | 4 +-- lib/test_hmm.c | 5 ++- mm/ksm.c | 6 ++-- mm/memory.c | 4 +-- mm/mempolicy.c | 2 +- mm/migrate.c | 4 +-- mm/mremap.c | 5 +-- net/ipv4/tcp.c | 4 +-- virt/kvm/kvm_main.c | 2 +- 22 files changed, 69 insertions(+), 45 deletions(-)Signature · 1 line
2.30.2