Changeset 99687 in vbox for trunk/src/VBox/VMM

Timestamp:

May 9, 2023 4:17:08 AM (21 months ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10318 Moved vmxHCGetGuestIntrStateWithUpdate() back into vmxHCEvaluatePendingEvent[Nested] as it implicitly ensures ordering.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/VMXAllTemplate.cpp.h (modified) (2 diffs)
• VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• VMMR3/NEMR3Native-darwin.cpp (modified) (1 diff)

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

@@ -4859 +4859 @@
  *
  * @returns Strict VBox status code (i.e. informational status codes too).
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pVmcsInfo   The VMCS information structure.
- */
-static VBOXSTRICTRC vmxHCEvaluatePendingEvent(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo)
-{
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   pVmcsInfo       The VMCS information structure.
+ * @param   pfIntrState     Where to store the updated VMX guest-interruptibility
+ *                          state.
+ */
+static VBOXSTRICTRC vmxHCEvaluatePendingEvent(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo, uint32_t *pfIntrState)
+{
+    Assert(pfIntrState);
     Assert(!TRPMHasTrap(pVCpu));
+
+    *pfIntrState = vmxHCGetGuestIntrStateWithUpdate(pVCpu);
 
     /*
@@ -4984 +4989 @@
  *
  * @returns Strict VBox status code (i.e. informational status codes too).
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pVmcsInfo   The VMCS information structure.
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   pVmcsInfo       The VMCS information structure.
+ * @param   pfIntrState     Where to store the updated VMX guest-interruptibility
+ *                          state.
  *
  * @remarks The guest must be in VMX non-root mode.
  */
-static VBOXSTRICTRC vmxHCEvaluatePendingEventNested(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo)
+static VBOXSTRICTRC vmxHCEvaluatePendingEventNested(PVMCPUCC pVCpu, PVMXVMCSINFO pVmcsInfo, uint32_t *pfIntrState)
 {
     PCCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
 
+    Assert(pfIntrState);
     Assert(CPUMIsGuestInVmxNonRootMode(pCtx));
     Assert(!TRPMHasTrap(pVCpu));
+
+    *pfIntrState = vmxHCGetGuestIntrStateWithUpdate(pVCpu);
 
     /*

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

@@ -5923 +5923 @@
         vmxHCTrpmTrapToPendingEvent(pVCpu);
 
-    uint32_t const fIntrState = vmxHCGetGuestIntrStateWithUpdate(pVCpu);
+    uint32_t fIntrState;
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     if (!pVmxTransient->fIsNestedGuest)
-        rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo);
+        rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo, &fIntrState);
     else
-        rcStrict = vmxHCEvaluatePendingEventNested(pVCpu, pVmxTransient->pVmcsInfo);
+        rcStrict = vmxHCEvaluatePendingEventNested(pVCpu, pVmxTransient->pVmcsInfo, &fIntrState);
 
     /*
@@ -5943 +5943 @@
     }
 #else
-    rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo);
+    rcStrict = vmxHCEvaluatePendingEvent(pVCpu, pVmxTransient->pVmcsInfo, &fIntrState);
     Assert(rcStrict == VINF_SUCCESS);
 #endif

trunk/src/VBox/VMM/VMMR3/NEMR3Native-darwin.cpp

@@ -3738 +3738 @@
         vmxHCTrpmTrapToPendingEvent(pVCpu);
 
-    uint32_t const fIntrState = vmxHCGetGuestIntrStateWithUpdate(pVCpu);
-    rcStrict = vmxHCEvaluatePendingEvent(pVCpu, &pVCpu->nem.s.VmcsInfo);
+    uint32_t fIntrState;
+    rcStrict = vmxHCEvaluatePendingEvent(pVCpu, &pVCpu->nem.s.VmcsInfo, &fIntrState);
 
     /*