Changeset 76196 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Dec 12, 2018 7:24:05 PM (6 years ago)

Author:

vboxsync

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

127453

Message:

VMMDev/HGCM,VBoxGuest: New page list variant for more effectively passing physical contiguous buffers (VbglR0PhysHeapAlloc, kmalloc, ++). bugref:9172

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (1 diff)
• VMMDevHGCM.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -2299 +2299 @@
     pReq->build     = RTBldCfgVersionBuild();
     pReq->revision  = RTBldCfgRevision();
-    pReq->features  = VMMDEV_HVF_HGCM_PHYS_PAGE_LIST | VMMDEV_HVF_HGCM_EMBEDDED_BUFFERS | VMMDEV_HVF_FAST_IRQ_ACK;
+    pReq->features  = VMMDEV_HVF_HGCM_PHYS_PAGE_LIST
+                    | VMMDEV_HVF_HGCM_EMBEDDED_BUFFERS
+                    | VMMDEV_HVF_HGCM_CONTIGUOUS_PAGE_LIST
+                    | VMMDEV_HVF_FAST_IRQ_ACK;
     return VINF_SUCCESS;
 }

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -329 +329 @@
                     || pGuestParm->enmType == VMMDevHGCMParmType_LinAddr_Out
                     || pGuestParm->enmType == VMMDevHGCMParmType_LinAddr
-                    || pGuestParm->enmType == VMMDevHGCMParmType_PageList)
+                    || pGuestParm->enmType == VMMDevHGCMParmType_PageList
+                    || pGuestParm->enmType == VMMDevHGCMParmType_ContiguousPageList)
                     if (pGuestParm->u.ptr.paPages != &pGuestParm->u.ptr.GCPhysSinglePage)
                         RTMemFree(pGuestParm->u.ptr.paPages);
@@ -667 +668 @@
             case VMMDevHGCMParmType_PageList:
             case VMMDevHGCMParmType_Embedded:
+            case VMMDevHGCMParmType_ContiguousPageList:
             {
                 const uint32_t cbData = pGuestParm->u.ptr.cbData;
@@ -684 +686 @@
                         if (pGuestParm->enmType != VMMDevHGCMParmType_Embedded)
                         {
-                            int rc = vmmdevHGCMGuestBufferRead(pThis->pDevInsR3, pv, cbData, &pGuestParm->u.ptr);
-                            ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
-                            RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
+                            if (pGuestParm->enmType != VMMDevHGCMParmType_ContiguousPageList)
+                            {
+                                int rc = vmmdevHGCMGuestBufferRead(pThis->pDevInsR3, pv, cbData, &pGuestParm->u.ptr);
+                                ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
+                                RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
+                            }
+                            else
+                            {
+                                int rc = PDMDevHlpPhysRead(pThis->pDevInsR3,
+                                                           pGuestParm->u.ptr.paPages[0] | pGuestParm->u.ptr.offFirstPage,
+                                                           pv, cbData);
+                                ASSERT_GUEST_RETURN(RT_SUCCESS(rc), rc);
+                                RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
+                            }
                         }
                         else
@@ -898 +911 @@
 
             case VMMDevHGCMParmType_PageList:
+            case VMMDevHGCMParmType_ContiguousPageList:
             {
 #ifdef VBOX_WITH_64_BITS_GUESTS
@@ -929 +943 @@
                                     && pPageListInfo->cPages <= cMaxPages,
                                     VERR_INVALID_PARAMETER);
+
+                /* Contiguous page lists only ever have a single page. */
+                ASSERT_GUEST_RETURN(   pPageListInfo->cPages == 1
+                                    || pGuestParm->enmType == VMMDevHGCMParmType_PageList, VERR_INVALID_PARAMETER);
 
                 /* Other fields of PageListInfo. */
@@ -1198 +1216 @@
     AssertReturn(pCmd->enmCmdType == VBOXHGCMCMDTYPE_CALL, VERR_INTERNAL_ERROR);
 
-    int rc = VINF_SUCCESS;
-
     /*
      * Go over parameter descriptions saved in pCmd.
@@ -1230 +1246 @@
                 const VBOXHGCMPARMPTR * const pPtr = &pGuestParm->u.ptr;
                 if (   pPtr->cbData > 0
-                    && pPtr->fu32Direction & VBOX_HGCM_F_PARM_DIRECTION_FROM_HOST)
+                    && (pPtr->fu32Direction & VBOX_HGCM_F_PARM_DIRECTION_FROM_HOST))
                 {
                     const void *pvSrc = pHostParm->u.pointer.addr;
                     uint32_t cbSrc = pHostParm->u.pointer.size;
-                    rc = vmmdevHGCMGuestBufferWrite(pThis->pDevInsR3, pPtr, pvSrc, cbSrc);
+                    int rc = vmmdevHGCMGuestBufferWrite(pThis->pDevInsR3, pPtr, pvSrc, cbSrc);
+                    if (RT_FAILURE(rc))
+                        break;
                 }
                 break;
@@ -1254 +1272 @@
             }
 
+            case VMMDevHGCMParmType_ContiguousPageList:
+            {
+/** @todo Update the return buffer size.  */
+                const VBOXHGCMPARMPTR * const pPtr = &pGuestParm->u.ptr;
+                if (   pPtr->cbData > 0
+                    && (pPtr->fu32Direction & VBOX_HGCM_F_PARM_DIRECTION_FROM_HOST))
+                {
+                    const void *pvSrc    = pHostParm->u.pointer.addr;
+                    uint32_t    cbSrc    = pHostParm->u.pointer.size;
+                    uint32_t    cbToCopy = RT_MIN(cbSrc, pPtr->cbData);
+                    int rc = PDMDevHlpPhysWrite(pThis->pDevInsR3, pGuestParm->u.ptr.paPages[0], pvSrc, cbToCopy);
+                    if (RT_FAILURE(rc))
+                        break;
+                }
+                break;
+            }
+
             default:
                 break;
         }
-
-        if (RT_FAILURE(rc))
-            break;
-    }
-
-    return rc;
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -1642 +1674 @@
                              || pGuestParm->enmType == VMMDevHGCMParmType_LinAddr
                              || pGuestParm->enmType == VMMDevHGCMParmType_PageList
-                             || pGuestParm->enmType == VMMDevHGCMParmType_Embedded)
+                             || pGuestParm->enmType == VMMDevHGCMParmType_Embedded
+                             || pGuestParm->enmType == VMMDevHGCMParmType_ContiguousPageList)
                     {
                         const VBOXHGCMPARMPTR * const pPtr = &pGuestParm->u.ptr;
@@ -1776 +1809 @@
                              || pGuestParm->enmType == VMMDevHGCMParmType_LinAddr
                              || pGuestParm->enmType == VMMDevHGCMParmType_PageList
-                             || pGuestParm->enmType == VMMDevHGCMParmType_Embedded)
+                             || pGuestParm->enmType == VMMDevHGCMParmType_Embedded
+                             || pGuestParm->enmType == VMMDevHGCMParmType_ContiguousPageList)
                     {
                         VBOXHGCMPARMPTR * const pPtr = &pGuestParm->u.ptr;
@@ -1789 +1823 @@
                             else
                             {
-                                AssertReturn(pGuestParm->enmType != VMMDevHGCMParmType_Embedded, VERR_INTERNAL_ERROR_3);
+                                AssertReturn(   pGuestParm->enmType != VMMDevHGCMParmType_Embedded
+                                             && pGuestParm->enmType != VMMDevHGCMParmType_ContiguousPageList, VERR_INTERNAL_ERROR_3);
                                 pPtr->paPages = (RTGCPHYS *)RTMemAlloc(pPtr->cPages * sizeof(RTGCPHYS));
                                 AssertStmt(pPtr->paPages, rc = VERR_NO_MEMORY);