Changeset 97055 in vbox

Timestamp:

Oct 7, 2022 11:12:54 PM (2 years ago)

Author:

vboxsync

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

154004

Message:

VMM/HMVMXR0: Just go with the better option in vmxHCExitEptViolationNested. bugref:10092

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (4 diffs)

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

@@ -10329 +10329 @@
     Assert(pVCpu->CTX_SUFF(pVM)->hmr0.s.fNestedPaging);
 
-//#  define DSL_IRQ_FIX_1
-#  define DSL_IRQ_FIX_2
-
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
     if (CPUMIsGuestVmxProcCtls2Set(&pVCpu->cpum.GstCtx, VMX_PROC_CTLS2_EPT))
@@ -10338 +10335 @@
         AssertRCReturn(rc, rc);
 
-#  ifdef DSL_IRQ_FIX_2
         vmxHCReadToTransient<  HMVMX_READ_EXIT_QUALIFICATION
                              | HMVMX_READ_EXIT_INSTR_LEN
@@ -10361 +10357 @@
         }
         bool const fClearEventOnForward = VCPU_2_VMXSTATE(pVCpu).Event.fPending; /* paranoia. should not inject events below.  */
-#  else
-        vmxHCReadExitQualVmcs(pVCpu, pVmxTransient);
-        vmxHCReadGuestPhysicalAddrVmcs(pVCpu, pVmxTransient);
-        VBOXSTRICTRC rcStrict;
-#  endif
 
         RTGCPHYS const GCPhysNestedFault = pVmxTransient->uGuestPhysicalAddr;
@@ -10394 +10385 @@
                   uExitQual, GCPhysNestedFault, GCPtrNestedFault, VBOXSTRICTRC_VAL(rcStrict), Walk.fFailed));
         if (RT_SUCCESS(rcStrict))
-        {
-#  ifdef DSL_IRQ_FIX_1
-            /*
-             * If it's our VMEXIT, we're responsible for re-injecting any event which delivery
-             * might have triggered this VMEXIT.  If we forward the problem to the inner VMM,
-             * it's its problem to deal with that issue.  This means that it's troublesome to
-             * call vmxHCCheckExitDueToEventDelivery before PGMR0NestedTrap0eHandlerNestedPaging
-             * have decided who's VMEXIT it is. Unfortunately, we're a bit of a pickle then if
-             * we end up with an informational status here, as we _must_ _not_ drop events either.
-             */
-            /** @todo need better solution for this.  Better solution should probably be
-             *        applied to other exits too...   */
-            if (rcStrict == VINF_SUCCESS)
-            {
-                vmxHCReadExitIntInfoVmcs(pVCpu, pVmxTransient);
-                vmxHCReadExitIntErrorCodeVmcs(pVCpu, pVmxTransient);
-                vmxHCReadExitInstrLenVmcs(pVCpu, pVmxTransient);
-                vmxHCReadIdtVectoringInfoVmcs(pVCpu, pVmxTransient);
-                vmxHCReadIdtVectoringErrorCodeVmcs(pVCpu, pVmxTransient);
-
-                vmxHCCheckExitDueToEventDelivery(pVCpu, pVmxTransient);
-            }
-#  endif
             return rcStrict;
-        }
-
-#  ifndef DSL_IRQ_FIX_2
-        vmxHCReadExitInstrLenVmcs(pVCpu, pVmxTransient);
-        vmxHCReadIdtVectoringInfoVmcs(pVCpu, pVmxTransient);
-        vmxHCReadIdtVectoringErrorCodeVmcs(pVCpu, pVmxTransient);
-#  else
+
         if (fClearEventOnForward)
             VCPU_2_VMXSTATE(pVCpu).Event.fPending = false;
-#  endif
 
         VMXVEXITEVENTINFO const ExitEventInfo = VMXVEXITEVENTINFO_INIT_ONLY_IDT(pVmxTransient->uIdtVectoringInfo,