Changeset 43379 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Sep 20, 2012 11:29:12 PM (13 years ago)

Author:

vboxsync

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

80845

Message:

SUPDrv,VMM: Prepared for SUPR0EnableVTx on darwin.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• SUPDrv.c (modified) (2 diffs)
• SUPDrvIOC.h (modified) (1 diff)
• SUPDrvInternal.h (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (11 diffs)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -267 +267 @@
  endif
  #VBoxDrv_DEFS.debug      += DEBUG_DARWIN_GIP
- #VBoxDrv_DEFS.darwin     := VBOX_WITH_HOST_VMX - break raw-mode, hack+enable after 4.2.0!
+ #VBoxDrv_DEFS.darwin     := VBOX_WITH_HOST_VMX
  VBoxDrv_DEFS.linux      := \
         KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) MODULE CONFIG_VBOXDRV_AS_MISC

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

@@ -173 +173 @@
     { "SUPR0ContFree",                          (void *)SUPR0ContFree },
     { "SUPR0EnableVTx",                         (void *)SUPR0EnableVTx },
+    { "SUPR0SuspendVTxOnCpu",                   (void *)SUPR0SuspendVTxOnCpu },
+    { "SUPR0ResumeVTxOnCpu",                    (void *)SUPR0ResumeVTxOnCpu },
     { "SUPR0GetPagingMode",                     (void *)SUPR0GetPagingMode },
     { "SUPR0LockMem",                           (void *)SUPR0LockMem },
@@ -3188 +3190 @@
 
 
+/**
+ * Suspends hardware virtualization extensions using the native OS API.
+ *
+ * This is called prior to entering raw-mode context.
+ *
+ * @returns @c true if suspended, @c false if not.
+ */
+SUPR0DECL(bool) SUPR0SuspendVTxOnCpu(void)
+{
+#ifdef RT_OS_DARWIN
+    return supdrvOSSuspendVTxOnCpu();
+#else
+    return false;
+#endif
+}
+
+
+/**
+ * Resumes hardware virtualization extensions using the native OS API.
+ *
+ * This is called after to entering raw-mode context.
+ *
+ * @param   fSuspended      The return value of SUPR0SuspendVTxOnCpu.
+ */
+SUPR0DECL(void) SUPR0ResumeVTxOnCpu(bool fSuspended)
+{
+#ifdef RT_OS_DARWIN
+    supdrvOSResumeVTxOnCpu(fSuspended);
+#else
+    Assert(!fSuspended);
+#endif
+}
+
+
 /** @todo document me */
 SUPR0DECL(int) SUPR0QueryVTCaps(PSUPDRVSESSION pSession, uint32_t *pfCaps)

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

@@ -194 +194 @@
  *          - Remove RTSpinlockReleaseNoInts.
  */
-#define SUPDRV_IOC_VERSION                              0x001a0004
+#define SUPDRV_IOC_VERSION                              0x001a0005
 
 /** SUP_IOCTL_COOKIE. */

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

@@ -601 +601 @@
 bool VBOXCALL   supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt);
 int  VBOXCALL   supdrvOSEnableVTx(bool fEnabled);
+bool VBOXCALL   supdrvOSSuspendVTxOnCpu(void);
+void VBOXCALL   supdrvOSResumeVTxOnCpu(bool fSuspended);
 
 /**

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

@@ -269 +269 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00190000
-                                   ? 0x00190003
+                                   ? 0x001a0005
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -43 +43 @@
 #include <VBox/version.h>
 #include <iprt/asm.h>
+#include <iprt/asm-amd64-x86.h>
 #include <iprt/initterm.h>
 #include <iprt/assert.h>
@@ -50 +51 @@
 #include <iprt/alloc.h>
 #include <iprt/power.h>
+#include <iprt/dbg.h>
 #include <VBox/err.h>
 #include <VBox/log.h>
@@ -99 +101 @@
 static IOReturn         VBoxDrvDarwinSleepHandler(void *pvTarget, void *pvRefCon, UInt32 uMessageType, IOService *pProvider, void *pvMessageArgument, vm_size_t argSize);
 RT_C_DECLS_END
+
+static void             vboxdrvDarwinResolveSymbols(void);
 
 
@@ -211 +215 @@
 static int32_t volatile g_cSessions = 0;
 /** The notifier handle for the sleep callback handler. */
-static IONotifier *g_pSleepNotifier = NULL;
-
+static IONotifier      *g_pSleepNotifier = NULL;
+
+/** Pointer to vmx_suspend(). */
+static PFNRT            g_pfnVmxSuspend = NULL;
+/** Pointer to vmx_resume(). */
+static PFNRT            g_pfnVmxResume = NULL;
+/** Pointer to vmx_use_count. */
+static int volatile    *g_pVmxUseCount = NULL;
 
 
@@ -267 +277 @@
                             LogRel(("VBoxDrv: register for sleep/wakeup events failed\n"));
 
+                        /* Find kernel symbols that are kind of optional. */
+                        vboxdrvDarwinResolveSymbols();
                         return KMOD_RETURN_SUCCESS;
                     }
@@ -296 +308 @@
 
 /**
+ * Resolves kernel symbols we want (but may do without).
+ */
+static void vboxdrvDarwinResolveSymbols(void)
+{
+    RTDBGKRNLINFO hKrnlInfo;
+    int rc = RTR0DbgKrnlInfoOpen(&hKrnlInfo, 0);
+    if (RT_SUCCESS(rc))
+    {
+        /* The VMX stuff. */
+        int rc1 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_resume", (void **)&g_pfnVmxResume);
+        int rc2 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_suspend", (void **)&g_pfnVmxSuspend);
+        int rc3 = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, "vmx_use_count", (void **)&g_pVmxUseCount);
+        if (RT_SUCCESS(rc1) && RT_SUCCESS(rc2) && RT_SUCCESS(rc3))
+        {
+            LogRel(("VBoxDrv: vmx_resume=%p vmx_suspend=%p vmx_use_count=%p (%d) cr4=%#x\n",
+                    g_pfnVmxResume, g_pfnVmxSuspend, g_pVmxUseCount, *g_pVmxUseCount, ASMGetCR4() ));
+        }
+        else
+        {
+            LogRel(("VBoxDrv: failed to resolve vmx stuff: vmx_resume=%Rrc vmx_suspend=%Rrc vmx_use_count=%Rrc", rc1, rc2, rc3));
+            g_pfnVmxResume  = NULL;
+            g_pfnVmxSuspend = NULL;
+            g_pVmxUseCount  = NULL;
+        }
+
+        RTR0DbgKrnlInfoRelease(hKrnlInfo);
+    }
+    else
+        LogRel(("VBoxDrv: Failed to open kernel symbols, rc=%Rrc\n", rc));
+}
+
+
+/**
  * Stop the kernel module.
  */
@@ -711 +756 @@
 
 /**
- * Enables or disables VT-x using kernel functions.
- *
- * @returns VBox status code. VERR_NOT_SUPPORTED has a special meaning.
- * @param   fEnable     Whether to enable or disable.
+ * @copydoc SUPR0EnableVTx
  */
 int VBOXCALL supdrvOSEnableVTx(bool fEnable)
@@ -720 +762 @@
 #ifdef VBOX_WITH_HOST_VMX
     int rc;
-    if (version_major >= 10 /* 10 = 10.6.x = Snow Leopard */)
+    if (   version_major >= 10 /* 10 = 10.6.x = Snow Leopard */
+        && g_pfnVmxSuspend
+        && g_pfnVmxResume
+        && g_pVmxUseCount)
     {
         if (fEnable)
@@ -736 +781 @@
                 rc = VERR_UNRESOLVED_ERROR;
             }
+            LogRel(("VBoxDrv: host_vmxon  -> vmx_use_count=%d rc=%Rrc\n", *g_pVmxUseCount, rc));
         }
         else
@@ -741 +787 @@
             host_vmxoff();
             rc = VINF_SUCCESS;
+            LogRel(("VBoxDrv: host_vmxoff -> vmx_use_count=%d\n", *g_pVmxUseCount));
         }
     }
@@ -752 +799 @@
 #else
     return VERR_NOT_SUPPORTED;
+#endif
+}
+
+
+/**
+ * @copydoc SUPR0SuspendVTxOnCpu
+ */
+bool VBOXCALL supdrvOSSuspendVTxOnCpu(void)
+{
+#ifdef VBOX_WITH_HOST_VMX
+    /*
+     * Consult the VMX usage counter, don't try suspend if not enabled.
+     *
+     * Note!  The host_vmxon/off code is still race prone since, but this is
+     *        currently the best we can do without always enable VMX when
+     *        loading the driver.
+     */
+    if (   g_pVmxUseCount
+        && *g_pVmxUseCount > 0)
+    {
+        g_pfnVmxSuspend();
+        return true;
+    }
+    return false;
+#else
+    return false;
+#endif
+}
+
+
+/**
+ * @copydoc SUPR0ResumeVTxOnCpu
+ */
+void VBOXCALL   supdrvOSResumeVTxOnCpu(bool fSuspended)
+{
+#ifdef VBOX_WITH_HOST_VMX
+    /*
+     * Don't consult the counter here, the state knows better.
+     * We're executing with interrupts disabled and anyone racing us with
+     * disabling VT-x will be waiting in the rendezvous code.
+     */
+    if (   fSuspended
+        && g_pfnVmxResume)
+        g_pfnVmxResume();
+    else
+        Assert(!fSuspended);
+#else
+    Assert(!fSuspended);
 #endif
 }