Changeset 91688 in vbox for trunk

Timestamp:

Oct 12, 2021 12:21:10 PM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM: Added some more #ifdef'ing to reduce the amount of ioctl probing to what we actually need. bugref:10118

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (1 diff)
• VMMR0/NEMR0Native-win.cpp (modified) (3 diffs)
• VMMR3/NEMR3Native-win.cpp (modified) (7 diffs)
• include/NEMInternal.h (modified) (4 diffs)

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

@@ -3833 +3833 @@
 
 
-#ifdef IN_RING0
+#if defined(IN_RING0) && defined(NEM_WIN_WITH_RING0_RUNLOOP)
 /**
  * Perform an I/O control operation on the partition handle (VID.SYS),

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -808 +808 @@
     AssertRCReturn(rc, rc);
     SUPR0Printf("NEMR0InitVMPart2\n"); LogRel(("2: NEMR0InitVMPart2\n"));
+#ifdef NEM_WIN_WITH_RING0_RUNLOOP
     Assert(pGVM->nemr0.s.fMayUseRing0Runloop == false);
+#endif
 
     /*
@@ -825 +827 @@
     pGVM->nemr0.s.IoCtlGetPartitionProperty = Copy;
 
+#ifdef NEM_WIN_WITH_RING0_RUNLOOP
     pGVM->nemr0.s.fMayUseRing0Runloop = pGVM->nem.s.fUseRing0Runloop;
 
@@ -855 +858 @@
     if (RT_SUCCESS(rc))
         pGVM->nemr0.s.IoCtlMessageSlotHandleAndGetNext = Copy;
+#endif
 
     if (   RT_SUCCESS(rc)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -178 +178 @@
 /** Info about the VidGetPartitionProperty I/O control interface. */
 static NEMWINIOCTL g_IoCtlGetPartitionProperty;
+#if defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED)
 /** Info about the VidStartVirtualProcessor I/O control interface. */
 static NEMWINIOCTL g_IoCtlStartVirtualProcessor;
@@ -184 +185 @@
 /** Info about the VidMessageSlotHandleAndGetNext I/O control interface. */
 static NEMWINIOCTL g_IoCtlMessageSlotHandleAndGetNext;
+#endif
 #ifdef LOG_ENABLED
 /** Info about the VidMessageSlotMap I/O control interface - for logging. */
@@ -843 +845 @@
 }
 
+#if defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED)
 
 /**
@@ -944 +947 @@
 }
 
+#endif /* defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED) */
 
 #ifdef LOG_ENABLED
@@ -1016 +1020 @@
 
     int rcRet = VINF_SUCCESS;
+#if defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED)
+
     /* VidStartVirtualProcessor */
     *g_ppfnVidNtDeviceIoControlFile = nemR3WinIoctlDetector_StartVirtualProcessor;
@@ -1052 +1058 @@
             g_IoCtlMessageSlotHandleAndGetNext.cbOutput));
 
+#endif /* defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(LOG_ENABLED) */
 #ifdef LOG_ENABLED
     /* The following are only for logging: */
@@ -1098 +1105 @@
     pVM->nem.s.IoCtlGetHvPartitionId            = g_IoCtlGetHvPartitionId;
     pVM->nem.s.IoCtlGetPartitionProperty        = g_IoCtlGetPartitionProperty;
+#ifdef NEM_WIN_WITH_RING0_RUNLOOP
     pVM->nem.s.IoCtlStartVirtualProcessor       = g_IoCtlStartVirtualProcessor;
     pVM->nem.s.IoCtlStopVirtualProcessor        = g_IoCtlStopVirtualProcessor;
     pVM->nem.s.IoCtlMessageSlotHandleAndGetNext = g_IoCtlMessageSlotHandleAndGetNext;
+#endif
     return rcRet;
 }

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

@@ -197 +197 @@
     /** Info about the VidGetPartitionProperty I/O control interface. */
     NEMWINIOCTL                 IoCtlGetPartitionProperty;
+#  ifdef NEM_WIN_WITH_RING0_RUNLOOP
     /** Info about the VidStartVirtualProcessor I/O control interface. */
     NEMWINIOCTL                 IoCtlStartVirtualProcessor;
@@ -203 +204 @@
     /** Info about the VidStopVirtualProcessor I/O control interface. */
     NEMWINIOCTL                 IoCtlMessageSlotHandleAndGetNext;
+#  endif
 
     /** Statistics updated by NEMR0UpdateStatistics. */
@@ -393 +395 @@
     /** Info about the VidGetPartitionProperty I/O control interface. */
     NEMWINIOCTL                 IoCtlGetPartitionProperty;
+#  ifdef NEM_WIN_WITH_RING0_RUNLOOP
     /** Info about the VidStartVirtualProcessor I/O control interface. */
     NEMWINIOCTL                 IoCtlStartVirtualProcessor;
@@ -401 +404 @@
     /** Whether we may use the ring-0 runloop or not. */
     bool                        fMayUseRing0Runloop;
+#  endif
 
     /** Hypercall input/ouput page for non-EMT. */