Changeset 77243 in vbox for trunk/include

Timestamp:

Feb 10, 2019 10:44:00 PM (6 years ago)

Author:

vboxsync

Message:

HGCM,SharedFolders: Added new variation on the HGCM page list type that does not use a bounce buffer. bugref:9172

• Added VMMDevHGCMParmType_NoBouncePageList.
• Made VMMDevHGCMParmType_Embedded

Location:

trunk/include/VBox

Files:

• VBoxGuestLibSharedFoldersInline.h (modified) (2 diffs)
• VMMDev.h (modified) (2 diffs)
• VMMDevCoreTypes.h (modified) (1 diff)
• hgcmsvc.h (modified) (2 diffs)
• shflsvc.h (modified) (2 diffs)

trunk/include/VBox/VBoxGuestLibSharedFoldersInline.h

@@ -779 +779 @@
     pReq->Parms.cb32Read.u.value32          = cbToRead;
 
-    pReq->Parms.pBuf.type                   = VMMDevHGCMParmType_PageList;
+    pReq->Parms.pBuf.type                   = g_fHostFeatures & VMMDEV_HVF_HGCM_NO_BOUNCE_PAGE_LIST
+                                            ? VMMDevHGCMParmType_NoBouncePageList : VMMDevHGCMParmType_PageList;
     pReq->Parms.pBuf.u.PageList.size        = cbToRead;
     pReq->Parms.pBuf.u.PageList.offset      = RT_UOFFSETOF(VBOXSFREADPGLSTREQ, PgLst) - sizeof(VBGLIOCIDCHGCMFASTCALL);
@@ -925 +926 @@
     pReq->Parms.cb32Write.u.value32         = cbToWrite;
 
-    pReq->Parms.pBuf.type                   = VMMDevHGCMParmType_PageList;
+    pReq->Parms.pBuf.type                   = g_fHostFeatures & VMMDEV_HVF_HGCM_NO_BOUNCE_PAGE_LIST
+                                            ? VMMDevHGCMParmType_NoBouncePageList : VMMDevHGCMParmType_PageList;;
     pReq->Parms.pBuf.u.PageList.size        = cbToWrite;
     pReq->Parms.pBuf.u.PageList.offset      = RT_UOFFSETOF(VBOXSFWRITEPGLSTREQ, PgLst) - sizeof(VBGLIOCIDCHGCMFASTCALL);

trunk/include/VBox/VMMDev.h

@@ -532 +532 @@
 /** HGCM supports the contiguous page list parameter type. */
 #define VMMDEV_HVF_HGCM_CONTIGUOUS_PAGE_LIST    RT_BIT_32(2)
+/** HGCM supports the no-bounce page list parameter type. */
+#define VMMDEV_HVF_HGCM_NO_BOUNCE_PAGE_LIST     RT_BIT_32(3)
 /** VMMDev supports fast IRQ acknowledgements. */
 #define VMMDEV_HVF_FAST_IRQ_ACK                 RT_BIT_32(31)
@@ -1632 +1634 @@
 #define VBOX_HGCM_F_PARM_DIRECTION_FROM_HOST UINT32_C(0x00000002)
 #define VBOX_HGCM_F_PARM_DIRECTION_BOTH      UINT32_C(0x00000003)
+#define VBOX_HGCM_F_PARM_DIRECTION_MASK      UINT32_C(0x00000003)
 /** Macro for validating that the specified flags are valid. */
 #define VBOX_HGCM_F_PARM_ARE_VALID(fFlags) \
-    (   (fFlags) > VBOX_HGCM_F_PARM_DIRECTION_NONE \
-     && (fFlags) <= VBOX_HGCM_F_PARM_DIRECTION_BOTH )
+    (   ((fFlags) & VBOX_HGCM_F_PARM_DIRECTION_MASK) \
+     && !((fFlags) & ~VBOX_HGCM_F_PARM_DIRECTION_MASK) )
 /** @} */
 

trunk/include/VBox/VMMDevCoreTypes.h

@@ -279 +279 @@
     VMMDevHGCMParmType_Embedded           = 11, /**< Small buffer embedded in request. */
     VMMDevHGCMParmType_ContiguousPageList = 12, /**< Like PageList but with physically contiguous memory, so only one page entry. */
+    VMMDevHGCMParmType_NoBouncePageList   = 13, /**< Like PageList but host function requires no bounce buffering. */
     VMMDevHGCMParmType_SizeHack           = 0x7fffffff
 } HGCMFunctionParameterType;

trunk/include/VBox/hgcmsvc.h

@@ -205 +205 @@
 
 #define VBOX_HGCM_SVC_PARM_INVALID (0U)
-#define VBOX_HGCM_SVC_PARM_32BIT (1U)
-#define VBOX_HGCM_SVC_PARM_64BIT (2U)
-#define VBOX_HGCM_SVC_PARM_PTR   (3U)
+#define VBOX_HGCM_SVC_PARM_32BIT   (1U)
+#define VBOX_HGCM_SVC_PARM_64BIT   (2U)
+#define VBOX_HGCM_SVC_PARM_PTR     (3U)
+#define VBOX_HGCM_SVC_PARM_PAGES   (4U)
+
+/** VBOX_HGCM_SVC_PARM_PAGES specific data. */
+typedef struct VBOXHGCMSVCPARMPAGES
+{
+    uint32_t    cb;
+    uint16_t    cPages;
+    uint16_t    u16Padding;
+    void      **papvPages;
+} VBOXHGCMSVCPARMPAGES;
+typedef VBOXHGCMSVCPARMPAGES *PVBOXHGCMSVCPARMPAGES;
 
 typedef struct VBOXHGCMSVCPARM
@@ -223 +234 @@
             void *addr;
         } pointer;
+        /** VBOX_HGCM_SVC_PARM_PAGES */
+        VBOXHGCMSVCPARMPAGES Pages;
     } u;
 } VBOXHGCMSVCPARM;

trunk/include/VBox/shflsvc.h

@@ -1349 +1349 @@
     /** value64, in: SHFLHANDLE of object to write to. */
     HGCMFunctionParameter u64Handle;
-    /** value64, in: Offset to start writing at. */
+    /** value64, in/out: Offset to start writing at / New offset.
+     * @note The new offset isn't necessarily off + cb for files opened with
+     *       SHFL_CF_ACCESS_APPEND since other parties (host programs, other VMs,
+     *       other computers) could have extended the file since the last time the
+     *       guest got a fresh size statistic.  So, this helps the guest avoiding
+     *       a stat call to check the actual size. */
     HGCMFunctionParameter off64Write;
     /** value32, in/out: How much to try write / Actually written. */
@@ -1372 +1377 @@
     HGCMFunctionParameter handle;
 
-    /** value64, in:
-     * Offset to write to.
+    /** value64, in/out:
+     * Offset to write to/New offset.
+     * @note The new offset isn't necessarily off + cb for files opened with
+     *       SHFL_CF_ACCESS_APPEND since other parties (host programs, other VMs,
+     *       other computers) could have extended the file since the last time the
+     *       guest got a fresh size statistic.  So, this helps the guest avoiding
+     *       a stat call to check the actual size.
      */
     HGCMFunctionParameter offset;