usbnet: ipheth: fix racing condition [Linux 4.14.128]

usbnet: ipheth: fix racing condition [Linux 4.14.128]

This Linux kernel change "usbnet: ipheth: fix racing condition" is included in the Linux 4.14.128 release. This change is authored by Bernd Eckstein <3erndeckstein [at] gmail.com> on Mon May 20 17:31:09 2019 +0200. The commit for this change in Linux stable tree is ba1cf86 (patch) which is from upstream commit 94d250f. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream 94d250f.

usbnet: ipheth: fix racing condition

[ Upstream commit 94d250fae48e6f873d8362308f5c4d02cd1b1fd2 ]

Fix a racing condition in ipheth.c that can lead to slow performance.

Bug: In ipheth_tx(), netif_wake_queue() may be called on the callback
ipheth_sndbulk_callback(), _before_ netif_stop_queue() is called.
When this happens, the queue is stopped longer than it needs to be,
thus reducing network performance.

Fix: Move netif_stop_queue() in front of usb_submit_urb(). Now the order
is always correct. In case, usb_submit_urb() fails, the queue is woken up
again as callback will not fire.

Testing: This racing condition is usually not noticeable, as it has to
occur very frequently to slowdown the network. The callback from the USB
is usually triggered slow enough, so the situation does not appear.
However, on a Ubuntu Linux on VMWare Workstation, running on Windows 10,
the we loose the race quite often and the following speedup can be noticed:

Without this patch: Download:  4.10 Mbit/s, Upload:  4.01 Mbit/s
With this patch:    Download: 36.23 Mbit/s, Upload: 17.61 Mbit/s

Signed-off-by: Oliver Zweigle <Oliver.Zweigle@faro.com>
Signed-off-by: Bernd Eckstein <3ernd.Eckstein@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

There are 3 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/usb/ipheth.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 3d8a70d..3d71f17 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -437,17 +437,18 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)
              dev);
    dev->tx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;

+   netif_stop_queue(net);
    retval = usb_submit_urb(dev->tx_urb, GFP_ATOMIC);
    if (retval) {
        dev_err(&dev->intf->dev, "%s: usb_submit_urb: %d\n",
            __func__, retval);
        dev->net->stats.tx_errors++;
        dev_kfree_skb_any(skb);
+       netif_wake_queue(net);
    } else {
        dev->net->stats.tx_packets++;
        dev->net->stats.tx_bytes += skb->len;
        dev_consume_skb_any(skb);
-       netif_stop_queue(net);
    }

    return NETDEV_TX_OK;

Leave a Reply

Your email address will not be published. Required fields are marked *