Commit 30685d78 authored by Dave Martin's avatar Dave Martin Committed by Catalin Marinas
Browse files

KVM: arm64: BTI: Reset BTYPE when skipping emulated instructions 



Since normal execution of any non-branch instruction resets the
PSTATE BTYPE field to 0, so do the same thing when emulating a
trapped instruction.

Branches don't trap directly, so we should never need to assign a
non-zero value to BTYPE here.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 0537c4cd

arch/arm64/include/asm/kvm_emulate.h

+4 −2
Original line number Diff line number Diff line
@@ -506,10 +506,12 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu, 


static inline void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_instr)

{

	if (vcpu_mode_is_32bit(vcpu))

	if (vcpu_mode_is_32bit(vcpu)) {

		kvm_skip_instr32(vcpu, is_wide_instr);

	else

	} else {

		*vcpu_pc(vcpu) += 4;

		*vcpu_cpsr(vcpu) &= ~PSR_BTYPE_MASK;

	}



	/* advance the singlestep state machine */

	*vcpu_cpsr(vcpu) &= ~DBG_SPSR_SS;