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

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 virtio-win#1174 (379f291). Will likely resolve issue virtio-win#1204 (RHEL-70446), unlikely to resolve issue virtio-win#907. My bad... 8^d Signed-off-by: benyamin-codez <[email protected]>
benyamin-codez · Jan 31, 2025 · 0743398 · 0743398
1 parent dd928f1
commit 0743398
Showing 1 changed file with 16 additions and 16 deletions.
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]);