]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: x86: Re-enter guest if WRMSR(X2APIC_ICR) fastpath is successful
authorSean Christopherson <seanjc@google.com>
Fri, 2 Aug 2024 19:51:16 +0000 (12:51 -0700)
committerSean Christopherson <seanjc@google.com>
Fri, 30 Aug 2024 02:50:21 +0000 (19:50 -0700)
Re-enter the guest in the fastpath if WRMSR emulation for x2APIC's ICR is
successful, as no additional work is needed, i.e. there is no code unique
for WRMSR exits between the fastpath and the "!= EXIT_FASTPATH_NONE" check
in __vmx_handle_exit().

Link: https://lore.kernel.org/r/20240802195120.325560-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/x86.c

index 00e7927250525798432805111810cd1f42f987e8..0c97dd5a01971f99554b68825bd5d52b627b3b74 100644 (file)
@@ -2195,7 +2195,7 @@ fastpath_t handle_fastpath_set_msr_irqoff(struct kvm_vcpu *vcpu)
                data = kvm_read_edx_eax(vcpu);
                if (!handle_fastpath_set_x2apic_icr_irqoff(vcpu, data)) {
                        kvm_skip_emulated_instruction(vcpu);
-                       ret = EXIT_FASTPATH_EXIT_HANDLED;
+                       ret = EXIT_FASTPATH_REENTER_GUEST;
                }
                break;
        case MSR_IA32_TSC_DEADLINE: