From: Chaoyong He <chaoyong.he@corigine.com>
To: stable@dpdk.org
Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com,
Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH 20.11] net/nfp: fix Tx descriptor free logic of NFD3
Date: Thu, 15 Jun 2023 14:21:34 +0800 [thread overview]
Message-ID: <20230615062134.1266145-1-chaoyong.he@corigine.com> (raw)
[ upstream commit 36d0f4238b2f79850695f49b191ddd4540ff88a6 ]
In the Tx descriptor free logic of nfd3, the former logic might force
cast a negative number into a very big unsigned number, and which will
cause potential problem in the xmit loop.
The xmit loop will continue in the place where it should break, and will
overwrite the Tx descriptor which is not free to use by the PMD.
Fixes: 74a640dac864 ("net/nfp: avoid modulo operations for handling ring wrapping")
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
drivers/net/nfp/nfp_net.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 17e48f1710..f9844851bf 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -2238,10 +2238,14 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq)
static inline
uint32_t nfp_free_tx_desc(struct nfp_net_txq *txq)
{
+ uint32_t free_desc;
+
if (txq->wr_p >= txq->rd_p)
- return txq->tx_count - (txq->wr_p - txq->rd_p) - 8;
+ free_desc = txq->tx_count - (txq->wr_p - txq->rd_p);
else
- return txq->rd_p - txq->wr_p - 8;
+ free_desc = txq->rd_p - txq->wr_p;
+
+ return (free_desc > 8) ? (free_desc - 8) : 0;
}
/*
--
2.39.1
next reply other threads:[~2023-06-15 6:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 6:21 Chaoyong He [this message]
2023-06-15 8:42 ` Luca Boccassi
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=20230615062134.1266145-1-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=niklas.soderlund@corigine.com \
--cc=oss-drivers@corigine.com \
--cc=stable@dpdk.org \
/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).