Changeset 94051 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

Timestamp:

Mar 2, 2022 5:00:49 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10092 Let the instruction specify the number of bytes it accesses in the VMX APIC-access page.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (7 diffs)

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

@@ -181 +181 @@
  *  VMX_EXIT_MONITOR (APIC access VM-exit caused by MONITOR pending)
  *  VMX_EXIT_ERR_MACHINE_CHECK (we never need to raise this?)
- *  VMX_EXIT_INVEPT
  *  VMX_EXIT_RDRAND
  *  VMX_EXIT_VMFUNC
@@ -2465 +2464 @@
     pVmcs->u64RoExitQual.u = u64ExitQual;
 
-    Log3(("vmexit: reason=%#RX32 qual=%#RX64 cs:rip=%04x:%#RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64\n", uExitReason,
-          pVmcs->u64RoExitQual.u, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
-          pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.cr4));
+    LogFlow(("vmexit: reason=%#RX32 qual=%#RX64 cs:rip=%04x:%#RX64 cr0=%#RX64 cr3=%#RX64 cr4=%#RX64\n", uExitReason,
+             pVmcs->u64RoExitQual.u, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
+             pVCpu->cpum.GstCtx.cr3, pVCpu->cpum.GstCtx.cr4));
 
     /*
@@ -4302 +4301 @@
 
 /**
- * Virtualizes a memory-based APIC access where the address is not used to access
- * memory.
+ * Virtualizes a memory-based APIC access by certain instructions even though they
+ * do not use the address to access memory.
  *
  * This is for instructions like MONITOR, CLFLUSH, CLFLUSHOPT, ENTER which may cause
@@ -4310 +4309 @@
  * @param   pVCpu           The cross context virtual CPU structure.
  * @param   pGCPhysAccess   Pointer to the guest-physical address accessed.
+ * @param   cbAccess        The size of the access in bytes.
  * @param   fAccess         The type of access, see IEM_ACCESS_XXX.
  */
-IEM_STATIC VBOXSTRICTRC iemVmxVirtApicAccessUnused(PVMCPUCC pVCpu, PRTGCPHYS pGCPhysAccess, uint32_t fAccess)
+IEM_STATIC VBOXSTRICTRC iemVmxVirtApicAccessUnused(PVMCPUCC pVCpu, PRTGCPHYS pGCPhysAccess, size_t cbAccess,
+                                                   uint32_t fAccess)
 {
     Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.Vmcs.u32ProcCtls2 & VMX_PROC_CTLS2_VIRT_APIC_ACCESS);
@@ -4324 +4325 @@
     {
         uint16_t const offAccess = *pGCPhysAccess & GUEST_PAGE_OFFSET_MASK;
-        uint16_t const cbAccess  = 1;
         bool const fIntercept = iemVmxVirtApicIsMemAccessIntercepted(pVCpu, offAccess, cbAccess, fAccess);
         if (fIntercept)
@@ -7641 +7641 @@
 # if defined(VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM) && defined(IN_RING3)
                         /* Reschedule to IEM-only execution of the nested-guest. */
-                        Log(("%s: Enabling IEM-only EM execution policy!\n", pszInstr));
+                        LogFlow(("%s: Enabling IEM-only EM execution policy!\n", pszInstr));
                         int rcSched = EMR3SetExecutionPolicy(pVCpu->CTX_SUFF(pVM)->pUVM, EMEXECPOLICY_IEM_ALL, true);
                         if (rcSched != VINF_SUCCESS)
@@ -7648 +7648 @@
 
                         /* Finally, done. */
-                        Log3(("%s: cs:rip=%#04x:%#RX64 cr0=%#RX64 (%#RX64) cr4=%#RX64 (%#RX64) efer=%#RX64\n",
-                              pszInstr, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
-                              pVmcs->u64Cr0ReadShadow.u, pVCpu->cpum.GstCtx.cr4, pVmcs->u64Cr4ReadShadow.u,
-                              pVCpu->cpum.GstCtx.msrEFER));
+                        LogFlow(("%s: cs:rip=%#04x:%#RX64 cr0=%#RX64 (%#RX64) cr4=%#RX64 (%#RX64) efer=%#RX64 (%#RX64)\n",
+                                 pszInstr, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
+                                 pVmcs->u64Cr0ReadShadow.u, pVCpu->cpum.GstCtx.cr4, pVmcs->u64Cr4ReadShadow.u,
+                                 pVCpu->cpum.GstCtx.msrEFER, pVmcs->u64GuestEferMsr.u));
                         return VINF_SUCCESS;
                     }