KVM: SVM: Rename vmcb->virt_ext to vmcb->misc_ctl2

'virt' is confusing in the VMCB because it is relative and ambiguous.
The 'virt_ext' field includes bits for LBR virtualization and
VMSAVE/VMLOAD virtualization, so it's just another miscellaneous control
field. Name it as such.

While at it, move the definitions of the bits below those for
'misc_ctl' and rename them for consistency.

Signed-off-by: Yosry Ahmed <yosry@kernel.org>
Link: https://patch.msgid.link/20260303003421.2185681-20-yosry@kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
index 983db6575141df31491aade7f8ba2870f214f6b4..c169256c415fb64151a3824553f3198115045d34 100644 (file)
--- a/arch/x86/include/asm/svm.h
+++ b/arch/x86/include/asm/svm.h
@@ -148,7 +148,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
        u32 event_inj;
        u32 event_inj_err;
        u64 nested_cr3;
-       u64 virt_ext;
+       u64 misc_ctl2;
        u32 clean;
        u32 reserved_5;
        u64 next_rip;
@@ -222,9 +222,6 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define X2APIC_MODE_SHIFT 30
 #define X2APIC_MODE_MASK (1 << X2APIC_MODE_SHIFT)
 
-#define LBR_CTL_ENABLE_MASK BIT_ULL(0)
-#define VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK BIT_ULL(1)
-
 #define SVM_INTERRUPT_SHADOW_MASK      BIT_ULL(0)
 #define SVM_GUEST_INTERRUPT_MASK       BIT_ULL(1)
 
@@ -243,6 +240,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define SVM_MISC_ENABLE_SEV            BIT(1)
 #define SVM_MISC_ENABLE_SEV_ES BIT(2)
 
+#define SVM_MISC2_ENABLE_V_LBR BIT_ULL(0)
+#define SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE       BIT_ULL(1)
 
 #define SVM_TSC_RATIO_RSVD     0xffffff0000000000ULL
 #define SVM_TSC_RATIO_MIN      0x0000000000000001ULL

diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
index 789f38c55541a53ae39ddb112323f553f7d59040..d3e3721fa223722513b97cae8866c44ef7115ab9 100644 (file)
--- a/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@ -116,7 +116,7 @@ static bool nested_vmcb_needs_vls_intercept(struct vcpu_svm *svm)
        if (!nested_npt_enabled(svm))
                return true;
 
-       if (!(svm->nested.ctl.virt_ext & VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK))
+       if (!(svm->nested.ctl.misc_ctl2 & SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE))
                return true;
 
        return false;
@@ -169,7 +169,7 @@ void nested_vmcb02_recalc_intercepts(struct vcpu_svm *svm)
                vmcb_set_intercept(&vmcb02->control, INTERCEPT_VMLOAD);
                vmcb_set_intercept(&vmcb02->control, INTERCEPT_VMSAVE);
        } else {
-               WARN_ON_ONCE(!(vmcb02->control.virt_ext & VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK));
+               WARN_ON_ONCE(!(vmcb02->control.misc_ctl2 & SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE));
        }
 }
 
@@ -499,7 +499,7 @@ void __nested_copy_vmcb_control_to_cache(struct kvm_vcpu *vcpu,
        to->event_inj_err       = from->event_inj_err;
        to->next_rip            = from->next_rip;
        to->nested_cr3          = from->nested_cr3;
-       to->virt_ext            = from->virt_ext;
+       to->misc_ctl2            = from->misc_ctl2;
        to->pause_filter_count  = from->pause_filter_count;
        to->pause_filter_thresh = from->pause_filter_thresh;
 
@@ -679,7 +679,7 @@ void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm)
 static bool nested_vmcb12_has_lbrv(struct kvm_vcpu *vcpu)
 {
        return guest_cpu_cap_has(vcpu, X86_FEATURE_LBRV) &&
-               (to_svm(vcpu)->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK);
+               (to_svm(vcpu)->nested.ctl.misc_ctl2 & SVM_MISC2_ENABLE_V_LBR);
 }
 
 static void nested_vmcb02_prepare_save(struct vcpu_svm *svm, struct vmcb *vmcb12)
@@ -907,10 +907,10 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm)
                        svm->soft_int_next_rip = vmcb12_ctrl->next_rip;
        }
 
-       /* LBR_CTL_ENABLE_MASK is controlled by svm_update_lbrv() */
+       /* SVM_MISC2_ENABLE_V_LBR is controlled by svm_update_lbrv() */
 
        if (!nested_vmcb_needs_vls_intercept(svm))
-               vmcb02->control.virt_ext |= VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;
+               vmcb02->control.misc_ctl2 |= SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE;
 
        if (guest_cpu_cap_has(vcpu, X86_FEATURE_PAUSEFILTER))
                pause_count12 = vmcb12_ctrl->pause_filter_count;
@@ -1774,8 +1774,8 @@ static void nested_copy_vmcb_cache_to_control(struct vmcb_control_area *dst,
        dst->event_inj            = from->event_inj;
        dst->event_inj_err        = from->event_inj_err;
        dst->next_rip             = from->next_rip;
-       dst->nested_cr3           = from->nested_cr3;
-       dst->virt_ext              = from->virt_ext;
+       dst->nested_cr3           = from->nested_cr3;
+       dst->misc_ctl2            = from->misc_ctl2;
        dst->pause_filter_count   = from->pause_filter_count;
        dst->pause_filter_thresh  = from->pause_filter_thresh;
        /* 'clean' and 'hv_enlightenments' are not changed by KVM */

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index c626cbacaf4aa56d7d3cb95cba8126e840cdadcd..7decb68f38f63c2504e37da605a659766e1a77f0 100644 (file)
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -713,7 +713,7 @@ void *svm_alloc_permissions_map(unsigned long size, gfp_t gfp_mask)
 static void svm_recalc_lbr_msr_intercepts(struct kvm_vcpu *vcpu)
 {
        struct vcpu_svm *svm = to_svm(vcpu);
-       bool intercept = !(svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK);
+       bool intercept = !(svm->vmcb->control.misc_ctl2 & SVM_MISC2_ENABLE_V_LBR);
 
        if (intercept == svm->lbr_msrs_intercepted)
                return;
@@ -846,7 +846,7 @@ static void svm_recalc_msr_intercepts(struct kvm_vcpu *vcpu)
 
 static void __svm_enable_lbrv(struct kvm_vcpu *vcpu)
 {
-       to_svm(vcpu)->vmcb->control.virt_ext |= LBR_CTL_ENABLE_MASK;
+       to_svm(vcpu)->vmcb->control.misc_ctl2 |= SVM_MISC2_ENABLE_V_LBR;
 }
 
 void svm_enable_lbrv(struct kvm_vcpu *vcpu)
@@ -858,16 +858,16 @@ void svm_enable_lbrv(struct kvm_vcpu *vcpu)
 static void __svm_disable_lbrv(struct kvm_vcpu *vcpu)
 {
        KVM_BUG_ON(sev_es_guest(vcpu->kvm), vcpu->kvm);
-       to_svm(vcpu)->vmcb->control.virt_ext &= ~LBR_CTL_ENABLE_MASK;
+       to_svm(vcpu)->vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_LBR;
 }
 
 void svm_update_lbrv(struct kvm_vcpu *vcpu)
 {
        struct vcpu_svm *svm = to_svm(vcpu);
-       bool current_enable_lbrv = svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK;
+       bool current_enable_lbrv = svm->vmcb->control.misc_ctl2 & SVM_MISC2_ENABLE_V_LBR;
        bool enable_lbrv = (svm->vmcb->save.dbgctl & DEBUGCTLMSR_LBR) ||
                            (is_guest_mode(vcpu) && guest_cpu_cap_has(vcpu, X86_FEATURE_LBRV) &&
-                           (svm->nested.ctl.virt_ext & LBR_CTL_ENABLE_MASK));
+                           (svm->nested.ctl.misc_ctl2 & SVM_MISC2_ENABLE_V_LBR));
 
        if (enable_lbrv && !current_enable_lbrv)
                __svm_enable_lbrv(vcpu);
@@ -1222,7 +1222,7 @@ static void init_vmcb(struct kvm_vcpu *vcpu, bool init_event)
                svm->vmcb->control.int_ctl |= V_GIF_ENABLE_MASK;
 
        if (vls)
-               svm->vmcb->control.virt_ext |= VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;
+               svm->vmcb->control.misc_ctl2 |= SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE;
 
        if (vcpu->kvm->arch.bus_lock_detection_enabled)
                svm_set_intercept(svm, INTERCEPT_BUSLOCK);
@@ -3423,7 +3423,7 @@ static void dump_vmcb(struct kvm_vcpu *vcpu)
        pr_err("%-20s%016llx\n", "ghcb:", control->ghcb_gpa);
        pr_err("%-20s%08x\n", "event_inj:", control->event_inj);
        pr_err("%-20s%08x\n", "event_inj_err:", control->event_inj_err);
-       pr_err("%-20s%lld\n", "virt_ext:", control->virt_ext);
+       pr_err("%-20s%lld\n", "misc_ctl2:", control->misc_ctl2);
        pr_err("%-20s%016llx\n", "next_rip:", control->next_rip);
        pr_err("%-20s%016llx\n", "avic_backing_page:", control->avic_backing_page);
        pr_err("%-20s%016llx\n", "avic_logical_id:", control->avic_logical_id);
@@ -4472,7 +4472,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags)
         * VM-Exit), as running with the host's DEBUGCTL can negatively affect
         * guest state and can even be fatal, e.g. due to Bus Lock Detect.
         */
-       if (!(svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK) &&
+       if (!(svm->vmcb->control.misc_ctl2 & SVM_MISC2_ENABLE_V_LBR) &&
            vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl)
                update_debugctlmsr(svm->vmcb->save.dbgctl);
 
@@ -4503,7 +4503,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu, u64 run_flags)
        if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))
                kvm_before_interrupt(vcpu, KVM_HANDLING_NMI);
 
-       if (!(svm->vmcb->control.virt_ext & LBR_CTL_ENABLE_MASK) &&
+       if (!(svm->vmcb->control.misc_ctl2 & SVM_MISC2_ENABLE_V_LBR) &&
            vcpu->arch.host_debugctl != svm->vmcb->save.dbgctl)
                update_debugctlmsr(vcpu->arch.host_debugctl);
 

diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index ab7eebd3fcff75701571a776b1024694e9c11d58..760a8a6d45cd53b0ba54e6ab6d174cc6c5764e3d 100644 (file)
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -172,7 +172,7 @@ struct vmcb_ctrl_area_cached {
        u32 event_inj_err;
        u64 next_rip;
        u64 nested_cr3;
-       u64 virt_ext;
+       u64 misc_ctl2;
        u32 clean;
        union {
 #if IS_ENABLED(CONFIG_HYPERV) || IS_ENABLED(CONFIG_KVM_HYPERV)

diff --git a/tools/testing/selftests/kvm/include/x86/svm.h b/tools/testing/selftests/kvm/include/x86/svm.h
index d81d8a9f5bfb6e8ea575b92564663e15271a989b..c8539166270ea8b3e1826bc094a22f2531975aa9 100644 (file)
--- a/tools/testing/selftests/kvm/include/x86/svm.h
+++ b/tools/testing/selftests/kvm/include/x86/svm.h
@@ -103,7 +103,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
        u32 event_inj;
        u32 event_inj_err;
        u64 nested_cr3;
-       u64 virt_ext;
+       u64 misc_ctl2;
        u32 clean;
        u32 reserved_5;
        u64 next_rip;
@@ -155,9 +155,6 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define AVIC_ENABLE_SHIFT 31
 #define AVIC_ENABLE_MASK (1 << AVIC_ENABLE_SHIFT)
 
-#define LBR_CTL_ENABLE_MASK BIT_ULL(0)
-#define VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK BIT_ULL(1)
-
 #define SVM_INTERRUPT_SHADOW_MASK 1
 
 #define SVM_IOIO_STR_SHIFT 2
@@ -178,6 +175,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
 #define SVM_MISC_ENABLE_NP             BIT(0)
 #define SVM_MISC_ENABLE_SEV            BIT(1)
 
+#define SVM_MISC2_ENABLE_V_LBR BIT_ULL(0)
+#define SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE BIT_ULL(1)
+
 struct __attribute__ ((__packed__)) vmcb_seg {
        u16 selector;
        u16 attrib;

diff --git a/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c b/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c
index 6764a48f9d4d9923106fe8699856add23d6b8db2..71717118d6924a4345ab8caaebae8cffd20f9820 100644 (file)
--- a/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c
+++ b/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c
@@ -79,8 +79,8 @@ static void l1_guest_code(struct svm_test_data *svm)
        svm->vmcb->control.intercept |= (BIT_ULL(INTERCEPT_VMSAVE) |
                                         BIT_ULL(INTERCEPT_VMLOAD));
 
-        /* ..VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK cleared.. */
-       svm->vmcb->control.virt_ext &= ~VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;
+        /* ..SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE cleared.. */
+       svm->vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE;
 
        svm->vmcb->save.rip = (u64)l2_guest_code_vmsave;
        run_guest(svm->vmcb, svm->vmcb_gpa);
@@ -90,8 +90,8 @@ static void l1_guest_code(struct svm_test_data *svm)
        run_guest(svm->vmcb, svm->vmcb_gpa);
        GUEST_ASSERT_EQ(svm->vmcb->control.exit_code, SVM_EXIT_VMLOAD);
 
-       /* ..and VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK set */
-       svm->vmcb->control.virt_ext |= VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;
+       /* ..and SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE set */
+       svm->vmcb->control.misc_ctl2 |= SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE;
 
        svm->vmcb->save.rip = (u64)l2_guest_code_vmsave;
        run_guest(svm->vmcb, svm->vmcb_gpa);
@@ -106,20 +106,20 @@ static void l1_guest_code(struct svm_test_data *svm)
                                          BIT_ULL(INTERCEPT_VMLOAD));
 
        /*
-        * Without VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK, the GPA will be
+        * Without SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE, the GPA will be
         * interpreted as an L1 GPA, so VMCB0 should be used.
         */
        svm->vmcb->save.rip = (u64)l2_guest_code_vmcb0;
-       svm->vmcb->control.virt_ext &= ~VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;
+       svm->vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE;
        run_guest(svm->vmcb, svm->vmcb_gpa);
        GUEST_ASSERT_EQ(svm->vmcb->control.exit_code, SVM_EXIT_VMMCALL);
 
        /*
-        * With VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK, the GPA will be interpeted as
+        * With SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE, the GPA will be interpeted as
         * an L2 GPA, and translated through the NPT to VMCB1.
         */
        svm->vmcb->save.rip = (u64)l2_guest_code_vmcb1;
-       svm->vmcb->control.virt_ext |= VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK;
+       svm->vmcb->control.misc_ctl2 |= SVM_MISC2_ENABLE_V_VMLOAD_VMSAVE;
        run_guest(svm->vmcb, svm->vmcb_gpa);
        GUEST_ASSERT_EQ(svm->vmcb->control.exit_code, SVM_EXIT_VMMCALL);
 

diff --git a/tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c b/tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c
index bf16abb1152e01661bb97deefb49a489a049763a..ff99438824d3a365369962330eec3b47f067ae46 100644 (file)
--- a/tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c
+++ b/tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c
@@ -69,9 +69,9 @@ static void l1_guest_code(struct svm_test_data *svm, bool nested_lbrv)
                          &l2_guest_stack[L2_GUEST_STACK_SIZE]);
 
        if (nested_lbrv)
-               vmcb->control.virt_ext = LBR_CTL_ENABLE_MASK;
+               vmcb->control.misc_ctl2 = SVM_MISC2_ENABLE_V_LBR;
        else
-               vmcb->control.virt_ext &= ~LBR_CTL_ENABLE_MASK;
+               vmcb->control.misc_ctl2 &= ~SVM_MISC2_ENABLE_V_LBR;
 
        run_guest(vmcb, svm->vmcb_gpa);
        GUEST_ASSERT(svm->vmcb->control.exit_code == SVM_EXIT_VMMCALL);