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 80df936..c870c03 100644
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -87,4 +87,9 @@ static inline bool kvm_vcpu_dabt_isvalid(struct kvm_vcpu *vcpu)
return !!(kvm_vcpu_get_hsr(vcpu) & HSR_ISV);
}
+static inline bool kvm_vcpu_dabt_iswrite(struct kvm_vcpu *vcpu)
+{
+ return !!(kvm_vcpu_get_hsr(vcpu) & HSR_WNR);
+}
+
#endif /* __ARM_KVM_EMULATE_H__ */
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c
index f65974e..1e5a505 100644
--- a/arch/arm/kvm/mmio.c
+++ b/arch/arm/kvm/mmio.c
@@ -91,7 +91,7 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
return -EFAULT;
}
- is_write = kvm_vcpu_get_hsr(vcpu) & HSR_WNR;
+ is_write = kvm_vcpu_dabt_iswrite(vcpu);
sign_extend = kvm_vcpu_get_hsr(vcpu) & HSR_SSE;
rd = (kvm_vcpu_get_hsr(vcpu) & HSR_SRT_MASK) >> HSR_SRT_SHIFT;
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 4666faa0..55f9d1d 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_dabt_isvalid(vcpu) && !(kvm_vcpu_get_hsr(vcpu) & HSR_WNR))
+ else if (kvm_vcpu_dabt_isvalid(vcpu) && !kvm_vcpu_dabt_iswrite(vcpu))
write_fault = false;
else
write_fault = true;
--
1.7.12
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
