Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
---
arch/arm/include/asm/kvm_emulate.h | 5 +++++
arch/arm/kvm/mmio.c | 2 +-
arch/arm/kvm/mmu.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index df41a27..80df936 100644
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -82,4 +82,9 @@ static inline unsigned long kvm_vcpu_get_hyp_pc(struct kvm_vcpu *vcpu)
return vcpu->arch.fault.hyp_pc;
}
+static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
+{
+ return !!(kvm_vcpu_get_hsr(vcpu) & HSR_ISV);
+}
+
#endif /* __ARM_KVM_EMULATE_H__ */
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index 516fe27..f65974e 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -129,7 +129,7 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
* space do its magic.
*/
- if (kvm_vcpu_get_hsr(vcpu) & HSR_ISV)
+ if (kvm_vcpu_dabt_isvalid(vcpu))
ret = decode_hsr(vcpu, fault_ipa, &mmio);
else
ret = kvm_emulate_mmio_ls(vcpu, fault_ipa, &mmio);
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index ec7331e..4666faa0 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -533,7 +533,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
if (is_iabt)
write_fault = false;
- else if ((kvm_vcpu_get_hsr(vcpu) & HSR_ISV) && !(kvm_vcpu_get_hsr(vcpu) & HSR_WNR))
+ else if (kvm_vcpu_dabt_isvalid(vcpu) && !(kvm_vcpu_get_hsr(vcpu) & HSR_WNR))
write_fault = false;
else
write_fault = true;
--
1.7.12
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
