Changeset 83587 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Apr 6, 2020 12:31:32 PM (5 years ago)

Author:

vboxsync

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

136946

Message:

Virtio_1_0: Reworked the VIRTIO_DESC_CHAIN_T handling to decrease the potential for memory leaks by employing reference counting and not having virtioCoreR3QueuePut be the one to free/release the chain. Combined the 5 allocations into a single one. bugref:9440

File:

• trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp

@@ -717 +717 @@
     }
 
-    PVIRTIO_DESC_CHAIN_T pDescChain;
+    PVIRTIO_DESC_CHAIN_T pDescChain = NULL;
     int rc = virtioCoreR3QueueGet(pDevIns, &pThis->Virtio, EVENTQ_IDX, &pDescChain, true);
     AssertRCReturn(rc, rc);
@@ -742 +742 @@
     virtioCoreR3QueuePut(pDevIns, &pThis->Virtio, EVENTQ_IDX, &ReqSgBuf, pDescChain, true /*fFence*/);
     virtioCoreQueueSync(pDevIns, &pThis->Virtio, EVENTQ_IDX);
+    virtioCoreR3DescChainRelease(pDescChain);
 
     return VINF_SUCCESS;
@@ -751 +752 @@
     RTMemFree(pReq->pbSense);
     pReq->pbSense = NULL;
+    virtioCoreR3DescChainRelease(pReq->pDescChain);
+    pReq->pDescChain = NULL;
     pTarget->pDrvMediaEx->pfnIoReqFree(pTarget->pDrvMediaEx, pReq->hIoReq);
 }
@@ -1257 +1260 @@
     pReq->cbDataOut   = cbDataOut;
     pReq->pDescChain  = pDescChain;
+    virtioCoreR3DescChainRetain(pDescChain); /* (For pReq->pDescChain. Released by virtioScsiR3FreeReq.) */
     pReq->uDataInOff  = offDataIn;
     pReq->uDataOutOff = offDataOut;
@@ -1550 +1554 @@
                                                     pWorkerR3->auRedoDescs[i], &pDescChain);
                   if (RT_FAILURE(rc))
-                     LogRel(("Error fetching desc chain to redo, %Rrc", rc));
+                      LogRel(("Error fetching desc chain to redo, %Rrc", rc));
 
                   rc = virtioScsiR3ReqSubmit(pDevIns, pThis, pThisCC, qIdx, pDescChain);
                   if (RT_FAILURE(rc))
-                     LogRel(("Error submitting req packet, resetting %Rrc", rc));
+                      LogRel(("Error submitting req packet, resetting %Rrc", rc));
+
+                  virtioCoreR3DescChainRelease(pDescChain);
              }
              pWorkerR3->cRedoDescs = 0;
 
              Log6Func(("fetching next descriptor chain from %s\n", VIRTQNAME(qIdx)));
-             PVIRTIO_DESC_CHAIN_T pDescChain;
+             PVIRTIO_DESC_CHAIN_T pDescChain = NULL;
              int rc = virtioCoreR3QueueGet(pDevIns, &pThis->Virtio, qIdx, &pDescChain, true);
              if (rc == VERR_NOT_AVAILABLE)
              {
-                Log6Func(("Nothing found in %s\n", VIRTQNAME(qIdx)));
-                continue;
+                 Log6Func(("Nothing found in %s\n", VIRTQNAME(qIdx)));
+                 continue;
              }
 
@@ -1572 +1578 @@
              else /* request queue index */
              {
-                  rc = virtioScsiR3ReqSubmit(pDevIns, pThis, pThisCC, qIdx, pDescChain);
-                  if (RT_FAILURE(rc))
-                      LogRel(("Error submitting req packet, resetting %Rrc", rc));
+                 rc = virtioScsiR3ReqSubmit(pDevIns, pThis, pThisCC, qIdx, pDescChain);
+                 if (RT_FAILURE(rc))
+                     LogRel(("Error submitting req packet, resetting %Rrc", rc));
              }
+
+             virtioCoreR3DescChainRelease(pDescChain);
         }
     }