From: Balazs Nemeth <bnemeth@redhat.com>
To: bnemeth@redhat.com, dev@dpdk.org
Cc: dsinghrawat@marvell.com, rmody@marvell.com,
jerinjacobk@gmail.com, irusskikh@marvell.com
Subject: [dpdk-dev] [PATCH v2 3/7] net/qede: assume mbuf to free is never null
Date: Fri, 26 Mar 2021 12:01:26 +0100 [thread overview]
Message-ID: <bf5461283fd76e6b1ef06e9da47d5f1d6f45b17c.1616754844.git.bnemeth@redhat.com> (raw)
In-Reply-To: <cover.1616754844.git.bnemeth@redhat.com>
The ring txq->sw_tx_ring is managed with txq->sw_tx_cons. As long as
txq->sw_tx_cons is correct, there is no need to check if
txq->sw_tx_ring[idx] is null explicitly.
Signed-off-by: Balazs Nemeth <bnemeth@redhat.com>
Reviewed-by: Igor Russkikh <irusskikh@marvell.com>
---
drivers/net/qede/qede_rxtx.c | 59 +++++++++++++++---------------------
1 file changed, 25 insertions(+), 34 deletions(-)
diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 0002e2c1e..9294f79eb 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -882,38 +882,6 @@ qede_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t tx_queue_id)
return rc;
}
-static inline uint16_t
-qede_free_tx_pkt(struct qede_tx_queue *txq)
-{
- struct rte_mbuf *mbuf;
- uint16_t nb_segs;
- uint16_t idx;
- uint16_t ret;
-
- idx = TX_CONS(txq);
- mbuf = txq->sw_tx_ring[idx];
- if (mbuf) {
- nb_segs = mbuf->nb_segs;
- PMD_TX_LOG(DEBUG, txq, "nb_segs to free %u\n", nb_segs);
-
- ret = nb_segs;
- while (nb_segs) {
- /* It's like consuming rxbuf in recv() */
- ecore_chain_consume(&txq->tx_pbl);
- nb_segs--;
- }
-
- rte_pktmbuf_free(mbuf);
- txq->sw_tx_ring[idx] = NULL;
- txq->sw_tx_cons++;
- PMD_TX_LOG(DEBUG, txq, "Freed tx packet\n");
- } else {
- ecore_chain_consume(&txq->tx_pbl);
- ret = 1;
- }
- return ret;
-}
-
static inline void
qede_process_tx_compl(__rte_unused struct ecore_dev *edev,
struct qede_tx_queue *txq)
@@ -921,6 +889,10 @@ qede_process_tx_compl(__rte_unused struct ecore_dev *edev,
uint16_t hw_bd_cons;
uint16_t sw_tx_cons;
uint16_t remaining;
+ uint16_t mask;
+ struct rte_mbuf *mbuf;
+ uint16_t nb_segs;
+ uint16_t idx;
rte_compiler_barrier();
sw_tx_cons = ecore_chain_get_cons_idx(&txq->tx_pbl);
@@ -930,11 +902,30 @@ qede_process_tx_compl(__rte_unused struct ecore_dev *edev,
abs(hw_bd_cons - sw_tx_cons));
#endif
+ mask = NUM_TX_BDS(txq);
+ idx = txq->sw_tx_cons & mask;
+
remaining = hw_bd_cons - sw_tx_cons;
txq->nb_tx_avail += remaining;
- while (remaining)
- remaining -= qede_free_tx_pkt(txq);
+ while (remaining) {
+ mbuf = txq->sw_tx_ring[idx];
+ RTE_ASSERT(mbuf);
+ nb_segs = mbuf->nb_segs;
+ remaining -= nb_segs;
+
+ PMD_TX_LOG(DEBUG, txq, "nb_segs to free %u\n", nb_segs);
+
+ while (nb_segs) {
+ ecore_chain_consume(&txq->tx_pbl);
+ nb_segs--;
+ }
+
+ rte_pktmbuf_free(mbuf);
+ idx = (idx + 1) & mask;
+ PMD_TX_LOG(DEBUG, txq, "Freed tx packet\n");
+ }
+ txq->sw_tx_cons = idx;
}
static int qede_drain_txq(struct qede_dev *qdev,
--
2.30.2
next prev parent reply other threads:[~2021-03-26 11:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 11:01 [dpdk-dev] [PATCH v2 0/7] Optimize qede use of Rx/Tx entries Balazs Nemeth
2021-03-26 11:01 ` [dpdk-dev] [PATCH v2 1/7] net/qede: remove flags from Tx entry Balazs Nemeth
2021-03-26 11:01 ` [dpdk-dev] [PATCH v2 2/7] net/qede: get consumer index once Balazs Nemeth
2021-03-26 11:01 ` Balazs Nemeth [this message]
2021-03-26 11:01 ` [dpdk-dev] [PATCH v2 4/7] net/qede: free packets in bulk instead of one by one Balazs Nemeth
2021-03-26 11:01 ` [dpdk-dev] [PATCH v2 5/7] net/qede: prefetch hardware consumer Balazs Nemeth
2021-03-26 11:01 ` [dpdk-dev] [PATCH v2 6/7] net/qede: prefetch next packet to free Balazs Nemeth
2021-03-26 11:01 ` [dpdk-dev] [PATCH v2 7/7] net/qede: remove unnecessary field in Rx entry and simplify Balazs Nemeth
2021-03-27 14:02 ` [dpdk-dev] [PATCH v2 0/7] Optimize qede use of Rx/Tx entries Jerin Jacob
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=bf5461283fd76e6b1ef06e9da47d5f1d6f45b17c.1616754844.git.bnemeth@redhat.com \
--to=bnemeth@redhat.com \
--cc=dev@dpdk.org \
--cc=dsinghrawat@marvell.com \
--cc=irusskikh@marvell.com \
--cc=jerinjacobk@gmail.com \
--cc=rmody@marvell.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).