| Message ID | 1394712342-15778-109-Taiwan-albertk@realtek.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Hayes Wang <hayeswang@realtek.com> Date: Fri, 19 Dec 2014 16:56:00 +0800 > Don't submit the rx if the device is unplugged, linking down, > or stopped. ... > @@ -1789,6 +1789,11 @@ int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags) > { > int ret; > > + /* The rx would be stopped, so skip submitting */ > + if (test_bit(RTL8152_UNPLUG, &tp->flags) || > + !test_bit(WORK_ENABLE, &tp->flags) || !(tp->speed & LINK_STATUS)) > + return 0; > + I think netif_carrier_off() should always be true in all three of those situations, and would be a much simpler test than what you've coded here. -- 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
David Miller [mailto:davem@davemloft.net] > Sent: Saturday, December 20, 2014 4:44 AM [...] > > Don't submit the rx if the device is unplugged, linking down, > > or stopped. > ... > > @@ -1789,6 +1789,11 @@ int r8152_submit_rx(struct r8152 > *tp, struct rx_agg *agg, gfp_t mem_flags) > > { > > int ret; > > > > + /* The rx would be stopped, so skip submitting */ > > + if (test_bit(RTL8152_UNPLUG, &tp->flags) || > > + !test_bit(WORK_ENABLE, &tp->flags) || !(tp->speed & LINK_STATUS)) > > + return 0; > > + > > I think netif_carrier_off() should always be true in all three of those > situations, and would be a much simpler test than what you've coded > here. When the device is unplugged or stopped, the linking status may be true, so I add additional checks to avoid the submission. Besides, in set_carrier() I set netif_carrier_on() after ops.enable() to avoid any transmission before I finish starting the tx/rx. tp->rtl_ops.enable(tp); set_bit(RTL8152_SET_RX_MODE, &tp->flags); netif_carrier_on(netdev); However, the r8152_submit_rx() would be called in ops.enable(), and the check of netif_carrier_ok() would be always false. That is why I use tp->speed, not netif_carrier_ok(), to check the linking stauts. Best Regards, Hayes -- 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
From: Hayes Wang <hayeswang@realtek.com> Date: Mon, 22 Dec 2014 02:53:42 +0000 > David Miller [mailto:davem@davemloft.net] >> Sent: Saturday, December 20, 2014 4:44 AM > [...] >> > Don't submit the rx if the device is unplugged, linking down, >> > or stopped. >> ... >> > @@ -1789,6 +1789,11 @@ int r8152_submit_rx(struct r8152 >> *tp, struct rx_agg *agg, gfp_t mem_flags) >> > { >> > int ret; >> > >> > + /* The rx would be stopped, so skip submitting */ >> > + if (test_bit(RTL8152_UNPLUG, &tp->flags) || >> > + !test_bit(WORK_ENABLE, &tp->flags) || !(tp->speed & LINK_STATUS)) >> > + return 0; >> > + >> >> I think netif_carrier_off() should always be true in all three of those >> situations, and would be a much simpler test than what you've coded >> here. > > When the device is unplugged or stopped, the linking status > may be true, so I add additional checks to avoid the submission. > > Besides, in set_carrier() I set netif_carrier_on() after > ops.enable() to avoid any transmission before I finish > starting the tx/rx. > > tp->rtl_ops.enable(tp); > set_bit(RTL8152_SET_RX_MODE, &tp->flags); > netif_carrier_on(netdev); > > However, the r8152_submit_rx() would be called in ops.enable(), > and the check of netif_carrier_ok() would be always false. That > is why I use tp->speed, not netif_carrier_ok(), to check the > linking stauts. I stil think your check is way too complicated for this fast path so I would ask that you arrange things such that the simpler netif_carrier_off() test works. Especially because that is what the core networking stack uses to decide whether to send packets to us as well. -- 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/r8152.c b/drivers/net/usb/r8152.c index 59b70c5..b39b2e4 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1789,6 +1789,11 @@ int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags) { int ret; + /* The rx would be stopped, so skip submitting */ + if (test_bit(RTL8152_UNPLUG, &tp->flags) || + !test_bit(WORK_ENABLE, &tp->flags) || !(tp->speed & LINK_STATUS)) + return 0; + usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1), agg->head, agg_buf_sz, (usb_complete_t)read_bulk_callback, agg);
Don't submit the rx if the device is unplugged, linking down, or stopped. Signed-off-by: Hayes Wang <hayeswang@realtek.com> --- drivers/net/usb/r8152.c | 5 +++++ 1 file changed, 5 insertions(+)