Changeset 65413 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jan 24, 2017 10:26:59 AM (8 years ago)

Author:

vboxsync

Message:

IPRT/r0drv/nt: Preps for using NonPagedPoolNx.

Location:

trunk/src/VBox/Runtime/r0drv/nt

Files:

• alloc-r0drv-nt.cpp (modified) (2 diffs)
• initterm-r0drv-nt.cpp (modified) (2 diffs)
• internal-r0drv-nt.h (modified) (1 diff)
• the-nt-kernel.h (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp

@@ -36 +36 @@
 #include <iprt/err.h>
 #include "r0drv/alloc-r0drv.h"
+#include "internal-r0drv-nt.h"
 
 
@@ -43 +44 @@
 DECLHIDDEN(int) rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
 {
-    if (fFlags & RTMEMHDR_FLAG_ANY_CTX)
-        return VERR_NOT_SUPPORTED;
-
-    PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
-    if (RT_UNLIKELY(!pHdr))
+    if (!(fFlags & RTMEMHDR_FLAG_ANY_CTX))
+    {
+#if 0 /* This allegedly makes the driver verifier happier... */
+        POOL_TYPE enmPoolType = NonPagedPool;
+        if (!(fFlags & RTMEMHDR_FLAG_EXEC) && g_uRtNtVersion >= RTNT_MAKE_VERSION(8,0))
+            enmPoolType = NonPagedPoolNx;
+        PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(enmPoolType, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
+#else
+        PRTMEMHDR pHdr = (PRTMEMHDR)ExAllocatePoolWithTag(NonPagedPool, cb + sizeof(*pHdr), IPRT_NT_POOL_TAG);
+#endif
+        if (pHdr)
+        {
+            pHdr->u32Magic  = RTMEMHDR_MAGIC;
+            pHdr->fFlags    = fFlags;
+            pHdr->cb        = (uint32_t)cb; Assert(pHdr->cb == cb);
+            pHdr->cbReq     = (uint32_t)cb;
+            *ppHdr = pHdr;
+            return VINF_SUCCESS;
+        }
         return VERR_NO_MEMORY;
-
-    pHdr->u32Magic  = RTMEMHDR_MAGIC;
-    pHdr->fFlags    = fFlags;
-    pHdr->cb        = (uint32_t)cb; Assert(pHdr->cb == cb);
-    pHdr->cbReq     = (uint32_t)cb;
-    *ppHdr = pHdr;
-    return VINF_SUCCESS;
+    }
+    return VERR_NOT_SUPPORTED;
 }
 

trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp

@@ -104 +104 @@
 uint32_t                                g_offrtNtPbDpcQueueDepth;
 
+/** The major version number. */
+uint8_t                                 g_uRtNtMajorVer;
+/** The minor version number. */
+uint8_t                                 g_uRtNtMinorVer;
+/** The build number. */
+uint32_t                                g_uRtNtBuildNo;
+
 
 /**
@@ -306 +313 @@
     RTNTSDBOSVER OsVerInfo;
     rtR0NtGetOsVersionInfo(&OsVerInfo);
+
+    /* Publish the version info in globals. */
+    g_uRtNtVersion  = RTNT_MAKE_VERSION(OsVerInfo.uMajorVer, OsVerInfo.uMinorVer);
+    g_uRtNtMinorVer = OsVerInfo.uMinorVer;
+    g_uRtNtMajorVer = OsVerInfo.uMajorVer;
+    g_uRtNtBuildNo  = OsVerInfo.uBuildNo;
 
     /*

trunk/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h

@@ -92 +92 @@
 extern uint32_t                                g_offrtNtPbDpcQueueDepth;
 
+/** Makes an NT version for checking against g_uRtNtVersion. */
+#define RTNT_MAKE_VERSION(uMajor, uMinor)       RT_MAKE_U32(uMinor, uMajor)
+
+extern uint32_t                                g_uRtNtVersion;
+extern uint8_t                                 g_uRtNtMajorVer;
+extern uint8_t                                 g_uRtNtMinorVer;
+extern uint32_t                                g_uRtNtBuildNo;
+
 
 int __stdcall rtMpPokeCpuUsingDpc(RTCPUID idCpu);

trunk/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h

@@ -64 +64 @@
 #endif
 
+/* Missing if we're compiling against older WDKs. */
+#ifndef NonPagedPoolNx
+# define NonPagedPoolNx     ((POOL_TYPE)512)
+#endif
+
 /*
  * When targeting NT4 we have to undo some of the nice macros
@@ -77 +82 @@
 # undef ExFreePool
   NTKERNELAPI VOID NTAPI ExFreePool(IN PVOID P);
+# undef NonPagedPoolNx
+# define NonPagedPoolNx NonPagedPool
 #endif /* IPRT_TARGET_NT4 */