Changeset 92697 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Dec 2, 2021 12:37:40 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148596

Message:

SUP: Added SUPR3INIT_F_DRIVERLESS as a forced driverless option and an associated SUPR3IsDriverless(). The SUPR3INIT_F_DRIVERLESS flag requires the host specific init code to allow driverless, only done so on linux thus far. Started adjusting some of the SUPR3 APIs for driverless operation. bugref:10138

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLib.cpp (modified) (8 diffs)
• SUPLibInternal.h (modified) (1 diff)
• linux/SUPLib-linux.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -100 +100 @@
 {
     /*.hDevice              = */    SUP_HDEVICE_NIL,
-    /*.fUnrestricted        = */    true
+    /*.fUnrestricted        = */    true,
+    /*.fDriverless          = */    false
 #if   defined(RT_OS_DARWIN)
     ,/* .uConnection        = */    0
@@ -263 +264 @@
     SUPINITOP enmWhat = kSupInitOp_Driver;
     int rc = suplibOsInit(&g_supLibData, g_fPreInited, fFlags, &enmWhat, NULL);
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc) && !g_supLibData.fDriverless)
     {
         /*
@@ -390 +391 @@
         suplibOsTerm(&g_supLibData);
     }
+    else if (RT_SUCCESS(rc))
+    {
+        /*
+         * Driverless initialization.
+         */
+        Assert(fFlags & SUPR3INIT_F_DRIVERLESS_MASK);
+        LogRel(("SUP: In driverless mode.\n"));
+        return VINF_SUCCESS;
+    }
+
     g_cInits--;
 
@@ -560 +571 @@
             return rc;
 
-        g_u32Cookie         = 0;
-        g_u32SessionCookie  = 0;
-        g_cInits            = 0;
+        g_supLibData.hDevice       = SUP_HDEVICE_NIL;
+        g_supLibData.fUnrestricted = true;
+        g_supLibData.fDriverless   = false;
+        g_u32Cookie                = 0;
+        g_u32SessionCookie         = 0;
+        g_cInits                   = 0;
     }
     else
@@ -571 +585 @@
 
 
+SUPR3DECL(bool) SUPR3IsDriverless(void)
+{
+    Assert(g_cInits > 0);
+    return g_supLibData.fDriverless;
+}
+
+
 SUPR3DECL(SUPPAGINGMODE) SUPR3GetPagingMode(void)
 {
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-#ifdef RT_ARCH_AMD64
+    /*
+     * Deal with driverless first.
+     */
+    if (g_supLibData.fDriverless)
+#if defined(RT_ARCH_AMD64)
         return SUPPAGINGMODE_AMD64_GLOBAL_NX;
+#elif defined(RT_ARCH_X86)
+        return SUPPAGINGMODE_32_BIT_GLOBAL;
 #else
-        return SUPPAGINGMODE_32_BIT_GLOBAL;
+        return SUPPAGINGMODE_INVALID;
 #endif
 
@@ -1099 +1124 @@
     AssertReturn(!fFlags, VERR_INVALID_FLAGS);
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-    {
-        void *pv = RTMemPageAllocZ(cPages * PAGE_SIZE);
-        if (!pv)
-            return VERR_NO_MEMORY;
-        *ppvPages = pv;
+    /*
+     * Deal with driverless mode first.
+     */
+    if (g_supLibData.fDriverless)
+    {
+        int rc = SUPR3PageAlloc(cPages * PAGE_SIZE, 0 /*fFlags*/, ppvPages);
         if (pR0Ptr)
-            *pR0Ptr = (RTR0PTR)pv;
+            *pR0Ptr = NIL_RTR0PTR;
         if (paPages)
             for (size_t iPage = 0; iPage < cPages; iPage++)
             {
                 paPages[iPage].uReserved = 0;
-                paPages[iPage].Phys = (iPage + 4321) << PAGE_SHIFT;
-                Assert(!(paPages[iPage].Phys & ~X86_PTE_PAE_PG_MASK));
+                paPages[iPage].Phys      = NIL_RTHCPHYS;
             }
-        return VINF_SUCCESS;
+        return rc;
     }
 
@@ -1682 +1705 @@
     *pfCaps = 0;
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-        return VINF_SUCCESS;
-
-    /*
-     * Issue IOCtl to the SUPDRV kernel module.
-     */
-    SUPVTCAPS Req;
-    Req.Hdr.u32Cookie = g_u32Cookie;
-    Req.Hdr.u32SessionCookie = g_u32SessionCookie;
-    Req.Hdr.cbIn = SUP_IOCTL_VT_CAPS_SIZE_IN;
-    Req.Hdr.cbOut = SUP_IOCTL_VT_CAPS_SIZE_OUT;
-    Req.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT;
-    Req.Hdr.rc = VERR_INTERNAL_ERROR;
-    Req.u.Out.fCaps = 0;
-    int rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_VT_CAPS, &Req, SUP_IOCTL_VT_CAPS_SIZE);
-    if (RT_SUCCESS(rc))
-    {
-        rc = Req.Hdr.rc;
+    int rc;
+    if (!g_supLibData.fDriverless)
+    {
+        /*
+         * Issue IOCtl to the SUPDRV kernel module.
+         */
+        SUPVTCAPS Req;
+        Req.Hdr.u32Cookie = g_u32Cookie;
+        Req.Hdr.u32SessionCookie = g_u32SessionCookie;
+        Req.Hdr.cbIn = SUP_IOCTL_VT_CAPS_SIZE_IN;
+        Req.Hdr.cbOut = SUP_IOCTL_VT_CAPS_SIZE_OUT;
+        Req.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT;
+        Req.Hdr.rc = VERR_INTERNAL_ERROR;
+        Req.u.Out.fCaps = 0;
+        rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_VT_CAPS, &Req, SUP_IOCTL_VT_CAPS_SIZE);
         if (RT_SUCCESS(rc))
-            *pfCaps = Req.u.Out.fCaps;
-    }
+        {
+            rc = Req.Hdr.rc;
+            if (RT_SUCCESS(rc))
+                *pfCaps = Req.u.Out.fCaps;
+        }
+    }
+    /*
+     * Fail this call in driverless mode.
+     */
+    else
+        rc = VERR_SUP_DRIVERLESS;
     return rc;
 }
@@ -1724 +1752 @@
     *uMicrocodeRev = 0;
 
-    /* fake */
-    if (RT_UNLIKELY(g_uSupFakeMode))
-        return VINF_SUCCESS;
-
-    /*
-     * Issue IOCtl to the SUPDRV kernel module.
-     */
-    SUPUCODEREV Req;
-    Req.Hdr.u32Cookie = g_u32Cookie;
-    Req.Hdr.u32SessionCookie = g_u32SessionCookie;
-    Req.Hdr.cbIn = SUP_IOCTL_UCODE_REV_SIZE_IN;
-    Req.Hdr.cbOut = SUP_IOCTL_UCODE_REV_SIZE_OUT;
-    Req.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT;
-    Req.Hdr.rc = VERR_INTERNAL_ERROR;
-    Req.u.Out.MicrocodeRev = 0;
-    int rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_UCODE_REV, &Req, SUP_IOCTL_UCODE_REV_SIZE);
-    if (RT_SUCCESS(rc))
-    {
-        rc = Req.Hdr.rc;
+    int rc;
+    if (!g_supLibData.fDriverless)
+    {
+        /*
+         * Issue IOCtl to the SUPDRV kernel module.
+         */
+        SUPUCODEREV Req;
+        Req.Hdr.u32Cookie = g_u32Cookie;
+        Req.Hdr.u32SessionCookie = g_u32SessionCookie;
+        Req.Hdr.cbIn = SUP_IOCTL_UCODE_REV_SIZE_IN;
+        Req.Hdr.cbOut = SUP_IOCTL_UCODE_REV_SIZE_OUT;
+        Req.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT;
+        Req.Hdr.rc = VERR_INTERNAL_ERROR;
+        Req.u.Out.MicrocodeRev = 0;
+        rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_UCODE_REV, &Req, SUP_IOCTL_UCODE_REV_SIZE);
         if (RT_SUCCESS(rc))
-            *uMicrocodeRev = Req.u.Out.MicrocodeRev;
-    }
+        {
+            rc = Req.Hdr.rc;
+            if (RT_SUCCESS(rc))
+                *uMicrocodeRev = Req.u.Out.MicrocodeRev;
+        }
+    }
+    /*
+     * Just fail the call in driverless mode.
+     */
+    else
+        rc = VERR_SUP_DRIVERLESS;
     return rc;
 }

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

@@ -256 +256 @@
      * support device. */
     bool                fUnrestricted;
+    /** Set if we're in driverless mode. */
+    bool                fDriverless;
 #if   defined(RT_OS_DARWIN)
     /** The connection to the VBoxSupDrv service. */

trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

@@ -95 +95 @@
     pThis->fSysMadviseWorks = (0 == madvise(pv, PAGE_SIZE, MADV_DONTFORK));
     munmap(pv, PAGE_SIZE);
+
+    /*
+     * Driverless?
+     */
+    if (fFlags & SUPR3INIT_F_DRIVERLESS)
+    {
+        pThis->fDriverless = true;
+        return VINF_SUCCESS;
+    }
 
     /*
@@ -118 +127 @@
                 case ENOENT:    rc = VERR_VM_DRIVER_NOT_INSTALLED; break;
                 default:        rc = VERR_VM_DRIVER_OPEN_ERROR; break;
+            }
+            if (fFlags & SUPR3INIT_F_DRIVERLESS_MASK)
+            {
+                LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc - Switching to driverless mode.\n", pszDeviceNm, errno, rc));
+                pThis->fDriverless = true;
+                return VINF_SUCCESS;
             }
             LogRel(("Failed to open \"%s\", errno=%d, rc=%Rrc\n", pszDeviceNm, errno, rc));