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: Marc Zyngier <maz@kernel.org>
Reviewed-by: Fuad Tabba <tabba@google.com>
Tested-by: Fuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20211013120346.2926621-12-maz@kernel.org

diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c
index 50c7d48..c0e3fed 100644 (file)
--- a/arch/arm64/kvm/hyp/nvhe/switch.c
+++ b/arch/arm64/kvm/hyp/nvhe/switch.c
@@ -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));
 }
 
 /**