Changeset 104511 in vbox

Timestamp:

May 3, 2024 3:03:42 PM (7 months ago)

Author:

vboxsync

Message:

VMM: Some more GCM cleanup. bugref:9735 bugref:10683

Location:

trunk

Files:

• include/VBox/vmm/gcm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/GCMAll.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/GCM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/gcm.h

@@ -59 +59 @@
 #endif /* IN_RING3 */
 
-VMM_INT_DECL(bool)          GCMShouldTrapXcptDE(PVMCPUCC pVCpu);
-VMM_INT_DECL(VBOXSTRICTRC)  GCMXcptDE(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr);
+VMM_INT_DECL(bool)          GCMIsInterceptingXcptDE(PVMCPUCC pVCpu);
+VMM_INT_DECL(int)           GCMXcptDE(PVMCPUCC pVCpu, PCPUMCTX pCtx);
 /** @} */
 

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

@@ -47 +47 @@
  * @param   pVCpu       The cross context virtual CPU structure.
  */
-VMM_INT_DECL(bool) GCMShouldTrapXcptDE(PVMCPUCC pVCpu)
+VMM_INT_DECL(bool) GCMIsInterceptingXcptDE(PVMCPUCC pVCpu)
 {
-    LogFunc(("GCM checking if #DE needs trapping\n"));
-    PVM pVM = pVCpu->CTX_SUFF(pVM);
-
     /* See if the enabled fixers need to intercept #DE. */
-    if (  pVM->gcm.s.fFixerSet
-        & (GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_WIN9X))
-    {
-        LogRel(("GCM: #DE should be trapped\n"));
-        return true;
-    }
-
-    return false;
+    PVM const  pVM  = pVCpu->CTX_SUFF(pVM);
+    bool const fRet = (pVM->gcm.s.fFixerSet & (GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_WIN9X)) != 0;
+    LogFlow(("GCMIsInterceptingXcptDE: returns %d\n", fRet));
+    return fRet;
 }
 
@@ -67 +60 @@
  * Exception handler for \#DE when registered by GCM.
  *
- * @returns Strict VBox status code.
+ * @returns VBox status code.
  * @retval  VINF_SUCCESS retry division and continue.
  * @retval  VERR_NOT_FOUND deliver exception to guest.
@@ -73 +66 @@
  * @param   pVCpu       The cross context virtual CPU structure.
  * @param   pCtx        Pointer to the guest-CPU context.
- * @param   pDis        Pointer to the disassembled instruction state at RIP.
- *                      If NULL is passed, it implies the disassembly of the
- *                      the instruction at RIP is the
- *                      responsibility of GCM.
- * @param   pcbInstr    Where to store the instruction length of
- *                      the divide instruction. Optional, can be
- *                      NULL.
  *
  * @thread  EMT(pVCpu).
  */
-VMM_INT_DECL(VBOXSTRICTRC) GCMXcptDE(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr)
+VMM_INT_DECL(int) GCMXcptDE(PVMCPUCC pVCpu, PCPUMCTX pCtx)
 {
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
     Assert(pVM->gcm.s.fFixerSet & (GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_WIN9X));
-    Assert(pDis || pcbInstr);
-    RT_NOREF(pDis);
-    RT_NOREF(pcbInstr);
 
     LogRel(("GCM: Intercepted #DE at CS:RIP=%04x:%RX64 (%RX64 linear) RDX:RAX=%RX64:%RX64 RCX=%RX64 RBX=%RX64\n",
@@ -214 +197 @@
     return VERR_NOT_FOUND;
 }
+

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

@@ -7551 +7551 @@
     if (VCPU_2_VMXSTATE(pVCpu).fGCMTrapXcptDE)
     {
-        uint8_t cbInstr = 0;
-        VBOXSTRICTRC rc2 = GCMXcptDE(pVCpu, &pVCpu->cpum.GstCtx, NULL /* pDis */, &cbInstr);
-        if (rc2 == VINF_SUCCESS)
-            rcStrict = VINF_SUCCESS;    /* Restart instruction with modified guest register context. */
-        else if (rc2 == VERR_NOT_FOUND)
-            rcStrict = VERR_NOT_FOUND;  /* Deliver the exception. */
-        else
-            Assert(RT_FAILURE(VBOXSTRICTRC_VAL(rcStrict)));
-    }
+        rcStrict = GCMXcptDE(pVCpu, &pVCpu->cpum.GstCtx);
+        Assert(rcStrict == VINF_SUCCESS /* restart instr */ || rcStrict == VERR_NOT_FOUND /* deliver exception */);
+    }
+    /** @todo r=bird: This cannot be right! It'll suppress \#DE   */
     else
         rcStrict = VINF_SUCCESS;        /* Do nothing. */
@@ -7571 +7566 @@
     }
 
+    /** @todo r=bird: This assertion is wrong. rcStrict can never be
+     *        VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE here, it can only be
+     *        VINF_SUCCESS. */
     Assert(rcStrict == VINF_SUCCESS || rcStrict == VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE);
     return VBOXSTRICTRC_VAL(rcStrict);

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

@@ -8359 +8359 @@
     {
         HMSVM_CPUMCTX_IMPORT_STATE(pVCpu, HMSVM_CPUMCTX_EXTRN_ALL);
-        uint8_t cbInstr = 0;
-        VBOXSTRICTRC rcStrict = GCMXcptDE(pVCpu, &pVCpu->cpum.GstCtx, NULL /* pDis */, &cbInstr);
-        if (rcStrict == VINF_SUCCESS)
-            rc = VINF_SUCCESS;      /* Restart instruction with modified guest register context. */
-        else if (rcStrict == VERR_NOT_FOUND)
-            rc = VERR_NOT_FOUND;    /* Deliver the exception. */
-        else
-            Assert(RT_FAILURE(VBOXSTRICTRC_VAL(rcStrict)));
+        rc = GCMXcptDE(pVCpu, &pVCpu->cpum.GstCtx);
+        AssertMsg(rc == VINF_SUCCESS /* restart */ || rc == VERR_NOT_FOUND /* deliver exception */, ("rc=%Rrc\n", rc));
     }
 

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

@@ -154 +154 @@
 
 #if 0 /* development override */
-    pVM->gcm.s.enmFixerIds = GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_WIN9X;
+    pVM->gcm.s.fFixerSet = GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_WIN9X;
 #endif
 

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

@@ -754 +754 @@
         PVMCPU pVCpu = pVM->apCpusR3[idCpu];
         pVCpu->hm.s.fActive = false;
-        pVCpu->hm.s.fGIMTrapXcptUD = GIMShouldTrapXcptUD(pVCpu);    /* Is safe to call now since GIMR3Init() has completed. */
-        pVCpu->hm.s.fGCMTrapXcptDE = GCMShouldTrapXcptDE(pVCpu);    /* Is safe to call now since GCMR3Init() has completed. */
+        pVCpu->hm.s.fGIMTrapXcptUD = GIMShouldTrapXcptUD(pVCpu);     /* Is safe to call now since GIMR3Init() has completed. */
+        pVCpu->hm.s.fGCMTrapXcptDE = GCMIsInterceptingXcptDE(pVCpu); /* Is safe to call now since GCMR3Init() has completed. */
     }