From mboxrd@z Thu Jan 1 00:00:00 1970 From: Soohoon Lee Subject: [PATCH usbnet v2.1] mtu change needs to stop RX Date: Fri, 24 Jun 2016 00:30:16 +0000 Message-ID: <1466728213238.68985@f5.com> References: <8aa35a23da7141bba3549841e66e55db@seaexchmbx01.olympus.F5Net.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT Cc: "netdev@vger.kernel.org" To: "oneukum@suse.com" Return-path: Received: from mail.f5.com ([208.85.209.139]:8615 "EHLO mail.f5.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866AbcFXAkG convert rfc822-to-8bit (ORCPT ); Thu, 23 Jun 2016 20:40:06 -0400 In-Reply-To: <8aa35a23da7141bba3549841e66e55db@seaexchmbx01.olympus.F5Net.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: When MTU is changed unlink_urbs() flushes RX Q but mean while usbnet_bh() can fill up the Q at the same time. Depends on which HCD is down there unlink takes long time then the flush never ends. Signed-off-by: Soohoon Lee Reviewed-by: Kimball Murray diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 61ba464..ce72dd0 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -395,8 +395,11 @@ int usbnet_change_mtu (struct net_device *net, int new_mtu) dev->hard_mtu = net->mtu + net->hard_header_len; if (dev->rx_urb_size == old_hard_mtu) { dev->rx_urb_size = dev->hard_mtu; - if (dev->rx_urb_size > old_rx_urb_size) + if (dev->rx_urb_size > old_rx_urb_size) { + usbnet_pause_rx(dev); usbnet_unlink_rx_urbs(dev); + usbnet_resume_rx(dev); + } } /* max qlen depend on hard_mtu and rx_urb_size */ @@ -1509,6 +1512,7 @@ static void usbnet_bh (unsigned long param) netif_device_present (dev->net) && netif_carrier_ok(dev->net) && !timer_pending (&dev->delay) && + !test_bit (EVENT_RX_PAUSED, &dev->flags) && !test_bit (EVENT_RX_HALT, &dev->flags)) { int temp = dev->rxq.qlen;