Changeset 71813 in vbox for trunk

Timestamp:

Apr 11, 2018 4:42:38 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Nested Hw.virt: Avoid calling ASM helpers for modifying the MSR bitmaps.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

@@ -1116 +1116 @@
         uint8_t *pbMsrpm = (uint8_t *)pCtx->hwvirt.svm.CTX_SUFF(pvMsrBitmap);
         pbMsrpm += offMsrpm;
-        if (ASMBitTest(pbMsrpm, uMsrpmBit))
+        if (*pbMsrpm & RT_BIT(uMsrpmBit))
         {
             IEM_SVM_UPDATE_NRIP(pVCpu);

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

@@ -839 +839 @@
     pbMsrBitmap += offMsrpm;
     if (enmRead == SVMMSREXIT_INTERCEPT_READ)
-        ASMBitSet(pbMsrBitmap, uMsrpmBit);
+        *pbMsrBitmap |= RT_BIT(uMsrpmBit);
     else
     {
         if (!fInNestedGuestMode)
-            ASMBitClear(pbMsrBitmap, uMsrpmBit);
+            *pbMsrBitmap &= ~RT_BIT(uMsrpmBit);
 #ifdef VBOX_WITH_NESTED_HWVIRT
         else
@@ -850 +850 @@
             uint8_t const *pbNstGstMsrBitmap = (uint8_t *)pCtx->hwvirt.svm.CTX_SUFF(pvMsrBitmap);
             pbNstGstMsrBitmap += offMsrpm;
-            if (!ASMBitTest(pbNstGstMsrBitmap, uMsrpmBit))
-                ASMBitClear(pbMsrBitmap, uMsrpmBit);
+            if (!(*pbNstGstMsrBitmap & RT_BIT(uMsrpmBit)))
+                *pbMsrBitmap &= ~RT_BIT(uMsrpmBit);
             else
-                Assert(ASMBitTest(pbMsrBitmap, uMsrpmBit));
+                Assert(*pbMsrBitmap & RT_BIT(uMsrpmBit));
         }
 #endif
@@ -859 +859 @@
 
     if (enmWrite == SVMMSREXIT_INTERCEPT_WRITE)
-        ASMBitSet(pbMsrBitmap, uMsrpmBit + 1);
+        *pbMsrBitmap |= RT_BIT(uMsrpmBit + 1);
     else
     {
         if (!fInNestedGuestMode)
-            ASMBitClear(pbMsrBitmap, uMsrpmBit + 1);
+            *pbMsrBitmap &= ~RT_BIT(uMsrpmBit + 1);
 #ifdef VBOX_WITH_NESTED_HWVIRT
         else
@@ -870 +870 @@
             uint8_t const *pbNstGstMsrBitmap = (uint8_t *)pCtx->hwvirt.svm.CTX_SUFF(pvMsrBitmap);
             pbNstGstMsrBitmap += offMsrpm;
-            if (!ASMBitTest(pbNstGstMsrBitmap, uMsrpmBit + 1))
-                ASMBitClear(pbMsrBitmap, uMsrpmBit + 1);
+            if (!(*pbNstGstMsrBitmap & RT_BIT(uMsrpmBit + 1)))
+                *pbMsrBitmap &= ~RT_BIT(uMsrpmBit + 1);
             else
-                Assert(ASMBitTest(pbMsrBitmap, uMsrpmBit + 1));
+                Assert(*pbMsrBitmap & RT_BIT(uMsrpmBit + 1));
         }
 #endif
@@ -5171 +5171 @@
                     uint8_t const *pbMsrBitmap = (uint8_t const *)pCtx->hwvirt.svm.CTX_SUFF(pvMsrBitmap);
                     pbMsrBitmap               += offMsrpm;
-                    bool const fInterceptRead  = ASMBitTest(pbMsrBitmap, uMsrpmBit);
-                    bool const fInterceptWrite = ASMBitTest(pbMsrBitmap, uMsrpmBit + 1);
+                    bool const fInterceptRead  = *pbMsrBitmap & RT_BIT(uMsrpmBit);
+                    bool const fInterceptWrite = *pbMsrBitmap & RT_BIT(uMsrpmBit + 1);
 
                     if (   (fInterceptWrite && pVmcbNstGstCtrl->u64ExitInfo1 == SVM_EXIT1_MSR_WRITE)
@@ -7322 +7322 @@
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitPause);
     hmR0SvmAdvanceRipHwAssist(pVCpu, pCtx, 2);
-
     /** @todo The guest has likely hit a contended spinlock. We might want to
      *        poke a schedule different guest VCPU. */