diff options
| author | Gavin Shan <gshan@redhat.com> | 2021-03-16 05:11:25 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-07 15:33:22 +0200 |
| commit | c728fd4ce75e9c342ea96facc5a2fe5ddb976a67 (patch) | |
| tree | b78c4e4c33eed41488f964c0a1b5a35012ca611f /arch/arm64/kvm/mmu.c | |
| parent | KVM: arm64: Hide kvm_mmu_wp_memory_region() (diff) | |
| download | linux-c728fd4ce75e9c342ea96facc5a2fe5ddb976a67.tar.xz linux-c728fd4ce75e9c342ea96facc5a2fe5ddb976a67.zip | |
KVM: arm64: Use find_vma_intersection()
find_vma_intersection() has been existing to search the intersected
vma. This uses the function where it's applicable, to simplify the
code.
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Keqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210316041126.81860-3-gshan@redhat.com
Diffstat (limited to 'arch/arm64/kvm/mmu.c')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 28f3b3736dc8..192e0df2fc8e 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -421,10 +421,11 @@ static void stage2_unmap_memslot(struct kvm *kvm, * +--------------------------------------------+ */ do { - struct vm_area_struct *vma = find_vma(current->mm, hva); + struct vm_area_struct *vma; hva_t vm_start, vm_end; - if (!vma || vma->vm_start >= reg_end) + vma = find_vma_intersection(current->mm, hva, reg_end); + if (!vma) break; /* @@ -1329,10 +1330,11 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, * +--------------------------------------------+ */ do { - struct vm_area_struct *vma = find_vma(current->mm, hva); + struct vm_area_struct *vma; hva_t vm_start, vm_end; - if (!vma || vma->vm_start >= reg_end) + vma = find_vma_intersection(current->mm, hva, reg_end); + if (!vma) break; /* |