From: Lijun Ou <oulijun@huawei.com>
To: <ferruh.yigit@intel.com>
Cc: <dev@dpdk.org>, <linuxarm@openeuler.org>
Subject: [dpdk-dev] [PATCH 03/17] net/hns3: implement cleanup for Tx done
Date: Wed, 3 Feb 2021 15:46:08 +0800 [thread overview]
Message-ID: <1612338382-3253-4-git-send-email-oulijun@huawei.com> (raw)
In-Reply-To: <1612338382-3253-1-git-send-email-oulijun@huawei.com>
From: Chengwen Feng <fengchengwen@huawei.com>
This patch add support tx_done_cleanup ops, which could support for
the API rte_eth_tx_done_cleanup to free consumed mbufs on Tx ring.
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Lijun Ou <oulijun@huawei.com>
---
Depends-on: series-10000 ("update doc for hns3")
---
doc/guides/nics/features/hns3.ini | 1 +
doc/guides/nics/features/hns3_vf.ini | 1 +
drivers/net/hns3/hns3_ethdev.c | 1 +
drivers/net/hns3/hns3_ethdev_vf.c | 1 +
drivers/net/hns3/hns3_rxtx.c | 59 ++++++++++++++++++++++++++++++++++++
drivers/net/hns3/hns3_rxtx.h | 1 +
6 files changed, 64 insertions(+)
diff --git a/doc/guides/nics/features/hns3.ini b/doc/guides/nics/features/hns3.ini
index 40febb0..aa4cba2 100644
--- a/doc/guides/nics/features/hns3.ini
+++ b/doc/guides/nics/features/hns3.ini
@@ -10,6 +10,7 @@ Queue start/stop = Y
Runtime Rx queue setup = Y
Runtime Tx queue setup = Y
Burst mode info = Y
+Free Tx mbuf on demand = Y
MTU update = Y
Jumbo frame = Y
Scattered Rx = Y
diff --git a/doc/guides/nics/features/hns3_vf.ini b/doc/guides/nics/features/hns3_vf.ini
index 99a0bf0..c796cd5 100644
--- a/doc/guides/nics/features/hns3_vf.ini
+++ b/doc/guides/nics/features/hns3_vf.ini
@@ -10,6 +10,7 @@ Queue start/stop = Y
Runtime Rx queue setup = Y
Runtime Tx queue setup = Y
Burst mode info = Y
+Free Tx mbuf on demand = Y
MTU update = Y
Jumbo frame = Y
Scattered Rx = Y
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 31418b8..f85149d 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -6321,6 +6321,7 @@ static const struct eth_dev_ops hns3_eth_dev_ops = {
.fec_get = hns3_fec_get,
.fec_set = hns3_fec_set,
.tm_ops_get = hns3_tm_ops_get,
+ .tx_done_cleanup = hns3_tx_done_cleanup,
};
static const struct hns3_reset_ops hns3_reset_ops = {
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index faf7e01..11cab37 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -2738,6 +2738,7 @@ static const struct eth_dev_ops hns3vf_eth_dev_ops = {
.vlan_offload_set = hns3vf_vlan_offload_set,
.get_reg = hns3_get_regs,
.dev_supported_ptypes_get = hns3_dev_supported_ptypes_get,
+ .tx_done_cleanup = hns3_tx_done_cleanup,
};
static const struct hns3_reset_ops hns3vf_reset_ops = {
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
index 222cf8a..5e79177 100644
--- a/drivers/net/hns3/hns3_rxtx.c
+++ b/drivers/net/hns3/hns3_rxtx.c
@@ -3913,6 +3913,65 @@ hns3_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
return 0;
}
+static int
+hns3_tx_done_cleanup_full(struct hns3_tx_queue *txq, uint32_t free_cnt)
+{
+ uint16_t next_to_clean = txq->next_to_clean;
+ uint16_t next_to_use = txq->next_to_use;
+ uint16_t tx_bd_ready = txq->tx_bd_ready;
+ struct hns3_entry *tx_pkt = &txq->sw_ring[next_to_clean];
+ struct hns3_desc *desc = &txq->tx_ring[next_to_clean];
+ uint32_t idx;
+
+ if (free_cnt == 0 || free_cnt > txq->nb_tx_desc)
+ free_cnt = txq->nb_tx_desc;
+
+ for (idx = 0; idx < free_cnt; idx++) {
+ if (next_to_clean == next_to_use)
+ break;
+
+ if (desc->tx.tp_fe_sc_vld_ra_ri &
+ rte_cpu_to_le_16(BIT(HNS3_TXD_VLD_B)))
+ break;
+
+ if (tx_pkt->mbuf != NULL) {
+ rte_pktmbuf_free_seg(tx_pkt->mbuf);
+ tx_pkt->mbuf = NULL;
+ }
+
+ next_to_clean++;
+ tx_bd_ready++;
+ tx_pkt++;
+ desc++;
+ if (next_to_clean == txq->nb_tx_desc) {
+ tx_pkt = txq->sw_ring;
+ desc = txq->tx_ring;
+ next_to_clean = 0;
+ }
+ }
+
+ if (idx > 0) {
+ txq->next_to_clean = next_to_clean;
+ txq->tx_bd_ready = tx_bd_ready;
+ }
+
+ return (int)idx;
+}
+
+int
+hns3_tx_done_cleanup(void *txq, uint32_t free_cnt)
+{
+ struct hns3_tx_queue *q = (struct hns3_tx_queue *)txq;
+ struct rte_eth_dev *dev = &rte_eth_devices[q->port_id];
+
+ if (dev->tx_pkt_burst == hns3_xmit_pkts)
+ return hns3_tx_done_cleanup_full(q, free_cnt);
+ else if (dev->tx_pkt_burst == hns3_dummy_rxtx_burst)
+ return 0;
+ else
+ return -ENOTSUP;
+}
+
uint32_t
hns3_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
{
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index 8f5ae5c..7118bd4 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -706,5 +706,6 @@ int hns3_start_all_txqs(struct rte_eth_dev *dev);
int hns3_start_all_rxqs(struct rte_eth_dev *dev);
void hns3_stop_all_txqs(struct rte_eth_dev *dev);
void hns3_restore_tqp_enable_state(struct hns3_hw *hw);
+int hns3_tx_done_cleanup(void *txq, uint32_t free_cnt);
#endif /* _HNS3_RXTX_H_ */
--
2.7.4
next prev parent reply other threads:[~2021-02-03 7:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 7:46 [dpdk-dev] [PATCH 00/17] bugfixes and small functionality for hns3 Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 01/17] net/hns3: support module EEPROM dump Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 02/17] net/hns3: add more registers to dump Lijun Ou
2021-02-03 7:46 ` Lijun Ou [this message]
2021-02-03 7:46 ` [dpdk-dev] [PATCH 04/17] net/hns3: add enhance stats function Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 05/17] net/hns3: fix query order of link status and link info Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 06/17] net/hns3: fix link status change from firmware Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 07/17] net/hns3: encapsulate a port shaping interface Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 08/17] net/hns3: support PF on electrical net device Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 09/17] net/hns3: fix RSS indirection table size Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 10/17] net/hns3: constraint TM peak rate Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 11/17] net/hns3: remove MPLS type from supported flow items Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 12/17] net/hns3: fix stats flip overflow Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 13/17] net/hns3: replace all atomic type with C11 atomic builtins Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 14/17] net/hns3: fix FD rule residue in hardware when malloc fail Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 15/17] net/hns3: fix cmdq cleared during firmware process Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 16/17] net/hns3: fix VF reset after MBX failed Lijun Ou
2021-02-03 7:46 ` [dpdk-dev] [PATCH 17/17] net/hns3: add check for max pkt length of Rx Lijun Ou
2021-02-03 9:24 ` [dpdk-dev] [PATCH 00/17] bugfixes and small functionality for hns3 Ferruh Yigit
2021-02-03 11:05 ` oulijun
2021-02-03 11:46 ` Ferruh Yigit
2021-02-03 12:18 ` oulijun
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=1612338382-3253-4-git-send-email-oulijun@huawei.com \
--to=oulijun@huawei.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=linuxarm@openeuler.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).