Changeset 40901 in vbox

Timestamp:

Apr 13, 2012 12:45:18 PM (13 years ago)

Author:

vboxsync

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

77449

Message:

Let the other hosts use page lists again.

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCMInternal.cpp (modified) (5 diffs)
• VBGLInternal.h (modified) (3 diffs)
• VbglR0CanUsePhysPageList.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -260 +260 @@
                 if (fIsUser)
                     return VERR_INVALID_PARAMETER;
-                /* always perform it as !VBGLR0_CAN_USE_PHYS_PAGE_LIST() since otherwise
-                 * we end up creating a RTR0MEMOBJ and doing page lock again, which leads to undefined behavior and possible BSOD on Win */
-                //if (!VBGLR0_CAN_USE_PHYS_PAGE_LIST())
+                if (!VBGLR0_CAN_USE_PHYS_PAGE_LIST(/*a_fLocked =*/ true))
                 {
                     cb = pSrcParm->u.Pointer.size;
@@ -401 +399 @@
                     pParmInfo->cLockBufs = iLockBuf + 1;
 
-                    if (VBGLR0_CAN_USE_PHYS_PAGE_LIST())
+                    if (VBGLR0_CAN_USE_PHYS_PAGE_LIST(/*a_fLocked =*/ false))
                     {
                         size_t const cPages = RTR0MemObjSize(hObj) >> PAGE_SHIFT;
@@ -539 +537 @@
             case VMMDevHGCMParmType_LinAddr_Locked_Out:
             case VMMDevHGCMParmType_LinAddr_Locked:
-                /* always perform it as !VBGLR0_CAN_USE_PHYS_PAGE_LIST() since otherwise
-                 * we end up creating a RTR0MEMOBJ and doing page lock again, which leads to undefined behavior and possible BSOD on Win */
-//                if (!VBGLR0_CAN_USE_PHYS_PAGE_LIST())
+                if (!VBGLR0_CAN_USE_PHYS_PAGE_LIST(/*a_fLocked =*/ true))
                 {
                     *pDstParm = *pSrcParm;
@@ -560 +556 @@
                     Assert(iParm == pParmInfo->aLockBufs[iLockBuf].iParm);
 
-                    if (VBGLR0_CAN_USE_PHYS_PAGE_LIST())
+                    if (VBGLR0_CAN_USE_PHYS_PAGE_LIST(/*a_fLocked =*/ false))
                     {
                         HGCMPageListInfo   *pDstPgLst = (HGCMPageListInfo *)((uint8_t *)pHGCMCall + offExtra);
@@ -805 +801 @@
             case VMMDevHGCMParmType_LinAddr_Locked_Out:
             case VMMDevHGCMParmType_LinAddr_Locked:
-                /* always perform it as !VBGLR0_CAN_USE_PHYS_PAGE_LIST() since otherwise
-                 * we end up creating a RTR0MEMOBJ and doing page lock again, which leads to undefined behavior and possible BSOD on Win */
-//                if (!VBGLR0_CAN_USE_PHYS_PAGE_LIST())
+                if (!VBGLR0_CAN_USE_PHYS_PAGE_LIST(/*a_fLocked =*/ true))
                 {
                     pDstParm->u.Pointer.size = pSrcParm->u.Pointer.size;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h

@@ -1 @@
-/* $Revision$ */
+/* Id: 73443 $ */
 /** @file
  * VBoxGuestLibR0 - Internal header.
@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -121 +121 @@
 
 /**
- * Internal macro for checking whether we can pass phyical page lists to the
+ * Internal macro for checking whether we can pass physical page lists to the
  * host.
  *
  * ASSUMES that vbglR0Enter has been called already.
+ *
+ * @param   a_fLocked       For the windows shared folders workarounds.
+ *
+ * @remarks Disable the PageList feature for 64-bit Windows, because shared
+ *          folders do not work, if this is enabled. This should be reenabled
+ *          again when the problem is fixed.
+ * @remarks Disabled the PageList feature for 32-bit Windows, see xTracker
+ *          ticket 6096 and public ticket 10290. Hopefully this is the same
+ *          issue as on Windows/AMD64.
  */
-#if defined(RT_OS_WINDOWS) && defined(RT_ARCH_AMD64)
-/* Disable the PageList feature for 64 bit Windows, because shared folders do not work,
- * if this is enabled. This should be reenabled again when the problem is fixed.
- */
-#define VBGLR0_CAN_USE_PHYS_PAGE_LIST() \
-    ( 0 )
+#if defined(RT_OS_WINDOWS)
+# ifdef RT_ARCH_AMD64
+#  define VBGLR0_CAN_USE_PHYS_PAGE_LIST(a_fLocked)  ( 0 )
+# else
+#  define VBGLR0_CAN_USE_PHYS_PAGE_LIST(a_fLocked) \
+     ( !(a_fLocked) && (g_vbgldata.hostVersion.features & VMMDEV_HVF_HGCM_PHYS_PAGE_LIST) )
+# endif
 #else
-#define VBGLR0_CAN_USE_PHYS_PAGE_LIST() \
+# define VBGLR0_CAN_USE_PHYS_PAGE_LIST(a_fLocked) \
     ( !!(g_vbgldata.hostVersion.features & VMMDEV_HVF_HGCM_PHYS_PAGE_LIST) )
 #endif

trunk/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp

@@ -37 +37 @@
     int rc = vbglR0Enter();
     return RT_SUCCESS(rc)
-        && VBGLR0_CAN_USE_PHYS_PAGE_LIST();
+        && VBGLR0_CAN_USE_PHYS_PAGE_LIST(/*a_fLocked =*/ false);
 }