Changeset 80262 in vbox

Timestamp:

Aug 14, 2019 5:02:49 AM (6 years ago)

Author:

vboxsync

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

132713

Message:

VMM/CPUM: Nested VMX: bugref:9180 Expose "TPR-shadow", "Virtualize-APIC accesses" and "Allow VM-entry injection for software int, software exception, priv. software exception with instruction length of 0", dumping of virtual-APIC page (disabled by default).

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (6 diffs)

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

@@ -1874 +1874 @@
     EmuFeat.fVmxCr8LoadExit           = 1;
     EmuFeat.fVmxCr8StoreExit          = 1;
-    EmuFeat.fVmxUseTprShadow          = 0;
+    EmuFeat.fVmxUseTprShadow          = 1;
     EmuFeat.fVmxNmiWindowExit         = 0;
     EmuFeat.fVmxMovDRxExit            = 1;
@@ -1884 +1884 @@
     EmuFeat.fVmxPauseExit             = 1;
     EmuFeat.fVmxSecondaryExecCtls     = 1;
-    EmuFeat.fVmxVirtApicAccess        = 0;
+    EmuFeat.fVmxVirtApicAccess        = 1;
     EmuFeat.fVmxEpt                   = 0;  /* Cannot be disabled if unrestricted guest is enabled. */
     EmuFeat.fVmxDescTableExit         = 1;
@@ -1919 +1919 @@
     EmuFeat.fVmxIntelPt               = 0;
     EmuFeat.fVmxVmwriteAll            = 0;  /** @todo NSTVMX: enable this when nested VMCS shadowing is enabled. */
-    EmuFeat.fVmxEntryInjectSoftInt    = 0;
+    EmuFeat.fVmxEntryInjectSoftInt    = 1;
 
     /*
@@ -3691 +3691 @@
  * Displays a virtual-VMCS.
  *
+ * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pHlp        The info helper functions.
  * @param   pVmcs       Pointer to a virtual VMCS.
  * @param   pszPrefix   Caller specified string prefix.
  */
-static void  cpumR3InfoVmxVmcs(PCDBGFINFOHLP pHlp, PCVMXVVMCS pVmcs, const char *pszPrefix)
+static void cpumR3InfoVmxVmcs(PVMCPU pVCpu, PCDBGFINFOHLP pHlp, PCVMXVVMCS pVmcs, const char *pszPrefix)
 {
     AssertReturnVoid(pHlp);
@@ -3940 +3941 @@
         pHlp->pfnPrintf(pHlp, "  %sGuest-linear addr          = %#RX64\n",   pszPrefix, pVmcs->u64RoGuestLinearAddr.u);
     }
+
+#ifdef DEBUG_ramshankar
+    if (pVmcs->u32ProcCtls & VMX_PROC_CTLS_USE_TPR_SHADOW)
+    {
+        void *pvPage = RTMemTmpAllocZ(VMX_V_VIRT_APIC_SIZE);
+        Assert(pvPage);
+        RTGCPHYS const GCPhysVirtApic = pVmcs->u64AddrVirtApic.u;
+        int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), pvPage, GCPhysVirtApic, VMX_V_VIRT_APIC_SIZE);
+        if (RT_SUCCESS(rc))
+        {
+            pHlp->pfnPrintf(pHlp, "  %sVirtual-APIC page\n", pszPrefix);
+            pHlp->pfnPrintf(pHlp, "%.*Rhxs\n", VMX_V_VIRT_APIC_SIZE, pvPage);
+            pHlp->pfnPrintf(pHlp, "\n");
+        }
+        RTMemTmpFree(pvPage);
+    }
+#else
+    NOREF(pVCpu);
+#endif
 
 #undef CPUMVMX_DUMP_HOST_XDTR
@@ -4063 +4083 @@
         pHlp->pfnPrintf(pHlp, "  fVirtNmiBlocking           = %RTbool\n",   pCtx->hwvirt.vmx.fVirtNmiBlocking);
         pHlp->pfnPrintf(pHlp, "  VMCS cache:\n");
-        cpumR3InfoVmxVmcs(pHlp, pCtx->hwvirt.vmx.pVmcsR3, "  " /* pszPrefix */);
+        cpumR3InfoVmxVmcs(pVCpu, pHlp, pCtx->hwvirt.vmx.pVmcsR3, "  " /* pszPrefix */);
     }