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

Commit e70dce73 authored by Alex Bennée's avatar Alex Bennée Committed by Christoffer Dall
Browse files

kvm: arm64: handle single-step during SError exceptions 



When an SError arrives during single-step both the SError and debug
exceptions may be pending when the step is completed, and the
architecture doesn't define the ordering of the two.  This means that we
can observe en SError even though we've just completed a step, without
receiving a debug exception.  In that case the DBG_SPSR_SS bit will have
flipped as the instruction executed. After handling the abort in
handle_exit() we test to see if the bit is clear and we were
single-stepping before deciding if we need to exit to user space.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 1eb59128

arch/arm64/kvm/handle_exit.c

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <asm/kvm_emulate.h>

#include <asm/kvm_mmu.h>

#include <asm/kvm_psci.h>

#include <asm/debug-monitors.h>



#define CREATE_TRACE_POINTS

#include "trace.h"
@@ -252,6 +253,11 @@ int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, 
		return 1;

	case ARM_EXCEPTION_EL1_SERROR:

		kvm_inject_vabt(vcpu);

		/* We may still need to return for single-step */

		if (!(*vcpu_cpsr(vcpu) & DBG_SPSR_SS)

			&& kvm_arm_handle_step_debug(vcpu, run))

			return 0;

		else

			return 1;

	case ARM_EXCEPTION_TRAP:

		return handle_trap_exceptions(vcpu, run);