KVM: SVM: adopt the same VMX_RUN_* flags as VMX

Rename VMX_RUN_* to KVM_ENTER_* (to not confuse with KVM_RUN_* that
already exists) and replace SVM's spec_ctrl_intercepted with that same
bitmask.

Note that KVM_ENTER_SAVE_SPEC_CTRL has the opposite polarity compared
to spec_ctrl_intercepted.  That is, the guest value of the MSR must be
saved if it writes are *not* intercepted.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 0a2b85db89771bd6dbbc57c9f282a1c42ed2d191..353e464d6d941f319b7f0a4466dd4d55f427c34c 100644 (file)
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -50,6 +50,7 @@
 
 #include "trace.h"
 
+#include "vmenter.h"
 #include "svm.h"
 #include "svm_ops.h"
 
@@ -4377,7 +4378,7 @@ static fastpath_t svm_exit_handlers_fastpath(struct kvm_vcpu *vcpu)
        return EXIT_FASTPATH_NONE;
 }
 
-static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu, bool spec_ctrl_intercepted)
+static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu, unsigned enter_flags)
 {
        struct svm_cpu_data *sd = per_cpu_ptr(&svm_data, vcpu->cpu);
        struct vcpu_svm *svm = to_svm(vcpu);
@@ -4399,10 +4400,10 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu, bool spec_ctrl_in
        amd_clear_divider();
 
        if (is_sev_es_guest(vcpu))
-               __svm_sev_es_vcpu_run(svm, spec_ctrl_intercepted,
+               __svm_sev_es_vcpu_run(svm, enter_flags,
                                      sev_es_host_save_area(sd));
        else
-               __svm_vcpu_run(svm, spec_ctrl_intercepted);
+               __svm_vcpu_run(svm, enter_flags);
 
        raw_local_irq_disable();
 
@@ -4413,7 +4414,10 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags)
 {
        bool force_immediate_exit = run_flags & KVM_RUN_FORCE_IMMEDIATE_EXIT;
        struct vcpu_svm *svm = to_svm(vcpu);
-       bool spec_ctrl_intercepted = msr_write_intercepted(svm, MSR_IA32_SPEC_CTRL);
+       unsigned enter_flags = 0;
+
+       if (!msr_write_intercepted(svm, MSR_IA32_SPEC_CTRL))
+               enter_flags |= KVM_ENTER_SAVE_SPEC_CTRL;
 
        trace_kvm_entry(vcpu, force_immediate_exit);
 
@@ -4496,7 +4500,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags)
        if (!static_cpu_has(X86_FEATURE_V_SPEC_CTRL))
                x86_spec_ctrl_set_guest(svm->virt_spec_ctrl);
 
-       svm_vcpu_enter_exit(vcpu, spec_ctrl_intercepted);
+       svm_vcpu_enter_exit(vcpu, enter_flags);
 
        if (!static_cpu_has(X86_FEATURE_V_SPEC_CTRL))
                x86_spec_ctrl_restore_host(svm->virt_spec_ctrl);

diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index a10668d17a16a0e32714c8c81feaf3eaea4966ba..01f30f0b4eb1d6192705b7f81972d6becd6c5825 100644 (file)
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -1007,9 +1007,9 @@ static inline void sev_free_decrypted_vmsa(struct kvm_vcpu *vcpu, struct vmcb_sa
 
 /* vmenter.S */
 
-void __svm_sev_es_vcpu_run(struct vcpu_svm *svm, bool spec_ctrl_intercepted,
+void __svm_sev_es_vcpu_run(struct vcpu_svm *svm, unsigned int flags,
                           struct sev_es_save_area *hostsa);
-void __svm_vcpu_run(struct vcpu_svm *svm, bool spec_ctrl_intercepted);
+void __svm_vcpu_run(struct vcpu_svm *svm, unsigned int flags);
 
 #define DEFINE_KVM_GHCB_ACCESSORS(field)                                               \
 static __always_inline u64 kvm_ghcb_get_##field(struct vcpu_svm *svm)                  \

diff --git a/arch/x86/kvm/svm/vmenter.S b/arch/x86/kvm/svm/vmenter.S
index aa655b519fe0e3a4d91fa415296758e0ec9a9138..2bc7ecb338a979429c323176b1b67d219af1c038 100644 (file)
--- a/arch/x86/kvm/svm/vmenter.S
+++ b/arch/x86/kvm/svm/vmenter.S
@@ -7,6 +7,7 @@
 #include <asm/kvm_vcpu_regs.h>
 #include <asm/nospec-branch.h>
 #include "kvm-asm-offsets.h"
+#include "vmenter.h"
 
 #define WORD_SIZE (BITS_PER_LONG / 8)
 
@@ -76,7 +77,7 @@
                "jmp 900f", X86_FEATURE_MSR_SPEC_CTRL, \
                "", X86_FEATURE_V_SPEC_CTRL
 .endm
-.macro RESTORE_HOST_SPEC_CTRL_BODY guest_spec_ctrl:req, spec_ctrl_intercepted:req, label:req
+.macro RESTORE_HOST_SPEC_CTRL_BODY guest_spec_ctrl:req, enter_flags:req, label:req
        /* Same for after vmexit.  */
        mov $MSR_IA32_SPEC_CTRL, %ecx
 
@@ -84,8 +85,8 @@
         * Load the value that the guest had written into MSR_IA32_SPEC_CTRL,
         * if it was not intercepted during guest execution.
         */
-       cmpb $0, \spec_ctrl_intercepted
-       jnz 998f
+       testl $KVM_ENTER_SAVE_SPEC_CTRL, \enter_flags
+       jz 998f
        rdmsr
        movl %eax, \guest_spec_ctrl
        movl %edx, 4 + \guest_spec_ctrl
@@ -115,8 +116,8 @@
 
 /**
  * __svm_vcpu_run - Run a vCPU via a transition to SVM guest mode
- * @svm:       struct vcpu_svm *
- * @spec_ctrl_intercepted: bool
+ * @svm:        struct vcpu_svm *
+ * @enter_flags: u32
  */
 SYM_FUNC_START(__svm_vcpu_run)
        push %_ASM_BP
@@ -274,7 +275,7 @@ SYM_FUNC_START(__svm_vcpu_run)
        xor %r15d, %r15d
 #endif
 
-       /* "Pop" @spec_ctrl_intercepted.  */
+       /* "Pop" @enter_flags.  */
        pop %_ASM_BX
 
        pop %_ASM_BX
@@ -335,8 +336,8 @@ SYM_FUNC_END(__svm_vcpu_run)
 
 /**
  * __svm_sev_es_vcpu_run - Run a SEV-ES vCPU via a transition to SVM guest mode
- * @svm:       struct vcpu_svm *
- * @spec_ctrl_intercepted: bool
+ * @svm:        struct vcpu_svm *
+ * @enter_flags: u32
  */
 SYM_FUNC_START(__svm_sev_es_vcpu_run)
        FRAME_BEGIN
@@ -355,7 +356,7 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run)
 
        /*
         * Save volatile registers that hold arguments that are needed after
-        * #VMEXIT (RDI=@svm and RSI=@spec_ctrl_intercepted).
+        * #VMEXIT (RDI=@svm and RSI=@enter_flags).
         */
        mov %rdi, SEV_ES_RDI (%rdx)
        mov %rsi, SEV_ES_RSI (%rdx)
@@ -377,7 +378,7 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run)
        /* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */
        FILL_RETURN_BUFFER %rax, RSB_CLEAR_LOOPS, X86_FEATURE_RSB_VMEXIT
 
-       /* Clobbers RAX, RCX, RDX, consumes RDI (@svm) and RSI (@spec_ctrl_intercepted). */
+       /* Clobbers RAX, RCX, RDX, consumes RDI (@svm) and RSI (@enter_flags). */
        RESTORE_HOST_SPEC_CTRL
 901:
 
@@ -397,7 +398,7 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run)
        RESTORE_GUEST_SPEC_CTRL_BODY SVM_spec_ctrl(%_ASM_DI), 801b
        jmp 801b
 900:
-       RESTORE_HOST_SPEC_CTRL_BODY SVM_spec_ctrl(%_ASM_DI), %sil, 901b
+       RESTORE_HOST_SPEC_CTRL_BODY SVM_spec_ctrl(%_ASM_DI), %esi, 901b
        jmp 901b
 
 3:     cmpb $0, virt_rebooting(%rip)

diff --git a/arch/x86/kvm/vmenter.h b/arch/x86/kvm/vmenter.h
new file mode 100644 (file)
index 0000000..29cdae6
--- /dev/null
+++ b/arch/x86/kvm/vmenter.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __KVM_X86_VMENTER_H
+#define __KVM_X86_VMENTER_H
+
+#define KVM_ENTER_VMRESUME                     BIT(0)
+#define KVM_ENTER_SAVE_SPEC_CTRL               BIT(1)
+#define KVM_ENTER_CLEAR_CPU_BUFFERS_FOR_MMIO   BIT(2)
+
+#endif /* __KVM_X86_VMENTER_H */

diff --git a/arch/x86/kvm/vmx/run_flags.h b/arch/x86/kvm/vmx/run_flags.h
deleted file mode 100644 (file)
index 6a87a12..0000000
--- a/arch/x86/kvm/vmx/run_flags.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __KVM_X86_VMX_RUN_FLAGS_H
-#define __KVM_X86_VMX_RUN_FLAGS_H
-
-#define VMX_RUN_VMRESUME                       BIT(0)
-#define VMX_RUN_SAVE_SPEC_CTRL                 BIT(1)
-#define VMX_RUN_CLEAR_CPU_BUFFERS_FOR_MMIO     BIT(2)
-
-#endif /* __KVM_X86_VMX_RUN_FLAGS_H */

diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S
index efac31cedfdeb56695e707eab1f48050d8ffa6d4..d776286fe738b5d35e98d5d3f2b6e91729fb66f9 100644 (file)
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
@@ -7,7 +7,7 @@
 #include <asm/percpu.h>
 #include <asm/segment.h>
 #include "kvm-asm-offsets.h"
-#include "run_flags.h"
+#include "vmenter.h"
 
 #define WORD_SIZE (BITS_PER_LONG / 8)
 
@@ -68,9 +68,9 @@
 /**
  * __vmx_vcpu_run - Run a vCPU via a transition to VMX guest mode
  * @vmx:       struct vcpu_vmx *
- * @flags:     VMX_RUN_VMRESUME:       use VMRESUME instead of VMLAUNCH
- *             VMX_RUN_SAVE_SPEC_CTRL: save guest SPEC_CTRL into vmx->spec_ctrl
- *             VMX_RUN_CLEAR_CPU_BUFFERS_FOR_MMIO: vCPU can access host MMIO
+ * @flags:     KVM_ENTER_VMRESUME:     use VMRESUME instead of VMLAUNCH
+ *             KVM_ENTER_SAVE_SPEC_CTRL: save guest SPEC_CTRL into vmx->spec_ctrl
+ *             KVM_ENTER_CLEAR_CPU_BUFFERS_FOR_MMIO: vCPU can access host MMIO
  *
  * Returns:
  *     0 on VM-Exit, 1 on VM-Fail
@@ -164,7 +164,7 @@ SYM_FUNC_START(__vmx_vcpu_run)
         * do VERW.  Else, do nothing (no mitigations needed/enabled).
         */
        ALTERNATIVE_2 "",                                                                         \
-                     __stringify(testl $VMX_RUN_CLEAR_CPU_BUFFERS_FOR_MMIO, (%_ASM_SP);          \
+                     __stringify(testl $KVM_ENTER_CLEAR_CPU_BUFFERS_FOR_MMIO, (%_ASM_SP);        \
                                  jz .Lskip_mmio_verw;                                            \
                                  VERW;                                                           \
                                  .Lskip_mmio_verw:),                                             \
@@ -172,7 +172,7 @@ SYM_FUNC_START(__vmx_vcpu_run)
                      __stringify(VERW), X86_FEATURE_CLEAR_CPU_BUF_VM
 
        /* Check @flags to see if VMLAUNCH or VMRESUME is needed. */
-       testl $VMX_RUN_VMRESUME, (%_ASM_SP)
+       testl $KVM_ENTER_VMRESUME, (%_ASM_SP)
        jz .Lvmlaunch
 
        /*

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 7dd4aff29026d0019e6b50fd623aacaab2280c98..a8039b0f939252a2f1293a5db42431e97d5d38db 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -73,6 +73,7 @@
 #include "x86_ops.h"
 #include "smm.h"
 #include "vmx_onhyperv.h"
+#include "vmenter.h"
 #include "posted_intr.h"
 
 #include "mmu/spte.h"
@@ -964,12 +965,12 @@ static bool msr_write_intercepted(struct vcpu_vmx *vmx, u32 msr)
        return vmx_test_msr_bitmap_write(vmx->loaded_vmcs->msr_bitmap, msr);
 }
 
-unsigned int __vmx_vcpu_run_flags(struct vcpu_vmx *vmx)
+unsigned int __vmx_vcpu_enter_flags(struct vcpu_vmx *vmx)
 {
        unsigned int flags = 0;
 
        if (vmx->loaded_vmcs->launched)
-               flags |= VMX_RUN_VMRESUME;
+               flags |= KVM_ENTER_VMRESUME;
 
        /*
         * If writes to the SPEC_CTRL MSR aren't intercepted, the guest is free
@@ -977,11 +978,11 @@ unsigned int __vmx_vcpu_run_flags(struct vcpu_vmx *vmx)
         * it after vmexit and store it in vmx->spec_ctrl.
         */
        if (!msr_write_intercepted(vmx, MSR_IA32_SPEC_CTRL))
-               flags |= VMX_RUN_SAVE_SPEC_CTRL;
+               flags |= KVM_ENTER_SAVE_SPEC_CTRL;
 
        if (cpu_feature_enabled(X86_FEATURE_CLEAR_CPU_BUF_VM_MMIO) &&
            kvm_vcpu_can_access_host_mmio(&vmx->vcpu))
-               flags |= VMX_RUN_CLEAR_CPU_BUFFERS_FOR_MMIO;
+               flags |= KVM_ENTER_CLEAR_CPU_BUFFERS_FOR_MMIO;
 
        return flags;
 }
@@ -7395,7 +7396,7 @@ void noinstr vmx_spec_ctrl_restore_host(struct vcpu_vmx *vmx,
        if (!cpu_feature_enabled(X86_FEATURE_MSR_SPEC_CTRL))
                return;
 
-       if (flags & VMX_RUN_SAVE_SPEC_CTRL)
+       if (flags & KVM_ENTER_SAVE_SPEC_CTRL)
                vmx->spec_ctrl = native_rdmsrq(MSR_IA32_SPEC_CTRL);
 
        /*
@@ -7586,7 +7587,7 @@ fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags)
        kvm_wait_lapic_expire(vcpu);
 
        /* The actual VMENTER/EXIT is in the .noinstr.text section. */
-       vmx_vcpu_enter_exit(vcpu, __vmx_vcpu_run_flags(vmx));
+       vmx_vcpu_enter_exit(vcpu, __vmx_vcpu_enter_flags(vmx));
 
        /* All fields are clean at this point */
        if (kvm_is_using_evmcs()) {

diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index 53793d530a69b16de2e2a8e69a3f9e182dfc1f60..be6a1dc2f69fe8ced92f151c6b74e1f85837eceb 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -15,7 +15,6 @@
 #include "vmcs.h"
 #include "vmx_ops.h"
 #include "../cpuid.h"
-#include "run_flags.h"
 #include "../mmu.h"
 #include "common.h"
 
@@ -369,7 +368,7 @@ struct vmx_uret_msr *vmx_find_uret_msr(struct vcpu_vmx *vmx, u32 msr);
 void pt_update_intercept_for_msr(struct kvm_vcpu *vcpu);
 void vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp);
 void vmx_spec_ctrl_restore_host(struct vcpu_vmx *vmx, unsigned int flags);
-unsigned int __vmx_vcpu_run_flags(struct vcpu_vmx *vmx);
+unsigned int __vmx_vcpu_enter_flags(struct vcpu_vmx *vmx);
 bool __vmx_vcpu_run(struct vcpu_vmx *vmx, unsigned int flags);
 void vmx_ept_load_pdptrs(struct kvm_vcpu *vcpu);