Skip to content

Commit e85753c

Browse files
simoschip2000bardliao
authored andcommitted
usbnet: fix crash due to missing BQL accounting after resume
In commit 7ff14c5 ("usbnet: Add support for Byte Queue Limits (BQL)"), it was missed that usbnet_resume() enqueues SKBs using __skb_queue_tail() without reporting them to BQL. As a result, the next call to netdev_completed_queue() triggers a BUG_ON() in dql_completed(), since the SKBs queued during resume were never accounted for. This patch fixes the issue by adding a corresponding netdev_sent_queue() call in usbnet_resume() when SKBs are queued after suspend. Because dev->txq.lock is held at this point, no concurrent calls to netdev_sent_queue() from usbnet_start_xmit() can occur. The crash can be reproduced by generating network traffic (e.g. iperf3 -c ... -t 0), suspending the system, and then waking it up (e.g. rtcwake -m mem -s 5). When testing USB2 Android tethering, the system crashed within three suspend/resume cycles without this patch. With the patch applied, no crashes were observed after 90 cycles. Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com> Tested-by: Simon Schippers <simon.schippers@tu-dortmund.de> Signed-off-by: Simon Schippers <simon.schippers@tu-dortmund.de>
1 parent be5ccf5 commit e85753c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/net/usb/usbnet.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1984,6 +1984,7 @@ int usbnet_resume(struct usb_interface *intf)
19841984
} else {
19851985
netif_trans_update(dev->net);
19861986
__skb_queue_tail(&dev->txq, skb);
1987+
netdev_sent_queue(dev->net, skb->len);
19871988
}
19881989
}
19891990

0 commit comments

Comments
 (0)