儲存庫 vbox 的更動 66751

時間撮記:

2017-5-2 下午05:12:08 (8 年 以前)

作者:

vboxsync

訊息:

VMM: Nested Hw.virt: Adjusted the helper functions for use with nested-guest interrupt injection.

位置:

trunk

檔案:

• include/VBox/vmm/hm.h (修改) (1 筆差異)
• src/VBox/VMM/VMMAll/HMSVMAll.cpp (修改) (3 筆差異)

trunk/include/VBox/vmm/hm.h

@@ -157 +157 @@
 VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmmcall(PVMCPU pVCpu, PCPUMCTX pCtx, bool *pfRipUpdated);
 VMM_INT_DECL(VBOXSTRICTRC)      HMSvmVmrun(PVMCPU pVCpu, PCPUMCTX pCtx, RTGCPHYS GCPhysVmcb);
-VMM_INT_DECL(int)               HMSvmNstGstGetInterrupt(PCCPUMCTX pCtx, uint8_t *pu8Interrupt);
-VMM_INT_DECL(bool)              HMSvmNstGstIsInterruptPending(PCCPUMCTX pCtx);
-VMM_INT_DECL(VBOXSTRICTRC)      HMSvmNstGstHandleCtrlIntercept(PVMCPU pVCpu, PCPUMCTX pCtx, uint64_t uExitCode, uint64_t uExitInfo1,
-                                                               uint64_t uExitInfo2);
+VMM_INT_DECL(uint8_t)           HMSvmNstGstGetInterrupt(PCCPUMCTX pCtx);
+VMM_INT_DECL(bool)              HMSvmNstGstCanTakeInterrupt(PVMCPU pVCpu, PCCPUMCTX pCtx);
+VMM_INT_DECL(VBOXSTRICTRC)      HMSvmNstGstHandleCtrlIntercept(PVMCPU pVCpu, PCPUMCTX pCtx, uint64_t uExitCode,
+                                                               uint64_t uExitInfo1, uint64_t uExitInfo2);
 VMM_INT_DECL(VBOXSTRICTRC)      HMSvmNstGstHandleMsrIntercept(PVMCPU pVCpu, PCPUMCTX pCtx, uint32_t idMsr, bool fWrite);
 VMM_INT_DECL(VBOXSTRICTRC)      HMSvmNstGstHandleIOIntercept(PVMCPU pVCpu, PCPUMCTX pCtx, PCSVMIOIOEXITINFO pIoExitInfo,

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

@@ -765 +765 @@
  * @retval  true if there's a pending interrupt, false otherwise.
  *
- * @param   pCtx            The guest-CPU context.
- */
-VMM_INT_DECL(bool) HMSvmNstGstIsInterruptPending(PCCPUMCTX pCtx)
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @param   pCtx        The guest-CPU context.
+ */
+VMM_INT_DECL(bool) HMSvmNstGstCanTakeInterrupt(PVMCPU pVCpu, PCCPUMCTX pCtx)
 {
     PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.VmcbCtrl;
-    if (!CPUMIsGuestInNestedHwVirtMode(pCtx))
-        return false;
+    Assert(CPUMIsGuestInNestedHwVirtMode(pCtx));
 
     X86RFLAGS RFlags;
@@ -782 +782 @@
         return false;
 
-    return RT_BOOL(pVmcbCtrl->IntCtrl.n.u1VIrqPending);
+    if (   !pVmcbCtrl->IntCtrl.n.u1IgnoreTPR
+        &&  pVmcbCtrl->IntCtrl.n.u4VIntrPrio <= pVmcbCtrl->IntCtrl.n.u8VTPR)
+        return false;
+
+    /* Paranoia. */
+    Assert(RT_BOOL(pCtx->hwvirt.svm.fGif));
+    Assert(!VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
+    Assert(VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST));
+    RT_NOREF(pVCpu);
+    return true;
 }
 
@@ -789 +798 @@
  * Gets the pending nested-guest interrupt.
  *
- * @returns VBox status code.
- * @retval  VINF_SUCCESS on success.
- * @retval  VERR_APIC_INTR_MASKED_BY_TPR when an APIC interrupt is pending but
- *          can't be delivered due to TPR priority.
- * @retval  VERR_NO_DATA if there is no interrupt to be delivered.
- *
+ * @returns The nested-guest interrupt to inject.
  * @param   pCtx            The guest-CPU context.
- * @param   pu8Interrupt    Where to store the interrupt.
- */
-VMM_INT_DECL(int) HMSvmNstGstGetInterrupt(PCCPUMCTX pCtx, uint8_t *pu8Interrupt)
+ */
+VMM_INT_DECL(uint8_t) HMSvmNstGstGetInterrupt(PCCPUMCTX pCtx)
 {
     PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.VmcbCtrl;
-    /** @todo remove later, paranoia for now. */
-#ifdef DEBUG_ramshankar
-    Assert(HMSvmNstGstIsInterruptPending(pCtx));
-#endif
-
-    *pu8Interrupt = pVmcbCtrl->IntCtrl.n.u8VIntrVector;
-    if (   pVmcbCtrl->IntCtrl.n.u1IgnoreTPR
-        || pVmcbCtrl->IntCtrl.n.u4VIntrPrio > pVmcbCtrl->IntCtrl.n.u8VTPR)
-        return VINF_SUCCESS;
-
-    return VERR_APIC_INTR_MASKED_BY_TPR;
+    return pVmcbCtrl->IntCtrl.n.u8VIntrVector;
 }