From: Noam Camus <noamc@ezchip.com>
To: <linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <Alexey.Brodkin@synopsys.com>,
<vgupta@synopsys.com>, <talz@ezchip.com>,
Noam Camus <noamc@ezchip.com>
Subject: [v1 3/6] NET: nps_enet: TX done race condition
Date: Mon, 17 Aug 2015 08:58:36 +0300 [thread overview]
Message-ID: <1439791119-26892-4-git-send-email-noamc@ezchip.com> (raw)
In-Reply-To: <1439791119-26892-3-git-send-email-noamc@ezchip.com>
From: Noam Camus <noamc@ezchip.com>
We need to set tx_skb pointer before send frame.
If we receive interrupt before we set pointer we will try
to free SKB with wrong pointer.
Now we are sure that SKB pointer will never be NULL during
handling TX done and check is removed.
Signed-off-by: Noam Camus <noamc@ezchip.com>
---
drivers/net/ethernet/ezchip/nps_enet.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c
index af72181..f78ad3d 100644
--- a/drivers/net/ethernet/ezchip/nps_enet.c
+++ b/drivers/net/ethernet/ezchip/nps_enet.c
@@ -158,11 +158,7 @@ static void nps_enet_tx_handler(struct net_device *ndev)
ndev->stats.tx_bytes += tx_ctrl.nt;
}
- if (priv->tx_skb) {
- dev_kfree_skb_irq(priv->tx_skb);
- priv->tx_skb = NULL;
- }
-
+ dev_kfree_skb_irq(priv->tx_skb);
priv->tx_packet_sent = false;
if (netif_queue_stopped(ndev))
@@ -531,10 +527,10 @@ static netdev_tx_t nps_enet_start_xmit(struct sk_buff *skb,
/* This driver handles one frame at a time */
netif_stop_queue(ndev);
- nps_enet_send_frame(ndev, skb);
-
priv->tx_skb = skb;
+ nps_enet_send_frame(ndev, skb);
+
return NETDEV_TX_OK;
}
--
1.7.1
next prev parent reply other threads:[~2015-08-17 5:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 5:58 [v1 0/6] *** nps_enet fixups *** Noam Camus
2015-08-17 5:58 ` [v1 1/6] NET: nps_enet: replace use of cause register Noam Camus
2015-08-17 5:58 ` [v1 2/6] NET: nps_enet: reduce processing latency Noam Camus
2015-08-17 5:58 ` Noam Camus [this message]
2015-08-17 5:58 ` [v1 4/6] NET: nps_enet: drop control frames Noam Camus
2015-08-17 5:58 ` [v1 5/6] NET: nps_enet: TX done acknowledge Noam Camus
2015-08-17 5:58 ` [v1 6/6] NET: nps_enet: minor namespace cleanup Noam Camus
2015-08-17 17:36 ` [v1 0/6] *** nps_enet fixups *** David Miller
2015-08-18 5:04 ` Noam Camus
2015-08-18 5:26 ` David Miller
2015-08-20 5:00 ` [v2 0/5] " Noam Camus
2015-08-20 5:00 ` [v2 1/5] NET: nps_enet: replace use of cause register Noam Camus
2015-08-20 5:00 ` [v2 2/5] NET: nps_enet: TX done race condition Noam Camus
2015-08-20 5:00 ` [v2 3/5] NET: nps_enet: drop control frames Noam Camus
2015-08-20 5:00 ` [v2 4/5] NET: nps_enet: TX done acknowledge Noam Camus
2015-08-20 5:00 ` [v2 5/5] NET: nps_enet: minor namespace cleanup Noam Camus
2015-08-23 23:09 ` [v2 0/5] *** nps_enet fixups *** David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439791119-26892-4-git-send-email-noamc@ezchip.com \
--to=noamc@ezchip.com \
--cc=Alexey.Brodkin@synopsys.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=talz@ezchip.com \
--cc=vgupta@synopsys.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).