Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4926d445 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

ARM: KVM: abstract exception class decoding away 



Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 23b415d6

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -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__ */

arch/arm/kvm/arm.c

+2 −2
Original line number Diff line number Diff line
@@ -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]) {

arch/arm/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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);