Changeset 71108 in vbox

Timestamp:

Feb 22, 2018 3:38:35 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120973

Message:

Added speculation control settings to API, refined implementation.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (1 diff)
• include/VBox/vmm/cpum.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (3 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (3 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (5 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (2 diffs)
• src/VBox/VMM/include/HMInternal.h (modified) (1 diff)

trunk/include/VBox/settings.h

@@ -907 +907 @@
     bool                fIBPBOnVMExit;          //< added out of cycle, after 1.16 was out.
     bool                fIBPBOnVMEntry;         //< added out of cycle, after 1.16 was out.
+    bool                fSpecCtrl;              //< added out of cycle, after 1.16 was out.
+    bool                fSpecCtrlByHost;        //< added out of cycle, after 1.16 was out.
     bool                fNestedHWVirt;          //< requires settings version 1.17 (VirtualBox 6.0)
     typedef enum LongModeType { LongMode_Enabled, LongMode_Disabled, LongMode_Legacy } LongModeType;

trunk/include/VBox/vmm/cpum.h

@@ -1223 +1223 @@
 VMMR0_INT_DECL(void)        CPUMR0SetGuestTscAux(PVMCPU pVCpu, uint64_t uValue);
 VMMR0_INT_DECL(uint64_t)    CPUMR0GetGuestTscAux(PVMCPU pVCpu);
+VMMR0_INT_DECL(void)        CPUMR0SetGuestSpecCtrl(PVMCPU pVCpu, uint64_t uValue);
+VMMR0_INT_DECL(uint64_t)    CPUMR0GetGuestSpecCtrl(PVMCPU pVCpu);
 /** @} */
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -514 +514 @@
                      "                            [--ibpb-on-vm-exit on|off]\n"
                      "                            [--ibpb-on-vm-entry on|off]\n"
+                     "                            [--spec-ctrl on|off]\n"
                      "                            [--nested-hw-virt on|off]\n"
                      "                            [--cpu-profile \"host|Intel 80[86|286|386]\"]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -77 +77 @@
     MODIFYVM_IBPB_ON_VM_EXIT,
     MODIFYVM_IBPB_ON_VM_ENTRY,
+    MODIFYVM_SPEC_CTRL,
     MODIFYVM_NESTED_HW_VIRT,
     MODIFYVM_CPUS,
@@ -260 +261 @@
     { "--ibpb-on-vm-exit",          MODIFYVM_IBPB_ON_VM_EXIT,           RTGETOPT_REQ_BOOL_ONOFF },
     { "--ibpb-on-vm-entry",         MODIFYVM_IBPB_ON_VM_ENTRY,          RTGETOPT_REQ_BOOL_ONOFF },
-    { "--nested-hw-virt",           MODIFYVM_NESTED_HW_VIRT,             RTGETOPT_REQ_BOOL_ONOFF },
+    { "--spec-ctrl",                MODIFYVM_SPEC_CTRL,                 RTGETOPT_REQ_BOOL_ONOFF },
+    { "--nested-hw-virt",           MODIFYVM_NESTED_HW_VIRT,            RTGETOPT_REQ_BOOL_ONOFF },
     { "--cpuid-set",                MODIFYVM_SETCPUID,                  RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX },
     { "--cpuid-remove",             MODIFYVM_DELCPUID,                  RTGETOPT_REQ_UINT32_OPTIONAL_PAIR | RTGETOPT_FLAG_HEX },
@@ -808 +810 @@
                 break;
 
+            case MODIFYVM_SPEC_CTRL:
+                CHECK_ERROR(sessionMachine, SetCPUProperty(CPUPropertyType_SpecCtrl, ValueUnion.f));
+                break;
+
             case MODIFYVM_NESTED_HW_VIRT:
                 CHECK_ERROR(sessionMachine, SetCPUProperty(CPUPropertyType_HWVirt, ValueUnion.f));

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1009 +1009 @@
         host CPU supports it.  This setting will significantly slow down workloads
         causing many VM exits, so it is only recommended for situation where there
-        real need to be paranoid.
+        is a real need to be paranoid.
       </desc>
     </const>
@@ -1017 +1017 @@
         host CPU supports it.  This setting will significantly slow down workloads
         causing many VM exits, so it is only recommended for situation where there
-        real need to be paranoid.
+        is a real need to be paranoid.
       </desc>
     </const>
@@ -1024 +1024 @@
         Enabled the hardware virtualization (AMD-V/VT-x) feature on the guest CPU.
         This requires hardware virtualization on the host CPU.
+      </desc>
+    </const>
+    <const name="SpecCtrl"              value="9">
+      <desc>
+        If set, the speculation control CPUID bits and MSRs, when available on the
+        host, are exposed to the guest. Depending on the host CPU and operating
+        system, this may significantly slow down workloads causing many VM exits.
+      </desc>
+    </const>
+    <const name="SpecCtrlByHost"        value="10">
+      <desc>
+        If set, the speculation controls are managed by the host. This is intended
+        for guests which do not set the speculation controls themselves.
       </desc>
     </const>

trunk/src/VBox/Main/include/MachineImpl.h

@@ -290 +290 @@
         BOOL                mIBPBOnVMExit;
         BOOL                mIBPBOnVMEntry;
+        BOOL                mSpecCtrl;
+        BOOL                mSpecCtrlByHost;
         BOOL                mNestedHWVirt;
         ULONG               mCPUCount;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1022 +1022 @@
         }
 
+        /* Speculation Control. */
+        BOOL fSpecCtrl = FALSE;
+        hrc = pMachine->GetCPUProperty(CPUPropertyType_SpecCtrl, &fSpecCtrl);      H();
+        InsertConfigInteger(pCPUM, "SpecCtrl", fSpecCtrl);
+
         /* Nested VT-x / AMD-V. */
         BOOL fNestedHWVirt = FALSE;
@@ -1172 +1177 @@
         hrc = pMachine->GetCPUProperty(CPUPropertyType_IBPBOnVMEntry, &fIBPBOnVMEntry); H();
         InsertConfigInteger(pHM, "IBPBOnVMEntry", fIBPBOnVMEntry);
+
+        BOOL fSpecCtrlByHost = false;
+        hrc = pMachine->GetCPUProperty(CPUPropertyType_SpecCtrlByHost, &fSpecCtrlByHost); H();
+        InsertConfigInteger(pHM, "SpecCtrlByHost", fSpecCtrlByHost);
 
         /* Reset overwrite. */

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -198 +198 @@
     mIBPBOnVMExit = false;
     mIBPBOnVMEntry = false;
+    mSpecCtrl = false;
+    mSpecCtrlByHost = false;
     mNestedHWVirt = false;
     mHPETEnabled = false;
@@ -2267 +2269 @@
             break;
 
+        case CPUPropertyType_SpecCtrl:
+            *aValue = mHWData->mSpecCtrl;
+            break;
+
+        case CPUPropertyType_SpecCtrlByHost:
+            *aValue = mHWData->mSpecCtrlByHost;
+            break;
+
         case CPUPropertyType_HWVirt:
             *aValue = mHWData->mNestedHWVirt;
@@ -2330 +2340 @@
             mHWData.backup();
             mHWData->mIBPBOnVMEntry = !!aValue;
+            break;
+
+        case CPUPropertyType_SpecCtrl:
+            i_setModified(IsModified_MachineData);
+            mHWData.backup();
+            mHWData->mSpecCtrl = !!aValue;
+            break;
+
+        case CPUPropertyType_SpecCtrlByHost:
+            i_setModified(IsModified_MachineData);
+            mHWData.backup();
+            mHWData->mSpecCtrlByHost = !!aValue;
             break;
 
@@ -9023 +9045 @@
         mHWData->mIBPBOnVMExit                = data.fIBPBOnVMExit;
         mHWData->mIBPBOnVMEntry               = data.fIBPBOnVMEntry;
+        mHWData->mSpecCtrl                    = data.fSpecCtrl;
+        mHWData->mSpecCtrlByHost              = data.fSpecCtrlByHost;
         mHWData->mNestedHWVirt                = data.fNestedHWVirt;
         mHWData->mCPUCount                    = data.cCPUs;
@@ -10349 +10373 @@
         data.fIBPBOnVMExit          = !!mHWData->mIBPBOnVMExit;
         data.fIBPBOnVMEntry         = !!mHWData->mIBPBOnVMEntry;
+        data.fSpecCtrl              = !!mHWData->mSpecCtrl;
+        data.fSpecCtrlByHost        = !!mHWData->mSpecCtrlByHost;
         data.fNestedHWVirt          = !!mHWData->mNestedHWVirt;
         data.cCPUs                  = mHWData->mCPUCount;

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2780 +2780 @@
     fIBPBOnVMExit(false),
     fIBPBOnVMEntry(false),
+    fSpecCtrl(false),
+    fSpecCtrlByHost(false),
     fNestedHWVirt(false),
     enmLongMode(HC_ARCH_BITS == 64 ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled),
@@ -2936 +2938 @@
             && fIBPBOnVMExit             == h.fIBPBOnVMExit
             && fIBPBOnVMEntry            == h.fIBPBOnVMEntry
+            && fSpecCtrl                 == h.fSpecCtrl
+            && fSpecCtrlByHost           == h.fSpecCtrlByHost
             && fNestedHWVirt             == h.fNestedHWVirt
             && cCPUs                     == h.cCPUs
@@ -3945 +3949 @@
                 pelmCPUChild->getAttributeValue("vmentry", hw.fIBPBOnVMEntry);
             }
+            pelmCPUChild = pelmHwChild->findChildElement("SpecCtrl");
+            if (pelmCPUChild)
+                pelmCPUChild->getAttributeValue("enabled", hw.fSpecCtrl);
+            pelmCPUChild = pelmHwChild->findChildElement("SpecCtrlByHost");
+            if (pelmCPUChild)
+                pelmCPUChild->getAttributeValue("enabled", hw.fSpecCtrlByHost);
             pelmCPUChild = pelmHwChild->findChildElement("NestedHWVirt");
             if (pelmCPUChild)
@@ -5284 +5294 @@
         }
     }
+    if (m->sv >= SettingsVersion_v1_16 && hw.fSpecCtrl)
+        pelmCPU->createChild("SpecCtrl")->setAttribute("enabled", hw.fSpecCtrl);
+    if (m->sv >= SettingsVersion_v1_16 && hw.fSpecCtrlByHost)
+        pelmCPU->createChild("SpecCtrlByHost")->setAttribute("enabled", hw.fSpecCtrlByHost);
     if (m->sv >= SettingsVersion_v1_17 && hw.fNestedHWVirt)
         pelmCPU->createChild("NestedHWVirt")->setAttribute("enabled", hw.fNestedHWVirt);
@@ -6969 +6983 @@
             || hardwareMachine.fX2APIC
             || hardwareMachine.fIBPBOnVMExit
-            || hardwareMachine.fIBPBOnVMEntry)
+            || hardwareMachine.fIBPBOnVMEntry
+            || hardwareMachine.fSpecCtrl
+            || hardwareMachine.fSpecCtrlByHost)
         {
             m->sv = SettingsVersion_v1_16;

trunk/src/VBox/VMM/VMMAll/CPUMAllMsrs.cpp

@@ -6295 +6295 @@
 }
 
+/**
+ * Fast way for HM to access the IA32_SPEC_CTRL register.
+ *
+ * @returns The register value.
+ * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
+ * @thread  EMT(pVCpu)
+ */
+VMMR0_INT_DECL(uint64_t) CPUMR0GetGuestSpecCtrl(PVMCPU pVCpu)
+{
+    return pVCpu->cpum.s.GuestMsrs.msr.SpecCtrl;
+}
+
+
+/**
+ * Fast way for HM to access the IA32_SPEC_CTRL register.
+ *
+ * @param   pVCpu   The cross context virtual CPU structure of the calling EMT.
+ * @param   uValue  The new value.
+ * @thread  EMT(pVCpu)
+ */
+VMMR0_INT_DECL(void) CPUMR0SetGuestSpecCtrl(PVMCPU pVCpu, uint64_t uValue)
+{
+    pVCpu->cpum.s.GuestMsrs.msr.SpecCtrl = uValue;
+}
+
 #endif /* IN_RING0 */
 

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -2491 +2491 @@
         }
 #endif
+        /*
+         * The IA32_PRED_CMD MSR is write-only and has no state associated with it. We never need to intercept
+         * access (writes need to be executed without exiting, reds will #GP-fault anyway).
+         */
+        if (pVM->cpum.ro.GuestFeatures.fIbpb)
+            hmR0VmxSetMsrPermission(pVCpu, MSR_IA32_PRED_CMD,     VMXMSREXIT_PASSTHRU_READ, VMXMSREXIT_PASSTHRU_WRITE);
+
         /* Though MSR_IA32_PERF_GLOBAL_CTRL is saved/restored lazily, we want intercept reads/write to it for now. */
     }
@@ -6630 +6637 @@
             case MSR_K8_SF_MASK:        pMixedCtx->msrSFMASK       = pMsr->u64Value;             break;
             case MSR_K8_KERNEL_GS_BASE: pMixedCtx->msrKERNELGSBASE = pMsr->u64Value;             break;
+            case MSR_IA32_SPEC_CTRL:    CPUMR0SetGuestSpecCtrl(pVCpu, pMsr->u64Value);           break;
             case MSR_K6_EFER: /* Nothing to do here since we intercept writes, see hmR0VmxLoadGuestMsrs(). */
                 break;
@@ -9172 +9180 @@
             Assert(!pVCpu->hm.s.vmx.cMsrs || pVCpu->hm.s.vmx.fUpdatedHostMsrs);
         }
+    }
+
+    if (pVM->cpum.ro.GuestFeatures.fIbrs)
+    {
+        bool fMsrUpdated;
+        int rc2 = hmR0VmxSaveGuestAutoLoadStoreMsrs(pVCpu, pMixedCtx);
+        AssertRC(rc2);
+        Assert(HMVMXCPU_GST_IS_UPDATED(pVCpu, HMVMX_UPDATED_GUEST_AUTO_LOAD_STORE_MSRS));
+
+        rc2 = hmR0VmxAddAutoLoadStoreMsr(pVCpu, MSR_IA32_SPEC_CTRL, CPUMR0GetGuestSpecCtrl(pVCpu), true /* fUpdateHostMsr */,
+                                         &fMsrUpdated);
+        AssertRC(rc2);
+        Assert(fMsrUpdated || pVCpu->hm.s.vmx.fUpdatedHostMsrs);
+        /* Finally, mark that all host MSR values are updated so we don't redo it without leaving VT-x. See @bugref{6956}. */
+        pVCpu->hm.s.vmx.fUpdatedHostMsrs = true;
     }
 

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -1750 +1750 @@
             pFeatures->fIbrs                = pFeatures->fIbpb;
             pFeatures->fStibp               = RT_BOOL(pSxfLeaf0->uEdx & X86_CPUID_STEXT_FEATURE_EDX_STIBP);
+#if 0   // Disabled until IA32_ARCH_CAPABILITIES support can be tested
             pFeatures->fArchCap             = RT_BOOL(pSxfLeaf0->uEdx & X86_CPUID_STEXT_FEATURE_EDX_ARCHCAP);
+#endif
         }
 
@@ -4314 +4316 @@
 
         /* Check if speculation control is enabled. */
-        rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "EnableSpecCtrl", &fEnable, false);
+        rc = CFGMR3QueryBoolDef(pCpumCfg, "SpecCtrl", &fEnable, false);
         AssertRCReturn(rc, rc);
         if (fEnable)
@@ -4621 +4623 @@
                 {
                     pLeaf->uEdx |= X86_CPUID_STEXT_FEATURE_EDX_IBRS_IBPB;
+                    pVM->cpum.s.GuestFeatures.fIbrs = 1;
                     if (pVM->cpum.s.HostFeatures.fStibp)
+                    {
                         pLeaf->uEdx |= X86_CPUID_STEXT_FEATURE_EDX_STIBP;
+                        pVM->cpum.s.GuestFeatures.fStibp = 1;
+                    }
 
                     /* Make sure we have the speculation control MSR... */

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -464 +464 @@
                               "|IBPBOnVMExit"
                               "|IBPBOnVMEntry"
+                              "|SpecCtrlByHost"
                               "|TPRPatchingEnabled"
                               "|64bitEnabled"
@@ -649 +650 @@
      * Costly paranoia setting. */
     rc = CFGMR3QueryBoolDef(pCfgHm, "IBPBOnVMEntry", &pVM->hm.s.fIbpbOnVmEntry, false);
+    AssertLogRelRCReturn(rc, rc);
+
+    /** @cfgm{/HM/SpecCtrlByHost, bool}
+     * Another expensive paranoia setting. */
+    rc = CFGMR3QueryBoolDef(pCfgHm, "SpecCtrlByHost", &pVM->hm.s.fSpecCtrlByHost, false);
     AssertLogRelRCReturn(rc, rc);
 

trunk/src/VBox/VMM/include/HMInternal.h

@@ -421 +421 @@
     /** Set if indirect branch prediction barrier on VM entry. */
     bool                        fIbpbOnVmEntry;
+    /** Set if host manages speculation control settings. */
+    bool                        fSpecCtrlByHost;
     /** Explicit padding. */
-    bool                        afPadding[3];
+    bool                        afPadding[2];
 
     /** Maximum ASID allowed. */