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

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

arm: KVM: Inject a Virtual Abort if it was pending 



If we have caught an Abort whilst exiting, we've tagged the
exit code with the pending information. In that case, let's
re-inject the error into the guest, after having adjusted
the PC if required.

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

arch/arm/kvm/handle_exit.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -144,6 +144,25 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, 
{

{

	exit_handle_fn exit_handler;

	exit_handle_fn exit_handler;





	if (ARM_ABORT_PENDING(exception_index)) {

		u8 hsr_ec = kvm_vcpu_trap_get_class(vcpu);



		/*

		 * HVC/SMC already have an adjusted PC, which we need

		 * to correct in order to return to after having

		 * injected the abort.

		 */

		if (hsr_ec == HSR_EC_HVC || hsr_ec == HSR_EC_SMC) {

			u32 adj =  kvm_vcpu_trap_il_is32bit(vcpu) ? 4 : 2;

			*vcpu_pc(vcpu) -= adj;

		}



		kvm_inject_vabt(vcpu);

		return 1;

	}



	exception_index = ARM_EXCEPTION_CODE(exception_index);



	switch (exception_index) {

	switch (exception_index) {

	case ARM_EXCEPTION_IRQ:

	case ARM_EXCEPTION_IRQ:

		return 1;

		return 1;