| Message ID | 1340176553-32225-4-git-send-email-ming.lei@canonical.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Am Mittwoch, 20. Juni 2012, 09:15:53 schrieb Ming Lei: > If usbnet is resumed by remote wakeup, generally there are > some packets comming to be handled, so allocate and submit > rx URBs in usbnet_resume to avoid delays introduced by tasklet. > Otherwise, usbnet may have been runtime suspended before the > usbnet_bh is executed to schedule Rx URBs. > > Without the patch, usbnet can't recieve any packets from peer > in runtime suspend state if runtime PM is enabled and > autosuspend_delay is set as zero. > > Signed-off-by: Ming Lei <ming.lei@canonical.com> Acked-by: Oliver Neukum <oneukum@suse.de> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello. On 20-06-2012 11:15, Ming Lei wrote: > If usbnet is resumed by remote wakeup, generally there are > some packets comming to be handled, so allocate and submit > rx URBs in usbnet_resume to avoid delays introduced by tasklet. > Otherwise, usbnet may have been runtime suspended before the > usbnet_bh is executed to schedule Rx URBs. > Without the patch, usbnet can't recieve any packets from peer > in runtime suspend state if runtime PM is enabled and > autosuspend_delay is set as zero. > Signed-off-by: Ming Lei<ming.lei@canonical.com> > --- > drivers/net/usb/usbnet.c | 42 ++++++++++++++++++++++++++---------------- > 1 file changed, 26 insertions(+), 16 deletions(-) > diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c > index 9bfa775..a89d6c5 100644 > --- a/drivers/net/usb/usbnet.c > +++ b/drivers/net/usb/usbnet.c > @@ -1201,6 +1201,21 @@ deferred: > } > EXPORT_SYMBOL_GPL(usbnet_start_xmit); > > +static void rx_alloc_submit(struct usbnet *dev, gfp_t flags) > +{ > + struct urb *urb; > + int i; > + > + /* don't refill the queue all at once */ > + for (i = 0; i< 10&& dev->rxq.qlen< RX_QLEN(dev); i++) { > + urb = usb_alloc_urb(0, flags); > + if (urb != NULL) { > + if (rx_submit(dev, urb, flags) == -ENOLINK) The above 2 *if* statements can be collapsed into single one. > + return; > + } > + } > +} > + WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Mittwoch, 20. Juni 2012, 13:02:12 schrieb Sergei Shtylyov: > > Without the patch, usbnet can't recieve any packets from peer > > in runtime suspend state if runtime PM is enabled and > > autosuspend_delay is set as zero. > > > Signed-off-by: Ming Lei<ming.lei@canonical.com> > > --- > > drivers/net/usb/usbnet.c | 42 ++++++++++++++++++++++++++---------------- > > 1 file changed, 26 insertions(+), 16 deletions(-) > > > diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c > > index 9bfa775..a89d6c5 100644 > > --- a/drivers/net/usb/usbnet.c > > +++ b/drivers/net/usb/usbnet.c > > @@ -1201,6 +1201,21 @@ deferred: > > } > > EXPORT_SYMBOL_GPL(usbnet_start_xmit); > > > > +static void rx_alloc_submit(struct usbnet *dev, gfp_t flags) > > +{ > > + struct urb *urb; > > + int i; > > + > > + /* don't refill the queue all at once */ > > + for (i = 0; i< 10&& dev->rxq.qlen< RX_QLEN(dev); i++) { > > + urb = usb_alloc_urb(0, flags); > > + if (urb != NULL) { > > + if (rx_submit(dev, urb, flags) == -ENOLINK) > > The above 2 if statements can be collapsed into single one. > That would not improve readability. Regards Oliver -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 9bfa775..a89d6c5 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1201,6 +1201,21 @@ deferred: } EXPORT_SYMBOL_GPL(usbnet_start_xmit); +static void rx_alloc_submit(struct usbnet *dev, gfp_t flags) +{ + struct urb *urb; + int i; + + /* don't refill the queue all at once */ + for (i = 0; i < 10 && dev->rxq.qlen < RX_QLEN(dev); i++) { + urb = usb_alloc_urb(0, flags); + if (urb != NULL) { + if (rx_submit(dev, urb, flags) == -ENOLINK) + return; + } + } +} + /*-------------------------------------------------------------------------*/ // tasklet (work deferred from completions, in_irq) or timer @@ -1240,26 +1255,14 @@ static void usbnet_bh (unsigned long param) !timer_pending (&dev->delay) && !test_bit (EVENT_RX_HALT, &dev->flags)) { int temp = dev->rxq.qlen; - int qlen = RX_QLEN (dev); - - if (temp < qlen) { - struct urb *urb; - int i; - - // don't refill the queue all at once - for (i = 0; i < 10 && dev->rxq.qlen < qlen; i++) { - urb = usb_alloc_urb (0, GFP_ATOMIC); - if (urb != NULL) { - if (rx_submit (dev, urb, GFP_ATOMIC) == - -ENOLINK) - return; - } - } + + if (temp < RX_QLEN(dev)) { + rx_alloc_submit(dev, GFP_ATOMIC); if (temp != dev->rxq.qlen) netif_dbg(dev, link, dev->net, "rxqlen %d --> %d\n", temp, dev->rxq.qlen); - if (dev->rxq.qlen < qlen) + if (dev->rxq.qlen < RX_QLEN(dev)) tasklet_schedule (&dev->bh); } if (dev->txq.qlen < TX_QLEN (dev)) @@ -1565,6 +1568,13 @@ int usbnet_resume (struct usb_interface *intf) spin_unlock_irq(&dev->txq.lock); if (test_bit(EVENT_DEV_OPEN, &dev->flags)) { + /* handle remote wakeup ASAP */ + if (!dev->wait && + netif_device_present(dev->net) && + !timer_pending(&dev->delay) && + !test_bit(EVENT_RX_HALT, &dev->flags)) + rx_alloc_submit(dev, GFP_KERNEL); + if (!(dev->txq.qlen >= TX_QLEN(dev))) netif_tx_wake_all_queues(dev->net); tasklet_schedule (&dev->bh);
If usbnet is resumed by remote wakeup, generally there are some packets comming to be handled, so allocate and submit rx URBs in usbnet_resume to avoid delays introduced by tasklet. Otherwise, usbnet may have been runtime suspended before the usbnet_bh is executed to schedule Rx URBs. Without the patch, usbnet can't recieve any packets from peer in runtime suspend state if runtime PM is enabled and autosuspend_delay is set as zero. Signed-off-by: Ming Lei <ming.lei@canonical.com> --- drivers/net/usb/usbnet.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-)