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

Commit 52d1dba9 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

ARM: KVM: abstract HSR_EC_IABT away 



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

arch/arm/include/asm/kvm_emulate.h

+5 −0
Original line number Diff line number Diff line
@@ -147,6 +147,11 @@ static inline u8 kvm_vcpu_trap_get_class(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) >> HSR_EC_SHIFT;

}



static inline bool kvm_vcpu_trap_is_iabt(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_trap_get_class(vcpu) == HSR_EC_IABT;

}



static inline u8 kvm_vcpu_trap_get_fault(struct kvm_vcpu *vcpu)

{

	return kvm_vcpu_get_hsr(vcpu) & HSR_FSC_TYPE;

arch/arm/kvm/mmu.c

+3 −5
Original line number Diff line number Diff line
@@ -585,7 +585,6 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
 */

int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	unsigned long hsr_ec;

	unsigned long fault_status;

	phys_addr_t fault_ipa;

	struct kvm_memory_slot *memslot;
@@ -593,8 +592,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	gfn_t gfn;

	int ret, idx;



	hsr_ec = kvm_vcpu_trap_get_class(vcpu);

	is_iabt = (hsr_ec == HSR_EC_IABT);

	is_iabt = kvm_vcpu_trap_is_iabt(vcpu);

	fault_ipa = kvm_vcpu_get_fault_ipa(vcpu);



	trace_kvm_guest_fault(*vcpu_pc(vcpu), kvm_vcpu_get_hsr(vcpu),
@@ -603,8 +601,8 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	/* Check the stage-2 fault is trans. fault or write fault */

	fault_status = kvm_vcpu_trap_get_fault(vcpu);

	if (fault_status != FSC_FAULT && fault_status != FSC_PERM) {

		kvm_err("Unsupported fault status: EC=%#lx DFCS=%#lx\n",

			hsr_ec, fault_status);

		kvm_err("Unsupported fault status: EC=%#x DFCS=%#lx\n",

			kvm_vcpu_trap_get_class(vcpu), fault_status);

		return -EFAULT;

	}