Changeset 82818 in vbox for trunk/src/VBox

Timestamp:

Jan 22, 2020 10:49:51 AM (5 years ago)

Author:

vboxsync

Message:

SUPDrv/darwin: Adjusted SMAP feature detection and handling to honor VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV. bugref:9627

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (7 diffs)

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

@@ -644 +644 @@
   VBoxDrv_ASDEFS         += VBOX_WITH_HARDENING
  endif
- if ($(VBOX_VERSION_BUILD) % 2) == 1
+ ifdef VBOX_WITH_RAM_IN_KERNEL
+  VBoxDrv_DEFS           += VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV IPRT_WITHOUT_EFLAGS_AC_PRESERVING
+ else if ($(VBOX_VERSION_BUILD) % 2) == 1
   VBoxDrv_DEFS           += VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV IPRT_WITH_EFLAGS_AC_PRESERVING
  endif

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

@@ -111 +111 @@
 static int              VBoxDrvDarwinClose(dev_t Dev, int fFlags, int fDevType, struct proc *pProcess);
 static int              VBoxDrvDarwinIOCtl(dev_t Dev, u_long iCmd, caddr_t pData, int fFlags, struct proc *pProcess);
+#ifndef VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV
 static int              VBoxDrvDarwinIOCtlSMAP(dev_t Dev, u_long iCmd, caddr_t pData, int fFlags, struct proc *pProcess);
+#endif
 static int              VBoxDrvDarwinIOCtlSlow(PSUPDRVSESSION pSession, u_long iCmd, caddr_t pData, struct proc *pProcess);
 
@@ -264 +266 @@
 #endif
 
+/** SUPKERNELFEATURES_XXX */
+static uint32_t         g_fKernelFeatures = 0;
 
 /**
@@ -300 +304 @@
                 if (vboxdrvDarwinCpuHasSMAP())
                 {
+                    g_fKernelFeatures |= SUPKERNELFEATURES_SMAP;
+#ifndef VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV
                     LogRel(("disabling SMAP for VBoxDrvDarwinIOCtl\n"));
                     g_DevCW.d_ioctl = VBoxDrvDarwinIOCtlSMAP;
+#endif
                 }
 
@@ -726 +733 @@
 
 
+#ifndef VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV
 /**
  * Alternative Device I/O Control entry point on hosts with SMAP support.
@@ -746 +754 @@
     int rc = VBoxDrvDarwinIOCtl(Dev, iCmd, pData, fFlags, pProcess);
 
-#if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
+# if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
     /*
      * Before we restore AC and the rest of EFLAGS, check if the IOCtl handler code
@@ -758 +766 @@
         supdrvBadContext(&g_DevExt, "SUPDrv-darwin.cpp",  __LINE__, szTmp);
     }
-#endif
+# endif
 
     ASMSetFlags(fSavedEfl);
     return rc;
 }
+#endif /* VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV */
 
 
@@ -1993 +2002 @@
 SUPR0DECL(uint32_t) SUPR0GetKernelFeatures(void)
 {
-    uint32_t fFlags = 0;
-    if (g_DevCW.d_ioctl == VBoxDrvDarwinIOCtlSMAP)
-        fFlags |= SUPKERNELFEATURES_SMAP;
-    else
-        Assert(!(ASMGetCR4() & X86_CR4_SMAP));
-    return fFlags;
+    return g_fKernelFeatures;
 }