[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1ac5ce059532da7c90fc9dc93fab96d01a9765bf.1456756740.git.larper@axis.com>
Date: Mon, 29 Feb 2016 16:22:30 +0100
From: Lars Persson <lars.persson@...s.com>
To: netdev@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Rabin Vincent <rabinv@...s.com>,
Lars Persson <larper@...s.com>
Subject: [PATCH net 1/5] dwc_eth_qos: fix race condition in dwceqos_start_xmit
From: Rabin Vincent <rabinv@...s.com>
The xmit handler and the tx_reclaim tasklet had a race on the tx_free
variable which could lead to a tx timeout if tx_free was updated after
the tx complete interrupt.
Signed-off-by: Rabin Vincent <rabinv@...s.com>
Signed-off-by: Lars Persson <larper@...s.com>
---
drivers/net/ethernet/synopsys/dwc_eth_qos.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/synopsys/dwc_eth_qos.c b/drivers/net/ethernet/synopsys/dwc_eth_qos.c
index fc8bbff..926db2d 100644
--- a/drivers/net/ethernet/synopsys/dwc_eth_qos.c
+++ b/drivers/net/ethernet/synopsys/dwc_eth_qos.c
@@ -2178,12 +2178,10 @@ static int dwceqos_start_xmit(struct sk_buff *skb, struct net_device *ndev)
((trans.initial_descriptor + trans.nr_descriptors) %
DWCEQOS_TX_DCNT));
- dwceqos_tx_finalize(skb, lp, &trans);
-
- netdev_sent_queue(ndev, skb->len);
-
spin_lock_bh(&lp->tx_lock);
lp->tx_free -= trans.nr_descriptors;
+ dwceqos_tx_finalize(skb, lp, &trans);
+ netdev_sent_queue(ndev, skb->len);
spin_unlock_bh(&lp->tx_lock);
ndev->trans_start = jiffies;
--
2.1.4
Powered by blists - more mailing lists