ARM: KVM: abstract exception class decoding away

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

diff --git a/arch/arm/include/asm/kvm_emulate.h b/arch/arm/include/asm/kvm_emulate.h
index a9b853f35aeda6394156c9ae83b558d4443611ea..539f83ac167f60a6b7ab73778ac699963050a436 100644 (file)
--- a/arch/arm/include/asm/kvm_emulate.h
+++ b/arch/arm/include/asm/kvm_emulate.h
@@ -142,4 +142,9 @@ static inline bool kvm_vcpu_trap_il_is32bit(struct kvm_vcpu *vcpu)
        return kvm_vcpu_get_hsr(vcpu) & HSR_IL;
 }
 
+static inline u8 kvm_vcpu_trap_get_class(struct kvm_vcpu *vcpu)
+{
+       return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;
+}
+
 #endif /* __ARM_KVM_EMULATE_H__ */

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 31616336255c48a8d297bb7345529902aa118e83..26990017410281eec7cadf1017534c26eabad1ae 100644 (file)
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -559,7 +559,7 @@ static bool kvm_condition_valid(struct kvm_vcpu *vcpu)
         * catch undefined instructions, and then we won't get past
         * the arm_exit_handlers test anyway.
         */
-       BUG_ON(((kvm_vcpu_get_hsr(vcpu) & HSR_EC) >> HSR_EC_SHIFT) == 0);
+       BUG_ON(!kvm_vcpu_trap_get_class(vcpu));
 
        /* Top two bits non-zero?  Unconditional. */
        if (kvm_vcpu_get_hsr(vcpu) >> 30)
@@ -609,7 +609,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
        case ARM_EXCEPTION_DATA_ABORT:
        case ARM_EXCEPTION_PREF_ABORT:
        case ARM_EXCEPTION_HVC:
-               hsr_ec = (kvm_vcpu_get_hsr(vcpu) & HSR_EC) >> HSR_EC_SHIFT;
+               hsr_ec = kvm_vcpu_trap_get_class(vcpu);
 
                if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers)
                    || !arm_exit_handlers[hsr_ec]) {

diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index d0f5f52c179fe08ee98a6e4716c211502e3d20ac..41fa75df107fba964975bf24cc965ae2445c6324 100644 (file)
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -593,7 +593,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
        gfn_t gfn;
        int ret, idx;
 
-       hsr_ec = kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;
+       hsr_ec = kvm_vcpu_trap_get_class(vcpu);
        is_iabt = (hsr_ec == HSR_EC_IABT);
        fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);