From: Shuyu Wei <wsy2220@gmail.com>
To: wxt@rock-chips.com, davem@davemloft.net
Cc: heiko@sntech.de, linux-rockchip@lists.infradead.org,
netdev@vger.kernel.org
Subject: [PATCH] ethernet:arc: Fix racing of TX ring buffer
Date: Sun, 15 May 2016 00:16:02 +0800 [thread overview]
Message-ID: <20160514161602.GA3347@debian-dorm> (raw)
[-- Attachment #1: mail1.txt --]
[-- Type: text/plain, Size: 1474 bytes --]
The tail of the ring buffer(txbd_dirty) should never go ahead of the
head(txbd_curr) or the ring buffer will corrupt.
This is the root cause of racing.
Besides, setting the FOR_EMAC flag should be the last step of modifying
the buffer descriptor, or possible racing will occur.
Signed-off-by: Shuyu Wei <sy.w@outlook.com>
---
diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c
index a3a9392..5ece05b 100644
--- a/drivers/net/ethernet/arc/emac_main.c
+++ b/drivers/net/ethernet/arc/emac_main.c
@@ -155,7 +155,7 @@ static void arc_emac_tx_clean(struct net_device *ndev)
struct net_device_stats *stats = &ndev->stats;
unsigned int i;
- for (i = 0; i < TX_BD_NUM; i++) {
+ for (i = priv->txbd_dirty; i != priv->txbd_curr; i = (i + 1) % TX_BD_NUM) {
unsigned int *txbd_dirty = &priv->txbd_dirty;
struct arc_emac_bd *txbd = &priv->txbd[*txbd_dirty];
struct buffer_state *tx_buff = &priv->tx_buff[*txbd_dirty];
@@ -686,12 +686,12 @@ static int arc_emac_tx(struct sk_buff *skb, struct net_device *ndev)
skb_tx_timestamp(skb);
+ priv->tx_buff[*txbd_curr].skb = skb;
*info = cpu_to_le32(FOR_EMAC | FIRST_OR_LAST_MASK | len);
/* Make sure info word is set */
wmb();
- priv->tx_buff[*txbd_curr].skb = skb;
/* Increment index to point to the next BD */
*txbd_curr = (*txbd_curr + 1) % TX_BD_NUM;
next reply other threads:[~2016-05-14 16:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-14 16:16 Shuyu Wei [this message]
2016-05-14 20:03 ` [PATCH] ethernet:arc: Fix racing of TX ring buffer Francois Romieu
2016-05-14 23:10 ` Shuyu Wei
2016-05-14 23:24 ` Shuyu Wei
2016-05-15 9:19 ` Francois Romieu
[not found] ` <20160515091953.GA19983-lmTtMILVy1jWQcoT9B9Ug5SCg42XY1Uw0E9HWUfgJXw@public.gmane.org>
2016-05-15 12:38 ` Shuyu Wei
2016-05-15 18:07 ` Francois Romieu
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=20160514161602.GA3347@debian-dorm \
--to=wsy2220@gmail.com \
--cc=davem@davemloft.net \
--cc=heiko@sntech.de \
--cc=linux-rockchip@lists.infradead.org \
--cc=netdev@vger.kernel.org \
--cc=wxt@rock-chips.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.