3a8995b1ad
Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
152 lines
4.9 KiB
Diff
152 lines
4.9 KiB
Diff
From f789787f6d1f096a04d39e3de46e5292a7bde3fe Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Thu, 4 Mar 2021 15:44:43 +0800
|
|
Subject: [PATCH 047/189] net/hns3: implement Tx mbuf free on demand
|
|
|
|
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>
|
|
---
|
|
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 5ccaca5..00a26cd 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 3128b63..f3dd239 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 2a37fcc..6e0f3b1 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -6388,6 +6388,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 d5157cf..5b4c587 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev_vf.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
@@ -2763,6 +2763,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 1991b4e..df97018 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
|
|
|