From: Dylan Hung <dylan_hung@aspeedtech.com>
To: <davem@davemloft.net>, <kuba@kernel.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<ratbert@faraday-tech.com>, <linux-aspeed@lists.ozlabs.org>,
<openbmc@lists.ozlabs.org>
Cc: <BMC-SW@aspeedtech.com>, Joel Stanley <joel@jms.id.au>
Subject: [PATCH 1/4] ftgmac100: Fix race issue on TX descriptor[0]
Date: Mon, 19 Oct 2020 16:57:14 +0800 [thread overview]
Message-ID: <20201019085717.32413-2-dylan_hung@aspeedtech.com> (raw)
In-Reply-To: <20201019085717.32413-1-dylan_hung@aspeedtech.com>
These rules must be followed when accessing the TX descriptor:
1. A TX descriptor is "cleanable" only when its value is non-zero
and the owner bit is set to "software"
2. A TX descriptor is "writable" only when its value is zero regardless
the edotr mask.
Fixes: 52c0cae87465 ("ftgmac100: Remove tx descriptor accessors")
Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
drivers/net/ethernet/faraday/ftgmac100.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 00024dd41147..7cacbe4aecb7 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -647,6 +647,9 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv)
if (ctl_stat & FTGMAC100_TXDES0_TXDMA_OWN)
return false;
+ if ((ctl_stat & ~(priv->txdes0_edotr_mask)) == 0)
+ return false;
+
skb = priv->tx_skbs[pointer];
netdev->stats.tx_packets++;
netdev->stats.tx_bytes += skb->len;
@@ -756,6 +759,9 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,
pointer = priv->tx_pointer;
txdes = first = &priv->txdes[pointer];
+ if (le32_to_cpu(txdes->txdes0) & ~priv->txdes0_edotr_mask)
+ goto drop;
+
/* Setup it up with the packet head. Don't write the head to the
* ring just yet
*/
@@ -787,6 +793,10 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,
/* Setup descriptor */
priv->tx_skbs[pointer] = skb;
txdes = &priv->txdes[pointer];
+
+ if (le32_to_cpu(txdes->txdes0) & ~priv->txdes0_edotr_mask)
+ goto dma_err;
+
ctl_stat = ftgmac100_base_tx_ctlstat(priv, pointer);
ctl_stat |= FTGMAC100_TXDES0_TXDMA_OWN;
ctl_stat |= FTGMAC100_TXDES0_TXBUF_SIZE(len);
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Dylan Hung <dylan_hung@aspeedtech.com>
To: <davem@davemloft.net>, <kuba@kernel.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<ratbert@faraday-tech.com>, <linux-aspeed@lists.ozlabs.org>,
<openbmc@lists.ozlabs.org>
Cc: BMC-SW@aspeedtech.com
Subject: [PATCH 1/4] ftgmac100: Fix race issue on TX descriptor[0]
Date: Mon, 19 Oct 2020 16:57:14 +0800 [thread overview]
Message-ID: <20201019085717.32413-2-dylan_hung@aspeedtech.com> (raw)
In-Reply-To: <20201019085717.32413-1-dylan_hung@aspeedtech.com>
These rules must be followed when accessing the TX descriptor:
1. A TX descriptor is "cleanable" only when its value is non-zero
and the owner bit is set to "software"
2. A TX descriptor is "writable" only when its value is zero regardless
the edotr mask.
Fixes: 52c0cae87465 ("ftgmac100: Remove tx descriptor accessors")
Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
drivers/net/ethernet/faraday/ftgmac100.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 00024dd41147..7cacbe4aecb7 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -647,6 +647,9 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv)
if (ctl_stat & FTGMAC100_TXDES0_TXDMA_OWN)
return false;
+ if ((ctl_stat & ~(priv->txdes0_edotr_mask)) == 0)
+ return false;
+
skb = priv->tx_skbs[pointer];
netdev->stats.tx_packets++;
netdev->stats.tx_bytes += skb->len;
@@ -756,6 +759,9 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,
pointer = priv->tx_pointer;
txdes = first = &priv->txdes[pointer];
+ if (le32_to_cpu(txdes->txdes0) & ~priv->txdes0_edotr_mask)
+ goto drop;
+
/* Setup it up with the packet head. Don't write the head to the
* ring just yet
*/
@@ -787,6 +793,10 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb,
/* Setup descriptor */
priv->tx_skbs[pointer] = skb;
txdes = &priv->txdes[pointer];
+
+ if (le32_to_cpu(txdes->txdes0) & ~priv->txdes0_edotr_mask)
+ goto dma_err;
+
ctl_stat = ftgmac100_base_tx_ctlstat(priv, pointer);
ctl_stat |= FTGMAC100_TXDES0_TXDMA_OWN;
ctl_stat |= FTGMAC100_TXDES0_TXBUF_SIZE(len);
--
2.17.1
next prev parent reply other threads:[~2020-10-19 8:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 8:57 [PATCH 0/4] fix ftgmac100 issues on aspeed soc Dylan Hung
2020-10-19 8:57 ` Dylan Hung
2020-10-19 8:57 ` Dylan Hung [this message]
2020-10-19 8:57 ` [PATCH 1/4] ftgmac100: Fix race issue on TX descriptor[0] Dylan Hung
2020-10-19 23:19 ` Benjamin Herrenschmidt
2020-10-19 23:19 ` Benjamin Herrenschmidt
2020-10-20 4:13 ` Joel Stanley
2020-10-20 4:13 ` Joel Stanley
2020-10-20 6:23 ` Benjamin Herrenschmidt
2020-10-20 6:23 ` Benjamin Herrenschmidt
2020-10-20 7:13 ` Joel Stanley
2020-10-20 7:13 ` Joel Stanley
2020-10-19 8:57 ` [PATCH 2/4] ftgmac100: Fix missing-poll issue Dylan Hung
2020-10-19 8:57 ` Dylan Hung
2020-10-19 8:57 ` [PATCH 3/4] ftgmac100: Add a dummy read to ensure running sequence Dylan Hung
2020-10-19 8:57 ` Dylan Hung
2020-10-19 23:25 ` Benjamin Herrenschmidt
2020-10-19 23:25 ` Benjamin Herrenschmidt
2020-10-19 8:57 ` [PATCH 4/4] ftgmac100: Restart MAC HW once Dylan Hung
2020-10-19 8:57 ` Dylan Hung
2020-10-19 23:26 ` Benjamin Herrenschmidt
2020-10-19 23:26 ` Benjamin Herrenschmidt
2020-10-20 4:14 ` Joel Stanley
2020-10-20 4:14 ` Joel Stanley
2021-03-12 0:26 ` Joel Stanley
2021-03-12 0:26 ` Joel Stanley
2021-03-12 0:28 ` David Miller
2021-03-12 0:28 ` 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=20201019085717.32413-2-dylan_hung@aspeedtech.com \
--to=dylan_hung@aspeedtech.com \
--cc=BMC-SW@aspeedtech.com \
--cc=davem@davemloft.net \
--cc=joel@jms.id.au \
--cc=kuba@kernel.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=openbmc@lists.ozlabs.org \
--cc=ratbert@faraday-tech.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.