[viostor] Fix returning SUCCESS when really -ENOSPC (regression)

benyamin-codez · YanVugenfirer · commit 2bcf04f0cd58 · 2025-02-11T10:32:59.000+02:00
1. Refactored to only return TRUE when add_buffer_req_status == VQ_ADD_BUFFER_SUCCESS. 2. Pro-actively refactors calls to InterlockedIncrement() back to the add_buffer_req_status == VQ_ADD_BUFFER_SUCCESS path. Impacts: RhelDoFlush(), RhelDoReadWrite(), RhelDoUnMap() and RhelGetSerialNumber(). Regression introduced with PR #1174 (379f291). Will likely resolve issue #1204 (RHEL-70446), unlikely to resolve issue #907. My bad... 8^d Signed-off-by: benyamin-codez <115509179+benyamin-codez@users.noreply.github.com>
diff --git a/viostor/virtio_stor_hw_helper.c b/viostor/virtio_stor_hw_helper.c
@@ -144,6 +144,10 @@ RhelDoFlush(PVOID DeviceExtension, PSRB_TYPE Srb, BOOLEAN resend, BOOLEAN bIsr)
         element = &adaptExt->processing_srbs[QueueNumber];
         InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);
         element->srb_cnt++;
+        result = TRUE;
+#ifdef DBG
+        InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
+#endif
     }
     else
     {
@@ -154,10 +158,6 @@ RhelDoFlush(PVOID DeviceExtension, PSRB_TYPE Srb, BOOLEAN resend, BOOLEAN bIsr)
     {
         VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);
     }
-#ifdef DBG
-    InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
-#endif
-    result = TRUE;
     if (notify)
     {
         virtqueue_notify(adaptExt->vq[QueueNumber]);
@@ -231,17 +231,17 @@ RhelDoReadWrite(PVOID DeviceExtension, PSRB_TYPE Srb)
         element = &adaptExt->processing_srbs[QueueNumber];
         InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);
         element->srb_cnt++;
+        result = TRUE;
+#ifdef DBG
+        InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
+#endif
     }
     else
     {
         RhelDbgPrint(TRACE_LEVEL_ERROR, " Can not add packet to queue %d.\n", QueueNumber);
         StorPortBusy(DeviceExtension, 2);
     }
     VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);
-#ifdef DBG
-    InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
-#endif
-    result = TRUE;
     if (notify)
     {
         virtqueue_notify(adaptExt->vq[QueueNumber]);
@@ -388,17 +388,17 @@ RhelDoUnMap(IN PVOID DeviceExtension, IN PSRB_TYPE Srb)
         element = &adaptExt->processing_srbs[QueueNumber];
         InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);
         element->srb_cnt++;
+        result = TRUE;
+#ifdef DBG
+        InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
+#endif
     }
     else
     {
         RhelDbgPrint(TRACE_LEVEL_ERROR, " Can not add packet to queue %d.\n", QueueNumber);
         StorPortBusy(DeviceExtension, 2);
     }
     VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);
-#ifdef DBG
-    InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
-#endif
-    result = TRUE;
     if (notify)
     {
         RhelDbgPrint(TRACE_LEVEL_INFORMATION, " %s virtqueue_notify %d.\n", __FUNCTION__, QueueNumber);
@@ -486,17 +486,17 @@ RhelGetSerialNumber(IN PVOID DeviceExtension, IN PSRB_TYPE Srb)
         element = &adaptExt->processing_srbs[QueueNumber];
         InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);
         element->srb_cnt++;
+        result = TRUE;
+#ifdef DBG
+        InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
+#endif
     }
     else
     {
         RhelDbgPrint(TRACE_LEVEL_ERROR, " Can not add packet to queue %d.\n", QueueNumber);
         StorPortBusy(DeviceExtension, 2);
     }
     VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);
-#ifdef DBG
-    InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);
-#endif
-    result = TRUE;
     if (notify)
     {
         virtqueue_notify(adaptExt->vq[QueueNumber]);

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,10 @@ RhelDoFlush(PVOID DeviceExtension, PSRB_TYPE Srb, BOOLEAN resend, BOOLEAN bIsr)`
`144`	`144`	`element = &adaptExt->processing_srbs[QueueNumber];`
`145`	`145`	`InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);`
`146`	`146`	`element->srb_cnt++;`
	`147`	`+ result = TRUE;`
	`148`	`+#ifdef DBG`
	`149`	`+ InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
	`150`	`+#endif`
`147`	`151`	`}`
`148`	`152`	`else`
`149`	`153`	`{`
`@@ -154,10 +158,6 @@ RhelDoFlush(PVOID DeviceExtension, PSRB_TYPE Srb, BOOLEAN resend, BOOLEAN bIsr)`
`154`	`158`	`{`
`155`	`159`	`VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);`
`156`	`160`	`}`
`157`		`-#ifdef DBG`
`158`		`- InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
`159`		`-#endif`
`160`		`- result = TRUE;`
`161`	`161`	`if (notify)`
`162`	`162`	`{`
`163`	`163`	`virtqueue_notify(adaptExt->vq[QueueNumber]);`
`@@ -231,17 +231,17 @@ RhelDoReadWrite(PVOID DeviceExtension, PSRB_TYPE Srb)`
`231`	`231`	`element = &adaptExt->processing_srbs[QueueNumber];`
`232`	`232`	`InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);`
`233`	`233`	`element->srb_cnt++;`
	`234`	`+ result = TRUE;`
	`235`	`+#ifdef DBG`
	`236`	`+ InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
	`237`	`+#endif`
`234`	`238`	`}`
`235`	`239`	`else`
`236`	`240`	`{`
`237`	`241`	`RhelDbgPrint(TRACE_LEVEL_ERROR, " Can not add packet to queue %d.\n", QueueNumber);`
`238`	`242`	`StorPortBusy(DeviceExtension, 2);`
`239`	`243`	`}`
`240`	`244`	`VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);`
`241`		`-#ifdef DBG`
`242`		`- InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
`243`		`-#endif`
`244`		`- result = TRUE;`
`245`	`245`	`if (notify)`
`246`	`246`	`{`
`247`	`247`	`virtqueue_notify(adaptExt->vq[QueueNumber]);`
`@@ -388,17 +388,17 @@ RhelDoUnMap(IN PVOID DeviceExtension, IN PSRB_TYPE Srb)`
`388`	`388`	`element = &adaptExt->processing_srbs[QueueNumber];`
`389`	`389`	`InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);`
`390`	`390`	`element->srb_cnt++;`
	`391`	`+ result = TRUE;`
	`392`	`+#ifdef DBG`
	`393`	`+ InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
	`394`	`+#endif`
`391`	`395`	`}`
`392`	`396`	`else`
`393`	`397`	`{`
`394`	`398`	`RhelDbgPrint(TRACE_LEVEL_ERROR, " Can not add packet to queue %d.\n", QueueNumber);`
`395`	`399`	`StorPortBusy(DeviceExtension, 2);`
`396`	`400`	`}`
`397`	`401`	`VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);`
`398`		`-#ifdef DBG`
`399`		`- InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
`400`		`-#endif`
`401`		`- result = TRUE;`
`402`	`402`	`if (notify)`
`403`	`403`	`{`
`404`	`404`	`RhelDbgPrint(TRACE_LEVEL_INFORMATION, " %s virtqueue_notify %d.\n", __FUNCTION__, QueueNumber);`
`@@ -486,17 +486,17 @@ RhelGetSerialNumber(IN PVOID DeviceExtension, IN PSRB_TYPE Srb)`
`486`	`486`	`element = &adaptExt->processing_srbs[QueueNumber];`
`487`	`487`	`InsertTailList(&element->srb_list, &srbExt->vbr.list_entry);`
`488`	`488`	`element->srb_cnt++;`
	`489`	`+ result = TRUE;`
	`490`	`+#ifdef DBG`
	`491`	`+ InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
	`492`	`+#endif`
`489`	`493`	`}`
`490`	`494`	`else`
`491`	`495`	`{`
`492`	`496`	`RhelDbgPrint(TRACE_LEVEL_ERROR, " Can not add packet to queue %d.\n", QueueNumber);`
`493`	`497`	`StorPortBusy(DeviceExtension, 2);`
`494`	`498`	`}`
`495`	`499`	`VioStorVQUnlock(DeviceExtension, MessageId, &LockHandle, FALSE);`
`496`		`-#ifdef DBG`
`497`		`- InterlockedIncrement((LONG volatile *)&adaptExt->inqueue_cnt);`
`498`		`-#endif`
`499`		`- result = TRUE;`
`500`	`500`	`if (notify)`
`501`	`501`	`{`
`502`	`502`	`virtqueue_notify(adaptExt->vq[QueueNumber]);`