Changeset 25275 in vbox for trunk

Timestamp:

Dec 9, 2009 3:58:31 PM (15 years ago)

Author:

vboxsync

Message:

SUPDrv: Added SUPGetGIP and added a fNativeLoader indicator to SUPLDROPEN (VBOX_WITH_NATIVE_R0_LOADER).

Location:

trunk

Files:

• include/VBox/sup.h (modified) (3 diffs)
• src/VBox/HostDrivers/Support/SUPDrv.c (modified) (7 diffs)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPR0.def (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -220 +220 @@
 extern DECLEXPORT(PSUPGLOBALINFOPAGE)   g_pSUPGlobalInfoPage;
 #elif defined(IN_RING0)
+# if 0 /* VBOX_WITH_NATIVE_R0_LOADER */
+#  define g_pSUPGlobalInfoPage          (SUPGetGIP())
+# else
 extern DECLIMPORT(SUPGLOBALINFOPAGE)    g_SUPGlobalInfoPage;
-# if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
+#  if defined(__GNUC__) && !defined(RT_OS_DARWIN) && defined(RT_ARCH_AMD64)
 /** Workaround for ELF+GCC problem on 64-bit hosts.
  * (GCC emits a mov with a R_X86_64_32 reloc, we need R_X86_64_64.) */
-DECLINLINE(PSUPGLOBALINFOPAGE) SUPGetGIP(void)
+DECLINLINE(PSUPGLOBALINFOPAGE) SUPGetGIPHlp(void)
 {
     PSUPGLOBALINFOPAGE pGIP;
@@ -231 +234 @@
     return pGIP;
 }
-#  define g_pSUPGlobalInfoPage          (SUPGetGIP())
-# else
-#  define g_pSUPGlobalInfoPage          (&g_SUPGlobalInfoPage)
+#   define g_pSUPGlobalInfoPage          (SUPGetGIPHlp())
+#  else
+#   define g_pSUPGlobalInfoPage          (&g_SUPGlobalInfoPage)
+#  endif
 # endif
 #else
@@ -239 +243 @@
 #endif
 
+/**
+ * Gets the GIP pointer.
+ *
+ * @returns Pointer to the GIP or NULL.
+ */
+SUPDECL(PSUPGLOBALINFOPAGE)             SUPGetGIP(void);
 
 /**

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -261 +261 @@
 *   Global Variables                                                           *
 *******************************************************************************/
+/** Pointer to the global info page for implementing SUPGetGIP(). */
+static PSUPGLOBALINFOPAGE g_pSUPGlobalInfoPageInternal = NULL;
+
 /**
  * Array of the R0 SUP API.
@@ -313 +316 @@
     { "SUPR0GetPagingMode",                     (void *)UNWIND_WRAP(SUPR0GetPagingMode) },
     { "SUPR0EnableVTx",                         (void *)SUPR0EnableVTx },
+    { "SUPGetGIP",                              (void *)SUPGetGIP },
     { "RTMemAlloc",                             (void *)UNWIND_WRAP(RTMemAlloc) },
     { "RTMemAllocZ",                            (void *)UNWIND_WRAP(RTMemAllocZ) },
@@ -3079 +3083 @@
 
 /**
+ * Gets the GIP pointer.
+ *
+ * @returns Pointer to the GIP or NULL.
+ */
+SUPDECL(PSUPGLOBALINFOPAGE) SUPGetGIP(void)
+{
+    return g_pSUPGlobalInfoPageInternal;
+}
+
+
+/**
  * Register a component factory with the support driver.
  *
@@ -3455 +3470 @@
             pReq->u.Out.pvImageBase   = pImage->pvImage;
             pReq->u.Out.fNeedsLoading = pImage->uState == SUP_IOCTL_LDR_OPEN;
+#ifdef VBOX_WITH_NATIVE_R0_LOADER
+            pReq->u.Out.fNativeLoader = pImage->fNative;
+#endif
             supdrvLdrAddUsage(pSession, pImage);
             RTSemFastMutexRelease(pDevExt->mtxLdr);
@@ -3534 +3552 @@
     supdrvLdrAddUsage(pSession, pImage);
 
-    pReq->u.Out.pvImageBase = pImage->pvImage;
+    pReq->u.Out.pvImageBase   = pImage->pvImage;
     pReq->u.Out.fNeedsLoading = true;
+#ifdef VBOX_WITH_NATIVE_R0_LOADER
+    pReq->u.Out.fNativeLoader = pImage->fNative;
+#endif
     RTSemFastMutexRelease(pDevExt->mtxLdr);
 
@@ -4543 +4564 @@
              */
             dprintf(("supdrvGipCreate: %ld ns interval.\n", (long)u32Interval));
+            g_pSUPGlobalInfoPageInternal = pGip;
             return VINF_SUCCESS;
         }
@@ -4580 +4602 @@
         pDevExt->pGip = NULL;
     }
+    g_pSUPGlobalInfoPageInternal = NULL;
 
     /*

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -320 +320 @@
             /** Indicate whether or not the image requires loading. */
             bool            fNeedsLoading;
+#ifdef VBOX_WITH_NATIVE_R0_LOADER
+            /** Indicates that we're using the native ring-0 loader. */
+            bool            fNativeLoader;
+#endif
         } Out;
     } u;

trunk/src/VBox/HostDrivers/Support/SUPR0.def

@@ -30 +30 @@
 
 LIBRARY SUPR0.dll
-;LIBRARY VBoxDrv.sys - @todo VBOX_WITH_NATIVE_R0_LOADER
+;LIBRARY VBoxDrv.sys ;- @todo VBOX_WITH_NATIVE_R0_LOADER
 
 EXPORTS
@@ -69 +69 @@
     SUPR0GetPagingMode
     SUPR0EnableVTx
+    SUPGetGIP
     RTMemAlloc
     RTMemAllocZ