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

Timestamp:

Nov 27, 2018 12:30:00 PM (6 years ago)

Author:

vboxsync

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

126971

Message:

VMMDev,HGCM: Give access to VMMDevRequestHeader::fRequestor. bugref:9105

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (1 diff)
• VMMDevHGCM.cpp (modified) (15 diffs)
• VMMDevHGCM.h (modified) (1 diff)

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

@@ -4420 +4420 @@
     pThis->IHGCMPort.pfnCompleted           = hgcmCompleted;
     pThis->IHGCMPort.pfnIsCmdRestored       = hgcmIsCmdRestored;
+    pThis->IHGCMPort.pfnGetRequestor        = hgcmGetRequestor;
 #endif
 

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

@@ -124 +124 @@
     RTLISTNODE          node;
 
-    /** The type of the command. */
-    VBOXHGCMCMDTYPE     enmCmdType;
+    /** The type of the command (VBOXHGCMCMDTYPE). */
+    uint8_t             enmCmdType;
 
     /** Whether the command was cancelled by the guest. */
@@ -135 +135 @@
     /** Set if allocated from the memory cache, clear if heap. */
     bool                fMemCache;
+
+    /** Copy of VMMDevRequestHeader::fRequestor.
+     * @note Only valid if VBOXGSTINFO2_F_REQUESTOR_INFO is set in
+     *       VMMDevState.guestInfo2.fFeatures. */
+    uint32_t            fRequestor;
 
     /** GC physical address of the guest request. */
@@ -231 +236 @@
  * @param   cbRequest       The size of the HGCM request.
  * @param   cParms          Number of HGCM parameters for VBOXHGCMCMDTYPE_CALL command.
- */
-static PVBOXHGCMCMD vmmdevHGCMCmdAlloc(PVMMDEV pThis, VBOXHGCMCMDTYPE enmCmdType, RTGCPHYS GCPhys, uint32_t cbRequest, uint32_t cParms)
+ * @param   fRequstor       The VMMDevRequestHeader::fRequestor value.
+ */
+static PVBOXHGCMCMD vmmdevHGCMCmdAlloc(PVMMDEV pThis, VBOXHGCMCMDTYPE enmCmdType, RTGCPHYS GCPhys,
+                                       uint32_t cbRequest, uint32_t cParms, uint32_t fRequestor)
 {
 #if 1
@@ -250 +257 @@
             pCmdCached->Core.cbRequest  = cbRequest;
             pCmdCached->Core.enmCmdType = enmCmdType;
+            pCmdCached->Core.fRequestor = fRequestor;
             if (enmCmdType == VBOXHGCMCMDTYPE_CALL)
             {
@@ -432 +440 @@
     int rc = VINF_SUCCESS;
 
-    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_CONNECT, GCPhys, pHGCMConnect->header.header.size, 0);
+    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_CONNECT, GCPhys, pHGCMConnect->header.header.size, 0,
+                                           pHGCMConnect->header.header.fRequestor);
     if (pCmd)
     {
@@ -475 +484 @@
     int rc = VINF_SUCCESS;
 
-    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_DISCONNECT, GCPhys, pHGCMDisconnect->header.header.size, 0);
+    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_DISCONNECT, GCPhys, pHGCMDisconnect->header.header.size, 0,
+                                           pHGCMDisconnect->header.header.fRequestor);
     if (pCmd)
     {
@@ -732 +742 @@
     RT_UNTRUSTED_VALIDATED_FENCE();
 
-    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_CALL, GCPhys, cbHGCMCall, cParms);
+    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_CALL, GCPhys, cbHGCMCall, cParms,
+                                           pHGCMCall->header.header.fRequestor);
     if (pCmd == NULL)
         return VERR_NO_MEMORY;
@@ -1008 +1019 @@
                    VMMDevRequestType enmRequestType, uint64_t tsArrival, PVMMDEVREQLOCK *ppLock)
 {
-    LogFunc(("client id = %d, function = %d, cParms = %d, enmRequestType = %d\n",
-             pHGCMCall->u32ClientID, pHGCMCall->u32Function, pHGCMCall->cParms, enmRequestType));
+    LogFunc(("client id = %d, function = %d, cParms = %d, enmRequestType = %d, fRequestor = %#x\n", pHGCMCall->u32ClientID,
+             pHGCMCall->u32Function, pHGCMCall->cParms, enmRequestType, pHGCMCall->header.header.fRequestor));
 
     /*
@@ -1524 +1535 @@
 }
 
+/**
+ * @interface_method_impl{PDMIHGCMPORT,pfnGetRequestor}
+ */
+DECLCALLBACK(uint32_t) hgcmGetRequestor(PPDMIHGCMPORT pInterface, PVBOXHGCMCMD pCmd)
+{
+    PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDevState, IHGCMPort);
+    if (pThis->guestInfo2.fFeatures & VBOXGSTINFO2_F_REQUESTOR_INFO)
+        if (pCmd)
+            return pCmd->fRequestor;
+   return 0;
+}
+
 /** Save information about pending HGCM requests from pThis->listHGCMCmd.
  *
@@ -1641 +1664 @@
  *
  * Allocate VBOXHGCMCMD commands and add them to pThis->listHGCMCmd temporarily.
- * vmmdevHGCMLoadStateDone will process the temporary list.
+ * vmmdevHGCMLoadStateDone will process the temporary list.  This includes
+ * loading the correct fRequestor fields.
  *
  * @returns VBox status code that the guest should see.
@@ -1689 +1713 @@
             AssertRCReturn(rc, rc);
 
-            PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, enmCmdType, GCPhys, cbRequest, cParms);
+            PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, enmCmdType, GCPhys, cbRequest, cParms, 0 /*fRequestor*/);
             AssertReturn(pCmd, VERR_NO_MEMORY);
 
@@ -1818 +1842 @@
             AssertRCReturn(rc, rc);
 
-            PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, enmCmdType, GCPhys, cbRequest, cLinAddrs);
+            PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, enmCmdType, GCPhys, cbRequest, cLinAddrs, 0 /*fRequestor*/);
             AssertReturn(pCmd, VERR_NO_MEMORY);
 
@@ -1876 +1900 @@
             LogFlowFunc(("Restoring %RGp size %x bytes\n", GCPhys, cbRequest));
 
-            PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_LOADSTATE, GCPhys, cbRequest, 0);
+            PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_LOADSTATE, GCPhys, cbRequest, 0, 0 /*fRequestor*/);
             AssertReturn(pCmd, VERR_NO_MEMORY);
 
@@ -1908 +1932 @@
     ASSERT_GUEST_RETURN(cbReq >= sizeof(*pReq), VERR_MISMATCH);
     if (u32SSMVersion >= 9)
-    {
         ASSERT_GUEST_RETURN(pLoadedCmd->enmCmdType == VBOXHGCMCMDTYPE_CONNECT, VERR_MISMATCH);
-    }
-
-    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_CONNECT, pLoadedCmd->GCPhys, cbReq, 0);
+
+    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_CONNECT, pLoadedCmd->GCPhys, cbReq, 0,
+                                           pReq->header.header.fRequestor);
     AssertReturn(pCmd, VERR_NO_MEMORY);
 
@@ -1952 +1975 @@
     ASSERT_GUEST_RETURN(cbReq >= sizeof(*pReq), VERR_MISMATCH);
     if (u32SSMVersion >= 9)
-    {
         ASSERT_GUEST_RETURN(pLoadedCmd->enmCmdType == VBOXHGCMCMDTYPE_DISCONNECT, VERR_MISMATCH);
-    }
-
-    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_DISCONNECT, pLoadedCmd->GCPhys, cbReq, 0);
+
+    PVBOXHGCMCMD pCmd = vmmdevHGCMCmdAlloc(pThis, VBOXHGCMCMDTYPE_DISCONNECT, pLoadedCmd->GCPhys, cbReq, 0,
+                                           pReq->header.header.fRequestor);
     AssertReturn(pCmd, VERR_NO_MEMORY);
 

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

@@ -31 +31 @@
 DECLCALLBACK(int)  hgcmCompleted(PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmdPtr);
 DECLCALLBACK(bool) hgcmIsCmdRestored(PPDMIHGCMPORT pInterface, PVBOXHGCMCMD pCmd);
+DECLCALLBACK(uint32_t) hgcmGetRequestor(PPDMIHGCMPORT pInterface, PVBOXHGCMCMD pCmd);
 
 int vmmdevHGCMSaveState(VMMDevState *pVMMDevState, PSSMHANDLE pSSM);