Changeset 82042 in vbox

Timestamp:

Nov 20, 2019 7:04:20 PM (5 years ago)

Author:

vboxsync

Message:

Factored out virtq naming code so it can be re-used in load exec code and fixed parameter list in Log*() statement that caused burn

File:

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

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

@@ -109 +109 @@
 #define VIRTQ_REQ_BASE                              2           /**< Spec-defined base index of request queues       */
 
-#define QUEUENAME(qIdx) (pThis->aszQueueNames[qIdx])            /**< Macro to get queue name from its index          */
-#define CBQUEUENAME(qIdx) RTStrNLen(QUEUENAME(qIdx), sizeof(QUEUENAME(qIdx)))
+#define VIRTQNAME(qIdx) (pThis->aszVIRTQNAMEs[qIdx])            /**< Macro to get queue name from its index          */
+#define CBVIRTQNAME(qIdx) RTStrNLen(VIRTQNAME(qIdx), sizeof(VIRTQNAME(qIdx)))
 
 #define IS_REQ_QUEUE(qIdx) (qIdx >= VIRTQ_REQ_BASE && qIdx < VIRTIOSCSI_QUEUE_CNT)
@@ -426 +426 @@
     char                            szInstance[16];
 
-    /** Device-specific spec-based VirtIO queuenames */
-    char                            aszQueueNames[VIRTIOSCSI_QUEUE_CNT][VIRTIO_MAX_QUEUE_NAME_SIZE];
+    /** Device-specific spec-based VirtIO VIRTQNAMEs */
+    char                            aszVIRTQNAMEs[VIRTIOSCSI_QUEUE_CNT][VIRTIO_MAX_QUEUE_NAME_SIZE];
 
     /** Track which VirtIO queues we've attached to */
@@ -577 +577 @@
 #ifdef IN_RING3 /* spans most of the file, at the moment. */
 
+
+DECLINLINE(void) virtioScsiSetVirtqNames(PVIRTIOSCSI pThis)
+{
+    RTStrCopy(pThis->aszVIRTQNAMEs[CONTROLQ_IDX], VIRTIO_MAX_QUEUE_NAME_SIZE, "controlq");
+    RTStrCopy(pThis->aszVIRTQNAMEs[EVENTQ_IDX],   VIRTIO_MAX_QUEUE_NAME_SIZE, "eventq");
+    for (uint16_t qIdx = VIRTQ_REQ_BASE; qIdx < VIRTQ_REQ_BASE + VIRTIOSCSI_REQ_QUEUE_CNT; qIdx++)
+        RTStrPrintf(pThis->aszVIRTQNAMEs[qIdx], VIRTIO_MAX_QUEUE_NAME_SIZE,
+                    "requestq<%d>", qIdx - VIRTQ_REQ_BASE);
+}
+
 #ifdef LOG_ENABLED
+
 
 DECLINLINE(const char *) virtioGetTxDirText(uint32_t enmTxDir)
@@ -1325 +1336 @@
                                | pScsiCtrlUnion->scsiCtrlTmf.abScsiLun[3]) & 0x3fff;
             Log2Func(("[%s] (Target: %d LUN: %d)  Task Mgt Function: %s\n",
-                      QUEUENAME(qIdx), uTarget, uScsiLun, virtioGetTMFTypeText(pScsiCtrlUnion->scsiCtrlTmf.uSubtype)));
+                      VIRTQNAME(qIdx), uTarget, uScsiLun, virtioGetTMFTypeText(pScsiCtrlUnion->scsiCtrlTmf.uSubtype)));
 
             if (uTarget >= pThis->cTargets || !pThisCC->paTargetInstances[uTarget].fPresent)
@@ -1393 +1404 @@
                 virtioGetControlAsyncMaskText(szTypeText, sizeof(szTypeText), pScsiCtrlAnQuery->fEventsRequested);
                 Log2Func(("[%s] (Target: %d LUN: %d)  Async. Notification Query: %s\n",
-                          QUEUENAME(qIdx), uTarget, uScsiLun, szTypeText));
+                          VIRTQNAME(qIdx), uTarget, uScsiLun, szTypeText));
             }
 #endif
@@ -1424 +1435 @@
                 virtioGetControlAsyncMaskText(szTypeText, sizeof(szTypeText), pScsiCtrlAnSubscribe->fEventsRequested);
                 Log2Func(("[%s] (Target: %d LUN: %d)  Async. Notification Subscribe: %s\n",
-                          QUEUENAME(qIdx), uTarget, uScsiLun, szTypeText));
+                          VIRTQNAME(qIdx), uTarget, uScsiLun, szTypeText));
             }
 #endif
@@ -1452 +1463 @@
         default:
         {
-            LogFunc(("Unknown control type extracted from %s: %u\n", QUEUENAME(qIdx), pScsiCtrlUnion->scsiCtrl.uType));
+            LogFunc(("Unknown control type extracted from %s: %u\n", VIRTQNAME(qIdx), pScsiCtrlUnion->scsiCtrl.uType));
 
             bResponse = VIRTIOSCSI_S_FAILURE;
@@ -1508 +1519 @@
             if (!fNotificationSent)
             {
-                Log6Func(("%s worker sleeping...\n", QUEUENAME(qIdx)));
+                Log6Func(("%s worker sleeping...\n", VIRTQNAME(qIdx)));
                 Assert(ASMAtomicReadBool(&pWorkerR3->fSleeping));
                 int rc = PDMDevHlpSUPSemEventWaitNoResume(pDevIns, pWorker->hEvtProcess, RT_INDEFINITE_WAIT);
@@ -1514 +1525 @@
                 if (RT_UNLIKELY(pThread->enmState != PDMTHREADSTATE_RUNNING))
                     return VINF_SUCCESS;
-                Log6Func(("%s worker woken\n", QUEUENAME(qIdx)));
+                Log6Func(("%s worker woken\n", VIRTQNAME(qIdx)));
                 ASMAtomicWriteBool(&pWorkerR3->fNotified, false);
             }
@@ -1522 +1533 @@
         if (!pThis->afQueueAttached[qIdx])
         {
-            LogFunc(("%s queue not attached, worker aborting...\n", QUEUENAME(qIdx)));
+            LogFunc(("%s queue not attached, worker aborting...\n", VIRTQNAME(qIdx)));
             break;
         }
@@ -1542 +1553 @@
              pWorkerR3->cRedoDescs = 0;
 
-             Log6Func(("fetching next descriptor chain from %s\n", QUEUENAME(qIdx)));
+             Log6Func(("fetching next descriptor chain from %s\n", VIRTQNAME(qIdx)));
              PVIRTIO_DESC_CHAIN_T pDescChain;
              int rc = virtioCoreR3QueueGet(pDevIns, &pThis->Virtio, qIdx, &pDescChain, true);
              if (rc == VERR_NOT_AVAILABLE)
              {
-                Log6Func(("Nothing found in %s\n", QUEUENAME(qIdx)));
+                Log6Func(("Nothing found in %s\n", VIRTQNAME(qIdx)));
                 continue;
              }
@@ -1664 +1675 @@
     if (qIdx == CONTROLQ_IDX || IS_REQ_QUEUE(qIdx))
     {
-        Log6Func(("%s has available data\n", QUEUENAME(qIdx)));
+        Log6Func(("%s has available data\n", VIRTQNAME(qIdx)));
         /* Wake queue's worker thread up if sleeping */
         if (!ASMAtomicXchgBool(&pWorkerR3->fNotified, true))
@@ -1670 +1681 @@
             if (ASMAtomicReadBool(&pWorkerR3->fSleeping))
             {
-                Log6Func(("waking %s worker.\n", QUEUENAME(qIdx)));
+                Log6Func(("waking %s worker.\n", VIRTQNAME(qIdx)));
                 int rc = PDMDevHlpSUPSemEventSignal(pDevIns, pWorker->hEvtProcess);
                 AssertRC(rc);
@@ -1678 +1689 @@
     else if (qIdx == EVENTQ_IDX)
     {
-        Log3Func(("Driver queued buffer(s) to %s\n", QUEUENAME(qIdx)));
+        Log3Func(("Driver queued buffer(s) to %s\n", VIRTQNAME(qIdx)));
         if (ASMAtomicXchgBool(&pThis->fEventsMissed, false))
             virtioScsiR3ReportEventsMissed(pDevIns, pThis, 0);
@@ -1960 +1971 @@
     AssertLogRelMsgReturn(uVersion == VIRTIOSCSI_SAVED_STATE_VERSION,
                           ("uVersion=%u\n", uVersion), VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION);
-// re-calculate names in aszQueueNames
-
+
+    virtioScsiSetVirtqNames(pThis);
     for (int qIdx = 0; qIdx < VIRTIOSCSI_QUEUE_CNT; qIdx++)
         pHlp->pfnSSMGetBool(pSSM, &pThis->afQueueAttached[qIdx]);
+
 
     pHlp->pfnSSMGetU32(pSSM,  &pThis->virtioScsiConfig.uNumQueues);
@@ -1984 +1996 @@
     pHlp->pfnSSMGetU32(pSSM,  &pThis->fResetting);
 
-    /* TODO: Ask aiechner about BIOS-related changes */
+    /* TODO: Ask aeichner about BIOS-related changes */
     pHlp->pfnSSMGetU32(pSSM, &pThis->cTargets);
 
@@ -2004 +2016 @@
 
         pHlp->pfnSSMGetU16(pSSM, &qIdx);
-
         pHlp->pfnSSMGetU16(pSSM, &uHeadIdx);
 LogFunc(("    loaded redo req: qIdx=%d, headIdx=%d\n", qIdx, uHeadIdx));
@@ -2025 +2036 @@
         if (pThis->afQueueAttached[qIdx])
         {
-            LogFunc(("Waking %s worker.\n", QUEUENAME(qIdx)));
+            LogFunc(("Waking %s worker.\n", VIRTQNAME(qIdx)));
             rc = PDMDevHlpSUPSemEventSignal(pDevIns, pThis->aWorkers[qIdx].hEvtProcess);
             AssertRCReturn(rc, rc);
@@ -2328 +2339 @@
         if (ASMAtomicReadBool(&pThisCC->aWorkers[qIdx].fSleeping))
         {
-            Log6Func(("waking %s worker.\n", QUEUENAME(qIdx)));
+            Log6Func(("waking %s worker.\n", VIRTQNAME(qIdx)));
             int rc = PDMDevHlpSUPSemEventSignal(pDevIns, pThis->aWorkers[qIdx].hEvtProcess);
             AssertRC(rc);
@@ -2494 +2505 @@
      */
 
-    /* Name the queues: */
-    RTStrCopy(pThis->aszQueueNames[CONTROLQ_IDX], VIRTIO_MAX_QUEUE_NAME_SIZE, "controlq");
-    RTStrCopy(pThis->aszQueueNames[EVENTQ_IDX],   VIRTIO_MAX_QUEUE_NAME_SIZE, "eventq");
-    for (uint16_t qIdx = VIRTQ_REQ_BASE; qIdx < VIRTQ_REQ_BASE + VIRTIOSCSI_REQ_QUEUE_CNT; qIdx++)
-        RTStrPrintf(pThis->aszQueueNames[qIdx], VIRTIO_MAX_QUEUE_NAME_SIZE,
-                    "requestq<%d>", qIdx - VIRTQ_REQ_BASE);
+    virtioScsiSetVirtqNames(pThis);
 
     /* Attach the queues and create worker threads for them: */
     for (uint16_t qIdx = 0; qIdx < VIRTIOSCSI_QUEUE_CNT; qIdx++)
     {
-        rc = virtioCoreR3QueueAttach(&pThis->Virtio, qIdx, QUEUENAME(qIdx));
+        rc = virtioCoreR3QueueAttach(&pThis->Virtio, qIdx, VIRTQNAME(qIdx));
         if (RT_FAILURE(rc))
             continue;
@@ -2511 +2517 @@
             rc = PDMDevHlpThreadCreate(pDevIns, &pThisCC->aWorkers[qIdx].pThread,
                                        (void *)(uintptr_t)qIdx, virtioScsiR3WorkerThread,
-                                       virtioScsiR3WorkerWakeUp, 0, RTTHREADTYPE_IO, QUEUENAME(qIdx));
+                                       virtioScsiR3WorkerWakeUp, 0, RTTHREADTYPE_IO, VIRTQNAME(qIdx));
             if (rc != VINF_SUCCESS)
             {
-                LogRel(("Error creating thread for Virtual Queue %s: %Rrc\n", QUEUENAME(qIdx), rc));
+                LogRel(("Error creating thread for Virtual Queue %s: %Rrc\n", VIRTQNAME(qIdx), rc));
                 return rc;
             }