From: Liam R. Howlett Date: Thu, 8 Apr 2021 17:25:21 +0000 (-0400) Subject: arch/powerpc/kvm/book3s: Use vma_lookup() in kvmppc_hv_setup_htab_rma() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8637cec1d2c8dcba4869fba0c434129366bad5f1;p=users%2Fjedix%2Flinux-maple.git arch/powerpc/kvm/book3s: Use vma_lookup() in kvmppc_hv_setup_htab_rma() Using vma_lookup() removes the requirement to check if the address is within the returned vma. The code is easier to understand and more compact. Signed-off-by: Liam R. Howlett --- diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 28a80d240b76..a3a4b2179350 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -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);