Changeset 72470 in vbox

Timestamp:

Jun 7, 2018 11:41:23 AM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Looks like we can get a stop confirmation first time around in nemHCWinStopCpu, so just deal with it. Did the necessary #UD forwarding to GIM (not needed for NEM/win). bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (6 diffs)
• VMMR3/NEMR3.cpp (modified) (2 diffs)
• include/NEMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -2683 +2683 @@
          * We get undefined opcodes on VMMCALL(AMD) & VMCALL(Intel) instructions
          * and need to turn them over to GIM.
+         *
+         * Note! We do not check fGIMTrapXcptUD here ASSUMING that GIM only wants
+         *       #UD for handling non-native hypercall instructions.  (IEM will
+         *       decode both and let the GIM provider decide whether to accept it.)
          */
         case X86_XCPT_UD:
             STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionUd);
-            /** @todo Call GIMXcptUD if required. */
             if (nemHcWinIsInterestingUndefinedOpcode(pMsg->InstructionByteCount, pMsg->InstructionBytes,
                                                      pMsg->Header.ExecutionState.EferLma && pMsg->Header.CsSegment.Long ))
@@ -2773 +2776 @@
          * We get undefined opcodes on VMMCALL(AMD) & VMCALL(Intel) instructions
          * and need to turn them over to GIM.
+         *
+         * Note! We do not check fGIMTrapXcptUD here ASSUMING that GIM only wants
+         *       #UD for handling non-native hypercall instructions.  (IEM will
+         *       decode both and let the GIM provider decide whether to accept it.)
          */
         case X86_XCPT_UD:
             STAM_REL_COUNTER_INC(&pVCpu->nem.s.StatExitExceptionUd);
-            /** @todo Call GIMXcptUD if required. */
             if (nemHcWinIsInterestingUndefinedOpcode(pExit->VpException.InstructionByteCount, pExit->VpException.InstructionBytes,
                                                      pExit->VpContext.ExecutionState.EferLma && pExit->VpContext.Cs.Long ))
@@ -2947 +2953 @@
 #endif /* IN_RING3 && !NEM_WIN_USE_OUR_OWN_RUN_API */
 
+
 #ifdef NEM_WIN_USE_OUR_OWN_RUN_API
 /**
@@ -3107 +3114 @@
 }
 #endif /* IN_RING3 && !NEM_WIN_USE_OUR_OWN_RUN_API */
+
 
 #ifdef NEM_WIN_USE_OUR_OWN_RUN_API
@@ -3171 +3179 @@
 
     /*
-     * First message: Exit or similar.
+     * First message: Exit or similar, sometimes VidMessageStopRequestComplete.
      * Note! We can safely ASSUME that rcStrict isn't an important information one.
      */
@@ -3191 +3199 @@
 # endif
 
-    /* It should be a hypervisor message and definitely not a stop request completed message. */
     VID_MESSAGE_TYPE enmVidMsgType = pMappingHeader->enmVidMsgType;
-    AssertLogRelMsgReturn(enmVidMsgType != VidMessageStopRequestComplete,
-                          ("Unexpected 1st message following ERROR_VID_STOP_PENDING: %#x LB %#x\n",
-                           enmVidMsgType, pMappingHeader->cbMessage),
-                          RT_SUCCESS(rcStrict) ? VERR_NEM_IPE_5 : rcStrict);
-
-    VBOXSTRICTRC rcStrict2 = nemHCWinHandleMessage(pVM, pVCpu, pMappingHeader, CPUMQueryGuestCtxPtr(pVCpu), pGVCpu);
-    if (rcStrict2 != VINF_SUCCESS && RT_SUCCESS(rcStrict))
-        rcStrict = rcStrict2;
-
-    /*
-     * Mark it as handled and get the stop request completed message, then mark
-     * that as handled too.  CPU is back into fully stopped stated then.
-     */
+    if (enmVidMsgType != VidMessageStopRequestComplete)
+    {
+        VBOXSTRICTRC rcStrict2 = nemHCWinHandleMessage(pVM, pVCpu, pMappingHeader, CPUMQueryGuestCtxPtr(pVCpu), pGVCpu);
+        if (rcStrict2 != VINF_SUCCESS && RT_SUCCESS(rcStrict))
+            rcStrict = rcStrict2;
+
+        /*
+         * Mark it as handled and get the stop request completed message, then mark
+         * that as handled too.  CPU is back into fully stopped stated then.
+         */
 # ifdef IN_RING0
-    pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.iCpu     = pGVCpu->idCpu;
-    pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.fFlags   = VID_MSHAGN_F_HANDLE_MESSAGE | VID_MSHAGN_F_GET_NEXT_MESSAGE;
-    pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.cMillies = 30000; /*ms*/
-    rcNt = nemR0NtPerformIoControl(pGVM, pGVM->nem.s.IoCtlMessageSlotHandleAndGetNext.uFunction,
-                                   &pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext,
-                                   sizeof(pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext),
-                                   NULL, 0);
-    AssertLogRelMsgReturn(NT_SUCCESS(rcNt), ("2nd VidMessageSlotHandleAndGetNext after ERROR_VID_STOP_PENDING failed: %#x\n", rcNt),
-                          RT_SUCCESS(rcStrict) ? VERR_NEM_IPE_5 : rcStrict);
+        pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.iCpu     = pGVCpu->idCpu;
+        pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.fFlags   = VID_MSHAGN_F_HANDLE_MESSAGE | VID_MSHAGN_F_GET_NEXT_MESSAGE;
+        pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.cMillies = 30000; /*ms*/
+        rcNt = nemR0NtPerformIoControl(pGVM, pGVM->nem.s.IoCtlMessageSlotHandleAndGetNext.uFunction,
+                                       &pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext,
+                                       sizeof(pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext),
+                                       NULL, 0);
+        AssertLogRelMsgReturn(NT_SUCCESS(rcNt), ("2nd VidMessageSlotHandleAndGetNext after ERROR_VID_STOP_PENDING failed: %#x\n", rcNt),
+                              RT_SUCCESS(rcStrict) ? VERR_NEM_IPE_5 : rcStrict);
 # else
-    fWait = g_pfnVidMessageSlotHandleAndGetNext(pVM->nem.s.hPartitionDevice, pVCpu->idCpu,
-                                                VID_MSHAGN_F_HANDLE_MESSAGE | VID_MSHAGN_F_GET_NEXT_MESSAGE, 30000 /*ms*/);
-    AssertLogRelMsgReturn(fWait, ("2nd VidMessageSlotHandleAndGetNext after ERROR_VID_STOP_PENDING failed: %u\n", RTNtLastErrorValue()),
-                          RT_SUCCESS(rcStrict) ? VERR_NEM_IPE_5 : rcStrict);
+        fWait = g_pfnVidMessageSlotHandleAndGetNext(pVM->nem.s.hPartitionDevice, pVCpu->idCpu,
+                                                    VID_MSHAGN_F_HANDLE_MESSAGE | VID_MSHAGN_F_GET_NEXT_MESSAGE, 30000 /*ms*/);
+        AssertLogRelMsgReturn(fWait, ("2nd VidMessageSlotHandleAndGetNext after ERROR_VID_STOP_PENDING failed: %u\n", RTNtLastErrorValue()),
+                              RT_SUCCESS(rcStrict) ? VERR_NEM_IPE_5 : rcStrict);
 # endif
 
-    /* It should be a stop request completed message. */
-    enmVidMsgType = pMappingHeader->enmVidMsgType;
-    AssertLogRelMsgReturn(enmVidMsgType == VidMessageStopRequestComplete,
-                          ("Unexpected 2nd message following ERROR_VID_STOP_PENDING: %#x LB %#x\n",
-                           enmVidMsgType, pMappingHeader->cbMessage),
-                          RT_SUCCESS(rcStrict) ? VERR_NEM_IPE_5 : rcStrict);
-
-    /* Mark this as handled. */
+        /* It should be a stop request completed message. */
+        enmVidMsgType = pMappingHeader->enmVidMsgType;
+        AssertLogRelMsgReturn(enmVidMsgType == VidMessageStopRequestComplete,
+                              ("Unexpected 2nd message following ERROR_VID_STOP_PENDING: %#x LB %#x\n",
+                               enmVidMsgType, pMappingHeader->cbMessage),
+                              RT_SUCCESS(rcStrict) ? VERR_NEM_IPE_5 : rcStrict);
+    }
+    else
+        Log8(("nemHCWinStopCpu: 1st VidMessageSlotHandleAndGetNext got VidMessageStopRequestComplete.\n"));
+
+    /*
+     * Mark the VidMessageStopRequestComplete message as handled.
+     */
 # ifdef IN_RING0
     pVCpu->nem.s.uIoCtlBuf.MsgSlotHandleAndGetNext.iCpu     = pGVCpu->idCpu;

trunk/src/VBox/VMM/VMMR3/NEMR3.cpp

@@ -32 +32 @@
 #define LOG_GROUP LOG_GROUP_NEM
 #include <VBox/vmm/nem.h>
+#include <VBox/vmm/gim.h>
 #include "NEMInternal.h"
 #include <VBox/vmm/vm.h>
@@ -209 +210 @@
 VMMR3_INT_DECL(int) NEMR3InitCompleted(PVM pVM, VMINITCOMPLETED enmWhat)
 {
+    /*
+     * Check if GIM needs #UD, since that applies to everyone.
+     */
+    if (enmWhat == VMINITCOMPLETED_RING3)
+        for (VMCPUID iCpu = 0; iCpu < pVM->cCpus; iCpu++)
+            pVM->aCpus[iCpu].nem.s.fGIMTrapXcptUD = GIMShouldTrapXcptUD(&pVM->aCpus[iCpu]);
+
+    /*
+     * Call native code.
+     */
     int rc = VINF_SUCCESS;
 #ifdef VBOX_WITH_NATIVE_NEM

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -190 +190 @@
     /** NEMCPU_MAGIC. */
     uint32_t                    u32Magic;
+    /** Whether \#UD needs to be intercepted and presented to GIM. */
+    bool                        fGIMTrapXcptUD : 1;
 #ifdef RT_OS_WINDOWS
     /** The current state of the interrupt windows (NEM_WIN_INTW_F_XXX). */
@@ -197 +199 @@
     /** Last copy of HV_X64_VP_EXECUTION_STATE::InterruptShadow. */
     bool                        fLastInterruptShadow : 1;
-    bool                        afPadding[1];
     /** Pending APIC base value.
      * This is set to UINT64_MAX when not pending  */