Changeset 93963 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Feb 28, 2022 8:39:08 AM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Add HM ring-0 API for querying transient VMX/SVM info.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)

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

@@ -287 +287 @@
                                                  | HMSVM_VMCB_CLEAN_AVIC)
 /** @} */
-
-/** @name SVM transient.
- *
- * A state structure for holding miscellaneous information across AMD-V
- * VMRUN/\#VMEXIT operation, restored after the transition.
- *
- * @{ */
-typedef struct SVMTRANSIENT
-{
-    /** The host's rflags/eflags. */
-    RTCCUINTREG     fEFlags;
-    /** The \#VMEXIT exit code (the EXITCODE field in the VMCB). */
-    uint64_t        u64ExitCode;
-
-    /** The guest's TPR value used for TPR shadowing. */
-    uint8_t         u8GuestTpr;
-    /** Alignment. */
-    uint8_t         abAlignment0[7];
-
-    /** Pointer to the currently executing VMCB. */
-    PSVMVMCB        pVmcb;
-
-    /** Whether we are currently executing a nested-guest. */
-    bool            fIsNestedGuest;
-    /** Whether the guest debug state was active at the time of \#VMEXIT. */
-    bool            fWasGuestDebugStateActive;
-    /** Whether the hyper debug state was active at the time of \#VMEXIT. */
-    bool            fWasHyperDebugStateActive;
-    /** Whether the TSC offset mode needs to be updated. */
-    bool            fUpdateTscOffsetting;
-    /** Whether the TSC_AUX MSR needs restoring on \#VMEXIT. */
-    bool            fRestoreTscAuxMsr;
-    /** Whether the \#VMEXIT was caused by a page-fault during delivery of a
-     *  contributary exception or a page-fault. */
-    bool            fVectoringDoublePF;
-    /** Whether the \#VMEXIT was caused by a page-fault during delivery of an
-     *  external interrupt or NMI. */
-    bool            fVectoringPF;
-    /** Padding. */
-    bool            afPadding0;
-} SVMTRANSIENT;
-/** Pointer to SVM transient state. */
-typedef SVMTRANSIENT *PSVMTRANSIENT;
-/** Pointer to a const SVM transient state. */
-typedef const SVMTRANSIENT *PCSVMTRANSIENT;
-
-AssertCompileSizeAlignment(SVMTRANSIENT, sizeof(uint64_t));
-AssertCompileMemberAlignment(SVMTRANSIENT, u64ExitCode, sizeof(uint64_t));
-AssertCompileMemberAlignment(SVMTRANSIENT, pVmcb,       sizeof(uint64_t));
-/** @}  */
 
 /**
@@ -2959 +2909 @@
 
 /**
+ * Gets SVM \#VMEXIT auxiliary information.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   pSvmExitAux     Where to store the auxiliary info.
+ */
+VMMR0DECL(int) SVMR0GetExitAuxInfo(PVMCPUCC pVCpu, PSVMEXITAUX pSvmExitAux)
+{
+    PCSVMTRANSIENT pSvmTransient = pVCpu->hmr0.s.svm.pSvmTransient;
+    if (RT_LIKELY(pSvmTransient))
+    {
+        PCSVMVMCB pVmcb = pSvmTransient->pVmcb;
+        if (RT_LIKELY(pVmcb))
+        {
+            pSvmExitAux->u64ExitCode  = pVmcb->ctrl.u64ExitCode;
+            pSvmExitAux->u64ExitInfo1 = pVmcb->ctrl.u64ExitInfo1;
+            pSvmExitAux->u64ExitInfo2 = pVmcb->ctrl.u64ExitInfo2;
+            pSvmExitAux->ExitIntInfo  = pVmcb->ctrl.ExitIntInfo;
+            return VINF_SUCCESS;
+        }
+        return VERR_SVM_IPE_5;
+    }
+    return VERR_NOT_AVAILABLE;
+}
+
+
+/**
  * Does the necessary state syncing before returning to ring-3 for any reason
  * (longjmp, preemption, voluntary exits to ring-3) from AMD-V.
@@ -4556 +4533 @@
     SvmTransient.fIsNestedGuest = true;
 
+    /* Setup pointer so PGM/IEM can query #VMEXIT auxiliary info. on demand in ring-0. */
+    pVCpu->hmr0.s.svm.pSvmTransient = &SvmTransient;
+
     VBOXSTRICTRC rc = VERR_INTERNAL_ERROR_4;
     for (;;)
@@ -4626 +4606 @@
         /** @todo NSTSVM: handle single-stepping. */
     }
+
+    /* Ensure #VMEXIT auxiliary info. is no longer available. */
+    pVCpu->hmr0.s.svm.pSvmTransient = NULL;
 
     STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatEntry, x);