Changeset 107871 in vbox for trunk

Timestamp:

Jan 21, 2025 9:33:52 AM (3 months ago)

Author:

vboxsync

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

167079

Message:

UsbNet: bugref:10779 Added suspend/resume handlers to prevent NATRX thread hanging during suspend

File:

• trunk/src/VBox/Devices/Network/UsbNet.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Network/UsbNet.cpp

@@ -407 +407 @@
     volatile bool                       fHaveToHostQueueWaiter;
 
+    /** VM is currently suspended and we should ignore all external requests. */
+    volatile bool                       fSuspended;
+
     /** Whether to signal the reset semaphore when the current request completes. */
     bool                                fSignalResetSem;
@@ -1248 +1251 @@
 
     RTCritSectEnter(&pThis->CritSect);
-    if (!usbNetQueueIsEmpty(&pThis->ToHostQueue))
+    if (!usbNetQueueIsEmpty(&pThis->ToHostQueue) || pThis->fSuspended)
     {
         RTCritSectLeave(&pThis->CritSect);
@@ -1276 +1279 @@
     RTCritSectEnter(&pThis->CritSect);
 
-    if (usbNetQueueIsEmpty(&pThis->ToHostQueue))
+    if (usbNetQueueIsEmpty(&pThis->ToHostQueue) || pThis->fSuspended)
     {
         RTCritSectLeave(&pThis->CritSect);
@@ -2115 +2118 @@
 
 
+ /**
+ * @interface_method_impl{PDMUSBREG,pfnVMSuspend}
+ */
+static DECLCALLBACK(void) usbNetVMSuspend(PPDMUSBINS pUsbIns)
+{
+    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
+#ifdef LOG_ENABLED
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
+    VMSUSPENDREASON enmReason = pHlp->pfnVMGetSuspendReason(pUsbIns);
+    LogFlowFunc(("/#%u/ enmReason=%u\n", pUsbIns->iInstance, enmReason));
+#endif
+    RTCritSectEnter(&pThis->CritSect);
+    pThis->fSuspended = true;
+    /* Unblock receive thread */
+    RTSemEventSignal(pThis->hEvtToHostQueue);
+    RTCritSectLeave(&pThis->CritSect);
+}
+
+
+/**
+ * @interface_method_impl{PDMUSBREG,pfnVMResume}
+ */
+static DECLCALLBACK(void) usbNetVMResume(PPDMUSBINS pUsbIns)
+{
+    PUSBNET pThis = PDMINS_2_DATA(pUsbIns, PUSBNET);
+#ifdef LOG_ENABLED
+    PCPDMUSBHLP pHlp  = pUsbIns->pHlpR3;
+    VMRESUMEREASON enmReason = pHlp->pfnVMGetResumeReason(pUsbIns);
+    LogFlowFunc(("/#%u/ enmReason=%u\n", pUsbIns->iInstance, enmReason));
+#endif
+    RTCritSectEnter(&pThis->CritSect);
+    pThis->fSuspended = false;
+    RTCritSectLeave(&pThis->CritSect);
+}
+
+
 /**
  * @interface_method_impl{PDMUSBREG,pfnDestruct}
@@ -2336 +2375 @@
     usbNetVMReset,
     /* pfnVMSuspend */
-    NULL,
+    usbNetVMSuspend,
     /* pfnVMResume */
-    NULL,
+    usbNetVMResume,
     /* pfnVMPowerOff */
     NULL,