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

Timestamp:

Mar 5, 2015 1:42:10 PM (10 years ago)

Author:

vboxsync

Message:

SUPDrv/VMMR0: properly handle the CR4 shadow register on Linux >= 4.0

File:

• trunk/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c (modified) (2 diffs)

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

@@ -69 +69 @@
 # define SUPDRV_LINUX_HAS_SAFE_MSR_API
 # include <asm/msr.h>
-# include <iprt/asm-amd64-x86.h>
-#endif
+#endif
+#include <iprt/asm-amd64-x86.h>
 
 
@@ -823 +823 @@
 
 
+RTCCUINTREG VBOXCALL supdrvOSChangeCR4(RTCCUINTREG fOrMask, RTCCUINTREG fAndMask)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
+    RTCCUINTREG uOld = this_cpu_read(cpu_tlbstate.cr4);
+    RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
+    if (uNew != uOld)
+    {
+        this_cpu_write(cpu_tlbstate.cr4, uNew);
+        __write_cr4(uNew);
+    }
+#else
+    RTCCUINTREG uOld = ASMGetCR4();
+    RTCCUINTREG uNew = (uOld & fAndMask) | fOrMask;
+    if (uNew != uOld)
+        ASMSetCR4(uNew);
+#endif
+    return uOld;
+}
+
+
 void VBOXCALL supdrvOSCleanupSession(PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession)
 {