儲存庫 vbox 的更動 65934

時間撮記:

2017-3-3 下午01:35:01 (8 年 以前)

作者:

vboxsync

訊息:

VMM: Nested Hw.virt: Invlpga IEM interface with HM.

位置:

trunk

檔案:

• include/VBox/vmm/iem.h (修改) (1 筆差異)
• src/VBox/VMM/VMMAll/IEMAll.cpp (修改) (1 筆差異)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (修改) (7 筆差異)

trunk/include/VBox/vmm/iem.h

@@ -137 +137 @@
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmload(PVMCPU pVCpu, uint8_t cbInstr);
 VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedVmsave(PVMCPU pVCpu, uint8_t cbInstr);
+VMM_INT_DECL(VBOXSTRICTRC)  IEMExecDecodedInvlpga(PVMCPU pVCpu, uint8_t cbInstr);
 #endif
 /** @}  */

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

@@ -15023 +15023 @@
     return iemUninitExecAndFiddleStatusAndMaybeReenter(pVCpu, rcStrict);
 }
+
+
+/**
+ * Interface for HM and EM to emulate the INVLPGA instruction.
+ *
+ * @returns Strict VBox status code.
+ * @param   pVCpu       The cross context virtual CPU structure of the calling EMT.
+ * @param   cbInstr     The instruction length in bytes.
+ * @thread  EMT(pVCpu)
+ */
+VMM_INT_DECL(VBOXSTRICTRC) IEMExecDecodedInvlpga(PVMCPU pVCpu, uint8_t cbInstr)
+{
+    IEMEXEC_ASSERT_INSTR_LEN_RETURN(cbInstr, 3);
+
+    iemInitExec(pVCpu, false /*fBypassHandlers*/);
+    VBOXSTRICTRC rcStrict = IEM_CIMPL_CALL_0(iemCImpl_invlpga);
+    return iemUninitExecAndFiddleStatusAndMaybeReenter(pVCpu, rcStrict);
+}
 #endif /* VBOX_WITH_NESTED_HWVIRT */
 

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

@@ -275 +275 @@
 static FNSVMEXITHANDLER hmR0SvmExitVmload;
 static FNSVMEXITHANDLER hmR0SvmExitVmsave;
+static FNSVMEXITHANDLER hmR0SvmExitInvlpga;
 #endif
 /** @} */
@@ -3656 +3657 @@
                 case SVM_EXIT_VMLOAD:   return hmR0SvmExitVmload(pVCpu, pCtx, pSvmTransient);
                 case SVM_EXIT_VMSAVE:   return hmR0SvmExitVmsave(pVCpu, pCtx, pSvmTransient);
+                case SVM_EXIT_INVLPGA:  return hmR0SvmExitInvlpga(pVCpu, pCtx, pSvmTransient);
 #else
                 case SVM_EXIT_CLGI:
@@ -3661 +3663 @@
                 case SVM_EXIT_VMLOAD:
                 case SVM_EXIT_VMSAVE:
+                case SVM_EXIT_INVLPGA:
 #endif
-                case SVM_EXIT_INVLPGA:
                 case SVM_EXIT_RSM:
                 case SVM_EXIT_VMRUN:
@@ -5670 +5672 @@
     /** @todo Stat. */
     /* STAM_COUNTER_INC(&pVCpu->hm.s.StatExitClgi); */
+    /** @todo Decode Assist. */
     VBOXSTRICTRC rcStrict = IEMExecDecodedClgi(pVCpu, 3);
     return VBOXSTRICTRC_VAL(rcStrict);
@@ -5683 +5686 @@
     /** @todo Stat. */
     /* STAM_COUNTER_INC(&pVCpu->hm.s.StatExitStgi); */
+    /** @todo Decode Assist. */
     VBOXSTRICTRC rcStrict = IEMExecDecodedStgi(pVCpu, 3);
     return VBOXSTRICTRC_VAL(rcStrict);
@@ -5696 +5700 @@
     /** @todo Stat. */
     /* STAM_COUNTER_INC(&pVCpu->hm.s.StatExitVmload); */
+    /** @todo Decode Assist. */
     VBOXSTRICTRC rcStrict = IEMExecDecodedVmload(pVCpu, 3);
     return VBOXSTRICTRC_VAL(rcStrict);
@@ -5709 +5714 @@
     /** @todo Stat. */
     /* STAM_COUNTER_INC(&pVCpu->hm.s.StatExitVmsave); */
+    /** @todo Decode Assist. */
     VBOXSTRICTRC rcStrict = IEMExecDecodedVmsave(pVCpu, 3);
     return VBOXSTRICTRC_VAL(rcStrict);
 }
+
+
+/**
+ * \#VMEXIT handler for INVLPGA (SVM_EXIT_INVLPGA). Conditional \#VMEXIT.
+ */
+HMSVM_EXIT_DECL hmR0SvmExitInvlpga(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMTRANSIENT pSvmTransient)
+{
+    HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
+    /** @todo Stat. */
+    /* STAM_COUNTER_INC(&pVCpu->hm.s.StatExitInvlpga); */
+    /** @todo Decode Assist. */
+    VBOXSTRICTRC rcStrict = IEMExecDecodedInvlpga(pVCpu, 3);
+    return VBOXSTRICTRC_VAL(rcStrict);
+}
 #endif /* VBOX_WITH_NESTED_HWVIRT */