Module Name: src
Committed By: riastradh
Date: Thu Mar 3 05:48:52 UTC 2022
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
usbnet: Detach interface and mii before waiting for refcnt to drain.
All outstanding software activity under usbnet's control -- which is
all that participates in the refcnting -- should be quiesced by
stopping and detaching everything.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/usbnet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.59 src/sys/dev/usb/usbnet.c:1.60
--- src/sys/dev/usb/usbnet.c:1.59 Thu Mar 3 05:48:45 2022
+++ src/sys/dev/usb/usbnet.c Thu Mar 3 05:48:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.59 2022/03/03 05:48:45 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.60 2022/03/03 05:48:52 riastradh Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.59 2022/03/03 05:48:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.60 2022/03/03 05:48:52 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1611,20 +1611,6 @@ usbnet_detach(device_t self, int flags)
usb_rem_task_wait(un->un_udev, &unp->unp_mcasttask, USB_TASKQ_DRIVER,
NULL);
- mutex_enter(&unp->unp_core_lock);
- unp->unp_refcnt--;
- while (unp->unp_refcnt >= 0) {
- /* Wait for processes to go away */
- cv_wait(&unp->unp_detachcv, &unp->unp_core_lock);
- }
- mutex_exit(&unp->unp_core_lock);
-
- usbnet_rx_list_free(un);
- usbnet_tx_list_free(un);
-
- callout_destroy(&unp->unp_stat_ch);
- rnd_detach_source(&unp->unp_rndsrc);
-
if (mii) {
mii_detach(mii, MII_PHY_ANY, MII_OFFSET_ANY);
ifmedia_fini(&mii->mii_media);
@@ -1672,6 +1658,20 @@ usbnet_detach(device_t self, int flags)
usb_rem_task_wait(un->un_udev, &unp->unp_mcasttask, USB_TASKQ_DRIVER,
NULL);
+ mutex_enter(&unp->unp_core_lock);
+ unp->unp_refcnt--;
+ while (unp->unp_refcnt >= 0) {
+ /* Wait for processes to go away */
+ cv_wait(&unp->unp_detachcv, &unp->unp_core_lock);
+ }
+ mutex_exit(&unp->unp_core_lock);
+
+ usbnet_rx_list_free(un);
+ usbnet_tx_list_free(un);
+
+ callout_destroy(&unp->unp_stat_ch);
+ rnd_detach_source(&unp->unp_rndsrc);
+
cv_destroy(&unp->unp_detachcv);
mutex_destroy(&unp->unp_core_lock);
mutex_destroy(&unp->unp_rxlock);
