diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-20 17:31:07 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-20 17:31:07 -0400 |
| commit | b73815a18de154d712d0a4b4932a4b1b37c99580 (patch) | |
| tree | a3da13867f35bbad2d59f02106a6453fe0783900 /arch/arm64/kvm/mmu.c | |
| parent | 7d1f8691ccffe88cec70a6e4044adf1b9bbd8a7c (diff) | |
| parent | 620cf45f7a516bf5fe9e5dce675a652e935c8bde (diff) | |
| download | linux-b73815a18de154d712d0a4b4932a4b1b37c99580.tar.gz linux-b73815a18de154d712d0a4b4932a4b1b37c99580.tar.bz2 linux-b73815a18de154d712d0a4b4932a4b1b37c99580.zip | |
Merge tag 'kvmarm-fixes-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/arm64 fixes for 5.9, take #2
- Fix handling of S1 Page Table Walk permission fault at S2
on instruction fetch
- Cleanup kvm_vcpu_dabt_iswrite()
Diffstat (limited to 'arch/arm64/kvm/mmu.c')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 9a636b8064f1..3d26b47a1343 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1849,7 +1849,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, struct kvm_s2_mmu *mmu = vcpu->arch.hw_mmu; write_fault = kvm_is_write_fault(vcpu); - exec_fault = kvm_vcpu_trap_is_iabt(vcpu); + exec_fault = kvm_vcpu_trap_is_exec_fault(vcpu); VM_BUG_ON(write_fault && exec_fault); if (fault_status == FSC_PERM && !write_fault && !exec_fault) { @@ -2131,7 +2131,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) goto out; } - if (kvm_vcpu_dabt_iss1tw(vcpu)) { + if (kvm_vcpu_abt_iss1tw(vcpu)) { kvm_inject_dabt(vcpu, kvm_vcpu_get_hfar(vcpu)); ret = 1; goto out_unlock; |