Changeset 93963 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

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

Author:

vboxsync

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

150193

Message:

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

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (1 diff)
• HMSVMR0.cpp (modified) (4 diffs)
• HMSVMR0.h (modified) (1 diff)
• HMVMXR0.cpp (modified) (4 diffs)
• HMVMXR0.h (modified) (1 diff)

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

@@ -1633 +1633 @@
     return SVMR0ImportStateOnDemand(pVCpu, fWhat);
 }
+
+
+/**
+ * Gets HM VM-exit auxiliary information.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu           The cross context CPU structure.
+ * @param   pHmExitAux      Where to store the auxiliary info.
+ * @param   fWhat           What to get, see HMVMX_READ_XXX. This is ignored/unused
+ *                          on AMD-V.
+ *
+ * @remarks Currently this works only when executing a nested-guest using
+ *          hardware-assisted execution as it's where the auxiliary information is
+ *          required outside of HM. In the future we can make this available while
+ *          executing a regular (non-nested) guest if necessary.
+ */
+VMMR0_INT_DECL(int) HMR0GetExitAuxInfo(PVMCPUCC pVCpu, PHMEXITAUX pHmExitAux, uint32_t fWhat)
+{
+    Assert(pHmExitAux);
+    Assert(!(fWhat & ~HMVMX_READ_VALID_MASK));
+    if (pVCpu->CTX_SUFF(pVM)->hm.s.vmx.fSupported)
+        return VMXR0GetExitAuxInfo(pVCpu, &pHmExitAux->Vmx, fWhat);
+    return SVMR0GetExitAuxInfo(pVCpu, &pHmExitAux->Svm);
+}
+
 
 #ifdef VBOX_STRICT

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);

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

@@ -52 +52 @@
 VMMR0DECL(int)          SVMR0ImportStateOnDemand(PVMCPUCC pVCpu, uint64_t fWhat);
 VMMR0DECL(int)          SVMR0InvalidatePage(PVMCPUCC pVCpu, RTGCPTR GCVirt);
+VMMR0DECL(int)          SVMR0GetExitAuxInfo(PVMCPUCC pVCpu, PSVMEXITAUX pSvmExitAux);
 
 /**

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

@@ -4834 +4834 @@
 
 /**
+ * Gets VMX VM-exit auxiliary information.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   pVmxExitAux     Where to store the VM-exit auxiliary info.
+ * @param   fWhat           What to fetch, HMVMX_READ_XXX.
+ */
+VMMR0DECL(int) VMXR0GetExitAuxInfo(PVMCPUCC pVCpu, PVMXEXITAUX pVmxExitAux, uint32_t fWhat)
+{
+    PVMXTRANSIENT pVmxTransient = pVCpu->hmr0.s.vmx.pVmxTransient;
+    if (RT_LIKELY(pVmxTransient))
+    {
+        AssertCompile(sizeof(fWhat) == sizeof(pVmxTransient->fVmcsFieldsRead));
+        fWhat &= ~pVmxTransient->fVmcsFieldsRead;
+
+        /* The exit reason is always available. */
+        pVmxExitAux->uReason = pVmxTransient->uExitReason;
+
+        if (fWhat & HMVMX_READ_EXIT_QUALIFICATION)
+        {
+            vmxHCReadExitQualVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_EXIT_QUALIFICATION;
+            pVmxExitAux->u64Qual = pVmxTransient->uExitQual;
+        }
+
+        if (fWhat & HMVMX_READ_IDT_VECTORING_INFO)
+        {
+            vmxHCReadIdtVectoringInfoVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_IDT_VECTORING_INFO;
+            pVmxExitAux->uIdtVectoringInfo = pVmxTransient->uIdtVectoringInfo;
+        }
+
+        if (fWhat & HMVMX_READ_IDT_VECTORING_ERROR_CODE)
+        {
+            vmxHCReadIdtVectoringErrorCodeVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_IDT_VECTORING_ERROR_CODE;
+            pVmxExitAux->uIdtVectoringErrCode = pVmxTransient->uIdtVectoringErrorCode;
+        }
+
+        if (fWhat & HMVMX_READ_EXIT_INSTR_LEN)
+        {
+            vmxHCReadExitInstrLenVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_EXIT_INSTR_LEN;
+            pVmxExitAux->cbInstr = pVmxTransient->cbExitInstr;
+        }
+
+        if (fWhat & HMVMX_READ_EXIT_INTERRUPTION_INFO)
+        {
+            vmxHCReadExitIntInfoVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_EXIT_INTERRUPTION_INFO;
+            pVmxExitAux->uExitIntInfo = pVmxTransient->uExitIntInfo;
+        }
+
+        if (fWhat & HMVMX_READ_EXIT_INTERRUPTION_ERROR_CODE)
+        {
+            vmxHCReadExitIntErrorCodeVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_EXIT_INTERRUPTION_ERROR_CODE;
+            pVmxExitAux->uExitIntErrCode = pVmxTransient->uExitIntErrorCode;
+        }
+
+        if (fWhat & HMVMX_READ_EXIT_INSTR_INFO)
+        {
+            vmxHCReadExitInstrInfoVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_EXIT_INSTR_INFO;
+            pVmxExitAux->InstrInfo.u = pVmxTransient->ExitInstrInfo.u;
+        }
+
+        if (fWhat & HMVMX_READ_GUEST_LINEAR_ADDR)
+        {
+            vmxHCReadGuestLinearAddrVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_GUEST_LINEAR_ADDR;
+            pVmxExitAux->u64GuestLinearAddr = pVmxTransient->uGuestLinearAddr;
+        }
+
+        if (fWhat & HMVMX_READ_GUEST_PHYSICAL_ADDR)
+        {
+            vmxHCReadGuestPhysicalAddrVmcs(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_GUEST_PHYSICAL_ADDR;
+            pVmxExitAux->u64GuestPhysAddr = pVmxTransient->uGuestPhysicalAddr;
+        }
+
+        if (fWhat & HMVMX_READ_GUEST_PENDING_DBG_XCPTS)
+        {
+            vmxHCReadGuestPendingDbgXctps(pVCpu, pVmxTransient);
+            fWhat &= ~HMVMX_READ_GUEST_PENDING_DBG_XCPTS;
+            pVmxExitAux->u64GuestPendingDbgXcpts = pVmxTransient->uGuestPendingDbgXcpts;
+        }
+
+        AssertMsg(!fWhat, ("fWhat=%#RX32 fVmcsFieldsRead=%#RX32\n", fWhat, pVmxTransient->fVmcsFieldsRead));
+        return VINF_SUCCESS;
+    }
+    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 VT-x.
@@ -6774 +6870 @@
     Assert(VmxTransient.pVmcsInfo == &pVCpu->hmr0.s.vmx.VmcsInfoNstGst);
 
+    /* Setup pointer so PGM/IEM can query VM-exit auxiliary info. on demand in ring-0. */
+    pVCpu->hmr0.s.vmx.pVmxTransient = &VmxTransient;
+
     VBOXSTRICTRC rcStrict = VERR_INTERNAL_ERROR_5;
     for (;;)
@@ -6806 +6905 @@
             STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatPreExit, x);
             hmR0VmxReportWorldSwitchError(pVCpu, rcRun, &VmxTransient);
-            return rcRun;
+            rcStrict = rcRun;
+            break;
         }
 
@@ -6855 +6955 @@
         break;
     }
+
+    /* Ensure VM-exit auxiliary info. is no longer available. */
+    pVCpu->hmr0.s.vmx.pVmxTransient = NULL;
 
     STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatEntry, x);

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

@@ -45 +45 @@
 VMMR0DECL(int)          VMXR0InvalidatePage(PVMCPUCC pVCpu, RTGCPTR GCVirt);
 VMMR0DECL(int)          VMXR0ImportStateOnDemand(PVMCPUCC pVCpu, uint64_t fWhat);
+VMMR0DECL(int)          VMXR0GetExitAuxInfo(PVMCPUCC pVCpu, PVMXEXITAUX pVmxExitAux, uint32_t fWhat);
 VMMR0DECL(VBOXSTRICTRC) VMXR0RunGuestCode(PVMCPUCC pVCpu);
 #endif /* IN_RING0 */