KVM: SVM: Check for an unexpected VM-Exit after RETPOLINE "fast" handling

Check for an unexpected/unhandled VM-Exit after the manual RETPOLINE=y
handling.  The entire point of the RETPOLINE checks is to optimize for
common VM-Exits, i.e. checking for the rare case of an unsupported
VM-Exit is counter-productive.  This also aligns SVM and VMX exit handling.

No functional change intended.

Reviewed-by: Yosry Ahmed <yosry.ahmed@linux.dev>
Link: https://patch.msgid.link/20251230211347.4099600-4-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index ddb07c6408ded0b0613df86ec8c973f5457ae36a..d2f997965a965a29c93315f8f048d0baab1776f6 100644 (file)
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3469,12 +3469,6 @@ no_vmsa:
 
 int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code)
 {
-       if (exit_code >= ARRAY_SIZE(svm_exit_handlers))
-               goto unexpected_vmexit;
-
-       if (!svm_exit_handlers[exit_code])
-               goto unexpected_vmexit;
-
 #ifdef CONFIG_MITIGATION_RETPOLINE
        if (exit_code == SVM_EXIT_MSR)
                return msr_interception(vcpu);
@@ -3491,6 +3485,12 @@ int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code)
                return sev_handle_vmgexit(vcpu);
 #endif
 #endif
+       if (exit_code >= ARRAY_SIZE(svm_exit_handlers))
+               goto unexpected_vmexit;
+
+       if (!svm_exit_handlers[exit_code])
+               goto unexpected_vmexit;
+
        return svm_exit_handlers[exit_code](vcpu);
 
 unexpected_vmexit: