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>
138 lines
5.0 KiB
Diff
138 lines
5.0 KiB
Diff
From d29daf59b08c1314190c6d1cab0e22ee176b6c0f Mon Sep 17 00:00:00 2001
|
|
From: Hongbo Zheng <zhenghongbo3@huawei.com>
|
|
Date: Tue, 23 Mar 2021 19:21:07 +0800
|
|
Subject: [PATCH 066/189] net/hns3: support Rx descriptor status query
|
|
|
|
Add support for query Rx descriptor status in hns3 driver. Check the
|
|
descriptor specified and provide the status information of the
|
|
corresponding descriptor.
|
|
|
|
Signed-off-by: Hongbo Zheng <zhenghongbo3@huawei.com>
|
|
Signed-off-by: Min Hu (Connor) <humin29@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 | 36 ++++++++++++++++++++++++++++++++++++
|
|
drivers/net/hns3/hns3_rxtx.h | 1 +
|
|
6 files changed, 41 insertions(+)
|
|
|
|
diff --git a/doc/guides/nics/features/hns3.ini b/doc/guides/nics/features/hns3.ini
|
|
index 445d391..d407b2f 100644
|
|
--- a/doc/guides/nics/features/hns3.ini
|
|
+++ b/doc/guides/nics/features/hns3.ini
|
|
@@ -34,6 +34,7 @@ L4 checksum offload = Y
|
|
Inner L3 checksum = Y
|
|
Inner L4 checksum = Y
|
|
Packet type parsing = Y
|
|
+Rx descriptor status = Y
|
|
Tx descriptor status = Y
|
|
Basic stats = Y
|
|
Extended stats = Y
|
|
diff --git a/doc/guides/nics/features/hns3_vf.ini b/doc/guides/nics/features/hns3_vf.ini
|
|
index eb55b4f..a0fd56d 100644
|
|
--- a/doc/guides/nics/features/hns3_vf.ini
|
|
+++ b/doc/guides/nics/features/hns3_vf.ini
|
|
@@ -33,6 +33,7 @@ Inner L3 checksum = Y
|
|
Inner L4 checksum = Y
|
|
Packet type parsing = Y
|
|
Tx descriptor status = Y
|
|
+Rx descriptor status = Y
|
|
Basic stats = Y
|
|
Extended stats = Y
|
|
Stats per queue = Y
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
|
|
index 5b07183..12cc3ac 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -6772,6 +6772,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
|
|
err_mp_init_secondary:
|
|
eth_dev->dev_ops = NULL;
|
|
eth_dev->rx_pkt_burst = NULL;
|
|
+ eth_dev->rx_descriptor_status = NULL;
|
|
eth_dev->tx_pkt_burst = NULL;
|
|
eth_dev->tx_pkt_prepare = NULL;
|
|
eth_dev->tx_descriptor_status = NULL;
|
|
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
index 2688c19..6404264 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev_vf.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
@@ -2915,6 +2915,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
|
|
err_mp_init_secondary:
|
|
eth_dev->dev_ops = NULL;
|
|
eth_dev->rx_pkt_burst = NULL;
|
|
+ eth_dev->rx_descriptor_status = NULL;
|
|
eth_dev->tx_pkt_burst = NULL;
|
|
eth_dev->tx_pkt_prepare = NULL;
|
|
eth_dev->tx_descriptor_status = NULL;
|
|
diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c
|
|
index efdb49a..6a7c360 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx.c
|
|
+++ b/drivers/net/hns3/hns3_rxtx.c
|
|
@@ -4042,6 +4042,7 @@ void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev)
|
|
if (hns->hw.adapter_state == HNS3_NIC_STARTED &&
|
|
__atomic_load_n(&hns->hw.reset.resetting, __ATOMIC_RELAXED) == 0) {
|
|
eth_dev->rx_pkt_burst = hns3_get_rx_function(eth_dev);
|
|
+ eth_dev->rx_descriptor_status = hns3_dev_rx_descriptor_status;
|
|
eth_dev->tx_pkt_burst = hns3_get_tx_function(eth_dev, &prep);
|
|
eth_dev->tx_pkt_prepare = prep;
|
|
eth_dev->tx_descriptor_status = hns3_dev_tx_descriptor_status;
|
|
@@ -4258,6 +4259,41 @@ hns3_tx_done_cleanup(void *txq, uint32_t free_cnt)
|
|
}
|
|
|
|
int
|
|
+hns3_dev_rx_descriptor_status(void *rx_queue, uint16_t offset)
|
|
+{
|
|
+ volatile struct hns3_desc *rxdp;
|
|
+ struct hns3_rx_queue *rxq;
|
|
+ struct rte_eth_dev *dev;
|
|
+ uint32_t bd_base_info;
|
|
+ uint16_t desc_id;
|
|
+
|
|
+ rxq = (struct hns3_rx_queue *)rx_queue;
|
|
+ if (offset >= rxq->nb_rx_desc)
|
|
+ return -EINVAL;
|
|
+
|
|
+ desc_id = (rxq->next_to_use + offset) % rxq->nb_rx_desc;
|
|
+ rxdp = &rxq->rx_ring[desc_id];
|
|
+ bd_base_info = rte_le_to_cpu_32(rxdp->rx.bd_base_info);
|
|
+ dev = &rte_eth_devices[rxq->port_id];
|
|
+ if (dev->rx_pkt_burst == hns3_recv_pkts ||
|
|
+ dev->rx_pkt_burst == hns3_recv_scattered_pkts) {
|
|
+ if (offset >= rxq->nb_rx_desc - rxq->rx_free_hold)
|
|
+ return RTE_ETH_RX_DESC_UNAVAIL;
|
|
+ } else if (dev->rx_pkt_burst == hns3_recv_pkts_vec ||
|
|
+ dev->rx_pkt_burst == hns3_recv_pkts_vec_sve){
|
|
+ if (offset >= rxq->nb_rx_desc - rxq->rx_rearm_nb)
|
|
+ return RTE_ETH_RX_DESC_UNAVAIL;
|
|
+ } else {
|
|
+ return RTE_ETH_RX_DESC_UNAVAIL;
|
|
+ }
|
|
+
|
|
+ if (!(bd_base_info & BIT(HNS3_RXD_VLD_B)))
|
|
+ return RTE_ETH_RX_DESC_AVAIL;
|
|
+ else
|
|
+ return RTE_ETH_RX_DESC_DONE;
|
|
+}
|
|
+
|
|
+int
|
|
hns3_dev_tx_descriptor_status(void *tx_queue, uint16_t offset)
|
|
{
|
|
volatile struct hns3_desc *txdp;
|
|
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
|
|
index 82d5aa0..f9b3048 100644
|
|
--- a/drivers/net/hns3/hns3_rxtx.h
|
|
+++ b/drivers/net/hns3/hns3_rxtx.h
|
|
@@ -720,6 +720,7 @@ 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);
|
|
void hns3_enable_rxd_adv_layout(struct hns3_hw *hw);
|
|
+int hns3_dev_rx_descriptor_status(void *rx_queue, uint16_t offset);
|
|
int hns3_dev_tx_descriptor_status(void *tx_queue, uint16_t offset);
|
|
|
|
#endif /* _HNS3_RXTX_H_ */
|
|
--
|
|
2.7.4
|
|
|