Changeset 79871 in vbox

Timestamp:

Jul 19, 2019 9:02:42 AM (6 years ago)

Author:

vboxsync

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

132273

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Add hmR0VmxReadGuestPhysicalAddrVmcs for upcoming changes.

File:

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

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

@@ -83 +83 @@
 #define HMVMX_READ_EXIT_INSTR_INFO                  RT_BIT_32(6)
 #define HMVMX_READ_GUEST_LINEAR_ADDR                RT_BIT_32(7)
+#define HMVMX_READ_GUEST_PHYSICAL_ADDR              RT_BIT_32(8)
 
 /** All the VMCS fields required for processing of exception/NMI VM-exits. */
@@ -214 +215 @@
     /** The Guest-linear address. */
     uint64_t            uGuestLinearAddr;
+    /** The Guest-physical address. */
+    uint64_t            uGuestPhysicalAddr;
 
     /** The VM-exit interruption-information field. */
@@ -1501 +1504 @@
         AssertRCReturn(rc, rc);
         pVmxTransient->fVmcsFieldsRead |= HMVMX_READ_GUEST_LINEAR_ADDR;
+    }
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * Reads the Guest-physical address from the VMCS into the VMX transient structure.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu           The cross context virtual CPU structure of the
+ *                          calling EMT. (Required for the VMCS cache case.)
+ * @param   pVmxTransient   The VMX-transient structure.
+ */
+DECLINLINE(int) hmR0VmxReadGuestPhysicalAddrVmcs(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient)
+{
+    if (!(pVmxTransient->fVmcsFieldsRead & HMVMX_READ_GUEST_PHYSICAL_ADDR))
+    {
+        int rc = VMXReadVmcs64(VMX_VMCS64_RO_GUEST_PHYS_ADDR_FULL, &pVmxTransient->uGuestPhysicalAddr); NOREF(pVCpu);
+        AssertRCReturn(rc, rc);
+        pVmxTransient->fVmcsFieldsRead |= HMVMX_READ_GUEST_PHYSICAL_ADDR;
     }
     return VINF_SUCCESS;
@@ -16353 +16376 @@
      * Get sufficent state and update the exit history entry.
      */
-    RTGCPHYS GCPhys;
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    rc  = VMXReadVmcs64(VMX_VMCS64_RO_GUEST_PHYS_ADDR_FULL, &GCPhys);
+    rc  = hmR0VmxReadGuestPhysicalAddrVmcs(pVCpu, pVmxTransient);
     rc |= hmR0VmxImportGuestState(pVCpu, pVmcsInfo, IEM_CPUMCTX_EXTRN_MUST_MASK);
     AssertRCReturn(rc, rc);
 
+    RTGCPHYS const GCPhys = pVmxTransient->uGuestPhysicalAddr;
     PCEMEXITREC pExitRec = EMHistoryUpdateFlagsAndTypeAndPC(pVCpu,
                                                             EMEXIT_MAKE_FT(EMEXIT_F_KIND_EM | EMEXIT_F_HM, EMEXITTYPE_MMIO),
@@ -16440 +16463 @@
     }
 
-    RTGCPHYS GCPhys;
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
-    rc  = VMXReadVmcs64(VMX_VMCS64_RO_GUEST_PHYS_ADDR_FULL, &GCPhys);
+    rc  = hmR0VmxReadGuestPhysicalAddrVmcs(pVCpu, pVmxTransient);
     rc |= hmR0VmxImportGuestState(pVCpu, pVmcsInfo, IEM_CPUMCTX_EXTRN_MUST_MASK);
     AssertRCReturn(rc, rc);
 
+    RTGCPHYS const GCPhys    = pVmxTransient->uGuestPhysicalAddr;
     uint64_t const uExitQual = pVmxTransient->uExitQual;
     AssertMsg(((pVmxTransient->uExitQual >> 7) & 3) != 2, ("%#RX64", uExitQual));