redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: KVM: abstract exception class decoding away 

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
hifive-unleashed-5.1
Marc Zyngier 2012-09-18 14:09:58 +01:00 committed by Christoffer Dall
parent 23b415d61a
commit 4926d445eb
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/include/asm/kvm_emulate.h
View File

@ -142,4 +142,9 @@ static inline bool kvm_vcpu_trap_il_is32bit(struct kvm_vcpu *vcpu)
return kvm_vcpu_get_hsr(vcpu) & HSR_IL; 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__ */ #endif /* __ARM_KVM_EMULATE_H__ */

4
arch/arm/kvm/arm.c
View File

@ -559,7 +559,7 @@ static bool kvm_condition_valid(struct kvm_vcpu *vcpu)
* catch undefined instructions, and then we won't get past * catch undefined instructions, and then we won't get past
* the arm_exit_handlers test anyway. * 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. */ /* Top two bits non-zero? Unconditional. */
if (kvm_vcpu_get_hsr(vcpu) >> 30) 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_DATA_ABORT:
case ARM_EXCEPTION_PREF_ABORT: case ARM_EXCEPTION_PREF_ABORT:
case ARM_EXCEPTION_HVC: 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) if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers)
|| !arm_exit_handlers[hsr_ec]) { || !arm_exit_handlers[hsr_ec]) {

2
arch/arm/kvm/mmu.c
View File

@ -593,7 +593,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)
gfn_t gfn; gfn_t gfn;
int ret, idx; 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); is_iabt = (hsr_ec == HSR_EC_IABT);
fault_ipa = kvm_vcpu_get_fault_ipa(vcpu); fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);