Commit 07305590 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: pkvm: Give priority to standard traps over pvm handling 



Checking for pvm handling first means that we cannot handle ptrauth
traps or apply any of the workarounds (GICv3 or TX2 #219).

Flip the order around.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20211013120346.2926621-12-maz@kernel.org
parent 0c7639cc

arch/arm64/kvm/hyp/nvhe/switch.c

+7 −4
Original line number Diff line number Diff line
@@ -167,10 +167,13 @@ static void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt) 
 */

static bool kvm_handle_pvm_sys64(struct kvm_vcpu *vcpu, u64 *exit_code)

{

	if (kvm_handle_pvm_sysreg(vcpu, exit_code))

		return true;



	return kvm_hyp_handle_sysreg(vcpu, exit_code);

	/*

	 * Make sure we handle the exit for workarounds and ptrauth

	 * before the pKVM handling, as the latter could decide to

	 * UNDEF.

	 */

	return (kvm_hyp_handle_sysreg(vcpu, exit_code) ||

		kvm_handle_pvm_sysreg(vcpu, exit_code));

}



/**