Changeset 82590 in vbox

Timestamp:

Dec 16, 2019 5:48:40 PM (5 years ago)

Author:

vboxsync

Message:

SUPDrv,IPRT: Adding SUPR0HCPhysToVirt to linux & solaris; introducing IPRT_WITHOUT_EFLAGS_AC_PRESERVING and VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV config macros for disabling EFLAGS.AC hacks (not active). bugref:9627

Location:

trunk

Files:

• include/VBox/sup.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrv.cpp (modified) (2 diffs)
• src/VBox/HostDrivers/Support/linux/Makefile (modified) (1 diff)
• src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (5 diffs)
• src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (3 diffs)
• src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -2019 +2019 @@
 SUPR0DECL(void) SUPR0BadContext(PSUPDRVSESSION pSession, const char *pszFile, uint32_t uLine, const char *pszExpr);
 
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
+/**
+ * Translates a physical address to a virtual mapping (valid up to end of page).
+ * @returns VBox status code.
+ * @param   HCPhys      The physical address, must be page aligned.
+ * @param   ppv         Where to store the mapping address on success.
+ */
+SUPR0DECL(int) SUPR0HCPhysToVirt(RTHCPHYS HCPhys, void **ppv);
+#endif
+
 /** Context structure returned by SUPR0IoCtlSetup for use with
  * SUPR0IoCtlPerform and cleaned up by SUPR0IoCtlCleanup. */

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

@@ -762 +762 @@
                 $(PATH_SUB_CURRENT)/$(KBUILD_TARGET)/Makefile \
                 $$(if $$(eq $$(Support/$(KBUILD_TARGET)/Makefile_VBOX_HARDENED),$$(VBOX_WITH_HARDENING)),,FORCE) \
+                $$(if $$(eq $$(Support/$(KBUILD_TARGET)/Makefile_VBOX_RAM_IN_KERNEL),$$(VBOX_WITH_RAM_IN_KERNEL)),,FORCE) \
                 | $$(dir $$@)
         $(call MSG_TOOL,Creating,,$@)
         $(QUIET)$(SED) -e "" \
                 $(if-expr !defined(VBOX_WITH_HARDENING)   ,-e "s;VBOX_WITH_HARDENING;;g",) \
-                $(if-expr ($(VBOX_VERSION_BUILD) % 2) == 0 \
+                $(if-expr ($(VBOX_VERSION_BUILD) % 2) == 0 || defined(VBOX_WITH_RAM_IN_KERNEL) \
                  , -e "s;VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV;;g" -e "s;IPRT_WITH_EFLAGS_AC_PRESERVING;;g",) \
+                $(if-expr !defined(VBOX_WITH_RAM_IN_KERNEL) \
+                 , -e 's;VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV;;g' -e 's;IPRT_WITHOUT_EFLAGS_AC_PRESERVING;;g',) \
                 --output $@ $<
         %$(QUIET2)$(APPEND) -t '$(PATH_TARGET)/vboxdrv-src-1.dep' \
-                'Support/$(KBUILD_TARGET)/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)'
+                'Support/$(KBUILD_TARGET)/Makefile_VBOX_HARDENED=$(VBOX_WITH_HARDENING)' \
+                'Support/$(KBUILD_TARGET)/Makefile_VBOX_RAM_IN_KERNEL=$(VBOX_WITH_RAM_IN_KERNEL)'
 
  #

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

@@ -105 +105 @@
  * Checks that the AC flag is set if SMAP is enabled.  If AC is not set, it
  * will be logged and @a a_BadExpr is executed. */
-#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
+#if (defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)) && !defined(VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV)
 # define SUPDRV_CHECK_SMAP_SETUP() uint32_t const fKernelFeatures = SUPR0GetKernelFeatures()
 # define SUPDRV_CHECK_SMAP_CHECK(a_pDevExt, a_BadExpr) \
@@ -227 +227 @@
     { "SUPR0PageMapKernel",                     (void *)(uintptr_t)SUPR0PageMapKernel },
     { "SUPR0PageProtect",                       (void *)(uintptr_t)SUPR0PageProtect },
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
+    { "SUPR0HCPhysToVirt",                      (void *)(uintptr_t)SUPR0HCPhysToVirt },         /* only-linux, only solaris */
+#endif
     { "SUPR0Printf",                            (void *)(uintptr_t)SUPR0Printf },
     { "SUPR0GetSessionGVM",                     (void *)(uintptr_t)SUPR0GetSessionGVM },

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -154 +154 @@
         VBOX_WITH_HARDENING \
         SUPDRV_WITH_RELEASE_LOGGER \
+        VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV \
         VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV \
+        IPRT_WITHOUT_EFLAGS_AC_PRESERVING \
         IPRT_WITH_EFLAGS_AC_PRESERVING \
         VBOX_WITH_64_BITS_GUESTS # <-- must be consistent with Config.kmk!

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

@@ -558 +558 @@
     PSUPDRVSESSION pSession = (PSUPDRVSESSION)pFilp->private_data;
     int rc;
-#if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
+#ifndef VBOX_WITHOUT_EFLAGS_AC_SET_IN_VBOXDRV
+# if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
     RTCCUINTREG fSavedEfl;
 
@@ -577 +578 @@
     stac();
 # endif
+#endif
 
     /*
@@ -599 +601 @@
 #endif  /* !HAVE_UNLOCKED_IOCTL */
 
-#if defined(VBOX_STRICT) || defined(VBOX_WITH_EFLAGS_AC_SET_IN_VBOXDRV)
+#ifndef VBOX_WITHOUT_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
@@ -612 +615 @@
     }
     ASMSetFlags(fSavedEfl);
-#else
+# else
     clac();
+# endif
 #endif
     return rc;
@@ -1388 +1392 @@
 
 
+SUPR0DECL(int) SUPR0HCPhysToVirt(RTHCPHYS HCPhys, void **ppv)
+{
+    AssertReturn(!(HCPhys & PAGE_OFFSET_MASK), VERR_INVALID_POINTER);
+    AssertReturn(HCPhys != NIL_RTHCPHYS, VERR_INVALID_POINTER);
+    /* Would've like to use valid_phys_addr_range for this test, but it isn't exported. */
+    AssertReturn((HCPhys | PAGE_OFFSET_MASK) < __pa(high_memory), VERR_INVALID_POINTER);
+    *ppv = phys_to_virt(HCPhys);
+    return VINF_SUCCESS;
+}
+
+
 RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
 {

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

@@ -46 +46 @@
 #include <sys/file.h>
 #include <sys/priv_names.h>
+#include <vm/hat.h>
 #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
 
@@ -64 +65 @@
 
 #include "dtrace/SUPDrv.h"
+
+extern "C" caddr_t hat_kpm_pfn2va(pfn_t); /* Found in vm/hat.h on solaris 11.3, but not on older like 10u7. */
 
 
@@ -1277 +1280 @@
 
 
+SUPR0DECL(int) SUPR0HCPhysToVirt(RTHCPHYS HCPhys, void **ppv)
+{
+    AssertReturn(!(HCPhys & PAGE_OFFSET_MASK), VERR_INVALID_POINTER);
+    AssertReturn(HCPhys != NIL_RTHCPHYS, VERR_INVALID_POINTER);
+    HCPhys >>= PAGE_SHIFT;
+    AssertReturn(HCPhys <= physmax, VERR_INVALID_POINTER);
+    *ppv = hat_kpm_pfn2va(HCPhys);
+    return VINF_SUCCESS;
+}
+
+
 RTDECL(int) SUPR0Printf(const char *pszFormat, ...)
 {

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

@@ -420 +420 @@
  * restoring flags.
  * @{ */
-#if defined(CONFIG_X86_SMAP) || defined(RT_STRICT) || defined(IPRT_WITH_EFLAGS_AC_PRESERVING)
+#if (defined(CONFIG_X86_SMAP) || defined(RT_STRICT) || defined(IPRT_WITH_EFLAGS_AC_PRESERVING)) \
+  && !defined(IPRT_WITHOUT_EFLAGS_AC_PRESERVING)
 # include <iprt/asm-amd64-x86.h>
 # define IPRT_X86_EFL_AC                    RT_BIT(18)