Skip to contentSkip to conversation

add port to port feature for CPFL PMD

PATCH Superseded Mingxia Liu 2 participants 9 messages Jan 18, 2023 – Feb 14, 2023 Network drivers

lore
Share & tools
lore
#0 lore raw

cover add port to port feature for CPFL PMD

This patch add the support of port to port feature.

MEV can loopback packets from RX port to TX port (can be the same or different port). This feature is called "port to port".

The main principal of operation is that port-to-port packets are looped back through the host/NIC memory, without software involvement, using the LAN RX and LAN TX DMA engines.

This patchset is based on the idpf PMD code:
http://patches.dpdk.org/project/dpdk/cover/[email protected]/
http://patches.dpdk.org/project/dpdk/cover/[email protected]/
http://patches.dpdk.org/project/dpdk/cover/[email protected]/
http://patches.dpdk.org/project/dpdk/cover/[email protected]/
http://patches.dpdk.org/project/dpdk/cover/[email protected]/

Mingxia Liu (1):
net/cpfl: add port to port feature.

 drivers/common/idpf/idpf_common_device.c   |  50 ++
 drivers/common/idpf/idpf_common_device.h   |   2 +
 drivers/common/idpf/idpf_common_virtchnl.c | 100 ++-
 drivers/common/idpf/idpf_common_virtchnl.h |  12 +
 drivers/common/idpf/version.map            |   5 +
 drivers/net/cpfl/cpfl_ethdev.c             | 374 +++++++--
 drivers/net/cpfl/cpfl_ethdev.h             |   8 +-
 drivers/net/cpfl/cpfl_logs.h               |   2 +
 drivers/net/cpfl/cpfl_rxtx.c               | 851 +++++++++++++++++++--
 drivers/net/cpfl/cpfl_rxtx.h               |  58 ++
 drivers/net/cpfl/cpfl_rxtx_vec_common.h    |  18 +-
 11 files changed, 1347 insertions(+), 133 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 net/cpfl: add port to port feature.

- Implement hairpin queue setup/confige/enable/disable.
- Cross-vport hairpin queue implemented via hairpin_bind/unbind API.

Test step:
1. Make sure no bug on CP side.
2. Add rule on IMC.
- devmem 0x202920C100 64 0x804

   - opcode=0x1303 prof_id=0x34 sub_prof_id=0x0 cookie=0xa2b87 key=0x18,\
     0x0,00,00,00,00,de,0xad,0xbe,0xef,0x20,0x24,0x0,0x0,0x0,0x0,00,00,\
     00,00,00,00,0xa,0x2,0x1d,0x64,00,00,00,00,00,00,00,00,00,00,00,00,\
     0xa,0x2,0x1d,0x2,00,00,00,00,00,00,00,00,00,00,00,00 act=set_vsi{\
     act_val=0 val_type=2 dst_pe=0 slot=0x0} act=set_q{\
     qnum=0x142 no_implicit_vsi=1 prec=5}

3. Send packets on ixia side
UDP packets with dmac=de:ad:be:ef:20:24 sip=10.2.29.100 dip=10.2.29.2

---
 drivers/common/idpf/idpf_common_device.c   |  50 ++
 drivers/common/idpf/idpf_common_device.h   |   2 +
 drivers/common/idpf/idpf_common_virtchnl.c | 100 ++-
 drivers/common/idpf/idpf_common_virtchnl.h |  12 +
 drivers/common/idpf/version.map            |   5 +
 drivers/net/cpfl/cpfl_ethdev.c             | 374 +++++++--
 drivers/net/cpfl/cpfl_ethdev.h             |   8 +-
 drivers/net/cpfl/cpfl_logs.h               |   2 +
 drivers/net/cpfl/cpfl_rxtx.c               | 851 +++++++++++++++++++--
 drivers/net/cpfl/cpfl_rxtx.h               |  58 ++
 drivers/net/cpfl/cpfl_rxtx_vec_common.h    |  18 +-
 11 files changed, 1347 insertions(+), 133 deletions(-)
drivers/common/idpf/idpf_common_device.c +50 -0
index b90b20d0f2..be2ec19650 100644
@@ -362,6 +362,56 @@ idpf_adapter_init(struct idpf_adapter *adapter)
 	return ret;
 }
 
+int
+idpf_adapter_common_init(struct idpf_adapter *adapter)
+{
+	struct idpf_hw *hw = &adapter->hw;
+	int ret;
+
+	idpf_reset_pf(hw);
+	ret = idpf_check_pf_reset_done(hw);
+	if (ret != 0) {
+		DRV_LOG(ERR, "IDPF is still resetting");
+		goto err_check_reset;
+	}
+
+	ret = idpf_init_mbx(hw);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to init mailbox");
+		goto err_check_reset;
+	}
+
+	adapter->mbx_resp = rte_zmalloc("idpf_adapter_mbx_resp",
+					IDPF_DFLT_MBX_BUF_SIZE, 0);
+	if (adapter->mbx_resp == NULL) {
+		DRV_LOG(ERR, "Failed to allocate idpf_adapter_mbx_resp memory");
+		ret = -ENOMEM;
+		goto err_mbx_resp;
+	}
+
+	ret = idpf_vc_check_api_version(adapter);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to check api version");
+		goto err_check_api;
+	}
+
+	ret = idpf_get_pkt_type(adapter);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to set ptype table");
+		goto err_check_api;
+	}
+
+	return 0;
+
+err_check_api:
+	rte_free(adapter->mbx_resp);
+	adapter->mbx_resp = NULL;
+err_mbx_resp:
+	idpf_ctlq_deinit(hw);
+err_check_reset:
+	return ret;
+}
+
 int
 idpf_adapter_deinit(struct idpf_adapter *adapter)
 {
drivers/common/idpf/idpf_common_device.h +2 -0
index 2adeeff37e..9eef9cf73c 100644
@@ -183,6 +183,8 @@ atomic_set_cmd(struct idpf_adapter *adapter, uint32_t ops)
 __rte_internal
 int idpf_adapter_init(struct idpf_adapter *adapter);
 __rte_internal
+int idpf_adapter_common_init(struct idpf_adapter *adapter);
+__rte_internal
 int idpf_adapter_deinit(struct idpf_adapter *adapter);
 __rte_internal
 int idpf_vport_init(struct idpf_vport *vport,
drivers/common/idpf/idpf_common_virtchnl.c +99 -1

121 lines not on this page · raw message

drivers/common/idpf/idpf_common_virtchnl.h +12 -0
index 86a8dfcece..7a6b4d6294 100644
@@ -50,6 +50,12 @@ int idpf_vc_config_rxq(struct idpf_vport *vport, struct idpf_rx_queue *rxq);
 __rte_internal
 int idpf_vc_config_txq(struct idpf_vport *vport, struct idpf_tx_queue *txq);
 __rte_internal
+int idpf_vc_config_rxq_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_info *rxq_info,
+			       uint16_t num_qs);
+__rte_internal
+int idpf_vc_config_txq_by_info(struct idpf_vport *vport, struct virtchnl2_txq_info *txq_info,
+			       uint16_t num_qs);
+__rte_internal
 int idpf_query_stats(struct idpf_vport *vport,
 		     struct virtchnl2_vport_stats **pstats);
 __rte_internal
@@ -58,4 +64,10 @@ __rte_internal
 int idpf_vc_get_rss_lut(struct idpf_vport *vport);
 __rte_internal
 int idpf_vc_get_rss_hash(struct idpf_vport *vport);
+__rte_internal
+int idpf_vc_ena_dis_one_queue(struct idpf_vport *vport, uint16_t qid,
+			      uint32_t type, bool on);
+__rte_internal
+int idpf_vc_get_caps_by_caps_info(struct idpf_adapter *adapter,
+				  struct virtchnl2_get_capabilities *caps_info);
 #endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +5 -0
index 591af6b046..cc9a88972b 100644
@@ -67,6 +67,11 @@ INTERNAL {
 	idpf_vc_get_rss_key;
 	idpf_vc_get_rss_lut;
 	idpf_vc_get_rss_hash;
+	idpf_vc_ena_dis_one_queue;
+	idpf_vc_config_rxq_by_info;
+	idpf_vc_config_txq_by_info;
+	idpf_vc_get_caps_by_caps_info;
+	idpf_adapter_common_init;
 
 	local: *;
 };
drivers/net/cpfl/cpfl_ethdev.c +320 -54

563 lines not on this page · raw message

drivers/net/cpfl/cpfl_ethdev.h +7 -1
index 0d60ee3aed..65c10c0c64 100644
@@ -70,13 +70,19 @@ struct cpfl_devargs {
 	uint16_t req_vport_nb;
 };
 
+struct cpfl_vport {
+	/* p2p mbuf pool */
+	struct rte_mempool *p2p_mp;
+	struct idpf_vport base;
+};
+
 struct cpfl_adapter_ext {
 	TAILQ_ENTRY(cpfl_adapter_ext) next;
 	struct idpf_adapter base;
 
 	char name[CPFL_ADAPTER_NAME_LEN];
 
-	struct idpf_vport **vports;
+	struct cpfl_vport **vports;
 	uint16_t max_vport_nb;
 
 	uint16_t cur_vports; /* bit mask of created vport */
drivers/net/cpfl/cpfl_logs.h +2 -0
index 451bdfbd1d..ddfeb5434c 100644
@@ -18,6 +18,8 @@ extern int cpfl_logtype_driver;
 			__func__, \
 			RTE_FMT_TAIL(__VA_ARGS__,)))
 
+#define PMD_INIT_FUNC_TRACE() PMD_DRV_LOG(DEBUG, " >>")
+
 #define PMD_DRV_LOG_RAW(level, ...) \
 	rte_log(RTE_LOG_ ## level, \
 		cpfl_logtype_driver, \
drivers/net/cpfl/cpfl_rxtx.c +781 -70

1,105 lines not on this page · raw message

drivers/net/cpfl/cpfl_rxtx.h +58 -0

74 lines not on this page · raw message

drivers/net/cpfl/cpfl_rxtx_vec_common.h +11 -7
index 1f01cd40c5..6680771e16 100644
@@ -77,14 +77,16 @@ static inline int
 cpfl_rx_vec_dev_check_default(struct rte_eth_dev *dev)
 {
 	struct idpf_vport *vport = dev->data->dev_private;
-	struct idpf_rx_queue *rxq;
+	struct cpfl_rx_queue *cpfl_rxq;
 	int i, default_ret, splitq_ret, ret = CPFL_SCALAR_PATH;
 
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
-		rxq = dev->data->rx_queues[i];
-		default_ret = cpfl_rx_vec_queue_default(rxq);
+		cpfl_rxq = dev->data->rx_queues[i];
+		default_ret = cpfl_rx_vec_queue_default(&cpfl_rxq->base);
 		if (vport->rxq_model == VIRTCHNL2_QUEUE_MODEL_SPLIT) {
-			splitq_ret = cpfl_rx_splitq_vec_default(rxq);
+			if (cpfl_rxq->hairpin_info.hairpin_q)
+				continue;
+			splitq_ret = cpfl_rx_splitq_vec_default(&cpfl_rxq->base);
 			ret = splitq_ret && default_ret;
 		} else
 			ret = default_ret;
@@ -99,12 +101,14 @@ static inline int
 cpfl_tx_vec_dev_check_default(struct rte_eth_dev *dev)
 {
 	int i;
-	struct idpf_tx_queue *txq;
+	struct cpfl_tx_queue *cpfl_txq;
 	int ret = 0;
 
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
-		txq = dev->data->tx_queues[i];
-		ret = cpfl_tx_vec_queue_default(txq);
+		cpfl_txq = dev->data->tx_queues[i];
+		if (cpfl_txq->hairpin_info.hairpin_q)
+			continue;
+		ret = cpfl_tx_vec_queue_default(&cpfl_txq->base);
 		if (ret == CPFL_SCALAR_PATH)
 			return CPFL_SCALAR_PATH;
 	}
Signature · 1 line
2.25.1
#2 lore raw

RE: [PATCH 1/1] net/cpfl: add port to port feature.

Quoted 10 lines

-----Original Message-----
From: Liu, Mingxia <[email protected]>
Sent: Wednesday, January 18, 2023 9:07 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: Liu, Mingxia <[email protected]>; Wang, Xiao W <[email protected]>; Guo, Junfeng <[email protected]>
Subject: [PATCH 1/1] net/cpfl: add port to port feature.

No need . at the end of the title

Quoted 2 lines

- Implement hairpin queue setup/confige/enable/disable.

Confige->configure

Quoted 1 line

- Cross-vport hairpin queue implemented via hairpin_bind/unbind API.

Better to split the features into different patches.

Quoted 11 lines

Test step:
1. Make sure no bug on CP side.
2. Add rule on IMC.
- devmem 0x202920C100 64 0x804

   - opcode=0x1303 prof_id=0x34 sub_prof_id=0x0 cookie=0xa2b87 key=0x18,\
     0x0,00,00,00,00,de,0xad,0xbe,0xef,0x20,0x24,0x0,0x0,0x0,0x0,00,00,\
     00,00,00,00,0xa,0x2,0x1d,0x64,00,00,00,00,00,00,00,00,00,00,00,00,\
     0xa,0x2,0x1d,0x2,00,00,00,00,00,00,00,00,00,00,00,00 act=set_vsi{\
     act_val=0 val_type=2 dst_pe=0 slot=0x0} act=set_q{\
     qnum=0x142 no_implicit_vsi=1 prec=5}
Quoted 3 lines

3. Send packets on ixia side
UDP packets with dmac=de:ad:be:ef:20:24 sip=10.2.29.100 dip=10.2.29.2

The steps should be refined with an example. Step 1 can be removed.

Quoted 25 lines
---
 drivers/common/idpf/idpf_common_device.c   |  50 ++
 drivers/common/idpf/idpf_common_device.h   |   2 +
 drivers/common/idpf/idpf_common_virtchnl.c | 100 ++-
 drivers/common/idpf/idpf_common_virtchnl.h |  12 +
 drivers/common/idpf/version.map            |   5 +
 drivers/net/cpfl/cpfl_ethdev.c             | 374 +++++++--
 drivers/net/cpfl/cpfl_ethdev.h             |   8 +-
 drivers/net/cpfl/cpfl_logs.h               |   2 +
 drivers/net/cpfl/cpfl_rxtx.c               | 851 +++++++++++++++++++--
 drivers/net/cpfl/cpfl_rxtx.h               |  58 ++
 drivers/net/cpfl/cpfl_rxtx_vec_common.h    |  18 +-
 11 files changed, 1347 insertions(+), 133 deletions(-)
drivers/common/idpf/idpf_common_device.c +0 -0
index b90b20d0f2..be2ec19650 100644

drivers/common/idpf/idpf_common_device.c idpf_adapter_init(struct idpf_adapter *adapter) · line 366

Quoted 5 lines
drivers/common/idpf/idpf_common_device.c +2 -0
@@ -362,6 +362,56 @@ idpf_adapter_init(struct idpf_adapter *adapter)
 	return ret;
 }
 
+int
+idpf_adapter_common_init(struct idpf_adapter *adapter)

It's quite similar to idpf_adapter_init. Can be refined.

Quoted 49 lines
drivers/common/idpf/idpf_common_device.c +48 -0
+{
+	struct idpf_hw *hw = &adapter->hw;
+	int ret;
+
+	idpf_reset_pf(hw);
+	ret = idpf_check_pf_reset_done(hw);
+	if (ret != 0) {
+		DRV_LOG(ERR, "IDPF is still resetting");
+		goto err_check_reset;
+	}
+
+	ret = idpf_init_mbx(hw);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to init mailbox");
+		goto err_check_reset;
+	}
+
+	adapter->mbx_resp = rte_zmalloc("idpf_adapter_mbx_resp",
+					IDPF_DFLT_MBX_BUF_SIZE, 0);
+	if (adapter->mbx_resp == NULL) {
+		DRV_LOG(ERR, "Failed to allocate idpf_adapter_mbx_resp
 memory");
+		ret = -ENOMEM;
+		goto err_mbx_resp;
+	}
+
+	ret = idpf_vc_check_api_version(adapter);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to check api version");
+		goto err_check_api;
+	}
+
+	ret = idpf_get_pkt_type(adapter);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to set ptype table");
+		goto err_check_api;
+	}
+
+	return 0;
+
+err_check_api:
+	rte_free(adapter->mbx_resp);
+	adapter->mbx_resp = NULL;
+err_mbx_resp:
+	idpf_ctlq_deinit(hw);
+err_check_reset:
+	return ret;
+}
+

<...>

drivers/common/idpf/version.map INTERNAL { · line 74

Quoted 11 lines
drivers/common/idpf/version.map +5 -0
@@ -67,6 +67,11 @@ INTERNAL {
 	idpf_vc_get_rss_key;
 	idpf_vc_get_rss_lut;
 	idpf_vc_get_rss_hash;
+	idpf_vc_ena_dis_one_queue;
+	idpf_vc_config_rxq_by_info;
+	idpf_vc_config_txq_by_info;
+	idpf_vc_get_caps_by_caps_info;
+	idpf_adapter_common_init;

Oder alphabetically.

Quoted 20 lines
drivers/common/idpf/version.map +0 -0
 	local: *;
 };
drivers/net/cpfl/cpfl_ethdev.c +3 -1
index f178f3fbb8..e464d76b60 100644
@@ -108,7 +108,9 @@ static int
 cpfl_dev_link_update(struct rte_eth_dev *dev,
 		     __rte_unused int wait_to_complete)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct rte_eth_link new_link;
 
 	memset(&new_link, 0, sizeof(new_link));
@@ -157,10 +159,24 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,
 	return rte_eth_linkstatus_set(dev, &new_link);

drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_link_update(struct rte_eth_dev *dev, · line 169

Quoted 10 lines
drivers/net/cpfl/cpfl_ethdev.c +8 -0
 }
 
+static int
+cpfl_hairpin_cap_get(__rte_unused struct rte_eth_dev *dev,
+		     struct rte_eth_hairpin_cap *cap)
+{
+	cap->max_nb_queues = 1;
+	cap->max_rx_2_tx = 1;
+	cap->max_tx_2_rx = 1;
+	cap->max_nb_desc = 1024;

Better to use macro.

Quoted 604 lines
drivers/net/cpfl/cpfl_ethdev.c +16 -7
+
+	return 0;
+}
+
 static int
 cpfl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 
 	dev_info->max_rx_queues = adapter->caps.max_rx_q;
@@ -274,8 +290,9 @@ cpfl_get_mbuf_alloc_failed_stats(struct rte_eth_dev
 *dev)
 static int
 cpfl_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
-	struct idpf_vport *vport =
-		(struct idpf_vport *)dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct virtchnl2_vport_stats *pstats = NULL;
 	int ret;
@@ -319,8 +336,9 @@ cpfl_reset_mbuf_alloc_failed_stats(struct rte_eth_dev
 *dev)
 static int
 cpfl_dev_stats_reset(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport =
-		(struct idpf_vport *)dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct virtchnl2_vport_stats *pstats = NULL;
 	int ret;
@@ -345,8 +363,9 @@ static int cpfl_dev_xstats_reset(struct rte_eth_dev
 *dev)
 static int cpfl_dev_xstats_get(struct rte_eth_dev *dev,
 			       struct rte_eth_xstat *xstats, unsigned int n)
 {
-	struct idpf_vport *vport =
-		(struct idpf_vport *)dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct virtchnl2_vport_stats *pstats = NULL;
 	unsigned int i;
drivers/net/cpfl/cpfl_ethdev.c +26 -20
 	int ret;
@@ -442,7 +461,8 @@ cpfl_init_rss(struct idpf_vport *vport)
 {
 	struct rte_eth_rss_conf *rss_conf;
 	struct rte_eth_dev_data *dev_data;
-	uint16_t i, nb_q;
+	struct cpfl_rx_queue *cpfl_rxq;
+	uint16_t i, nb_q, max_nb_data_q;
 	int ret = 0;
 
 	dev_data = vport->dev_data;
@@ -461,8 +481,16 @@ cpfl_init_rss(struct idpf_vport *vport)
 			   vport->rss_key_size);
 	}
 
+	/* RSS only to the data queues */
+	max_nb_data_q = nb_q;
+	if (nb_q > 1) {
+		cpfl_rxq = dev_data->rx_queues[nb_q - 1];
+		if (cpfl_rxq && cpfl_rxq->hairpin_info.hairpin_q)
+			max_nb_data_q = nb_q - 1;
+	}
+
 	for (i = 0; i < vport->rss_lut_size; i++)
-		vport->rss_lut[i] = i % nb_q;
+		vport->rss_lut[i] = i % max_nb_data_q;
 
 	vport->rss_hf = IDPF_DEFAULT_RSS_HASH_EXPANDED;
 
@@ -478,7 +506,9 @@ cpfl_rss_reta_update(struct rte_eth_dev *dev,
 		     struct rte_eth_rss_reta_entry64 *reta_conf,
 		     uint16_t reta_size)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	uint16_t idx, shift;
 	uint32_t *lut;
@@ -534,7 +564,9 @@ cpfl_rss_reta_query(struct rte_eth_dev *dev,
 		    struct rte_eth_rss_reta_entry64 *reta_conf,
 		    uint16_t reta_size)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	uint16_t idx, shift;
 	int ret = 0;
@@ -572,7 +604,9 @@ static int
 cpfl_rss_hash_update(struct rte_eth_dev *dev,
 		     struct rte_eth_rss_conf *rss_conf)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	int ret = 0;
 
@@ -637,7 +671,9 @@ static int
 cpfl_rss_hash_conf_get(struct rte_eth_dev *dev,
 		       struct rte_eth_rss_conf *rss_conf)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	int ret = 0;
 
@@ -674,10 +710,10 @@ cpfl_rss_hash_conf_get(struct rte_eth_dev *dev,
 static int
 cpfl_dev_configure(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct rte_eth_conf *conf = &dev->data->dev_conf;
-	struct idpf_adapter *adapter = vport->adapter;
-	int ret;
 
 	if (conf->link_speeds & RTE_ETH_LINK_SPEED_FIXED) {
 		PMD_INIT_LOG(ERR, "Setting link speed is not supported");
@@ -716,17 +752,6 @@ cpfl_dev_configure(struct rte_eth_dev *dev)
 		return -ENOTSUP;
 	}
 
-	if (adapter->caps.rss_caps != 0 && dev->data->nb_rx_queues != 0) {
-		ret = cpfl_init_rss(vport);
-		if (ret != 0) {
-			PMD_INIT_LOG(ERR, "Failed to init rss");
-			return ret;
-		}
-	} else {
-		PMD_INIT_LOG(ERR, "RSS is not supported.");
-		return -1;
-	}
-
 	vport->max_pkt_len =
 		(dev->data->mtu == 0) ? CPFL_DEFAULT_MTU : dev->data-
Quoted 1 line

mtu +

drivers/net/cpfl/cpfl_ethdev.c +47 -15
 		CPFL_ETH_OVERHEAD;
@@ -737,7 +762,9 @@ cpfl_dev_configure(struct rte_eth_dev *dev)
 static int
 cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	uint16_t nb_rx_queues = dev->data->nb_rx_queues;
 
 	return idpf_config_irq_map(vport, nb_rx_queues);
@@ -746,30 +773,92 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)
 static int
 cpfl_start_queues(struct rte_eth_dev *dev)
 {
-	struct idpf_rx_queue *rxq;
-	struct idpf_tx_queue *txq;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
+	struct idpf_adapter *adapter = vport->adapter;
+	struct cpfl_rx_queue *cpfl_rxq;
+	struct cpfl_tx_queue *cpfl_txq;
 	int err = 0;
 	int i;
 
-	for (i = 0; i < dev->data->nb_tx_queues; i++) {
-		txq = dev->data->tx_queues[i];
-		if (txq == NULL || txq->tx_deferred_start)
-			continue;
-		err = cpfl_tx_queue_start(dev, i);
+	if (adapter->caps.rss_caps != 0 && dev->data->nb_rx_queues != 0) {
+		err = cpfl_init_rss(vport);
 		if (err != 0) {
-			PMD_DRV_LOG(ERR, "Fail to start Tx queue %u", i);
+			PMD_INIT_LOG(ERR, "Failed to init rss");
 			return err;
 		}
+	} else {
+		PMD_INIT_LOG(ERR, "RSS is not supported.");
+		return -1;
+	}
+
+	for (i = 0; i < dev->data->nb_tx_queues; i++) {
+		cpfl_txq = dev->data->tx_queues[i];
+		if (cpfl_txq == NULL || cpfl_txq->base.tx_deferred_start)
+			continue;
+
+		if (!cpfl_txq->hairpin_info.hairpin_q) {
+			err = cpfl_tx_queue_start(dev, i);
+			if (err != 0) {
+				PMD_DRV_LOG(ERR, "Fail to start Tx
 queue %u", i);
+				return err;
+			}
+		} else if (!cpfl_txq->hairpin_info.hairpin_cv) {
+			err = cpfl_set_hairpin_txqinfo(vport, cpfl_txq);
+			if (err) {
+				PMD_DRV_LOG(ERR, "Fail to configure hairpin
 Tx queue %u", i);
+				return err;
+			}
+		}
 	}
 
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
-		rxq = dev->data->rx_queues[i];
-		if (rxq == NULL || rxq->rx_deferred_start)
+		cpfl_rxq = dev->data->rx_queues[i];
+		if (cpfl_rxq == NULL || cpfl_rxq->base.rx_deferred_start)
 			continue;
-		err = cpfl_rx_queue_start(dev, i);
-		if (err != 0) {
-			PMD_DRV_LOG(ERR, "Fail to start Rx queue %u", i);
-			return err;
+		if (!cpfl_rxq->hairpin_info.hairpin_q) {
+			err = cpfl_rx_queue_start(dev, i);
+			if (err != 0) {
+				PMD_DRV_LOG(ERR, "Fail to start Rx
 queue %u", i);
+				return err;
+			}
+		} else if (!cpfl_rxq->hairpin_info.hairpin_cv) {
+			err = cpfl_set_hairpin_rxqinfo(vport, cpfl_rxq);
+			if (err) {
+				PMD_DRV_LOG(ERR, "Fail to configure hairpin

Rx queue %u", i);

drivers/net/cpfl/cpfl_ethdev.c +5 -0
+				return err;
+			}
+			err = cpfl_rx_queue_init(dev, i);
+			if (err) {
+				PMD_DRV_LOG(ERR, "Fail to init hairpin Rx

queue %u", i);

drivers/net/cpfl/cpfl_ethdev.c +9 -0
+				return err;
+			}
+		}
+	}
+
+	/* For non-cross vport hairpin queues, enable Txq and Rxq at last. */
+	for (i = 0; i < dev->data->nb_tx_queues; i++) {
+		cpfl_txq = dev->data->tx_queues[i];
+		if (cpfl_txq->hairpin_info.hairpin_q && !cpfl_txq-
Quoted 1 line

hairpin_info.hairpin_cv) {

drivers/net/cpfl/cpfl_ethdev.c +3 -0
+			err = cpfl_switch_hairpin_queue(vport, i, false, true);
+			if (err)
+				PMD_DRV_LOG(ERR, "Failed to switch hairpin

TX queue %u on",

drivers/net/cpfl/cpfl_ethdev.c +9 -0
+					    i);
+			else
+				cpfl_txq->base.q_started = true;
+		}
+	}
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++) {
+		cpfl_rxq = dev->data->rx_queues[i];
+		if (cpfl_rxq->hairpin_info.hairpin_q && !cpfl_rxq-
Quoted 1 line

hairpin_info.hairpin_cv) {

drivers/net/cpfl/cpfl_ethdev.c +3 -0
+			err = cpfl_switch_hairpin_queue(vport, i, true, true);
+			if (err)
+				PMD_DRV_LOG(ERR, "Failed to switch hairpin

RX queue %u on",

drivers/net/cpfl/cpfl_ethdev.c +111 -4
+					    i);
+			else
+				cpfl_rxq->base.q_started = true;
 		}
 	}
@@ -779,7 +868,9 @@ cpfl_start_queues(struct rte_eth_dev *dev)
 static int
 cpfl_dev_start(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *base = vport->adapter;
 	struct cpfl_adapter_ext *adapter = CPFL_ADAPTER_TO_EXT(base);
 	uint16_t num_allocated_vectors = base->caps.num_allocated_vectors;
@@ -841,10 +932,106 @@ cpfl_dev_start(struct rte_eth_dev *dev)
 	return ret;
 }
 
+static int
+cpfl_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,
+			    __rte_unused size_t len, uint32_t tx)
+{
+	/* Assume the last queue is used by app as hairpin */
+	int qid = dev->data->nb_tx_queues - 1;
+	struct cpfl_txq_hairpin_info *txq_hairpin_info;
+	struct cpfl_rxq_hairpin_info *rxq_hairpin_info;
+	struct cpfl_tx_queue *cpfl_txq = dev->data->tx_queues[qid];
+	struct cpfl_rx_queue *cpfl_rxq = dev->data->rx_queues[qid];
+
+	PMD_INIT_FUNC_TRACE();
+
+	txq_hairpin_info = &(cpfl_txq->hairpin_info);
+	rxq_hairpin_info = &(cpfl_rxq->hairpin_info);
+
+	if (tx && txq_hairpin_info->hairpin_cv) {
+		peer_ports[0] = txq_hairpin_info->peer_rxp;
+		return 1;
+	} else if (!tx && rxq_hairpin_info->hairpin_cv) {
+		peer_ports[0] = rxq_hairpin_info->peer_txp;
+		return 1;
+	}
+
+	return 0;
+}
+
+static int
+cpfl_hairpin_bind(struct rte_eth_dev *dev, uint16_t rx_port)
+{
+	struct cpfl_vport *cpfl_vport, *peer_cpfl_vport;
+	struct idpf_vport *vport, *peer_vport;
+	/* Assume the last queue is used by app as hairpin */
+	int qid = dev->data->nb_tx_queues - 1;
+	struct cpfl_tx_queue *cpfl_txq = dev->data->tx_queues[qid];
+	struct cpfl_rx_queue *cpfl_rxq;
+	struct rte_eth_dev *peer_dev;
+	int err;
+
+	PMD_INIT_FUNC_TRACE();
+	if (rx_port >= RTE_MAX_ETHPORTS)
+		return 0;
+
+	if (cpfl_txq->hairpin_info.bound) {
+		PMD_DRV_LOG(INFO, "port %u already hairpin bound",
+				dev->data->port_id);
+		return 0;
+	}
+
+	cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	vport = &(cpfl_vport->base);
+	err = cpfl_set_hairpin_txqinfo(vport, cpfl_txq);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Fail to configure hairpin Tx queue %u of
 port %u",
+			    qid, dev->data->port_id);
+		return err;
+	}
+
+	peer_dev = &rte_eth_devices[rx_port];
+	peer_cpfl_vport = (struct cpfl_vport *)peer_dev->data->dev_private;
+	peer_vport = &(peer_cpfl_vport->base);
+	cpfl_rxq = peer_dev->data->rx_queues[qid];
+	err = cpfl_set_hairpin_rxqinfo(peer_vport, cpfl_rxq);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Fail to configure hairpin Rx queue %u of
 port %u",
+			    qid, peer_dev->data->port_id);
+		return err;
+	}
+	err = cpfl_rx_queue_init(peer_dev, qid);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Fail to init hairpin Rx queue %u of
 port %u",
+			    qid, peer_dev->data->port_id);
+		return err;
+	}
+
+	err = cpfl_switch_hairpin_queue(vport, qid, false, true);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Fail to enable hairpin Tx queue %u of
 port %u",
+			    qid, dev->data->port_id);
+		return err;
+	}
+
+	err = cpfl_switch_hairpin_queue(peer_vport, qid, true, true);
+	if (err) {
+		PMD_DRV_LOG(ERR, "Fail to enable hairpin Rx queue %u of
 port %u",
+			    qid, peer_dev->data->port_id);
+		return err;
+	}
+
+	cpfl_txq->hairpin_info.bound = true;
+	return 0;
+}
+
 static int
 cpfl_dev_stop(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 
 	if (vport->stopped == 1)
 		return 0;
@@ -865,17 +1052,23 @@ cpfl_dev_stop(struct rte_eth_dev *dev)
 static int
 cpfl_dev_close(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct cpfl_adapter_ext *adapter = CPFL_ADAPTER_TO_EXT(vport-
 >adapter);
 
 	cpfl_dev_stop(dev);
+	if (cpfl_vport->p2p_mp) {
+		rte_mempool_free(cpfl_vport->p2p_mp);
+		cpfl_vport->p2p_mp = NULL;
+	}
 	idpf_vport_deinit(vport);
 
 	adapter->cur_vports &= ~RTE_BIT32(vport->devarg_id);
 	adapter->cur_vport_nb--;
 	dev->data->dev_private = NULL;
 	adapter->vports[vport->sw_idx] = NULL;
-	rte_free(vport);
+	rte_free(cpfl_vport);
 
 	return 0;

}

drivers/net/cpfl/cpfl_ethdev.c +1 -1
@@ -1048,7 +1241,7 @@ cpfl_find_vport(struct cpfl_adapter_ext *adapter,
 uint32_t vport_id)
 	int i;
 
 	for (i = 0; i < adapter->cur_vport_nb; i++) {
-		vport = adapter->vports[i];
+		vport = &(adapter->vports[i]->base);
 		if (vport->vport_id != vport_id)
 			continue;
drivers/net/cpfl/cpfl_ethdev.c +66 -0
 		else
@@ -1162,6 +1355,72 @@ cpfl_dev_alarm_handler(void *param)
 	rte_eal_alarm_set(CPFL_ALARM_INTERVAL, cpfl_dev_alarm_handler,
 adapter);
 }
 
+static int
+cpfl_get_caps(struct idpf_adapter *adapter)
+{
+	struct virtchnl2_get_capabilities caps_msg = {0};
+
+	caps_msg.csum_caps =
+		VIRTCHNL2_CAP_TX_CSUM_L3_IPV4          |
+		VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_TCP      |
+		VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_UDP      |
+		VIRTCHNL2_CAP_TX_CSUM_L4_IPV4_SCTP     |
+		VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_TCP      |
+		VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_UDP      |
+		VIRTCHNL2_CAP_TX_CSUM_L4_IPV6_SCTP     |
+		VIRTCHNL2_CAP_TX_CSUM_GENERIC          |
+		VIRTCHNL2_CAP_RX_CSUM_L3_IPV4          |
+		VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_TCP      |
+		VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_UDP      |
+		VIRTCHNL2_CAP_RX_CSUM_L4_IPV4_SCTP     |
+		VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_TCP      |
+		VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_UDP      |
+		VIRTCHNL2_CAP_RX_CSUM_L4_IPV6_SCTP     |
+		VIRTCHNL2_CAP_RX_CSUM_GENERIC;
+
+	caps_msg.rss_caps =
+		VIRTCHNL2_CAP_RSS_IPV4_TCP             |
+		VIRTCHNL2_CAP_RSS_IPV4_UDP             |
+		VIRTCHNL2_CAP_RSS_IPV4_SCTP            |
+		VIRTCHNL2_CAP_RSS_IPV4_OTHER           |
+		VIRTCHNL2_CAP_RSS_IPV6_TCP             |
+		VIRTCHNL2_CAP_RSS_IPV6_UDP             |
+		VIRTCHNL2_CAP_RSS_IPV6_SCTP            |
+		VIRTCHNL2_CAP_RSS_IPV6_OTHER           |
+		VIRTCHNL2_CAP_RSS_IPV4_AH              |
+		VIRTCHNL2_CAP_RSS_IPV4_ESP             |
+		VIRTCHNL2_CAP_RSS_IPV4_AH_ESP          |
+		VIRTCHNL2_CAP_RSS_IPV6_AH              |
+		VIRTCHNL2_CAP_RSS_IPV6_ESP             |
+		VIRTCHNL2_CAP_RSS_IPV6_AH_ESP;
+
+	caps_msg.other_caps = VIRTCHNL2_CAP_WB_ON_ITR |
+			      VIRTCHNL2_CAP_PTP |
+			      VIRTCHNL2_CAP_RX_FLEX_DESC;
+
+	return idpf_vc_get_caps_by_caps_info(adapter, &caps_msg);
+}
+
+static int
+cpfl_adapter_init(struct idpf_adapter *adapter)
+{
+	int ret = 0;
+
+	ret = idpf_adapter_common_init(adapter);
+	if (ret != 0) {
+		PMD_DRV_LOG(ERR, "Failed to  init idpf common adapter");
+		return ret;
+	}
+
+	ret = cpfl_get_caps(adapter);
+	if (ret != 0) {
+		PMD_DRV_LOG(ERR, "Failed to get capabilities");
+		return ret;
+	}
+
+	return ret;
+}
+
 static int
 cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext

*adapter)
{

drivers/net/cpfl/cpfl_ethdev.c +1 -1
@@ -1178,7 +1437,7 @@ cpfl_adapter_ext_init(struct rte_pci_device
 *pci_dev, struct cpfl_adapter_ext *a
 
 	strncpy(adapter->name, pci_dev->device.name, PCI_PRI_STR_SIZE);
 
-	ret = idpf_adapter_init(base);
+	ret = cpfl_adapter_init(base);
 	if (ret != 0) {
 		PMD_INIT_LOG(ERR, "Failed to init adapter");
drivers/net/cpfl/cpfl_ethdev.c +5 -0
 		goto err_adapter_init;
@@ -1237,6 +1496,11 @@ static const struct eth_dev_ops cpfl_eth_dev_ops
 = {
 	.xstats_get			= cpfl_dev_xstats_get,
 	.xstats_get_names		= cpfl_dev_xstats_get_names,
 	.xstats_reset			= cpfl_dev_xstats_reset,
+	.hairpin_cap_get		= cpfl_hairpin_cap_get,
+	.rx_hairpin_queue_setup		=
 cpfl_rx_hairpin_queue_setup,
+	.tx_hairpin_queue_setup		=
 cpfl_tx_hairpin_queue_setup,
+	.hairpin_get_peer_ports		= cpfl_hairpin_get_peer_ports,
+	.hairpin_bind			= cpfl_hairpin_bind,

};

static uint16_t

drivers/net/cpfl/cpfl_ethdev.c +5 -3
@@ -1261,7 +1525,9 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *ad)
 static int
 cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct cpfl_vport_param *param = init_params;
 	struct cpfl_adapter_ext *adapter = param->adapter;
 	/* for sending create vport virtchnl msg prepare */
@@ -1287,7 +1553,7 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void
 *init_params)
 		goto err;
 	}
 
-	adapter->vports[param->idx] = vport;
+	adapter->vports[param->idx] = cpfl_vport;
 	adapter->cur_vports |= RTE_BIT32(param->devarg_id);
 	adapter->cur_vport_nb++;
@@ -1370,7 +1636,7 @@ cpfl_pci_probe(struct rte_pci_driver *pci_drv
 __rte_unused,
 	if (adapter == NULL) {
 		first_probe = true;
 		adapter = rte_zmalloc("cpfl_adapter_ext",
-						sizeof(struct cpfl_adapter_ext),
 0);
+				      sizeof(struct cpfl_adapter_ext), 0);
 		if (adapter == NULL) {
drivers/net/cpfl/cpfl_ethdev.c +1 -1
 			PMD_INIT_LOG(ERR, "Failed to allocate adapter.");
 			return -ENOMEM;
@@ -1405,7 +1671,7 @@ cpfl_pci_probe(struct rte_pci_driver *pci_drv
 __rte_unused,
 		snprintf(name, sizeof(name), "cpfl_%s_vport_0",
 			 pci_dev->device.name);
 		retval = rte_eth_dev_create(&pci_dev->device, name,
-					    sizeof(struct idpf_vport),
+					    sizeof(struct cpfl_vport),
 					    NULL, NULL, cpfl_dev_vport_init,
 					    &vport_param);
drivers/net/cpfl/cpfl_ethdev.c +1 -1
 		if (retval != 0)
@@ -1423,7 +1689,7 @@ cpfl_pci_probe(struct rte_pci_driver *pci_drv
 __rte_unused,
 				 pci_dev->device.name,
 				 devargs.req_vports[i]);
 			retval = rte_eth_dev_create(&pci_dev->device, name,
-						    sizeof(struct idpf_vport),
+						    sizeof(struct cpfl_vport),
 						    NULL, NULL,
 cpfl_dev_vport_init,
drivers/net/cpfl/cpfl_ethdev.c +0 -0
 						    &vport_param);
 			if (retval != 0)
drivers/net/cpfl/cpfl_ethdev.h +0 -0
index 0d60ee3aed..65c10c0c64 100644

drivers/net/cpfl/cpfl_ethdev.h struct cpfl_devargs { · line 77

Quoted 8 lines
drivers/net/cpfl/cpfl_ethdev.h +5 -0
@@ -70,13 +70,19 @@ struct cpfl_devargs {
 	uint16_t req_vport_nb;
 };
 
+struct cpfl_vport {
+	/* p2p mbuf pool */
+	struct rte_mempool *p2p_mp;
+	struct idpf_vport base;
+};

It can be in a separate patch which introduces the new structure and code refactor.

Quoted 12 lines
drivers/net/cpfl/cpfl_ethdev.h +2 -1
+
 struct cpfl_adapter_ext {
 	TAILQ_ENTRY(cpfl_adapter_ext) next;
 	struct idpf_adapter base;
 
 	char name[CPFL_ADAPTER_NAME_LEN];
 
-	struct idpf_vport **vports;
+	struct cpfl_vport **vports;
 	uint16_t max_vport_nb;
 
 	uint16_t cur_vports; /* bit mask of created vport */

<snip>

#3 lore raw

v2 cover add port to port feature

In reply to Mingxia Liu

This patchset add the support of port to port feature. Port-to-port packets are looped back through the host/NIC memory, without software involvement, using the LAN RX and LAN TX DMA engines.

And this patchset only support the same port for Tx and Rx queue.

This patchset is based on the cpfl PMD code:
http://patches.dpdk.org/project/dpdk/cover/[email protected]/

Mingxia Liu (5):
net/cpfl: add some structure for hairpin queue net/cpfl: update device initialization for hairpin queue net/cpfl: add hairpin queue enable and setup net/cpfl: support hairpin queue start and stop net/cpfl: adjust RSS LUT to exclude hairpin queue

 drivers/common/idpf/idpf_common_device.c   |  52 ++
 drivers/common/idpf/idpf_common_device.h   |   2 +
 drivers/common/idpf/idpf_common_virtchnl.c | 100 ++-
 drivers/common/idpf/idpf_common_virtchnl.h |  12 +
 drivers/common/idpf/version.map            |   5 +
 drivers/net/cpfl/cpfl_ethdev.c             | 292 +++++--
 drivers/net/cpfl/cpfl_ethdev.h             |   8 +-
 drivers/net/cpfl/cpfl_rxtx.c               | 855 +++++++++++++++++++--
 drivers/net/cpfl/cpfl_rxtx.h               |  71 +-
 drivers/net/cpfl/cpfl_rxtx_vec_common.h    |  22 +-
 10 files changed, 1272 insertions(+), 147 deletions(-)
Signature · 1 line
2.25.1
#4 lore raw

PATCH v2 1/5 net/cpfl: add some structure for hairpin queue

This patch add some structure for hairpin queue,
cpfl_rx_queue/cpfl_tx_queue/cpfl_vport.

---
 drivers/net/cpfl/cpfl_ethdev.c          | 102 +++++++-----
 drivers/net/cpfl/cpfl_ethdev.h          |   8 +-
 drivers/net/cpfl/cpfl_rxtx.c            | 196 +++++++++++++++++-------
 drivers/net/cpfl/cpfl_rxtx.h            |  28 ++++
 drivers/net/cpfl/cpfl_rxtx_vec_common.h |  18 ++-
 5 files changed, 255 insertions(+), 97 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +66 -36
index 543dbd60f0..f799707ea7 100644
@@ -108,7 +108,9 @@ static int
 cpfl_dev_link_update(struct rte_eth_dev *dev,
 		     __rte_unused int wait_to_complete)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct rte_eth_link new_link;
 
 	memset(&new_link, 0, sizeof(new_link));
@@ -160,7 +162,9 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,
 static int
 cpfl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 
 	dev_info->max_rx_queues = adapter->caps.max_rx_q;
@@ -220,7 +224,9 @@ cpfl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 static int
 cpfl_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 
 	/* mtu setting is forbidden if port is start */
 	if (dev->data->dev_started) {
@@ -260,12 +266,12 @@ static uint64_t
 cpfl_get_mbuf_alloc_failed_stats(struct rte_eth_dev *dev)
 {
 	uint64_t mbuf_alloc_failed = 0;
-	struct idpf_rx_queue *rxq;
+	struct cpfl_rx_queue *cpfl_rxq;
 	int i = 0;
 
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
-		rxq = dev->data->rx_queues[i];
-		mbuf_alloc_failed += __atomic_load_n(&rxq->rx_stats.mbuf_alloc_failed,
+		cpfl_rxq = dev->data->rx_queues[i];
+		mbuf_alloc_failed += __atomic_load_n(&cpfl_rxq->base.rx_stats.mbuf_alloc_failed,
 						     __ATOMIC_RELAXED);
 	}
 
@@ -275,8 +281,9 @@ cpfl_get_mbuf_alloc_failed_stats(struct rte_eth_dev *dev)
 static int
 cpfl_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 {
-	struct idpf_vport *vport =
-		(struct idpf_vport *)dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct virtchnl2_vport_stats *pstats = NULL;
 	int ret;
 
@@ -308,20 +315,21 @@ cpfl_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 static void
 cpfl_reset_mbuf_alloc_failed_stats(struct rte_eth_dev *dev)
 {
-	struct idpf_rx_queue *rxq;
+	struct cpfl_rx_queue *cpfl_rxq;
 	int i;
 
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
-		rxq = dev->data->rx_queues[i];
-		__atomic_store_n(&rxq->rx_stats.mbuf_alloc_failed, 0, __ATOMIC_RELAXED);
+		cpfl_rxq = dev->data->rx_queues[i];
+		__atomic_store_n(&cpfl_rxq->base.rx_stats.mbuf_alloc_failed, 0, __ATOMIC_RELAXED);
 	}
 }
 
 static int
 cpfl_dev_stats_reset(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport =
-		(struct idpf_vport *)dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct virtchnl2_vport_stats *pstats = NULL;
 	int ret;
 
@@ -346,8 +354,9 @@ static int cpfl_dev_xstats_reset(struct rte_eth_dev *dev)
 static int cpfl_dev_xstats_get(struct rte_eth_dev *dev,
 			       struct rte_eth_xstat *xstats, unsigned int n)
 {
-	struct idpf_vport *vport =
-		(struct idpf_vport *)dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct virtchnl2_vport_stats *pstats = NULL;
 	unsigned int i;
 	int ret;
@@ -461,7 +470,9 @@ cpfl_rss_reta_update(struct rte_eth_dev *dev,
 		     struct rte_eth_rss_reta_entry64 *reta_conf,
 		     uint16_t reta_size)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	uint16_t idx, shift;
 	int ret = 0;
@@ -500,7 +511,9 @@ cpfl_rss_reta_query(struct rte_eth_dev *dev,
 		    struct rte_eth_rss_reta_entry64 *reta_conf,
 		    uint16_t reta_size)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	uint16_t idx, shift;
 	int ret = 0;
@@ -538,7 +551,9 @@ static int
 cpfl_rss_hash_update(struct rte_eth_dev *dev,
 		     struct rte_eth_rss_conf *rss_conf)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	int ret = 0;
 
@@ -603,7 +618,9 @@ static int
 cpfl_rss_hash_conf_get(struct rte_eth_dev *dev,
 		       struct rte_eth_rss_conf *rss_conf)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *adapter = vport->adapter;
 	int ret = 0;
 
@@ -640,7 +657,9 @@ cpfl_rss_hash_conf_get(struct rte_eth_dev *dev,
 static int
 cpfl_dev_configure(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct rte_eth_conf *conf = &dev->data->dev_conf;
 	struct idpf_adapter *adapter = vport->adapter;
 	int ret;
@@ -703,7 +722,9 @@ cpfl_dev_configure(struct rte_eth_dev *dev)
 static int
 cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	uint16_t nb_rx_queues = dev->data->nb_rx_queues;
 
 	return idpf_vport_irq_map_config(vport, nb_rx_queues);
@@ -712,15 +733,16 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)
 static int
 cpfl_start_queues(struct rte_eth_dev *dev)
 {
-	struct idpf_rx_queue *rxq;
-	struct idpf_tx_queue *txq;
+	struct cpfl_rx_queue *cpfl_rxq;
+	struct cpfl_tx_queue *cpfl_txq;
 	int err = 0;
 	int i;
 
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
-		txq = dev->data->tx_queues[i];
-		if (txq == NULL || txq->tx_deferred_start)
+		cpfl_txq = dev->data->tx_queues[i];
+		if (cpfl_txq == NULL || cpfl_txq->base.tx_deferred_start)
 			continue;
+
 		err = cpfl_tx_queue_start(dev, i);
 		if (err != 0) {
 			PMD_DRV_LOG(ERR, "Fail to start Tx queue %u", i);
@@ -729,8 +751,8 @@ cpfl_start_queues(struct rte_eth_dev *dev)
 	}
 
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
-		rxq = dev->data->rx_queues[i];
-		if (rxq == NULL || rxq->rx_deferred_start)
+		cpfl_rxq = dev->data->rx_queues[i];
+		if (cpfl_rxq == NULL || cpfl_rxq->base.rx_deferred_start)
 			continue;
 		err = cpfl_rx_queue_start(dev, i);
 		if (err != 0) {
@@ -745,7 +767,9 @@ cpfl_start_queues(struct rte_eth_dev *dev)
 static int
 cpfl_dev_start(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct idpf_adapter *base = vport->adapter;
 	struct cpfl_adapter_ext *adapter = CPFL_ADAPTER_TO_EXT(base);
 	uint16_t num_allocated_vectors = base->caps.num_allocated_vectors;
@@ -808,7 +832,9 @@ cpfl_dev_start(struct rte_eth_dev *dev)
 static int
 cpfl_dev_stop(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 
 	if (vport->stopped == 1)
 		return 0;
@@ -829,7 +855,9 @@ cpfl_dev_stop(struct rte_eth_dev *dev)
 static int
 cpfl_dev_close(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct cpfl_adapter_ext *adapter = CPFL_ADAPTER_TO_EXT(vport->adapter);
 
 	cpfl_dev_stop(dev);
@@ -839,7 +867,7 @@ cpfl_dev_close(struct rte_eth_dev *dev)
 	adapter->cur_vport_nb--;
 	dev->data->dev_private = NULL;
 	adapter->vports[vport->sw_idx] = NULL;
-	rte_free(vport);
+	rte_free(cpfl_vport);
 
 	return 0;
 }
@@ -1012,7 +1040,7 @@ cpfl_find_vport(struct cpfl_adapter_ext *adapter, uint32_t vport_id)
 	int i;
 
 	for (i = 0; i < adapter->cur_vport_nb; i++) {
-		vport = adapter->vports[i];
+		vport = &(adapter->vports[i]->base);
 		if (vport->vport_id != vport_id)
 			continue;
 		else
@@ -1225,7 +1253,9 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *ad)
 static int
 cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct cpfl_vport_param *param = init_params;
 	struct cpfl_adapter_ext *adapter = param->adapter;
 	/* for sending create vport virtchnl msg prepare */
@@ -1251,7 +1281,7 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)
 		goto err;
 	}
 
-	adapter->vports[param->idx] = vport;
+	adapter->vports[param->idx] = cpfl_vport;
 	adapter->cur_vports |= RTE_BIT32(param->devarg_id);
 	adapter->cur_vport_nb++;
 
@@ -1369,7 +1399,7 @@ cpfl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 		snprintf(name, sizeof(name), "cpfl_%s_vport_0",
 			 pci_dev->device.name);
 		retval = rte_eth_dev_create(&pci_dev->device, name,
-					    sizeof(struct idpf_vport),
+					    sizeof(struct cpfl_vport),
 					    NULL, NULL, cpfl_dev_vport_init,
 					    &vport_param);
 		if (retval != 0)
@@ -1387,7 +1417,7 @@ cpfl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 				 pci_dev->device.name,
 				 devargs.req_vports[i]);
 			retval = rte_eth_dev_create(&pci_dev->device, name,
-						    sizeof(struct idpf_vport),
+						    sizeof(struct cpfl_vport),
 						    NULL, NULL, cpfl_dev_vport_init,
 						    &vport_param);
 			if (retval != 0)
drivers/net/cpfl/cpfl_ethdev.h +7 -1
index e00dff4bf0..ef3225878b 100644
@@ -70,13 +70,19 @@ struct cpfl_devargs {
 	uint16_t req_vport_nb;
 };
 
+struct cpfl_vport {
+	/* p2p mbuf pool */
+	struct rte_mempool *p2p_mp;
+	struct idpf_vport base;
+};
+
 struct cpfl_adapter_ext {
 	TAILQ_ENTRY(cpfl_adapter_ext) next;
 	struct idpf_adapter base;
 
 	char name[CPFL_ADAPTER_NAME_LEN];
 
-	struct idpf_vport **vports;
+	struct cpfl_vport **vports;
 	uint16_t max_vport_nb;
 
 	uint16_t cur_vports; /* bit mask of created vport */
drivers/net/cpfl/cpfl_rxtx.c +144 -52

429 lines not on this page · raw message

drivers/net/cpfl/cpfl_rxtx.h +28 -0
index fb267d38c8..e241afece9 100644
@@ -23,6 +23,34 @@
 
 #define CPFL_SUPPORT_CHAIN_NUM 5
 
+struct cpfl_rxq_hairpin_info {
+	bool hairpin_q;		/* if rx queue is a hairpin queue */
+	/* only valid if the hairpin queue pair crosses vport */
+	bool hairpin_cv;
+	uint16_t peer_txp;
+};
+
+struct cpfl_rx_queue {
+	struct idpf_rx_queue base;
+	struct cpfl_rxq_hairpin_info hairpin_info;
+};
+
+struct cpfl_txq_hairpin_info {
+	/* only valid for hairpin queue */
+	bool hairpin_q;
+	/* only valid if the hairpin queue pair crosses vport */
+	bool hairpin_cv;
+	uint16_t peer_rxq_id;
+	uint16_t peer_rxp;
+	bool bound;
+	uint16_t complq_peer_rxq_id;
+};
+
+struct cpfl_tx_queue {
+	struct idpf_tx_queue base;
+	struct cpfl_txq_hairpin_info hairpin_info;
+};
+
 int cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
 			uint16_t nb_desc, unsigned int socket_id,
 			const struct rte_eth_txconf *tx_conf);
drivers/net/cpfl/cpfl_rxtx_vec_common.h +10 -8
index 665418d27d..8d0b825f95 100644
@@ -76,15 +76,17 @@ cpfl_rx_splitq_vec_default(struct idpf_rx_queue *rxq)
 static inline int
 cpfl_rx_vec_dev_check_default(struct rte_eth_dev *dev)
 {
-	struct idpf_vport *vport = dev->data->dev_private;
-	struct idpf_rx_queue *rxq;
+	struct cpfl_vport *cpfl_vport =
+	    (struct cpfl_vport *)dev->data->dev_private;
+	struct idpf_vport *vport = &(cpfl_vport->base);
+	struct cpfl_rx_queue *cpfl_rxq;
 	int i, default_ret, splitq_ret, ret = CPFL_SCALAR_PATH;
 
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
-		rxq = dev->data->rx_queues[i];
-		default_ret = cpfl_rx_vec_queue_default(rxq);
+		cpfl_rxq = dev->data->rx_queues[i];
+		default_ret = cpfl_rx_vec_queue_default(&cpfl_rxq->base);
 		if (vport->rxq_model == VIRTCHNL2_QUEUE_MODEL_SPLIT) {
-			splitq_ret = cpfl_rx_splitq_vec_default(rxq);
+			splitq_ret = cpfl_rx_splitq_vec_default(&cpfl_rxq->base);
 			ret = splitq_ret && default_ret;
 		} else {
 			ret = default_ret;
@@ -100,12 +102,12 @@ static inline int
 cpfl_tx_vec_dev_check_default(struct rte_eth_dev *dev)
 {
 	int i;
-	struct idpf_tx_queue *txq;
+	struct cpfl_tx_queue *cpfl_txq;
 	int ret = 0;
 
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
-		txq = dev->data->tx_queues[i];
-		ret = cpfl_tx_vec_queue_default(txq);
+		cpfl_txq = dev->data->tx_queues[i];
+		ret = cpfl_tx_vec_queue_default(&cpfl_txq->base);
 		if (ret == CPFL_SCALAR_PATH)
 			return CPFL_SCALAR_PATH;
 	}
Signature · 1 line
2.25.1
#5 lore raw

PATCH v2 2/5 net/cpfl: update device initialization for hairpin queue

In reply to Mingxia Liu

This patch update device initialization for hairpin queue.

---
 drivers/common/idpf/idpf_common_device.c   | 51 ++++++++++++++++
 drivers/common/idpf/idpf_common_device.h   |  2 +
 drivers/common/idpf/idpf_common_virtchnl.c | 28 +++++++++
 drivers/common/idpf/idpf_common_virtchnl.h |  3 +
 drivers/common/idpf/version.map            |  2 +
 drivers/net/cpfl/cpfl_ethdev.c             | 68 +++++++++++++++++++++-
 6 files changed, 153 insertions(+), 1 deletion(-)
drivers/common/idpf/idpf_common_device.c +51 -0
index 5475a3e52c..2d968884c6 100644
@@ -362,6 +362,57 @@ idpf_adapter_init(struct idpf_adapter *adapter)
 	return ret;
 }
 
+int
+idpf_adapter_common_init(struct idpf_adapter *adapter)
+{
+	struct idpf_hw *hw = &adapter->hw;
+	int ret;
+
+	idpf_reset_pf(hw);
+	ret = idpf_check_pf_reset_done(hw);
+	if (ret != 0) {
+		DRV_LOG(ERR, "IDPF is still resetting");
+		goto err_check_reset;
+	}
+
+	ret = idpf_init_mbx(hw);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to init mailbox");
+		goto err_check_reset;
+	}
+
+	adapter->mbx_resp = rte_zmalloc("idpf_adapter_mbx_resp",
+					IDPF_DFLT_MBX_BUF_SIZE, 0);
+	if (adapter->mbx_resp == NULL) {
+		DRV_LOG(ERR, "Failed to allocate idpf_adapter_mbx_resp memory");
+		ret = -ENOMEM;
+		goto err_mbx_resp;
+	}
+
+	ret = idpf_vc_api_version_check(adapter);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to check api version");
+		goto err_check_api;
+	}
+
+	ret = idpf_get_pkt_type(adapter);
+	if (ret != 0) {
+		DRV_LOG(ERR, "Failed to set ptype table");
+		goto err_check_api;
+	}
+
+	return 0;
+
+err_check_api:
+	rte_free(adapter->mbx_resp);
+	adapter->mbx_resp = NULL;
+err_mbx_resp:
+	idpf_ctlq_deinit(hw);
+err_check_reset:
+	return ret;
+}
+
+
 int
 idpf_adapter_deinit(struct idpf_adapter *adapter)
 {
drivers/common/idpf/idpf_common_device.h +2 -0
index 364a60221a..185c88fcd2 100644
@@ -183,6 +183,8 @@ atomic_set_cmd(struct idpf_adapter *adapter, uint32_t ops)
 __rte_internal
 int idpf_adapter_init(struct idpf_adapter *adapter);
 __rte_internal
+int idpf_adapter_common_init(struct idpf_adapter *adapter);
+__rte_internal
 int idpf_adapter_deinit(struct idpf_adapter *adapter);
 __rte_internal
 int idpf_vport_init(struct idpf_vport *vport,
drivers/common/idpf/idpf_common_virtchnl.c +28 -0
index 99d9efbb7c..7fa0074293 100644
@@ -338,6 +338,34 @@ idpf_vc_caps_get(struct idpf_adapter *adapter)
 	return 0;
 }
 
+int idpf_vc_caps_get_by_info(struct idpf_adapter *adapter,
+			     struct virtchnl2_get_capabilities *caps_info)
+{
+	struct virtchnl2_get_capabilities caps_msg;
+	struct idpf_cmd_info args;
+	int err;
+
+	memset(&caps_msg, 0, sizeof(struct virtchnl2_get_capabilities));
+	rte_memcpy(&caps_msg, caps_info, sizeof(caps_msg));
+
+	args.ops = VIRTCHNL2_OP_GET_CAPS;
+	args.in_args = (uint8_t *)&caps_msg;
+	args.in_args_size = sizeof(caps_msg);
+	args.out_buffer = adapter->mbx_resp;
+	args.out_size = IDPF_DFLT_MBX_BUF_SIZE;
+
+	err = idpf_vc_cmd_execute(adapter, &args);
+	if (err != 0) {
+		DRV_LOG(ERR,
+			"Failed to execute command of VIRTCHNL2_OP_GET_CAPS");
+		return err;
+	}
+
+	rte_memcpy(&adapter->caps, args.out_buffer, sizeof(caps_msg));
+
+	return 0;
+}
+
 int
 idpf_vc_vport_create(struct idpf_vport *vport,
 		     struct virtchnl2_create_vport *create_vport_info)
drivers/common/idpf/idpf_common_virtchnl.h +3 -0
index d479d93c8e..6f46bef673 100644
@@ -64,4 +64,7 @@ int idpf_vc_ctlq_recv(struct idpf_ctlq_info *cq, u16 *num_q_msg,
 __rte_internal
 int idpf_vc_ctlq_post_rx_buffs(struct idpf_hw *hw, struct idpf_ctlq_info *cq,
 			   u16 *buff_count, struct idpf_dma_mem **buffs);
+__rte_internal
+int idpf_vc_caps_get_by_info(struct idpf_adapter *adapter,
+				  struct virtchnl2_get_capabilities *caps_info);
 #endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +2 -0
index 70334a1b03..c021669fd2 100644
@@ -2,6 +2,7 @@ INTERNAL {
 	global:
 
 	idpf_adapter_deinit;
+	idpf_adapter_common_init;
 	idpf_adapter_init;
 
 	idpf_dp_prep_pkts;
@@ -37,6 +38,7 @@ INTERNAL {
 
 	idpf_vc_api_version_check;
 	idpf_vc_caps_get;
+	idpf_vc_caps_get_by_info;
 	idpf_vc_cmd_execute;
 	idpf_vc_ctlq_post_rx_buffs;
 	idpf_vc_ctlq_recv;
drivers/net/cpfl/cpfl_ethdev.c +67 -1

80 lines not on this page · raw message

Signature · 1 line
2.25.1
#6 lore raw

PATCH v2 3/5 net/cpfl: add hairpin queue enable and setup

In reply to Mingxia Liu

This patch add hairpin queue ops
- hairpin_cap_get
- rx_hairpin_queue_setup
- tx_hairpin_queue_setup

---
 drivers/net/cpfl/cpfl_ethdev.c |  15 ++
 drivers/net/cpfl/cpfl_rxtx.c   | 443 ++++++++++++++++++++++++++++++++-
 drivers/net/cpfl/cpfl_rxtx.h   |  22 +-
 3 files changed, 468 insertions(+), 12 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +15 -0
index acc6180ca4..ebee21a82a 100644
@@ -159,6 +159,18 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,
 	return rte_eth_linkstatus_set(dev, &new_link);
 }
 
+static int
+cpfl_hairpin_cap_get(__rte_unused struct rte_eth_dev *dev,
+		     struct rte_eth_hairpin_cap *cap)
+{
+	cap->max_nb_queues = CPFL_MAX_NB_QUEUES;
+	cap->max_rx_2_tx = CPFL_MAX_HAIRPINQ_RX_2_TX;
+	cap->max_tx_2_rx = CPFL_MAX_HAIRPINQ_TX_2_RX;
+	cap->max_nb_desc = CPFL_MAX_HAIRPINQ_NB_DESC;
+
+	return 0;
+}
+
 static int
 cpfl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -1295,6 +1307,9 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = {
 	.xstats_get			= cpfl_dev_xstats_get,
 	.xstats_get_names		= cpfl_dev_xstats_get_names,
 	.xstats_reset			= cpfl_dev_xstats_reset,
+	.hairpin_cap_get		= cpfl_hairpin_cap_get,
+	.rx_hairpin_queue_setup		= cpfl_rx_hairpin_queue_setup,
+	.tx_hairpin_queue_setup		= cpfl_tx_hairpin_queue_setup,
 };
 
 static uint16_t
drivers/net/cpfl/cpfl_rxtx.c +436 -7

466 lines not on this page · raw message

drivers/net/cpfl/cpfl_rxtx.h +17 -5
index e241afece9..d4790d60ae 100644
@@ -9,12 +9,17 @@
 #include "cpfl_ethdev.h"
 
 /* In QLEN must be whole number of 32 descriptors. */
-#define CPFL_ALIGN_RING_DESC	32
-#define CPFL_MIN_RING_DESC	32
-#define CPFL_MAX_RING_DESC	4096
-#define CPFL_DMA_MEM_ALIGN	4096
+#define CPFL_ALIGN_RING_DESC		32
+#define CPFL_MIN_RING_DESC		32
+#define CPFL_MAX_RING_DESC		4096
+#define CPFL_DMA_MEM_ALIGN		4096
+#define CPFL_P2P_DESC_LEN		16
+#define CPFL_MAX_HAIRPINQ_RX_2_TX	1
+#define CPFL_MAX_HAIRPINQ_TX_2_RX	1
+#define CPFL_MAX_HAIRPINQ_NB_DESC	1024
+#define CPFL_MAX_NB_QUEUES		16
 /* Base address of the HW descriptor ring should be 128B aligned. */
-#define CPFL_RING_BASE_ALIGN	128
+#define CPFL_RING_BASE_ALIGN		128
 
 #define CPFL_DEFAULT_RX_FREE_THRESH	32
 
@@ -69,4 +74,11 @@ void cpfl_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
 void cpfl_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
 void cpfl_set_rx_function(struct rte_eth_dev *dev);
 void cpfl_set_tx_function(struct rte_eth_dev *dev);
+int
+cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
+			    uint16_t nb_desc, const struct rte_eth_hairpin_conf *conf);
+int
+cpfl_tx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
+			    uint16_t nb_desc,
+			    const struct rte_eth_hairpin_conf *conf);
 #endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.25.1
#7 lore raw

PATCH v2 4/5 net/cpfl: support hairpin queue start and stop

In reply to Mingxia Liu

This patch add hairpin queue start and stop.

---
 drivers/common/idpf/idpf_common_device.c   |   1 +
 drivers/common/idpf/idpf_common_virtchnl.c |  72 ++++++-
 drivers/common/idpf/idpf_common_virtchnl.h |   9 +
 drivers/common/idpf/version.map            |   3 +
 drivers/net/cpfl/cpfl_ethdev.c             |  69 +++++-
 drivers/net/cpfl/cpfl_rxtx.c               | 232 +++++++++++++++++++--
 drivers/net/cpfl/cpfl_rxtx.h               |  21 ++
 drivers/net/cpfl/cpfl_rxtx_vec_common.h    |   4 +
 8 files changed, 381 insertions(+), 30 deletions(-)
drivers/common/idpf/idpf_common_device.c +1 -0
index 2d968884c6..d0156eabd6 100644
@@ -538,6 +538,7 @@ idpf_vport_init(struct idpf_vport *vport,
 err_create_vport:
 	return ret;
 }
+
 int
 idpf_vport_deinit(struct idpf_vport *vport)
 {
drivers/common/idpf/idpf_common_virtchnl.c +71 -1

90 lines not on this page · raw message

drivers/common/idpf/idpf_common_virtchnl.h +9 -0
index 6f46bef673..900d79c3c7 100644
@@ -67,4 +67,13 @@ int idpf_vc_ctlq_post_rx_buffs(struct idpf_hw *hw, struct idpf_ctlq_info *cq,
 __rte_internal
 int idpf_vc_caps_get_by_info(struct idpf_adapter *adapter,
 				  struct virtchnl2_get_capabilities *caps_info);
+__rte_internal
+int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_info *rxq_info,
+			       uint16_t num_qs);
+__rte_internal
+int idpf_vc_txq_config_by_info(struct idpf_vport *vport, struct virtchnl2_txq_info *txq_info,
+			       uint16_t num_qs);
+__rte_internal
+int idpf_vc_ena_dis_one_queue(struct idpf_vport *vport, uint16_t qid,
+			      uint32_t type, bool on);
 #endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +3 -0
index c021669fd2..764e603dfb 100644
@@ -42,6 +42,7 @@ INTERNAL {
 	idpf_vc_cmd_execute;
 	idpf_vc_ctlq_post_rx_buffs;
 	idpf_vc_ctlq_recv;
+	idpf_vc_ena_dis_one_queue;
 	idpf_vc_irq_map_unmap_config;
 	idpf_vc_one_msg_read;
 	idpf_vc_ptype_info_query;
@@ -54,8 +55,10 @@ INTERNAL {
 	idpf_vc_rss_lut_get;
 	idpf_vc_rss_lut_set;
 	idpf_vc_rxq_config;
+	idpf_vc_rxq_config_by_info;
 	idpf_vc_stats_query;
 	idpf_vc_txq_config;
+	idpf_vc_txq_config_by_info;
 	idpf_vc_vectors_alloc;
 	idpf_vc_vectors_dealloc;
 	idpf_vc_vport_create;
drivers/net/cpfl/cpfl_ethdev.c +61 -8

93 lines not on this page · raw message

drivers/net/cpfl/cpfl_rxtx.c +211 -21

320 lines not on this page · raw message

drivers/net/cpfl/cpfl_rxtx.h +21 -0
index d4790d60ae..4803ad555b 100644
@@ -28,6 +28,21 @@
 
 #define CPFL_SUPPORT_CHAIN_NUM 5
 
+#define CPFL_RX_BUF_STRIDE 64
+
+#define CPFL_RXQ_PER_GRP 1
+
+/* The value written in the RX buffer queue tail register,
+ * and in WritePTR field in the TX completion queue context,
+ * must be a multiple of 8.
+ */
+#define CPFL_HAIRPIN_Q_TAIL_AUX_VALUE 8
+
+struct virtchnl2_p2p_rx_buf_desc {
+	__le64  reserve0;
+	__le64  pkt_addr; /* Packet buffer address */
+};
+
 struct cpfl_rxq_hairpin_info {
 	bool hairpin_q;		/* if rx queue is a hairpin queue */
 	/* only valid if the hairpin queue pair crosses vport */
@@ -74,6 +89,12 @@ void cpfl_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
 void cpfl_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
 void cpfl_set_rx_function(struct rte_eth_dev *dev);
 void cpfl_set_tx_function(struct rte_eth_dev *dev);
+int cpfl_switch_hairpin_queue(struct idpf_vport *vport, uint16_t qid,
+			      bool rx, bool on);
+int
+cpfl_set_hairpin_txqinfo(struct idpf_vport *vport, struct cpfl_tx_queue *cpfl_txq);
+int
+cpfl_set_hairpin_rxqinfo(struct idpf_vport *vport, struct cpfl_rx_queue *cpfl_rxq);
 int
 cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
 			    uint16_t nb_desc, const struct rte_eth_hairpin_conf *conf);
drivers/net/cpfl/cpfl_rxtx_vec_common.h +4 -0
index 8d0b825f95..7d4d46b833 100644
@@ -86,6 +86,8 @@ cpfl_rx_vec_dev_check_default(struct rte_eth_dev *dev)
 		cpfl_rxq = dev->data->rx_queues[i];
 		default_ret = cpfl_rx_vec_queue_default(&cpfl_rxq->base);
 		if (vport->rxq_model == VIRTCHNL2_QUEUE_MODEL_SPLIT) {
+			if (cpfl_rxq->hairpin_info.hairpin_q)
+				continue;
 			splitq_ret = cpfl_rx_splitq_vec_default(&cpfl_rxq->base);
 			ret = splitq_ret && default_ret;
 		} else {
@@ -107,6 +109,8 @@ cpfl_tx_vec_dev_check_default(struct rte_eth_dev *dev)
 
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
 		cpfl_txq = dev->data->tx_queues[i];
+		if (cpfl_txq->hairpin_info.hairpin_q)
+			continue;
 		ret = cpfl_tx_vec_queue_default(&cpfl_txq->base);
 		if (ret == CPFL_SCALAR_PATH)
 			return CPFL_SCALAR_PATH;
Signature · 1 line
2.25.1
#8 lore raw

PATCH v2 5/5 net/cpfl: adjust RSS LUT to exclude hairpin queue

In reply to Mingxia Liu

RSS should direct traffic only to the normal data Rx queues, so when hairpin queue configured, RSS LUT should be adjusted to exclude the hairpin queue.

---
 drivers/net/cpfl/cpfl_ethdev.c | 38 ++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +23 -15
index f08b7beb13..014735b2b0 100644
@@ -446,7 +446,8 @@ cpfl_init_rss(struct idpf_vport *vport)
 {
 	struct rte_eth_rss_conf *rss_conf;
 	struct rte_eth_dev_data *dev_data;
-	uint16_t i, nb_q;
+	struct cpfl_rx_queue *cpfl_rxq;
+	uint16_t i, nb_q, max_nb_data_q;
 	int ret = 0;
 
 	dev_data = vport->dev_data;
@@ -465,8 +466,16 @@ cpfl_init_rss(struct idpf_vport *vport)
 			   vport->rss_key_size);
 	}
 
+	/* RSS only to the data queues */
+	max_nb_data_q = nb_q;
+	if (nb_q > 1) {
+		cpfl_rxq = dev_data->rx_queues[nb_q - 1];
+		if (cpfl_rxq && cpfl_rxq->hairpin_info.hairpin_q)
+			max_nb_data_q = nb_q - 1;
+	}
+
 	for (i = 0; i < vport->rss_lut_size; i++)
-		vport->rss_lut[i] = i % nb_q;
+		vport->rss_lut[i] = i % max_nb_data_q;
 
 	vport->rss_hf = IDPF_DEFAULT_RSS_HASH_EXPANDED;
 
@@ -673,8 +682,6 @@ cpfl_dev_configure(struct rte_eth_dev *dev)
 	    (struct cpfl_vport *)dev->data->dev_private;
 	struct idpf_vport *vport = &(cpfl_vport->base);
 	struct rte_eth_conf *conf = &dev->data->dev_conf;
-	struct idpf_adapter *adapter = vport->adapter;
-	int ret;
 
 	if (conf->link_speeds & RTE_ETH_LINK_SPEED_FIXED) {
 		PMD_INIT_LOG(ERR, "Setting link speed is not supported");
@@ -713,17 +720,6 @@ cpfl_dev_configure(struct rte_eth_dev *dev)
 		return -ENOTSUP;
 	}
 
-	if (adapter->caps.rss_caps != 0 && dev->data->nb_rx_queues != 0) {
-		ret = cpfl_init_rss(vport);
-		if (ret != 0) {
-			PMD_INIT_LOG(ERR, "Failed to init rss");
-			return ret;
-		}
-	} else {
-		PMD_INIT_LOG(ERR, "RSS is not supported.");
-		return -1;
-	}
-
 	vport->max_pkt_len =
 		(dev->data->mtu == 0) ? CPFL_DEFAULT_MTU : dev->data->mtu +
 		CPFL_ETH_OVERHEAD;
@@ -748,11 +744,23 @@ cpfl_start_queues(struct rte_eth_dev *dev)
 	struct cpfl_vport *cpfl_vport =
 	    (struct cpfl_vport *)dev->data->dev_private;
 	struct idpf_vport *vport = &(cpfl_vport->base);
+	struct idpf_adapter *adapter = vport->adapter;
 	struct cpfl_rx_queue *cpfl_rxq;
 	struct cpfl_tx_queue *cpfl_txq;
 	int err = 0;
 	int i;
 
+	if (adapter->caps.rss_caps != 0 && dev->data->nb_rx_queues != 0) {
+		err = cpfl_init_rss(vport);
+		if (err != 0) {
+			PMD_INIT_LOG(ERR, "Failed to init rss");
+			return err;
+		}
+	} else {
+		PMD_INIT_LOG(ERR, "RSS is not supported.");
+		return -1;
+	}
+
 	for (i = 0; i < dev->data->nb_tx_queues; i++) {
 		cpfl_txq = dev->data->tx_queues[i];
 		if (cpfl_txq == NULL || cpfl_txq->base.tx_deferred_start)
Signature · 1 line
2.25.1