Changeset 96743 in vbox

Timestamp:

Sep 15, 2022 8:21:56 AM (2 years ago)

Author:

vboxsync

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

153630

Message:

VMM/IEM: Nested VMX: bugref:10092 Handle nested-guest instruction boundary FFs in IEMExecLots and IEMExecForExits as well as after the 2nd instruction execution attempt in iemExecOneInner.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -9721 +9721 @@
 #endif
             if (rcStrict == VINF_SUCCESS)
+            {
                 pVCpu->iem.s.cInstructions++;
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+                if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_VMX_APIC_WRITE | VMCPU_FF_VMX_MTF | VMCPU_FF_VMX_PREEMPT_TIMER
+                                             | VMCPU_FF_VMX_INT_WINDOW | VMCPU_FF_VMX_NMI_WINDOW))
+                    rcStrict = iemHandleNestedInstructionBoundraryFFs(pVCpu, rcStrict);
+#endif
+            }
             if (pVCpu->iem.s.cActiveMappings > 0)
             {
@@ -10049 +10056 @@
                     Assert(pVCpu->iem.s.cActiveMappings == 0);
                     pVCpu->iem.s.cInstructions++;
-                    if (RT_LIKELY(pVCpu->iem.s.rcPassUp == VINF_SUCCESS))
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+                    /* Perform any VMX nested-guest instruction boundary actions. */
+                    if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_VMX_APIC_WRITE | VMCPU_FF_VMX_MTF | VMCPU_FF_VMX_PREEMPT_TIMER
+                                                 | VMCPU_FF_VMX_INT_WINDOW | VMCPU_FF_VMX_NMI_WINDOW))
+                        rcStrict = iemHandleNestedInstructionBoundraryFFs(pVCpu, rcStrict);
+#endif
+                    if (   RT_LIKELY(rcStrict == VINF_SUCCESS)
+                        && RT_LIKELY(pVCpu->iem.s.rcPassUp == VINF_SUCCESS))
                     {
                         uint64_t fCpu = pVCpu->fLocalForcedActions
@@ -10210 +10224 @@
                     pStats->cInstructions++;
                     cInstructionSinceLastExit++;
-                    if (RT_LIKELY(pVCpu->iem.s.rcPassUp == VINF_SUCCESS))
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+                    /* Perform any VMX nested-guest instruction boundary actions. */
+                    if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_VMX_APIC_WRITE | VMCPU_FF_VMX_MTF | VMCPU_FF_VMX_PREEMPT_TIMER
+                                                 | VMCPU_FF_VMX_INT_WINDOW | VMCPU_FF_VMX_NMI_WINDOW))
+                        rcStrict = iemHandleNestedInstructionBoundraryFFs(pVCpu, rcStrict);
+#endif
+                    if (   RT_LIKELY(rcStrict == VINF_SUCCESS)
+                        && RT_LIKELY(pVCpu->iem.s.rcPassUp == VINF_SUCCESS))
                     {
                         uint64_t fCpu = pVCpu->fLocalForcedActions