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

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

arm: KVM: Drop unreachable HYP abort handlers 



Both data and prefetch aborts occuring in HYP lead to a well
deserved panic. Let's get rid of these silly handlers.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 5d7bcf7d

arch/arm/kvm/handle_exit.c

+0 −27
Original line number Original line Diff line number Diff line
@@ -28,14 +28,6 @@ 




typedef int (*exit_handle_fn)(struct kvm_vcpu *, struct kvm_run *);

typedef int (*exit_handle_fn)(struct kvm_vcpu *, struct kvm_run *);





static int handle_svc_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	/* SVC called from Hyp mode should never get here */

	kvm_debug("SVC called from Hyp mode shouldn't go here\n");

	BUG();

	return -EINVAL; /* Squash warning */

}



static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)

static int handle_hvc(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

{

	int ret;

	int ret;
@@ -59,22 +51,6 @@ static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	return 1;

	return 1;

}

}





static int handle_pabt_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	/* The hypervisor should never cause aborts */

	kvm_err("Prefetch Abort taken from Hyp mode at %#08lx (HSR: %#08x)\n",

		kvm_vcpu_get_hfar(vcpu), kvm_vcpu_get_hsr(vcpu));

	return -EFAULT;

}



static int handle_dabt_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	/* This is either an error in the ws. code or an external abort */

	kvm_err("Data Abort taken from Hyp mode at %#08lx (HSR: %#08x)\n",

		kvm_vcpu_get_hfar(vcpu), kvm_vcpu_get_hsr(vcpu));

	return -EFAULT;

}



/**

/**

 * kvm_handle_wfx - handle a WFI or WFE instructions trapped in guests

 * kvm_handle_wfx - handle a WFI or WFE instructions trapped in guests

 * @vcpu:	the vcpu pointer

 * @vcpu:	the vcpu pointer
@@ -112,13 +88,10 @@ static exit_handle_fn arm_exit_handlers[] = { 
	[HSR_EC_CP14_64]	= kvm_handle_cp14_access,

	[HSR_EC_CP14_64]	= kvm_handle_cp14_access,

	[HSR_EC_CP_0_13]	= kvm_handle_cp_0_13_access,

	[HSR_EC_CP_0_13]	= kvm_handle_cp_0_13_access,

	[HSR_EC_CP10_ID]	= kvm_handle_cp10_id,

	[HSR_EC_CP10_ID]	= kvm_handle_cp10_id,

	[HSR_EC_SVC_HYP]	= handle_svc_hyp,

	[HSR_EC_HVC]		= handle_hvc,

	[HSR_EC_HVC]		= handle_hvc,

	[HSR_EC_SMC]		= handle_smc,

	[HSR_EC_SMC]		= handle_smc,

	[HSR_EC_IABT]		= kvm_handle_guest_abort,

	[HSR_EC_IABT]		= kvm_handle_guest_abort,

	[HSR_EC_IABT_HYP]	= handle_pabt_hyp,

	[HSR_EC_DABT]		= kvm_handle_guest_abort,

	[HSR_EC_DABT]		= kvm_handle_guest_abort,

	[HSR_EC_DABT_HYP]	= handle_dabt_hyp,

};

};





static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)

static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu)