Changeset 82590 in vbox for trunk/src/VBox/HostDrivers/Support/linux

Timestamp:

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

Author:

vboxsync

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

135475

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/src/VBox/HostDrivers/Support/linux

Files:

• Makefile (modified) (1 diff)
• SUPDrv-linux.c (modified) (5 diffs)

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, ...)
 {