Changeset 87558 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 3, 2021 11:21:28 AM (4 years ago)

Author:

vboxsync

Message:

VMM/HMVMX: Moved/copy last branch stuff from HM::vmxUse to HMR0PERVM::vmx. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (11 diffs)

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

@@ -875 +875 @@
  * @remarks Must only be called when LBR is enabled.
  */
-DECL_FORCE_INLINE(bool) hmR0VmxIsLbrBranchFromMsr(PCVM pVM, uint32_t idMsr, uint32_t *pidxMsr)
-{
-    Assert(pVM->hm.s.vmx.fLbr);
-    Assert(pVM->hm.s.vmx.idLbrFromIpMsrFirst);
-    uint32_t const cLbrStack = pVM->hm.s.vmx.idLbrFromIpMsrLast - pVM->hm.s.vmx.idLbrFromIpMsrFirst + 1;
-    uint32_t const idxMsr    = idMsr - pVM->hm.s.vmx.idLbrFromIpMsrFirst;
+DECL_FORCE_INLINE(bool) hmR0VmxIsLbrBranchFromMsr(PCVMCC pVM, uint32_t idMsr, uint32_t *pidxMsr)
+{
+    Assert(pVM->hmr0.s.vmx.fLbr);
+    Assert(pVM->hmr0.s.vmx.idLbrFromIpMsrFirst);
+    uint32_t const cLbrStack = pVM->hmr0.s.vmx.idLbrFromIpMsrLast - pVM->hmr0.s.vmx.idLbrFromIpMsrFirst + 1;
+    uint32_t const idxMsr    = idMsr - pVM->hmr0.s.vmx.idLbrFromIpMsrFirst;
     if (idxMsr < cLbrStack)
     {
@@ -903 +903 @@
  *          are supported by the CPU (see hmR0VmxSetupLbrMsrRange).
  */
-DECL_FORCE_INLINE(bool) hmR0VmxIsLbrBranchToMsr(PCVM pVM, uint32_t idMsr, uint32_t *pidxMsr)
-{
-    Assert(pVM->hm.s.vmx.fLbr);
-    if (pVM->hm.s.vmx.idLbrToIpMsrFirst)
-    {
-        uint32_t const cLbrStack = pVM->hm.s.vmx.idLbrToIpMsrLast - pVM->hm.s.vmx.idLbrToIpMsrFirst + 1;
-        uint32_t const idxMsr    = idMsr - pVM->hm.s.vmx.idLbrToIpMsrFirst;
+DECL_FORCE_INLINE(bool) hmR0VmxIsLbrBranchToMsr(PCVMCC pVM, uint32_t idMsr, uint32_t *pidxMsr)
+{
+    Assert(pVM->hmr0.s.vmx.fLbr);
+    if (pVM->hmr0.s.vmx.idLbrToIpMsrFirst)
+    {
+        uint32_t const cLbrStack = pVM->hmr0.s.vmx.idLbrToIpMsrLast - pVM->hmr0.s.vmx.idLbrToIpMsrFirst + 1;
+        uint32_t const idxMsr    = idMsr - pVM->hmr0.s.vmx.idLbrToIpMsrFirst;
         if (idxMsr < cLbrStack)
         {
@@ -2796 +2796 @@
             {
                 /* Verify LBR MSRs (used only for debugging) are intercepted. We don't passthru these MSRs to the guest yet. */
-                PCVM pVM = pVCpu->CTX_SUFF(pVM);
-                if (   pVM->hm.s.vmx.fLbr
+                PCVMCC pVM = pVCpu->CTX_SUFF(pVM);
+                if (   pVM->hmr0.s.vmx.fLbr
                     && (   hmR0VmxIsLbrBranchFromMsr(pVM, pGuestMsrLoad->u32Msr, NULL /* pidxMsr */)
                         || hmR0VmxIsLbrBranchToMsr(pVM, pGuestMsrLoad->u32Msr, NULL /* pidxMsr */)
-                        || pGuestMsrLoad->u32Msr == pVM->hm.s.vmx.idLbrTosMsr))
+                        || pGuestMsrLoad->u32Msr == pVM->hmr0.s.vmx.idLbrTosMsr))
                 {
                     AssertMsgReturnVoid((fMsrpm & VMXMSRPM_MASK) == VMXMSRPM_EXIT_RD_WR,
@@ -3396 +3396 @@
 static int hmR0VmxSetupLbrMsrRange(PVMCC pVM)
 {
-    Assert(pVM->hm.s.vmx.fLbr);
+    Assert(pVM->hmr0.s.vmx.fLbr);
     uint32_t idLbrFromIpMsrFirst;
     uint32_t idLbrFromIpMsrLast;
@@ -3481 +3481 @@
      * Update the LBR info. to the VM struct. for use later.
      */
-    pVM->hm.s.vmx.idLbrTosMsr         = idLbrTosMsr;
-    pVM->hm.s.vmx.idLbrFromIpMsrFirst = idLbrFromIpMsrFirst;
-    pVM->hm.s.vmx.idLbrFromIpMsrLast  = idLbrFromIpMsrLast;
-
-    pVM->hm.s.vmx.idLbrToIpMsrFirst   = idLbrToIpMsrFirst;
-    pVM->hm.s.vmx.idLbrToIpMsrLast    = idLbrToIpMsrLast;
+    pVM->hmr0.s.vmx.idLbrTosMsr = idLbrTosMsr;
+
+    pVM->hm.s.vmx.idLbrFromIpMsrFirstForRing3 = pVM->hmr0.s.vmx.idLbrFromIpMsrFirst = idLbrFromIpMsrFirst;
+    pVM->hm.s.vmx.idLbrFromIpMsrLastForRing3  = pVM->hmr0.s.vmx.idLbrFromIpMsrLast  = idLbrFromIpMsrLast;
+
+    pVM->hm.s.vmx.idLbrToIpMsrFirstForRing3   = pVM->hmr0.s.vmx.idLbrToIpMsrFirst   = idLbrToIpMsrFirst;
+    pVM->hm.s.vmx.idLbrToIpMsrLastForRing3    = pVM->hmr0.s.vmx.idLbrToIpMsrLast    = idLbrToIpMsrLast;
     return VINF_SUCCESS;
 }
@@ -4073 +4074 @@
         pVmcsInfo->u64Cr4Mask = u64Cr4Mask;
 
-        if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fLbr)
+        if (pVCpu->CTX_SUFF(pVM)->hmr0.s.vmx.fLbr)
         {
             rc = VMXWriteVmcsNw(VMX_VMCS64_GUEST_DEBUGCTL_FULL, MSR_IA32_DEBUGCTL_LBR);
@@ -4549 +4550 @@
 
     /* Determine LBR capabilities. */
-    if (pVM->hm.s.vmx.fLbr)
+    pVM->hmr0.s.vmx.fLbr = pVM->hm.s.vmx.fLbrCfg;
+    if (pVM->hmr0.s.vmx.fLbr)
     {
         rc = hmR0VmxSetupLbrMsrRange(pVM);
@@ -6834 +6836 @@
 
         /* Last Branch Record. */
-        if (pVM->hm.s.vmx.fLbr)
+        if (pVM->hmr0.s.vmx.fLbr)
         {
             PVMXVMCSINFOSHARED const pVmcsInfoShared = pVmxTransient->pVmcsInfo->pShared;
-            uint32_t const idFromIpMsrStart = pVM->hm.s.vmx.idLbrFromIpMsrFirst;
-            uint32_t const idToIpMsrStart   = pVM->hm.s.vmx.idLbrToIpMsrFirst;
-            uint32_t const cLbrStack        = pVM->hm.s.vmx.idLbrFromIpMsrLast - pVM->hm.s.vmx.idLbrFromIpMsrFirst + 1;
+            uint32_t const idFromIpMsrStart = pVM->hmr0.s.vmx.idLbrFromIpMsrFirst;
+            uint32_t const idToIpMsrStart   = pVM->hmr0.s.vmx.idLbrToIpMsrFirst;
+            uint32_t const cLbrStack        = pVM->hmr0.s.vmx.idLbrFromIpMsrLast - pVM->hmr0.s.vmx.idLbrFromIpMsrFirst + 1;
             Assert(cLbrStack <= 32);
             for (uint32_t i = 0; i < cLbrStack; i++)
@@ -6859 +6861 @@
 
             /* Add LBR top-of-stack MSR (which contains the index to the most recent record). */
-            int rc = hmR0VmxAddAutoLoadStoreMsr(pVCpu, pVmxTransient, pVM->hm.s.vmx.idLbrTosMsr,
+            int rc = hmR0VmxAddAutoLoadStoreMsr(pVCpu, pVmxTransient, pVM->hmr0.s.vmx.idLbrTosMsr,
                                                 pVmcsInfoShared->u64LbrTosMsr, false /* fSetReadWrite */,
                                                 false /* fUpdateHostMsr */);
@@ -7784 +7786 @@
                         {
                             uint32_t idxLbrMsr;
-                            if (pVM->hm.s.vmx.fLbr)
+                            if (pVM->hmr0.s.vmx.fLbr)
                             {
                                 if (hmR0VmxIsLbrBranchFromMsr(pVM, idMsr, &idxLbrMsr))
@@ -7798 +7800 @@
                                     break;
                                 }
-                                if (idMsr == pVM->hm.s.vmx.idLbrTosMsr)
+                                if (idMsr == pVM->hmr0.s.vmx.idLbrTosMsr)
                                 {
                                     pVmcsInfoShared->u64LbrTosMsr = pMsrs[i].u64Value;