add hairpin queue support
PATCH v5 2/13 common/idpf: support queue groups add/delete
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds queue group add/delete virtual channel support.
--- drivers/common/idpf/idpf_common_virtchnl.c | 66 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 9 +++ drivers/common/idpf/version.map | 2 + 3 files changed, 77 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +66 -0
@@ -359,6 +359,72 @@ idpf_vc_vport_destroy(struct idpf_vport *vport)return err; } +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_queue_grps_out) +{ +struct idpf_adapter *adapter = vport->adapter; +struct idpf_cmd_info args; +int size, qg_info_size; +int err =-1 ; + + size =sizeof (*p2p_queue_grps_info) + + (p2p_queue_grps_info->qg_info.num_queue_groups -1 ) * +sizeof (struct virtchnl2_queue_group_info ); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_ADD_QUEUE_GROUPS ; + args.in_args = (uint8_t *)p2p_queue_grps_info; + args.in_args_size = size; + 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_ADD_QUEUE_GROUPS" ); +return err; + } + +rte_memcpy (p2p_queue_grps_out, args.out_buffer,IDPF_DFLT_MBX_BUF_SIZE ); +return 0 ; +} + +int idpf_vc_queue_grps_del (struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_delete_queue_groups *vc_del_q_grps; +struct idpf_cmd_info args; +int size; +int err; + + size =sizeof (*vc_del_q_grps) + + (num_q_grps -1 ) *sizeof (struct virtchnl2_queue_group_id ); + vc_del_q_grps =rte_zmalloc ("vc_del_q_grps" , size,0 ); + + vc_del_q_grps->vport_id = vport->vport_id; + vc_del_q_grps->num_queue_groups = num_q_grps; +memcpy (vc_del_q_grps->qg_ids, qg_ids, + num_q_grps *sizeof (struct virtchnl2_queue_group_id )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_DEL_QUEUE_GROUPS ; + args.in_args = (uint8_t *)vc_del_q_grps; + args.in_args_size = size; + 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_DEL_QUEUE_GROUPS" ); + +rte_free (vc_del_q_grps); +return err; +} +int idpf_vc_rss_key_set (struct idpf_vport *vport) {
drivers/common/idpf/idpf_common_virtchnl.h +9 -0
@@ -64,4 +64,13 @@ 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_queue_grps_del(struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids); +__rte_internal +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *ptp_queue_grps_info, +uint8_t *ptp_queue_grps_out);#endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +2 -0
@@ -43,6 +43,8 @@ INTERNAL { idpf_vc_irq_map_unmap_config; idpf_vc_one_msg_read; idpf_vc_ptype_info_query; + idpf_vc_queue_grps_add; + idpf_vc_queue_grps_del; idpf_vc_queue_switch; idpf_vc_queues_ena_dis; idpf_vc_rss_hash_get;
Signature · 1 line
2.26.2
PATCH v5 3/13 net/cpfl: add haipin queue group during vport init
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds haipin queue group during vport init.
--- drivers/net/cpfl/cpfl_ethdev.c | 133 +++++++++++++++++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 18 +++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 158 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +133 -0
@@ -840,6 +840,20 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) +{ +struct virtchnl2_queue_group_id qg_ids[CPFL_P2P_NB_QUEUE_GRPS ] = {0 }; +int ret =0 ; + + qg_ids[0 ].queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids[0 ].queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret =idpf_vc_queue_grps_del (vport,CPFL_P2P_NB_QUEUE_GRPS , qg_ids); +if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close (struct rte_eth_dev *dev) {
@@ -848,7 +862,12 @@ cpfl_dev_close(struct rte_eth_dev *dev)struct cpfl_adapter_ext *adapter =CPFL_ADAPTER_TO_EXT (vport->adapter);cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;
@@ -1284,6 +1303,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_complq =CPFL_P2P_NB_TX_COMPLQ ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + p2p_queue_grps_info->qg_info.groups[0 ].rx_q_grp_info.rss_lut_size =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.pir_weight =0 ; + + ret =idpf_vc_queue_grps_add (vport, p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, +struct virtchnl2_add_queue_groups *p2p_q_vc_out_info) +{ +struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport->p2p_q_chunks_info; +struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init (struct rte_eth_dev *dev,void *init_params) {
@@ -1293,6 +1402,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ; dev->dev_ops = &cpfl_eth_dev_ops;
@@ -1327,6 +1438,28 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { +memset (&p2p_queue_grps_info,0 ,sizeof (p2p_queue_grps_info)); + ret =cpfl_p2p_q_grps_add (vport, &p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to add p2p queue group." ); +return 0 ; + } + cpfl_vport->p2p_q_chunks_info =rte_zmalloc (NULL , +sizeof (struct p2p_queue_chunks_info ),0 ); +if (cpfl_vport->p2p_q_chunks_info ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret =cpfl_p2p_queue_info_init (cpfl_vport, + (struct virtchnl2_add_queue_groups *)p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); + } + } +return 0 ; err_mac_addrs:
drivers/net/cpfl/cpfl_ethdev.h +18 -0
@@ -56,6 +56,7 @@/* Device IDs */ #define IDPF_DEV_ID_CPF 0x1453 +#define VIRTCHNL2_QUEUE_GROUP_P2P 0x100struct cpfl_vport_param {struct cpfl_adapter_ext *adapter;
@@ -69,8 +70,25 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct p2p_queue_chunks_info { +uint32_t tx_start_qid; +uint32_t rx_start_qid; +uint32_t tx_compl_start_qid; +uint32_t rx_buf_start_qid; + +uint64_t tx_qtail_start; +uint32_t tx_qtail_spacing; +uint64_t rx_qtail_start; +uint32_t rx_qtail_spacing; +uint64_t tx_compl_qtail_start; +uint32_t tx_compl_qtail_spacing; +uint64_t rx_buf_qtail_start; +uint32_t rx_buf_qtail_spacing; +}; +struct cpfl_vport {struct idpf_vport base; +struct p2p_queue_chunks_info *p2p_q_chunks_info; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -13,6 +13,13 @@#define CPFL_MIN_RING_DESC 32#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 + +#define CPFL_MAX_P2P_NB_QUEUES 16 +#define CPFL_P2P_NB_RX_BUFQ 1 +#define CPFL_P2P_NB_TX_COMPLQ 1 +#define CPFL_P2P_NB_QUEUE_GRPS 1 +#define CPFL_P2P_QUEUE_GRP_ID 1 +/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
Signature · 1 line
2.26.2
PATCH v5 4/13 net/cpfl: support hairpin queue capbility get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds hairpin_cap_get ops support.
--- drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 3 +++ 2 files changed, 21 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -154,6 +154,23 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,return rte_eth_linkstatus_set (dev, &new_link); } +static int +cpfl_hairpin_cap_get (struct rte_eth_dev *dev, +struct rte_eth_hairpin_cap *cap) +{ +struct cpfl_vport *cpfl_vport = dev->data->dev_private; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + + cap->max_nb_queues =CPFL_MAX_P2P_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) {
@@ -904,6 +921,7 @@ 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, }; static int
drivers/net/cpfl/cpfl_rxtx.h +3 -0
@@ -14,6 +14,9 @@#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 +#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_P2P_NB_QUEUES 16#define CPFL_P2P_NB_RX_BUFQ 1#define CPFL_P2P_NB_TX_COMPLQ 1
Signature · 1 line
2.26.2
PATCH v5 5/13 net/cpfl: support hairpin queue setup and release
In reply to [email protected]From: Beilei Xing <[email protected]>
Support hairpin Rx/Tx queue setup and release.
--- drivers/net/cpfl/cpfl_ethdev.c | 6 + drivers/net/cpfl/cpfl_ethdev.h | 11 + drivers/net/cpfl/cpfl_rxtx.c | 364 +++++++++++++++++++++++- drivers/net/cpfl/cpfl_rxtx.h | 36 +++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 + 5 files changed, 420 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +6 -0
@@ -879,6 +879,10 @@ cpfl_dev_close(struct rte_eth_dev *dev)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 ; + }if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq)cpfl_p2p_queue_grps_del (vport);
@@ -922,6 +926,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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 int
drivers/net/cpfl/cpfl_ethdev.h +11 -0
@@ -89,6 +89,17 @@ struct p2p_queue_chunks_info {struct cpfl_vport {struct idpf_vport base;struct p2p_queue_chunks_info *p2p_q_chunks_info; + +struct rte_mempool *p2p_mp; + +uint16_t nb_data_rxq; +uint16_t nb_data_txq; +uint16_t nb_p2p_rxq; +uint16_t nb_p2p_txq; + +struct idpf_rx_queue *p2p_rx_bufq; +struct idpf_tx_queue *p2p_tx_complq; +bool p2p_manual_bind; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.c +363 -1
400 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +36 -0
@@ -22,6 +22,11 @@#define CPFL_P2P_NB_TX_COMPLQ 1#define CPFL_P2P_NB_QUEUE_GRPS 1#define CPFL_P2P_QUEUE_GRP_ID 1 +#define CPFL_P2P_DESC_LEN 16 +#define CPFL_P2P_NB_MBUF 4096 +#define CPFL_P2P_CACHE_SIZE 250 +#define CPFL_P2P_MBUF_SIZE 2048 +#define CPFL_P2P_RING_BUF 128/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
@@ -33,14 +38,40 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rxq_hairpin_info { +bool hairpin_q;/* if rx queue is a hairpin queue */ +uint16_t peer_txp; +uint16_t peer_txq_id; +}; +struct cpfl_rx_queue {struct idpf_rx_queue base; +struct cpfl_rxq_hairpin_info hairpin_info; +}; + +struct cpfl_txq_hairpin_info { +bool hairpin_q;/* if tx queue is a hairpin queue */ +uint16_t peer_rxp; +uint16_t peer_rxq_id; };struct cpfl_tx_queue {struct idpf_tx_queue base; +struct cpfl_txq_hairpin_info hairpin_info; }; +static inline uint16_t +cpfl_hw_qid_get (uint16_t start_qid,uint16_t offset) +{ +return start_qid + offset; +} + +static inline uint64_t +cpfl_hw_qtail_get (uint64_t tail_start,uint16_t offset,uint64_t tail_spacing) +{ +return tail_start + offset * tail_spacing; +} +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);
@@ -59,4 +90,9 @@ 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_ */
drivers/net/cpfl/cpfl_rxtx_vec_common.h +4 -0
@@ -85,6 +85,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 {
@@ -106,6 +108,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.26.2
PATCH v5 6/13 common/idpf: add queue config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx queue configuration APIs.
--- drivers/common/idpf/idpf_common_virtchnl.c | 70 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 6 ++ drivers/common/idpf/version.map | 2 + 3 files changed, 78 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +70 -0
@@ -1050,6 +1050,41 @@ idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq)return err; } +int idpf_vc_rxq_config_by_info (struct idpf_vport *vport,struct virtchnl2_rxq_info *rxq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_rx_queues *vc_rxqs =NULL ; +struct idpf_cmd_info args; +int size, err, i; + + size =sizeof (*vc_rxqs) + (num_qs -1 ) * +sizeof (struct virtchnl2_rxq_info ); + vc_rxqs =rte_zmalloc ("cfg_rxqs" , size,0 ); +if (vc_rxqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_rx_queues" ); + err = -ENOMEM ; +return err; + } + vc_rxqs->vport_id = vport->vport_id; + vc_rxqs->num_qinfo = num_qs; +memcpy (vc_rxqs->qinfo, rxq_info, num_qs *sizeof (struct virtchnl2_rxq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_RX_QUEUES ; + args.in_args = (uint8_t *)vc_rxqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_rxqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_RX_QUEUES" ); + +return err; +} +int idpf_vc_txq_config (struct idpf_vport *vport,struct idpf_tx_queue *txq) {
@@ -1121,6 +1156,41 @@ idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)return err; } +int +idpf_vc_txq_config_by_info (struct idpf_vport *vport,struct virtchnl2_txq_info *txq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_tx_queues *vc_txqs =NULL ; +struct idpf_cmd_info args; +int size, err; + + size =sizeof (*vc_txqs) + (num_qs -1 ) *sizeof (struct virtchnl2_txq_info ); + vc_txqs =rte_zmalloc ("cfg_txqs" , size,0 ); +if (vc_txqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_tx_queues" ); + err = -ENOMEM ; +return err; + } + vc_txqs->vport_id = vport->vport_id; + vc_txqs->num_qinfo = num_qs; +memcpy (vc_txqs->qinfo, txq_info, num_qs *sizeof (struct virtchnl2_txq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_TX_QUEUES ; + args.in_args = (uint8_t *)vc_txqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_txqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_TX_QUEUES" ); + +return err; +} +int idpf_vc_ctlq_recv (struct idpf_ctlq_info *cq,u16 *num_q_msg,struct idpf_ctlq_msg *q_msg)
drivers/common/idpf/idpf_common_virtchnl.h +6 -0
@@ -65,6 +65,12 @@ __rte_internalint 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_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_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +2 -0
@@ -54,8 +54,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;
Signature · 1 line
2.26.2
PATCH v5 7/13 net/cpfl: support hairpin queue configuration
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue configuration.
--- drivers/net/cpfl/cpfl_ethdev.c | 136 +++++++++++++++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.c | 80 +++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 217 insertions(+), 6 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +130 -6
@@ -742,33 +742,157 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)return idpf_vport_irq_map_config (vport, nb_rx_queues); } +/* Update hairpin_info for dev's tx hairpin queue */ +static int +cpfl_txq_hairpin_info_update (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_txq_hairpin_info *hairpin_info; +struct cpfl_tx_queue *cpfl_txq; +int i; + +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + hairpin_info = &cpfl_txq->hairpin_info; +if (hairpin_info->peer_rxp != rx_port) { +PMD_DRV_LOG (ERR ,"port %d is not the peer port" , rx_port); +return -EINVAL ; + } + hairpin_info->peer_rxq_id = +cpfl_hw_qid_get (cpfl_rx_vport->p2p_q_chunks_info->rx_start_qid, + hairpin_info->peer_rxq_id - cpfl_rx_vport->nb_data_rxq); + } + +return 0 ; +} + +/* Bind Rx hairpin queue's memory zone to peer Tx hairpin queue's memory zone */ +static void +cpfl_rxq_hairpin_mz_bind (struct rte_eth_dev *dev) +{ +struct cpfl_vport *cpfl_rx_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_rx_vport->base; +struct idpf_adapter *adapter = vport->adapter; +struct idpf_hw *hw = &adapter->hw; +struct cpfl_rx_queue *cpfl_rxq; +struct cpfl_tx_queue *cpfl_txq; +struct rte_eth_dev *peer_dev; +const struct rte_memzone *mz; +uint16_t peer_tx_port; +uint16_t peer_tx_qid; +int i; + +for (i = cpfl_rx_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; + peer_tx_port = cpfl_rxq->hairpin_info.peer_txp; + peer_tx_qid = cpfl_rxq->hairpin_info.peer_txq_id; + peer_dev = &rte_eth_devices[peer_tx_port]; + cpfl_txq = peer_dev->data->tx_queues[peer_tx_qid]; + +/* bind rx queue */ + mz = cpfl_txq->base.mz; + cpfl_rxq->base.rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.rx_ring = mz->addr; + cpfl_rxq->base.mz = mz; + +/* bind rx buffer queue */ + mz = cpfl_txq->base.complq->mz; + cpfl_rxq->base.bufq1->rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.bufq1->rx_ring = mz->addr; + cpfl_rxq->base.bufq1->mz = mz; + cpfl_rxq->base.bufq1->qrx_tail = hw->hw_addr + +cpfl_hw_qtail_get (cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_start, +0 , cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_spacing); + } +} +static int cpfl_start_queues (struct rte_eth_dev *dev) { +struct cpfl_vport *cpfl_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct cpfl_rx_queue *cpfl_rxq;struct cpfl_tx_queue *cpfl_txq; +int update_flag =0 ;int err =0 ;int i; +/* For normal data queues, configure, init and enale Txq. +* For non-manual bind hairpin queues, configure Txq. +*/ 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 ; - err =cpfl_tx_queue_start (dev, i); +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_vport->p2p_manual_bind) { +if (update_flag ==0 ) { + err =cpfl_txq_hairpin_info_update (dev, + cpfl_txq->hairpin_info.peer_rxp); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info" ); +return err; + } + update_flag =1 ; + } + err =cpfl_hairpin_txq_config (vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + } + +/* For non-manual bind hairpin queues, configure Tx completion queue first.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_tx_complq !=NULL ) { + err =cpfl_hairpin_tx_complq_config (cpfl_vport);if (err !=0 ) { -PMD_DRV_LOG (ERR ,"Fail to start Tx queue %u" , i); +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" );return err; } } +/* For non-manual bind hairpin queues, configure Rx buffer queue.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_rx_bufq !=NULL ) { +cpfl_rxq_hairpin_mz_bind (dev); + err =cpfl_hairpin_rx_bufq_config (cpfl_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + } + +/* For normal data queues, configure, init and enale Rxq. +* For non-manual bind hairpin queues, configure Rxq, and then init Rxq. +*/ for (i =0 ; i < dev->data->nb_rx_queues; i++) { 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_vport->p2p_manual_bind) { + err =cpfl_hairpin_rxq_config (vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } } }
drivers/net/cpfl/cpfl_rxtx.c +80 -0
86 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -32,12 +32,15 @@#define CPFL_RING_BASE_ALIGN 128#define CPFL_DEFAULT_RX_FREE_THRESH 32 +#define CPFL_RXBUF_LOW_WATERMARK 64#define CPFL_DEFAULT_TX_RS_THRESH 32#define CPFL_DEFAULT_TX_FREE_THRESH 32#define CPFL_SUPPORT_CHAIN_NUM 5 +#define CPFL_RX_BUF_STRIDE 64 +struct cpfl_rxq_hairpin_info {bool hairpin_q;/* if rx queue is a hairpin queue */ uint16_t peer_txp;
@@ -95,4 +98,8 @@ int cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,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); +int cpfl_hairpin_tx_complq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq); +int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v5 8/13 common/idpf: add switch queue API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds idpf_vc_ena_dis_one_queue API.
--- drivers/common/idpf/idpf_common_virtchnl.c | 2 +- drivers/common/idpf/idpf_common_virtchnl.h | 3 +++ drivers/common/idpf/version.map | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/common/idpf/idpf_common_virtchnl.c +1 -1
@@ -733,7 +733,7 @@ idpf_vc_vectors_dealloc(struct idpf_vport *vport)return err; } -static int +int idpf_vc_ena_dis_one_queue (struct idpf_vport *vport,uint16_t qid,uint32_t type,bool on) {
drivers/common/idpf/idpf_common_virtchnl.h +3 -0
@@ -71,6 +71,9 @@ __rte_internalint 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); +__rte_internal int idpf_vc_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +1 -0
@@ -40,6 +40,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;
Signature · 1 line
2.26.2
PATCH v5 9/13 net/cpfl: support hairpin queue start/stop
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue start/stop.
--- drivers/net/cpfl/cpfl_ethdev.c | 46 +++++++++ drivers/net/cpfl/cpfl_rxtx.c | 164 +++++++++++++++++++++++++++++---- drivers/net/cpfl/cpfl_rxtx.h | 15 +++ 3 files changed, 207 insertions(+), 18 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +46 -0
@@ -896,6 +896,52 @@ cpfl_start_queues(struct rte_eth_dev *dev) } } +/* For non-manual bind hairpin queues, enable Tx queue and Rx queue, +* then enable Tx completion queue and Rx buffer queue. +*/ +for (i = cpfl_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +if (cpfl_txq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_txq, + false, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +else + cpfl_txq->base.q_started = true; + } + } + +for (i = cpfl_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_rxq, + true, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); +else + cpfl_rxq->base.q_started = true; + } + } + +if (!cpfl_vport->p2p_manual_bind && + cpfl_vport->p2p_tx_complq !=NULL && + cpfl_vport->p2p_rx_bufq !=NULL ) { + err =cpfl_switch_hairpin_complq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + err =cpfl_switch_hairpin_bufq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx bufq" ); +return err; + } + } +return err; }
drivers/net/cpfl/cpfl_rxtx.c +146 -18
218 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +15 -0
@@ -41,6 +41,17 @@#define CPFL_RX_BUF_STRIDE 64 +/* 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 */ uint16_t peer_txp;
@@ -102,4 +113,8 @@ int cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport);int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq);int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport);int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq); +int cpfl_switch_hairpin_complq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_bufq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_rxtx_queue (struct cpfl_vport *cpfl_vport,uint16_t qid, +bool rx,bool on);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v5 10/13 common/idpf: add irq map config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports idpf_vport_irq_map_config_by_qids API.
--- drivers/common/idpf/idpf_common_device.c | 75 ++++++++++++++++++++++++ drivers/common/idpf/idpf_common_device.h | 4 ++ drivers/common/idpf/version.map | 1 + 3 files changed, 80 insertions(+)
drivers/common/idpf/idpf_common_device.c +75 -0
@@ -667,6 +667,81 @@ idpf_vport_irq_map_config(struct idpf_vport *vport, uint16_t nb_rx_queues)return ret; } +int +idpf_vport_irq_map_config_by_qids (struct idpf_vport *vport,uint32_t *qids,uint16_t nb_rx_queues) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_queue_vector *qv_map; +struct idpf_hw *hw = &adapter->hw; +uint32_t dynctl_val, itrn_val; +uint32_t dynctl_reg_start; +uint32_t itrn_reg_start; +uint16_t i; +int ret; + + qv_map =rte_zmalloc ("qv_map" , + nb_rx_queues * +sizeof (struct virtchnl2_queue_vector ),0 ); +if (qv_map ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate %d queue-vector map" , + nb_rx_queues); + ret = -ENOMEM ; + goto qv_map_alloc_err; + } + +/* Rx interrupt disabled, Map interrupt only for writeback */ + +/* The capability flags adapter->caps.other_caps should be +* compared with bit VIRTCHNL2_CAP_WB_ON_ITR here. The if +* condition should be updated when the FW can return the +* correct flag bits. +*/ + dynctl_reg_start = + vport->recv_vectors->vchunks.vchunks->dynctl_reg_start; + itrn_reg_start = + vport->recv_vectors->vchunks.vchunks->itrn_reg_start; + dynctl_val =IDPF_READ_REG (hw, dynctl_reg_start); +DRV_LOG (DEBUG ,"Value of dynctl_reg_start is 0x%x" , dynctl_val); + itrn_val =IDPF_READ_REG (hw, itrn_reg_start); +DRV_LOG (DEBUG ,"Value of itrn_reg_start is 0x%x" , itrn_val); +/* Force write-backs by setting WB_ON_ITR bit in DYN_CTL +* register. WB_ON_ITR and INTENA are mutually exclusive +* bits. Setting WB_ON_ITR bits means TX and RX Descs +* are written back based on ITR expiration irrespective +* of INTENA setting. +*/ +/* TBD: need to tune INTERVAL value for better performance. */ + itrn_val = (itrn_val ==0 ) ?IDPF_DFLT_INTERVAL : itrn_val; + dynctl_val =VIRTCHNL2_ITR_IDX_0 << +PF_GLINT_DYN_CTL_ITR_INDX_S | +PF_GLINT_DYN_CTL_WB_ON_ITR_M | + itrn_val <<PF_GLINT_DYN_CTL_INTERVAL_S ; +IDPF_WRITE_REG (hw, dynctl_reg_start, dynctl_val); + +for (i =0 ; i < nb_rx_queues; i++) { +/* map all queues to the same vector */ + qv_map[i].queue_id = qids[i]; + qv_map[i].vector_id = + vport->recv_vectors->vchunks.vchunks->start_vector_id; + } + vport->qv_map = qv_map; + + ret =idpf_vc_irq_map_unmap_config (vport, nb_rx_queues, true); +if (ret !=0 ) { +DRV_LOG (ERR ,"config interrupt mapping failed" ); + goto config_irq_map_err; + } + +return 0 ; + +config_irq_map_err: +rte_free (vport->qv_map); + vport->qv_map =NULL ; + +qv_map_alloc_err: +return ret; +} +int idpf_vport_irq_unmap_config (struct idpf_vport *vport,uint16_t nb_rx_queues) {
drivers/common/idpf/idpf_common_device.h +4 -0
@@ -200,5 +200,9 @@ int idpf_vport_info_init(struct idpf_vport *vport, struct virtchnl2_create_vport *vport_info);__rte_internal void idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes); +__rte_internal +int idpf_vport_irq_map_config_by_qids(struct idpf_vport *vport, +uint32_t *qids, +uint16_t nb_rx_queues);#endif /* _IDPF_COMMON_DEVICE_H_ */
drivers/common/idpf/version.map +1 -0
@@ -69,6 +69,7 @@ INTERNAL { idpf_vport_info_init; idpf_vport_init; idpf_vport_irq_map_config; + idpf_vport_irq_map_config_by_qids; idpf_vport_irq_unmap_config; idpf_vport_rss_config; idpf_vport_stats_update;
Signature · 1 line
2.26.2
PATCH v5 11/13 net/cpfl: enable write back based on ITR expire
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch enables write back based on ITR expire
(WR_ON_ITR) for hairpin queues.
--- drivers/net/cpfl/cpfl_ethdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +12 -1
@@ -735,11 +735,22 @@ cpfl_dev_configure(struct rte_eth_dev *dev)static int cpfl_config_rx_queues_irqs (struct rte_eth_dev *dev) { +uint32_t qids[CPFL_MAX_P2P_NB_QUEUES +IDPF_DEFAULT_RXQ_NUM ] = {0 };struct cpfl_vport *cpfl_vport = dev->data->dev_private;struct idpf_vport *vport = &cpfl_vport->base;uint16_t nb_rx_queues = dev->data->nb_rx_queues; +struct cpfl_rx_queue *cpfl_rxq; +int i; -return idpf_vport_irq_map_config (vport, nb_rx_queues); +for (i =0 ; i < nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q) + qids[i] =cpfl_hw_qid_get (cpfl_vport->p2p_q_chunks_info->rx_start_qid, + (i - cpfl_vport->nb_data_rxq)); +else + qids[i] =cpfl_hw_qid_get (vport->chunks_info.rx_start_qid, i); + } +return idpf_vport_irq_map_config_by_qids (vport, qids, nb_rx_queues); }/* Update hairpin_info for dev's tx hairpin queue */
Signature · 1 line
2.26.2
PATCH v5 12/13 net/cpfl: support peer ports get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports get hairpin peer ports.
--- drivers/net/cpfl/cpfl_ethdev.c | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +40 -0
@@ -1080,6 +1080,45 @@ cpfl_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_hairpin_get_peer_ports (struct rte_eth_dev *dev,uint16_t *peer_ports, +size_t len,uint32_t tx) +{ +struct cpfl_vport *cpfl_vport = + (struct cpfl_vport *)dev->data->dev_private; +struct idpf_tx_queue *txq; +struct idpf_rx_queue *rxq; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i, j; + +if (len <=0 ) +return -EINVAL ; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + +if (tx >0 ) { +for (i = cpfl_vport->nb_data_txq, j =0 ; i < dev->data->nb_tx_queues; i++, j++) { + txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +return -EINVAL ; + cpfl_txq = (struct cpfl_tx_queue *)txq; + peer_ports[j] = cpfl_txq->hairpin_info.peer_rxp; + } + }else if (tx ==0 ) { +for (i = cpfl_vport->nb_data_rxq, j =0 ; i < dev->data->nb_rx_queues; i++, j++) { + rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +return -EINVAL ; + cpfl_rxq = (struct cpfl_rx_queue *)rxq; + peer_ports[j] = cpfl_rxq->hairpin_info.peer_txp; + } + } + +return j; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1109,6 +1148,7 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, }; static int
Signature · 1 line
2.26.2
PATCH v5 13/13 net/cpfl: support hairpin bind/unbind
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports hairpin_bind/unbind ops.
--- drivers/net/cpfl/cpfl_ethdev.c | 137 +++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +137 -0
@@ -1119,6 +1119,141 @@ cpfl_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,return j; } +static int +cpfl_hairpin_bind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct idpf_vport *tx_vport = &cpfl_tx_vport->base; +struct cpfl_vport *cpfl_rx_vport; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +struct rte_eth_dev *peer_dev; +struct idpf_vport *rx_vport; +int err =0 ; +int i; + + err =cpfl_txq_hairpin_info_update (dev, rx_port); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info." ); +return err; + } + +/* configure hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_hairpin_txq_config (tx_vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + + err =cpfl_hairpin_tx_complq_config (cpfl_tx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" ); +return err; + } + + peer_dev = &rte_eth_devices[rx_port]; + cpfl_rx_vport = (struct cpfl_vport *)peer_dev->data->dev_private; + rx_vport = &cpfl_rx_vport->base; +cpfl_rxq_hairpin_mz_bind (peer_dev); + + err =cpfl_hairpin_rx_bufq_config (cpfl_rx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_hairpin_rxq_config (rx_vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (peer_dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } + } + +/* enable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +return err; + } + cpfl_txq->base.q_started = true; + } + + err =cpfl_switch_hairpin_complq (cpfl_tx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); + } + cpfl_rxq->base.q_started = true; + } + + err =cpfl_switch_hairpin_bufq (cpfl_rx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx buffer queue" ); +return err; + } + +return 0 ; +} + +static int +cpfl_hairpin_unbind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; + +/* disable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, false); + cpfl_txq->base.q_started = false; + } + +cpfl_switch_hairpin_complq (cpfl_tx_vport, false); + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, false); + cpfl_rxq->base.q_started = false; + } + +cpfl_switch_hairpin_bufq (cpfl_rx_vport, false); + +return 0 ; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1149,6 +1284,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, + .hairpin_unbind = cpfl_hairpin_unbind, }; static int
Signature · 1 line
2.26.2
v6 cover net/cpfl: add hairpin queue support
In reply to [email protected]From: Beilei Xing <[email protected]>
This patchset adds hairpin queue support.
v2 changes:
- change hairpin rx queus configuration sequence.
- code refine.
v3 changes:
- Refine the patchset based on the latest code.
v4 change:
- Remove hairpin rx buffer queue's sw_ring.
- Change hairpin rx queus configuration sequence in cpfl_hairpin_bind function.
- Refind hairpin queue setup and release.
v5 change:
- Fix memory leak during queue setup.
- Refine hairpin Rxq/Txq start/stop.
v6 change:
- Add sign-off.
Beilei Xing (13):
net/cpfl: refine structures
common/idpf: support queue groups add/delete net/cpfl: add haipin queue group during vport init net/cpfl: support hairpin queue capbility get net/cpfl: support hairpin queue setup and release common/idpf: add queue config API net/cpfl: support hairpin queue configuration common/idpf: add switch queue API net/cpfl: support hairpin queue start/stop common/idpf: add irq map config API net/cpfl: enable write back based on ITR expire net/cpfl: support peer ports get
net/cpfl: support hairpin bind/unbind
drivers/common/idpf/idpf_common_device.c | 75 ++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 138 +++- drivers/common/idpf/idpf_common_virtchnl.h | 18 + drivers/common/idpf/version.map | 6 + drivers/net/cpfl/cpfl_ethdev.c | 610 ++++++++++++++-- drivers/net/cpfl/cpfl_ethdev.h | 35 +- drivers/net/cpfl/cpfl_rxtx.c | 781 +++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.h | 76 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 21 +- 10 files changed, 1645 insertions(+), 119 deletions(-)
Signature · 1 line
2.26.2
PATCH v6 1/13 net/cpfl: refine structures
From: Beilei Xing <[email protected]>
This patch refines some structures to support hairpin queue, cpfl_rx_queue/cpfl_tx_queue/cpfl_vport.
--- drivers/net/cpfl/cpfl_ethdev.c | 85 +++++++----- drivers/net/cpfl/cpfl_ethdev.h | 6 +- drivers/net/cpfl/cpfl_rxtx.c | 175 +++++++++++++++++------- drivers/net/cpfl/cpfl_rxtx.h | 8 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 17 +-- 5 files changed, 196 insertions(+), 95 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +49 -36
@@ -124,7 +124,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_link new_link;unsigned int i;
@@ -156,7 +157,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter; dev_info->max_rx_queues = base->caps.max_rx_q;
@@ -216,7 +218,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;/* mtu setting is forbidden if port is start */ if (dev->data->dev_started) {
@@ -256,12 +259,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); }
@@ -271,8 +274,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -305,20 +308,20 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -343,8 +346,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;unsigned int i;int ret;
@@ -459,7 +462,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -498,7 +502,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -536,7 +541,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -601,7 +607,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -638,7 +645,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_conf *conf = &dev->data->dev_conf;struct idpf_adapter *base = vport->adapter;int ret;
@@ -710,7 +718,8 @@ 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 = 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);
@@ -719,14 +728,14 @@ 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 ) {
@@ -736,8 +745,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 ) {
@@ -752,7 +761,8 @@ 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 = 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;
@@ -813,7 +823,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;if (dev->data->dev_started ==0 )return 0 ;
@@ -832,7 +843,8 @@ 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 = 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);
@@ -842,7 +854,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 ; }
@@ -1047,7 +1059,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
@@ -1275,7 +1287,8 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)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 = 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 */
@@ -1300,7 +1313,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++;
@@ -1415,7 +1428,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 )
@@ -1433,7 +1446,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 +5 -1
@@ -69,13 +69,17 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct cpfl_vport { +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 +125 -50
401 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +8 -0
@@ -23,6 +23,14 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rx_queue { +struct idpf_rx_queue base; +}; + +struct cpfl_tx_queue { +struct idpf_tx_queue base; +}; +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 +9 -8
@@ -76,15 +76,16 @@ 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 = 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 +101,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.26.2
PATCH v6 2/13 common/idpf: support queue groups add/delete
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds queue group add/delete virtual channel support.
--- drivers/common/idpf/idpf_common_virtchnl.c | 66 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 9 +++ drivers/common/idpf/version.map | 2 + 3 files changed, 77 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +66 -0
@@ -359,6 +359,72 @@ idpf_vc_vport_destroy(struct idpf_vport *vport)return err; } +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_queue_grps_out) +{ +struct idpf_adapter *adapter = vport->adapter; +struct idpf_cmd_info args; +int size, qg_info_size; +int err =-1 ; + + size =sizeof (*p2p_queue_grps_info) + + (p2p_queue_grps_info->qg_info.num_queue_groups -1 ) * +sizeof (struct virtchnl2_queue_group_info ); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_ADD_QUEUE_GROUPS ; + args.in_args = (uint8_t *)p2p_queue_grps_info; + args.in_args_size = size; + 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_ADD_QUEUE_GROUPS" ); +return err; + } + +rte_memcpy (p2p_queue_grps_out, args.out_buffer,IDPF_DFLT_MBX_BUF_SIZE ); +return 0 ; +} + +int idpf_vc_queue_grps_del (struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_delete_queue_groups *vc_del_q_grps; +struct idpf_cmd_info args; +int size; +int err; + + size =sizeof (*vc_del_q_grps) + + (num_q_grps -1 ) *sizeof (struct virtchnl2_queue_group_id ); + vc_del_q_grps =rte_zmalloc ("vc_del_q_grps" , size,0 ); + + vc_del_q_grps->vport_id = vport->vport_id; + vc_del_q_grps->num_queue_groups = num_q_grps; +memcpy (vc_del_q_grps->qg_ids, qg_ids, + num_q_grps *sizeof (struct virtchnl2_queue_group_id )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_DEL_QUEUE_GROUPS ; + args.in_args = (uint8_t *)vc_del_q_grps; + args.in_args_size = size; + 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_DEL_QUEUE_GROUPS" ); + +rte_free (vc_del_q_grps); +return err; +} +int idpf_vc_rss_key_set (struct idpf_vport *vport) {
drivers/common/idpf/idpf_common_virtchnl.h +9 -0
@@ -64,4 +64,13 @@ 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_queue_grps_del(struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids); +__rte_internal +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *ptp_queue_grps_info, +uint8_t *ptp_queue_grps_out);#endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +2 -0
@@ -43,6 +43,8 @@ INTERNAL { idpf_vc_irq_map_unmap_config; idpf_vc_one_msg_read; idpf_vc_ptype_info_query; + idpf_vc_queue_grps_add; + idpf_vc_queue_grps_del; idpf_vc_queue_switch; idpf_vc_queues_ena_dis; idpf_vc_rss_hash_get;
Signature · 1 line
2.26.2
PATCH v6 3/13 net/cpfl: add haipin queue group during vport init
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds haipin queue group during vport init.
--- drivers/net/cpfl/cpfl_ethdev.c | 133 +++++++++++++++++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 18 +++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 158 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +133 -0
@@ -840,6 +840,20 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) +{ +struct virtchnl2_queue_group_id qg_ids[CPFL_P2P_NB_QUEUE_GRPS ] = {0 }; +int ret =0 ; + + qg_ids[0 ].queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids[0 ].queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret =idpf_vc_queue_grps_del (vport,CPFL_P2P_NB_QUEUE_GRPS , qg_ids); +if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close (struct rte_eth_dev *dev) {
@@ -848,7 +862,12 @@ cpfl_dev_close(struct rte_eth_dev *dev)struct cpfl_adapter_ext *adapter =CPFL_ADAPTER_TO_EXT (vport->adapter);cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;
@@ -1284,6 +1303,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_complq =CPFL_P2P_NB_TX_COMPLQ ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + p2p_queue_grps_info->qg_info.groups[0 ].rx_q_grp_info.rss_lut_size =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.pir_weight =0 ; + + ret =idpf_vc_queue_grps_add (vport, p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, +struct virtchnl2_add_queue_groups *p2p_q_vc_out_info) +{ +struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport->p2p_q_chunks_info; +struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init (struct rte_eth_dev *dev,void *init_params) {
@@ -1293,6 +1402,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ; dev->dev_ops = &cpfl_eth_dev_ops;
@@ -1327,6 +1438,28 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { +memset (&p2p_queue_grps_info,0 ,sizeof (p2p_queue_grps_info)); + ret =cpfl_p2p_q_grps_add (vport, &p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to add p2p queue group." ); +return 0 ; + } + cpfl_vport->p2p_q_chunks_info =rte_zmalloc (NULL , +sizeof (struct p2p_queue_chunks_info ),0 ); +if (cpfl_vport->p2p_q_chunks_info ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret =cpfl_p2p_queue_info_init (cpfl_vport, + (struct virtchnl2_add_queue_groups *)p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); + } + } +return 0 ; err_mac_addrs:
drivers/net/cpfl/cpfl_ethdev.h +18 -0
@@ -56,6 +56,7 @@/* Device IDs */ #define IDPF_DEV_ID_CPF 0x1453 +#define VIRTCHNL2_QUEUE_GROUP_P2P 0x100struct cpfl_vport_param {struct cpfl_adapter_ext *adapter;
@@ -69,8 +70,25 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct p2p_queue_chunks_info { +uint32_t tx_start_qid; +uint32_t rx_start_qid; +uint32_t tx_compl_start_qid; +uint32_t rx_buf_start_qid; + +uint64_t tx_qtail_start; +uint32_t tx_qtail_spacing; +uint64_t rx_qtail_start; +uint32_t rx_qtail_spacing; +uint64_t tx_compl_qtail_start; +uint32_t tx_compl_qtail_spacing; +uint64_t rx_buf_qtail_start; +uint32_t rx_buf_qtail_spacing; +}; +struct cpfl_vport {struct idpf_vport base; +struct p2p_queue_chunks_info *p2p_q_chunks_info; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -13,6 +13,13 @@#define CPFL_MIN_RING_DESC 32#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 + +#define CPFL_MAX_P2P_NB_QUEUES 16 +#define CPFL_P2P_NB_RX_BUFQ 1 +#define CPFL_P2P_NB_TX_COMPLQ 1 +#define CPFL_P2P_NB_QUEUE_GRPS 1 +#define CPFL_P2P_QUEUE_GRP_ID 1 +/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
Signature · 1 line
2.26.2
PATCH v6 4/13 net/cpfl: support hairpin queue capbility get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds hairpin_cap_get ops support.
--- drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 3 +++ 2 files changed, 21 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -154,6 +154,23 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,return rte_eth_linkstatus_set (dev, &new_link); } +static int +cpfl_hairpin_cap_get (struct rte_eth_dev *dev, +struct rte_eth_hairpin_cap *cap) +{ +struct cpfl_vport *cpfl_vport = dev->data->dev_private; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + + cap->max_nb_queues =CPFL_MAX_P2P_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) {
@@ -904,6 +921,7 @@ 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, }; static int
drivers/net/cpfl/cpfl_rxtx.h +3 -0
@@ -14,6 +14,9 @@#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 +#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_P2P_NB_QUEUES 16#define CPFL_P2P_NB_RX_BUFQ 1#define CPFL_P2P_NB_TX_COMPLQ 1
Signature · 1 line
2.26.2
PATCH v6 5/13 net/cpfl: support hairpin queue setup and release
In reply to [email protected]From: Beilei Xing <[email protected]>
Support hairpin Rx/Tx queue setup and release.
--- drivers/net/cpfl/cpfl_ethdev.c | 6 + drivers/net/cpfl/cpfl_ethdev.h | 11 + drivers/net/cpfl/cpfl_rxtx.c | 364 +++++++++++++++++++++++- drivers/net/cpfl/cpfl_rxtx.h | 36 +++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 + 5 files changed, 420 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +6 -0
@@ -879,6 +879,10 @@ cpfl_dev_close(struct rte_eth_dev *dev)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 ; + }if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq)cpfl_p2p_queue_grps_del (vport);
@@ -922,6 +926,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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 int
drivers/net/cpfl/cpfl_ethdev.h +11 -0
@@ -89,6 +89,17 @@ struct p2p_queue_chunks_info {struct cpfl_vport {struct idpf_vport base;struct p2p_queue_chunks_info *p2p_q_chunks_info; + +struct rte_mempool *p2p_mp; + +uint16_t nb_data_rxq; +uint16_t nb_data_txq; +uint16_t nb_p2p_rxq; +uint16_t nb_p2p_txq; + +struct idpf_rx_queue *p2p_rx_bufq; +struct idpf_tx_queue *p2p_tx_complq; +bool p2p_manual_bind; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.c +363 -1
400 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +36 -0
@@ -22,6 +22,11 @@#define CPFL_P2P_NB_TX_COMPLQ 1#define CPFL_P2P_NB_QUEUE_GRPS 1#define CPFL_P2P_QUEUE_GRP_ID 1 +#define CPFL_P2P_DESC_LEN 16 +#define CPFL_P2P_NB_MBUF 4096 +#define CPFL_P2P_CACHE_SIZE 250 +#define CPFL_P2P_MBUF_SIZE 2048 +#define CPFL_P2P_RING_BUF 128/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
@@ -33,14 +38,40 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rxq_hairpin_info { +bool hairpin_q;/* if rx queue is a hairpin queue */ +uint16_t peer_txp; +uint16_t peer_txq_id; +}; +struct cpfl_rx_queue {struct idpf_rx_queue base; +struct cpfl_rxq_hairpin_info hairpin_info; +}; + +struct cpfl_txq_hairpin_info { +bool hairpin_q;/* if tx queue is a hairpin queue */ +uint16_t peer_rxp; +uint16_t peer_rxq_id; };struct cpfl_tx_queue {struct idpf_tx_queue base; +struct cpfl_txq_hairpin_info hairpin_info; }; +static inline uint16_t +cpfl_hw_qid_get (uint16_t start_qid,uint16_t offset) +{ +return start_qid + offset; +} + +static inline uint64_t +cpfl_hw_qtail_get (uint64_t tail_start,uint16_t offset,uint64_t tail_spacing) +{ +return tail_start + offset * tail_spacing; +} +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);
@@ -59,4 +90,9 @@ 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_ */
drivers/net/cpfl/cpfl_rxtx_vec_common.h +4 -0
@@ -85,6 +85,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 {
@@ -106,6 +108,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.26.2
PATCH v6 6/13 common/idpf: add queue config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx queue configuration APIs.
--- drivers/common/idpf/idpf_common_virtchnl.c | 70 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 6 ++ drivers/common/idpf/version.map | 2 + 3 files changed, 78 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +70 -0
@@ -1050,6 +1050,41 @@ idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq)return err; } +int idpf_vc_rxq_config_by_info (struct idpf_vport *vport,struct virtchnl2_rxq_info *rxq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_rx_queues *vc_rxqs =NULL ; +struct idpf_cmd_info args; +int size, err, i; + + size =sizeof (*vc_rxqs) + (num_qs -1 ) * +sizeof (struct virtchnl2_rxq_info ); + vc_rxqs =rte_zmalloc ("cfg_rxqs" , size,0 ); +if (vc_rxqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_rx_queues" ); + err = -ENOMEM ; +return err; + } + vc_rxqs->vport_id = vport->vport_id; + vc_rxqs->num_qinfo = num_qs; +memcpy (vc_rxqs->qinfo, rxq_info, num_qs *sizeof (struct virtchnl2_rxq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_RX_QUEUES ; + args.in_args = (uint8_t *)vc_rxqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_rxqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_RX_QUEUES" ); + +return err; +} +int idpf_vc_txq_config (struct idpf_vport *vport,struct idpf_tx_queue *txq) {
@@ -1121,6 +1156,41 @@ idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)return err; } +int +idpf_vc_txq_config_by_info (struct idpf_vport *vport,struct virtchnl2_txq_info *txq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_tx_queues *vc_txqs =NULL ; +struct idpf_cmd_info args; +int size, err; + + size =sizeof (*vc_txqs) + (num_qs -1 ) *sizeof (struct virtchnl2_txq_info ); + vc_txqs =rte_zmalloc ("cfg_txqs" , size,0 ); +if (vc_txqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_tx_queues" ); + err = -ENOMEM ; +return err; + } + vc_txqs->vport_id = vport->vport_id; + vc_txqs->num_qinfo = num_qs; +memcpy (vc_txqs->qinfo, txq_info, num_qs *sizeof (struct virtchnl2_txq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_TX_QUEUES ; + args.in_args = (uint8_t *)vc_txqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_txqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_TX_QUEUES" ); + +return err; +} +int idpf_vc_ctlq_recv (struct idpf_ctlq_info *cq,u16 *num_q_msg,struct idpf_ctlq_msg *q_msg)
drivers/common/idpf/idpf_common_virtchnl.h +6 -0
@@ -65,6 +65,12 @@ __rte_internalint 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_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_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +2 -0
@@ -54,8 +54,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;
Signature · 1 line
2.26.2
PATCH v6 7/13 net/cpfl: support hairpin queue configuration
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue configuration.
--- drivers/net/cpfl/cpfl_ethdev.c | 136 +++++++++++++++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.c | 80 +++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 217 insertions(+), 6 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +130 -6
@@ -742,33 +742,157 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)return idpf_vport_irq_map_config (vport, nb_rx_queues); } +/* Update hairpin_info for dev's tx hairpin queue */ +static int +cpfl_txq_hairpin_info_update (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_txq_hairpin_info *hairpin_info; +struct cpfl_tx_queue *cpfl_txq; +int i; + +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + hairpin_info = &cpfl_txq->hairpin_info; +if (hairpin_info->peer_rxp != rx_port) { +PMD_DRV_LOG (ERR ,"port %d is not the peer port" , rx_port); +return -EINVAL ; + } + hairpin_info->peer_rxq_id = +cpfl_hw_qid_get (cpfl_rx_vport->p2p_q_chunks_info->rx_start_qid, + hairpin_info->peer_rxq_id - cpfl_rx_vport->nb_data_rxq); + } + +return 0 ; +} + +/* Bind Rx hairpin queue's memory zone to peer Tx hairpin queue's memory zone */ +static void +cpfl_rxq_hairpin_mz_bind (struct rte_eth_dev *dev) +{ +struct cpfl_vport *cpfl_rx_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_rx_vport->base; +struct idpf_adapter *adapter = vport->adapter; +struct idpf_hw *hw = &adapter->hw; +struct cpfl_rx_queue *cpfl_rxq; +struct cpfl_tx_queue *cpfl_txq; +struct rte_eth_dev *peer_dev; +const struct rte_memzone *mz; +uint16_t peer_tx_port; +uint16_t peer_tx_qid; +int i; + +for (i = cpfl_rx_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; + peer_tx_port = cpfl_rxq->hairpin_info.peer_txp; + peer_tx_qid = cpfl_rxq->hairpin_info.peer_txq_id; + peer_dev = &rte_eth_devices[peer_tx_port]; + cpfl_txq = peer_dev->data->tx_queues[peer_tx_qid]; + +/* bind rx queue */ + mz = cpfl_txq->base.mz; + cpfl_rxq->base.rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.rx_ring = mz->addr; + cpfl_rxq->base.mz = mz; + +/* bind rx buffer queue */ + mz = cpfl_txq->base.complq->mz; + cpfl_rxq->base.bufq1->rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.bufq1->rx_ring = mz->addr; + cpfl_rxq->base.bufq1->mz = mz; + cpfl_rxq->base.bufq1->qrx_tail = hw->hw_addr + +cpfl_hw_qtail_get (cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_start, +0 , cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_spacing); + } +} +static int cpfl_start_queues (struct rte_eth_dev *dev) { +struct cpfl_vport *cpfl_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct cpfl_rx_queue *cpfl_rxq;struct cpfl_tx_queue *cpfl_txq; +int update_flag =0 ;int err =0 ;int i; +/* For normal data queues, configure, init and enale Txq. +* For non-manual bind hairpin queues, configure Txq. +*/ 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 ; - err =cpfl_tx_queue_start (dev, i); +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_vport->p2p_manual_bind) { +if (update_flag ==0 ) { + err =cpfl_txq_hairpin_info_update (dev, + cpfl_txq->hairpin_info.peer_rxp); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info" ); +return err; + } + update_flag =1 ; + } + err =cpfl_hairpin_txq_config (vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + } + +/* For non-manual bind hairpin queues, configure Tx completion queue first.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_tx_complq !=NULL ) { + err =cpfl_hairpin_tx_complq_config (cpfl_vport);if (err !=0 ) { -PMD_DRV_LOG (ERR ,"Fail to start Tx queue %u" , i); +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" );return err; } } +/* For non-manual bind hairpin queues, configure Rx buffer queue.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_rx_bufq !=NULL ) { +cpfl_rxq_hairpin_mz_bind (dev); + err =cpfl_hairpin_rx_bufq_config (cpfl_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + } + +/* For normal data queues, configure, init and enale Rxq. +* For non-manual bind hairpin queues, configure Rxq, and then init Rxq. +*/ for (i =0 ; i < dev->data->nb_rx_queues; i++) { 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_vport->p2p_manual_bind) { + err =cpfl_hairpin_rxq_config (vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } } }
drivers/net/cpfl/cpfl_rxtx.c +80 -0
86 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -32,12 +32,15 @@#define CPFL_RING_BASE_ALIGN 128#define CPFL_DEFAULT_RX_FREE_THRESH 32 +#define CPFL_RXBUF_LOW_WATERMARK 64#define CPFL_DEFAULT_TX_RS_THRESH 32#define CPFL_DEFAULT_TX_FREE_THRESH 32#define CPFL_SUPPORT_CHAIN_NUM 5 +#define CPFL_RX_BUF_STRIDE 64 +struct cpfl_rxq_hairpin_info {bool hairpin_q;/* if rx queue is a hairpin queue */ uint16_t peer_txp;
@@ -95,4 +98,8 @@ int cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,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); +int cpfl_hairpin_tx_complq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq); +int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v6 8/13 common/idpf: add switch queue API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds idpf_vc_ena_dis_one_queue API.
--- drivers/common/idpf/idpf_common_virtchnl.c | 2 +- drivers/common/idpf/idpf_common_virtchnl.h | 3 +++ drivers/common/idpf/version.map | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/common/idpf/idpf_common_virtchnl.c +1 -1
@@ -733,7 +733,7 @@ idpf_vc_vectors_dealloc(struct idpf_vport *vport)return err; } -static int +int idpf_vc_ena_dis_one_queue (struct idpf_vport *vport,uint16_t qid,uint32_t type,bool on) {
drivers/common/idpf/idpf_common_virtchnl.h +3 -0
@@ -71,6 +71,9 @@ __rte_internalint 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); +__rte_internal int idpf_vc_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +1 -0
@@ -40,6 +40,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;
Signature · 1 line
2.26.2
PATCH v6 9/13 net/cpfl: support hairpin queue start/stop
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue start/stop.
--- drivers/net/cpfl/cpfl_ethdev.c | 46 +++++++++ drivers/net/cpfl/cpfl_rxtx.c | 164 +++++++++++++++++++++++++++++---- drivers/net/cpfl/cpfl_rxtx.h | 15 +++ 3 files changed, 207 insertions(+), 18 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +46 -0
@@ -896,6 +896,52 @@ cpfl_start_queues(struct rte_eth_dev *dev) } } +/* For non-manual bind hairpin queues, enable Tx queue and Rx queue, +* then enable Tx completion queue and Rx buffer queue. +*/ +for (i = cpfl_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +if (cpfl_txq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_txq, + false, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +else + cpfl_txq->base.q_started = true; + } + } + +for (i = cpfl_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_rxq, + true, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); +else + cpfl_rxq->base.q_started = true; + } + } + +if (!cpfl_vport->p2p_manual_bind && + cpfl_vport->p2p_tx_complq !=NULL && + cpfl_vport->p2p_rx_bufq !=NULL ) { + err =cpfl_switch_hairpin_complq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + err =cpfl_switch_hairpin_bufq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx bufq" ); +return err; + } + } +return err; }
drivers/net/cpfl/cpfl_rxtx.c +146 -18
218 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +15 -0
@@ -41,6 +41,17 @@#define CPFL_RX_BUF_STRIDE 64 +/* 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 */ uint16_t peer_txp;
@@ -102,4 +113,8 @@ int cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport);int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq);int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport);int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq); +int cpfl_switch_hairpin_complq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_bufq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_rxtx_queue (struct cpfl_vport *cpfl_vport,uint16_t qid, +bool rx,bool on);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v6 10/13 common/idpf: add irq map config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports idpf_vport_irq_map_config_by_qids API.
--- drivers/common/idpf/idpf_common_device.c | 75 ++++++++++++++++++++++++ drivers/common/idpf/idpf_common_device.h | 4 ++ drivers/common/idpf/version.map | 1 + 3 files changed, 80 insertions(+)
drivers/common/idpf/idpf_common_device.c +75 -0
@@ -667,6 +667,81 @@ idpf_vport_irq_map_config(struct idpf_vport *vport, uint16_t nb_rx_queues)return ret; } +int +idpf_vport_irq_map_config_by_qids (struct idpf_vport *vport,uint32_t *qids,uint16_t nb_rx_queues) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_queue_vector *qv_map; +struct idpf_hw *hw = &adapter->hw; +uint32_t dynctl_val, itrn_val; +uint32_t dynctl_reg_start; +uint32_t itrn_reg_start; +uint16_t i; +int ret; + + qv_map =rte_zmalloc ("qv_map" , + nb_rx_queues * +sizeof (struct virtchnl2_queue_vector ),0 ); +if (qv_map ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate %d queue-vector map" , + nb_rx_queues); + ret = -ENOMEM ; + goto qv_map_alloc_err; + } + +/* Rx interrupt disabled, Map interrupt only for writeback */ + +/* The capability flags adapter->caps.other_caps should be +* compared with bit VIRTCHNL2_CAP_WB_ON_ITR here. The if +* condition should be updated when the FW can return the +* correct flag bits. +*/ + dynctl_reg_start = + vport->recv_vectors->vchunks.vchunks->dynctl_reg_start; + itrn_reg_start = + vport->recv_vectors->vchunks.vchunks->itrn_reg_start; + dynctl_val =IDPF_READ_REG (hw, dynctl_reg_start); +DRV_LOG (DEBUG ,"Value of dynctl_reg_start is 0x%x" , dynctl_val); + itrn_val =IDPF_READ_REG (hw, itrn_reg_start); +DRV_LOG (DEBUG ,"Value of itrn_reg_start is 0x%x" , itrn_val); +/* Force write-backs by setting WB_ON_ITR bit in DYN_CTL +* register. WB_ON_ITR and INTENA are mutually exclusive +* bits. Setting WB_ON_ITR bits means TX and RX Descs +* are written back based on ITR expiration irrespective +* of INTENA setting. +*/ +/* TBD: need to tune INTERVAL value for better performance. */ + itrn_val = (itrn_val ==0 ) ?IDPF_DFLT_INTERVAL : itrn_val; + dynctl_val =VIRTCHNL2_ITR_IDX_0 << +PF_GLINT_DYN_CTL_ITR_INDX_S | +PF_GLINT_DYN_CTL_WB_ON_ITR_M | + itrn_val <<PF_GLINT_DYN_CTL_INTERVAL_S ; +IDPF_WRITE_REG (hw, dynctl_reg_start, dynctl_val); + +for (i =0 ; i < nb_rx_queues; i++) { +/* map all queues to the same vector */ + qv_map[i].queue_id = qids[i]; + qv_map[i].vector_id = + vport->recv_vectors->vchunks.vchunks->start_vector_id; + } + vport->qv_map = qv_map; + + ret =idpf_vc_irq_map_unmap_config (vport, nb_rx_queues, true); +if (ret !=0 ) { +DRV_LOG (ERR ,"config interrupt mapping failed" ); + goto config_irq_map_err; + } + +return 0 ; + +config_irq_map_err: +rte_free (vport->qv_map); + vport->qv_map =NULL ; + +qv_map_alloc_err: +return ret; +} +int idpf_vport_irq_unmap_config (struct idpf_vport *vport,uint16_t nb_rx_queues) {
drivers/common/idpf/idpf_common_device.h +4 -0
@@ -200,5 +200,9 @@ int idpf_vport_info_init(struct idpf_vport *vport, struct virtchnl2_create_vport *vport_info);__rte_internal void idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes); +__rte_internal +int idpf_vport_irq_map_config_by_qids(struct idpf_vport *vport, +uint32_t *qids, +uint16_t nb_rx_queues);#endif /* _IDPF_COMMON_DEVICE_H_ */
drivers/common/idpf/version.map +1 -0
@@ -69,6 +69,7 @@ INTERNAL { idpf_vport_info_init; idpf_vport_init; idpf_vport_irq_map_config; + idpf_vport_irq_map_config_by_qids; idpf_vport_irq_unmap_config; idpf_vport_rss_config; idpf_vport_stats_update;
Signature · 1 line
2.26.2
PATCH v6 11/13 net/cpfl: enable write back based on ITR expire
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch enables write back based on ITR expire
(WR_ON_ITR) for hairpin queues.
--- drivers/net/cpfl/cpfl_ethdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +12 -1
@@ -735,11 +735,22 @@ cpfl_dev_configure(struct rte_eth_dev *dev)static int cpfl_config_rx_queues_irqs (struct rte_eth_dev *dev) { +uint32_t qids[CPFL_MAX_P2P_NB_QUEUES +IDPF_DEFAULT_RXQ_NUM ] = {0 };struct cpfl_vport *cpfl_vport = dev->data->dev_private;struct idpf_vport *vport = &cpfl_vport->base;uint16_t nb_rx_queues = dev->data->nb_rx_queues; +struct cpfl_rx_queue *cpfl_rxq; +int i; -return idpf_vport_irq_map_config (vport, nb_rx_queues); +for (i =0 ; i < nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q) + qids[i] =cpfl_hw_qid_get (cpfl_vport->p2p_q_chunks_info->rx_start_qid, + (i - cpfl_vport->nb_data_rxq)); +else + qids[i] =cpfl_hw_qid_get (vport->chunks_info.rx_start_qid, i); + } +return idpf_vport_irq_map_config_by_qids (vport, qids, nb_rx_queues); }/* Update hairpin_info for dev's tx hairpin queue */
Signature · 1 line
2.26.2
PATCH v6 12/13 net/cpfl: support peer ports get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports get hairpin peer ports.
--- drivers/net/cpfl/cpfl_ethdev.c | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +40 -0
@@ -1080,6 +1080,45 @@ cpfl_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_hairpin_get_peer_ports (struct rte_eth_dev *dev,uint16_t *peer_ports, +size_t len,uint32_t tx) +{ +struct cpfl_vport *cpfl_vport = + (struct cpfl_vport *)dev->data->dev_private; +struct idpf_tx_queue *txq; +struct idpf_rx_queue *rxq; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i, j; + +if (len <=0 ) +return -EINVAL ; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + +if (tx >0 ) { +for (i = cpfl_vport->nb_data_txq, j =0 ; i < dev->data->nb_tx_queues; i++, j++) { + txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +return -EINVAL ; + cpfl_txq = (struct cpfl_tx_queue *)txq; + peer_ports[j] = cpfl_txq->hairpin_info.peer_rxp; + } + }else if (tx ==0 ) { +for (i = cpfl_vport->nb_data_rxq, j =0 ; i < dev->data->nb_rx_queues; i++, j++) { + rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +return -EINVAL ; + cpfl_rxq = (struct cpfl_rx_queue *)rxq; + peer_ports[j] = cpfl_rxq->hairpin_info.peer_txp; + } + } + +return j; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1109,6 +1148,7 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, }; static int
Signature · 1 line
2.26.2
PATCH v6 13/13 net/cpfl: support hairpin bind/unbind
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports hairpin_bind/unbind ops.
--- drivers/net/cpfl/cpfl_ethdev.c | 137 +++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +137 -0
@@ -1119,6 +1119,141 @@ cpfl_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,return j; } +static int +cpfl_hairpin_bind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct idpf_vport *tx_vport = &cpfl_tx_vport->base; +struct cpfl_vport *cpfl_rx_vport; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +struct rte_eth_dev *peer_dev; +struct idpf_vport *rx_vport; +int err =0 ; +int i; + + err =cpfl_txq_hairpin_info_update (dev, rx_port); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info." ); +return err; + } + +/* configure hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_hairpin_txq_config (tx_vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + + err =cpfl_hairpin_tx_complq_config (cpfl_tx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" ); +return err; + } + + peer_dev = &rte_eth_devices[rx_port]; + cpfl_rx_vport = (struct cpfl_vport *)peer_dev->data->dev_private; + rx_vport = &cpfl_rx_vport->base; +cpfl_rxq_hairpin_mz_bind (peer_dev); + + err =cpfl_hairpin_rx_bufq_config (cpfl_rx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_hairpin_rxq_config (rx_vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (peer_dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } + } + +/* enable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +return err; + } + cpfl_txq->base.q_started = true; + } + + err =cpfl_switch_hairpin_complq (cpfl_tx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); + } + cpfl_rxq->base.q_started = true; + } + + err =cpfl_switch_hairpin_bufq (cpfl_rx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx buffer queue" ); +return err; + } + +return 0 ; +} + +static int +cpfl_hairpin_unbind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; + +/* disable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, false); + cpfl_txq->base.q_started = false; + } + +cpfl_switch_hairpin_complq (cpfl_tx_vport, false); + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, false); + cpfl_rxq->base.q_started = false; + } + +cpfl_switch_hairpin_bufq (cpfl_rx_vport, false); + +return 0 ; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1149,6 +1284,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, + .hairpin_unbind = cpfl_hairpin_unbind, }; static int
Signature · 1 line
2.26.2
v7 cover net/cpfl: add hairpin queue support
In reply to [email protected]From: Beilei Xing <[email protected]>
This patchset adds hairpin queue support.
v2 changes:
- change hairpin rx queus configuration sequence.
- code refine.
v3 changes:
- Refine the patchset based on the latest code.
v4 change:
- Remove hairpin rx buffer queue's sw_ring.
- Change hairpin rx queus configuration sequence in cpfl_hairpin_bind function.
- Refind hairpin queue setup and release.
v5 change:
- Fix memory leak during queue setup.
- Refine hairpin Rxq/Txq start/stop.
v6 change:
- Add sign-off.
v7 change:
- Update cpfl.rst
Beilei Xing (14):
net/cpfl: refine structures
common/idpf: support queue groups add/delete net/cpfl: add haipin queue group during vport init net/cpfl: support hairpin queue capbility get net/cpfl: support hairpin queue setup and release common/idpf: add queue config API net/cpfl: support hairpin queue configuration common/idpf: add switch queue API net/cpfl: support hairpin queue start/stop common/idpf: add irq map config API net/cpfl: enable write back based on ITR expire net/cpfl: support peer ports get
net/cpfl: support hairpin bind/unbind
doc: update the doc of CPFL PMD
doc/guides/nics/cpfl.rst | 7 + drivers/common/idpf/idpf_common_device.c | 75 ++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 138 +++- drivers/common/idpf/idpf_common_virtchnl.h | 18 + drivers/common/idpf/version.map | 6 + drivers/net/cpfl/cpfl_ethdev.c | 610 ++++++++++++++-- drivers/net/cpfl/cpfl_ethdev.h | 35 +- drivers/net/cpfl/cpfl_rxtx.c | 781 +++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.h | 76 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 21 +- 11 files changed, 1652 insertions(+), 119 deletions(-)
Signature · 1 line
2.26.2
PATCH v7 1/14 net/cpfl: refine structures
From: Beilei Xing <[email protected]>
This patch refines some structures to support hairpin queue, cpfl_rx_queue/cpfl_tx_queue/cpfl_vport.
--- drivers/net/cpfl/cpfl_ethdev.c | 85 +++++++----- drivers/net/cpfl/cpfl_ethdev.h | 6 +- drivers/net/cpfl/cpfl_rxtx.c | 175 +++++++++++++++++------- drivers/net/cpfl/cpfl_rxtx.h | 8 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 17 +-- 5 files changed, 196 insertions(+), 95 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +49 -36
@@ -124,7 +124,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_link new_link;unsigned int i;
@@ -156,7 +157,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter; dev_info->max_rx_queues = base->caps.max_rx_q;
@@ -216,7 +218,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;/* mtu setting is forbidden if port is start */ if (dev->data->dev_started) {
@@ -256,12 +259,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); }
@@ -271,8 +274,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -305,20 +308,20 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -343,8 +346,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;unsigned int i;int ret;
@@ -459,7 +462,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -498,7 +502,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -536,7 +541,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -601,7 +607,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -638,7 +645,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_conf *conf = &dev->data->dev_conf;struct idpf_adapter *base = vport->adapter;int ret;
@@ -710,7 +718,8 @@ 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 = 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);
@@ -719,14 +728,14 @@ 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 ) {
@@ -736,8 +745,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 ) {
@@ -752,7 +761,8 @@ 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 = 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;
@@ -813,7 +823,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;if (dev->data->dev_started ==0 )return 0 ;
@@ -832,7 +843,8 @@ 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 = 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);
@@ -842,7 +854,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 ; }
@@ -1047,7 +1059,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
@@ -1275,7 +1287,8 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)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 = 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 */
@@ -1300,7 +1313,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++;
@@ -1415,7 +1428,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 )
@@ -1433,7 +1446,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 +5 -1
@@ -69,13 +69,17 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct cpfl_vport { +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 +125 -50
401 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +8 -0
@@ -23,6 +23,14 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rx_queue { +struct idpf_rx_queue base; +}; + +struct cpfl_tx_queue { +struct idpf_tx_queue base; +}; +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 +9 -8
@@ -76,15 +76,16 @@ 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 = 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 +101,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.26.2
PATCH v7 2/14 common/idpf: support queue groups add/delete
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds queue group add/delete virtual channel support.
--- drivers/common/idpf/idpf_common_virtchnl.c | 66 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 9 +++ drivers/common/idpf/version.map | 2 + 3 files changed, 77 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +66 -0
@@ -359,6 +359,72 @@ idpf_vc_vport_destroy(struct idpf_vport *vport)return err; } +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_queue_grps_out) +{ +struct idpf_adapter *adapter = vport->adapter; +struct idpf_cmd_info args; +int size, qg_info_size; +int err =-1 ; + + size =sizeof (*p2p_queue_grps_info) + + (p2p_queue_grps_info->qg_info.num_queue_groups -1 ) * +sizeof (struct virtchnl2_queue_group_info ); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_ADD_QUEUE_GROUPS ; + args.in_args = (uint8_t *)p2p_queue_grps_info; + args.in_args_size = size; + 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_ADD_QUEUE_GROUPS" ); +return err; + } + +rte_memcpy (p2p_queue_grps_out, args.out_buffer,IDPF_DFLT_MBX_BUF_SIZE ); +return 0 ; +} + +int idpf_vc_queue_grps_del (struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_delete_queue_groups *vc_del_q_grps; +struct idpf_cmd_info args; +int size; +int err; + + size =sizeof (*vc_del_q_grps) + + (num_q_grps -1 ) *sizeof (struct virtchnl2_queue_group_id ); + vc_del_q_grps =rte_zmalloc ("vc_del_q_grps" , size,0 ); + + vc_del_q_grps->vport_id = vport->vport_id; + vc_del_q_grps->num_queue_groups = num_q_grps; +memcpy (vc_del_q_grps->qg_ids, qg_ids, + num_q_grps *sizeof (struct virtchnl2_queue_group_id )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_DEL_QUEUE_GROUPS ; + args.in_args = (uint8_t *)vc_del_q_grps; + args.in_args_size = size; + 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_DEL_QUEUE_GROUPS" ); + +rte_free (vc_del_q_grps); +return err; +} +int idpf_vc_rss_key_set (struct idpf_vport *vport) {
drivers/common/idpf/idpf_common_virtchnl.h +9 -0
@@ -64,4 +64,13 @@ 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_queue_grps_del(struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids); +__rte_internal +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *ptp_queue_grps_info, +uint8_t *ptp_queue_grps_out);#endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +2 -0
@@ -43,6 +43,8 @@ INTERNAL { idpf_vc_irq_map_unmap_config; idpf_vc_one_msg_read; idpf_vc_ptype_info_query; + idpf_vc_queue_grps_add; + idpf_vc_queue_grps_del; idpf_vc_queue_switch; idpf_vc_queues_ena_dis; idpf_vc_rss_hash_get;
Signature · 1 line
2.26.2
PATCH v7 3/14 net/cpfl: add haipin queue group during vport init
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds haipin queue group during vport init.
--- drivers/net/cpfl/cpfl_ethdev.c | 133 +++++++++++++++++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 18 +++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 158 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +133 -0
@@ -840,6 +840,20 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) +{ +struct virtchnl2_queue_group_id qg_ids[CPFL_P2P_NB_QUEUE_GRPS ] = {0 }; +int ret =0 ; + + qg_ids[0 ].queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids[0 ].queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret =idpf_vc_queue_grps_del (vport,CPFL_P2P_NB_QUEUE_GRPS , qg_ids); +if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close (struct rte_eth_dev *dev) {
@@ -848,7 +862,12 @@ cpfl_dev_close(struct rte_eth_dev *dev)struct cpfl_adapter_ext *adapter =CPFL_ADAPTER_TO_EXT (vport->adapter);cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;
@@ -1284,6 +1303,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_complq =CPFL_P2P_NB_TX_COMPLQ ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + p2p_queue_grps_info->qg_info.groups[0 ].rx_q_grp_info.rss_lut_size =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.pir_weight =0 ; + + ret =idpf_vc_queue_grps_add (vport, p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, +struct virtchnl2_add_queue_groups *p2p_q_vc_out_info) +{ +struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport->p2p_q_chunks_info; +struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init (struct rte_eth_dev *dev,void *init_params) {
@@ -1293,6 +1402,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ; dev->dev_ops = &cpfl_eth_dev_ops;
@@ -1327,6 +1438,28 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { +memset (&p2p_queue_grps_info,0 ,sizeof (p2p_queue_grps_info)); + ret =cpfl_p2p_q_grps_add (vport, &p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to add p2p queue group." ); +return 0 ; + } + cpfl_vport->p2p_q_chunks_info =rte_zmalloc (NULL , +sizeof (struct p2p_queue_chunks_info ),0 ); +if (cpfl_vport->p2p_q_chunks_info ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret =cpfl_p2p_queue_info_init (cpfl_vport, + (struct virtchnl2_add_queue_groups *)p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); + } + } +return 0 ; err_mac_addrs:
drivers/net/cpfl/cpfl_ethdev.h +18 -0
@@ -56,6 +56,7 @@/* Device IDs */ #define IDPF_DEV_ID_CPF 0x1453 +#define VIRTCHNL2_QUEUE_GROUP_P2P 0x100struct cpfl_vport_param {struct cpfl_adapter_ext *adapter;
@@ -69,8 +70,25 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct p2p_queue_chunks_info { +uint32_t tx_start_qid; +uint32_t rx_start_qid; +uint32_t tx_compl_start_qid; +uint32_t rx_buf_start_qid; + +uint64_t tx_qtail_start; +uint32_t tx_qtail_spacing; +uint64_t rx_qtail_start; +uint32_t rx_qtail_spacing; +uint64_t tx_compl_qtail_start; +uint32_t tx_compl_qtail_spacing; +uint64_t rx_buf_qtail_start; +uint32_t rx_buf_qtail_spacing; +}; +struct cpfl_vport {struct idpf_vport base; +struct p2p_queue_chunks_info *p2p_q_chunks_info; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -13,6 +13,13 @@#define CPFL_MIN_RING_DESC 32#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 + +#define CPFL_MAX_P2P_NB_QUEUES 16 +#define CPFL_P2P_NB_RX_BUFQ 1 +#define CPFL_P2P_NB_TX_COMPLQ 1 +#define CPFL_P2P_NB_QUEUE_GRPS 1 +#define CPFL_P2P_QUEUE_GRP_ID 1 +/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
Signature · 1 line
2.26.2
PATCH v7 4/14 net/cpfl: support hairpin queue capbility get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds hairpin_cap_get ops support.
--- drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 3 +++ 2 files changed, 21 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -154,6 +154,23 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,return rte_eth_linkstatus_set (dev, &new_link); } +static int +cpfl_hairpin_cap_get (struct rte_eth_dev *dev, +struct rte_eth_hairpin_cap *cap) +{ +struct cpfl_vport *cpfl_vport = dev->data->dev_private; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + + cap->max_nb_queues =CPFL_MAX_P2P_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) {
@@ -904,6 +921,7 @@ 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, }; static int
drivers/net/cpfl/cpfl_rxtx.h +3 -0
@@ -14,6 +14,9 @@#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 +#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_P2P_NB_QUEUES 16#define CPFL_P2P_NB_RX_BUFQ 1#define CPFL_P2P_NB_TX_COMPLQ 1
Signature · 1 line
2.26.2
PATCH v7 5/14 net/cpfl: support hairpin queue setup and release
In reply to [email protected]From: Beilei Xing <[email protected]>
Support hairpin Rx/Tx queue setup and release.
--- drivers/net/cpfl/cpfl_ethdev.c | 6 + drivers/net/cpfl/cpfl_ethdev.h | 11 + drivers/net/cpfl/cpfl_rxtx.c | 364 +++++++++++++++++++++++- drivers/net/cpfl/cpfl_rxtx.h | 36 +++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 + 5 files changed, 420 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +6 -0
@@ -879,6 +879,10 @@ cpfl_dev_close(struct rte_eth_dev *dev)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 ; + }if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq)cpfl_p2p_queue_grps_del (vport);
@@ -922,6 +926,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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 int
drivers/net/cpfl/cpfl_ethdev.h +11 -0
@@ -89,6 +89,17 @@ struct p2p_queue_chunks_info {struct cpfl_vport {struct idpf_vport base;struct p2p_queue_chunks_info *p2p_q_chunks_info; + +struct rte_mempool *p2p_mp; + +uint16_t nb_data_rxq; +uint16_t nb_data_txq; +uint16_t nb_p2p_rxq; +uint16_t nb_p2p_txq; + +struct idpf_rx_queue *p2p_rx_bufq; +struct idpf_tx_queue *p2p_tx_complq; +bool p2p_manual_bind; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.c +363 -1
400 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +36 -0
@@ -22,6 +22,11 @@#define CPFL_P2P_NB_TX_COMPLQ 1#define CPFL_P2P_NB_QUEUE_GRPS 1#define CPFL_P2P_QUEUE_GRP_ID 1 +#define CPFL_P2P_DESC_LEN 16 +#define CPFL_P2P_NB_MBUF 4096 +#define CPFL_P2P_CACHE_SIZE 250 +#define CPFL_P2P_MBUF_SIZE 2048 +#define CPFL_P2P_RING_BUF 128/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
@@ -33,14 +38,40 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rxq_hairpin_info { +bool hairpin_q;/* if rx queue is a hairpin queue */ +uint16_t peer_txp; +uint16_t peer_txq_id; +}; +struct cpfl_rx_queue {struct idpf_rx_queue base; +struct cpfl_rxq_hairpin_info hairpin_info; +}; + +struct cpfl_txq_hairpin_info { +bool hairpin_q;/* if tx queue is a hairpin queue */ +uint16_t peer_rxp; +uint16_t peer_rxq_id; };struct cpfl_tx_queue {struct idpf_tx_queue base; +struct cpfl_txq_hairpin_info hairpin_info; }; +static inline uint16_t +cpfl_hw_qid_get (uint16_t start_qid,uint16_t offset) +{ +return start_qid + offset; +} + +static inline uint64_t +cpfl_hw_qtail_get (uint64_t tail_start,uint16_t offset,uint64_t tail_spacing) +{ +return tail_start + offset * tail_spacing; +} +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);
@@ -59,4 +90,9 @@ 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_ */
drivers/net/cpfl/cpfl_rxtx_vec_common.h +4 -0
@@ -85,6 +85,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 {
@@ -106,6 +108,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.26.2
PATCH v7 6/14 common/idpf: add queue config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx queue configuration APIs.
--- drivers/common/idpf/idpf_common_virtchnl.c | 70 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 6 ++ drivers/common/idpf/version.map | 2 + 3 files changed, 78 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +70 -0
@@ -1050,6 +1050,41 @@ idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq)return err; } +int idpf_vc_rxq_config_by_info (struct idpf_vport *vport,struct virtchnl2_rxq_info *rxq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_rx_queues *vc_rxqs =NULL ; +struct idpf_cmd_info args; +int size, err, i; + + size =sizeof (*vc_rxqs) + (num_qs -1 ) * +sizeof (struct virtchnl2_rxq_info ); + vc_rxqs =rte_zmalloc ("cfg_rxqs" , size,0 ); +if (vc_rxqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_rx_queues" ); + err = -ENOMEM ; +return err; + } + vc_rxqs->vport_id = vport->vport_id; + vc_rxqs->num_qinfo = num_qs; +memcpy (vc_rxqs->qinfo, rxq_info, num_qs *sizeof (struct virtchnl2_rxq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_RX_QUEUES ; + args.in_args = (uint8_t *)vc_rxqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_rxqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_RX_QUEUES" ); + +return err; +} +int idpf_vc_txq_config (struct idpf_vport *vport,struct idpf_tx_queue *txq) {
@@ -1121,6 +1156,41 @@ idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)return err; } +int +idpf_vc_txq_config_by_info (struct idpf_vport *vport,struct virtchnl2_txq_info *txq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_tx_queues *vc_txqs =NULL ; +struct idpf_cmd_info args; +int size, err; + + size =sizeof (*vc_txqs) + (num_qs -1 ) *sizeof (struct virtchnl2_txq_info ); + vc_txqs =rte_zmalloc ("cfg_txqs" , size,0 ); +if (vc_txqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_tx_queues" ); + err = -ENOMEM ; +return err; + } + vc_txqs->vport_id = vport->vport_id; + vc_txqs->num_qinfo = num_qs; +memcpy (vc_txqs->qinfo, txq_info, num_qs *sizeof (struct virtchnl2_txq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_TX_QUEUES ; + args.in_args = (uint8_t *)vc_txqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_txqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_TX_QUEUES" ); + +return err; +} +int idpf_vc_ctlq_recv (struct idpf_ctlq_info *cq,u16 *num_q_msg,struct idpf_ctlq_msg *q_msg)
drivers/common/idpf/idpf_common_virtchnl.h +6 -0
@@ -65,6 +65,12 @@ __rte_internalint 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_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_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +2 -0
@@ -54,8 +54,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;
Signature · 1 line
2.26.2
PATCH v7 7/14 net/cpfl: support hairpin queue configuration
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue configuration.
--- drivers/net/cpfl/cpfl_ethdev.c | 136 +++++++++++++++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.c | 80 +++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 217 insertions(+), 6 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +130 -6
@@ -742,33 +742,157 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)return idpf_vport_irq_map_config (vport, nb_rx_queues); } +/* Update hairpin_info for dev's tx hairpin queue */ +static int +cpfl_txq_hairpin_info_update (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_txq_hairpin_info *hairpin_info; +struct cpfl_tx_queue *cpfl_txq; +int i; + +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + hairpin_info = &cpfl_txq->hairpin_info; +if (hairpin_info->peer_rxp != rx_port) { +PMD_DRV_LOG (ERR ,"port %d is not the peer port" , rx_port); +return -EINVAL ; + } + hairpin_info->peer_rxq_id = +cpfl_hw_qid_get (cpfl_rx_vport->p2p_q_chunks_info->rx_start_qid, + hairpin_info->peer_rxq_id - cpfl_rx_vport->nb_data_rxq); + } + +return 0 ; +} + +/* Bind Rx hairpin queue's memory zone to peer Tx hairpin queue's memory zone */ +static void +cpfl_rxq_hairpin_mz_bind (struct rte_eth_dev *dev) +{ +struct cpfl_vport *cpfl_rx_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_rx_vport->base; +struct idpf_adapter *adapter = vport->adapter; +struct idpf_hw *hw = &adapter->hw; +struct cpfl_rx_queue *cpfl_rxq; +struct cpfl_tx_queue *cpfl_txq; +struct rte_eth_dev *peer_dev; +const struct rte_memzone *mz; +uint16_t peer_tx_port; +uint16_t peer_tx_qid; +int i; + +for (i = cpfl_rx_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; + peer_tx_port = cpfl_rxq->hairpin_info.peer_txp; + peer_tx_qid = cpfl_rxq->hairpin_info.peer_txq_id; + peer_dev = &rte_eth_devices[peer_tx_port]; + cpfl_txq = peer_dev->data->tx_queues[peer_tx_qid]; + +/* bind rx queue */ + mz = cpfl_txq->base.mz; + cpfl_rxq->base.rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.rx_ring = mz->addr; + cpfl_rxq->base.mz = mz; + +/* bind rx buffer queue */ + mz = cpfl_txq->base.complq->mz; + cpfl_rxq->base.bufq1->rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.bufq1->rx_ring = mz->addr; + cpfl_rxq->base.bufq1->mz = mz; + cpfl_rxq->base.bufq1->qrx_tail = hw->hw_addr + +cpfl_hw_qtail_get (cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_start, +0 , cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_spacing); + } +} +static int cpfl_start_queues (struct rte_eth_dev *dev) { +struct cpfl_vport *cpfl_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct cpfl_rx_queue *cpfl_rxq;struct cpfl_tx_queue *cpfl_txq; +int update_flag =0 ;int err =0 ;int i; +/* For normal data queues, configure, init and enale Txq. +* For non-manual bind hairpin queues, configure Txq. +*/ 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 ; - err =cpfl_tx_queue_start (dev, i); +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_vport->p2p_manual_bind) { +if (update_flag ==0 ) { + err =cpfl_txq_hairpin_info_update (dev, + cpfl_txq->hairpin_info.peer_rxp); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info" ); +return err; + } + update_flag =1 ; + } + err =cpfl_hairpin_txq_config (vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + } + +/* For non-manual bind hairpin queues, configure Tx completion queue first.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_tx_complq !=NULL ) { + err =cpfl_hairpin_tx_complq_config (cpfl_vport);if (err !=0 ) { -PMD_DRV_LOG (ERR ,"Fail to start Tx queue %u" , i); +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" );return err; } } +/* For non-manual bind hairpin queues, configure Rx buffer queue.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_rx_bufq !=NULL ) { +cpfl_rxq_hairpin_mz_bind (dev); + err =cpfl_hairpin_rx_bufq_config (cpfl_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + } + +/* For normal data queues, configure, init and enale Rxq. +* For non-manual bind hairpin queues, configure Rxq, and then init Rxq. +*/ for (i =0 ; i < dev->data->nb_rx_queues; i++) { 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_vport->p2p_manual_bind) { + err =cpfl_hairpin_rxq_config (vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } } }
drivers/net/cpfl/cpfl_rxtx.c +80 -0
86 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -32,12 +32,15 @@#define CPFL_RING_BASE_ALIGN 128#define CPFL_DEFAULT_RX_FREE_THRESH 32 +#define CPFL_RXBUF_LOW_WATERMARK 64#define CPFL_DEFAULT_TX_RS_THRESH 32#define CPFL_DEFAULT_TX_FREE_THRESH 32#define CPFL_SUPPORT_CHAIN_NUM 5 +#define CPFL_RX_BUF_STRIDE 64 +struct cpfl_rxq_hairpin_info {bool hairpin_q;/* if rx queue is a hairpin queue */ uint16_t peer_txp;
@@ -95,4 +98,8 @@ int cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,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); +int cpfl_hairpin_tx_complq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq); +int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v7 8/14 common/idpf: add switch queue API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds idpf_vc_ena_dis_one_queue API.
--- drivers/common/idpf/idpf_common_virtchnl.c | 2 +- drivers/common/idpf/idpf_common_virtchnl.h | 3 +++ drivers/common/idpf/version.map | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/common/idpf/idpf_common_virtchnl.c +1 -1
@@ -733,7 +733,7 @@ idpf_vc_vectors_dealloc(struct idpf_vport *vport)return err; } -static int +int idpf_vc_ena_dis_one_queue (struct idpf_vport *vport,uint16_t qid,uint32_t type,bool on) {
drivers/common/idpf/idpf_common_virtchnl.h +3 -0
@@ -71,6 +71,9 @@ __rte_internalint 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); +__rte_internal int idpf_vc_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +1 -0
@@ -40,6 +40,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;
Signature · 1 line
2.26.2
PATCH v7 9/14 net/cpfl: support hairpin queue start/stop
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue start/stop.
--- drivers/net/cpfl/cpfl_ethdev.c | 46 +++++++++ drivers/net/cpfl/cpfl_rxtx.c | 164 +++++++++++++++++++++++++++++---- drivers/net/cpfl/cpfl_rxtx.h | 15 +++ 3 files changed, 207 insertions(+), 18 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +46 -0
@@ -896,6 +896,52 @@ cpfl_start_queues(struct rte_eth_dev *dev) } } +/* For non-manual bind hairpin queues, enable Tx queue and Rx queue, +* then enable Tx completion queue and Rx buffer queue. +*/ +for (i = cpfl_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +if (cpfl_txq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_txq, + false, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +else + cpfl_txq->base.q_started = true; + } + } + +for (i = cpfl_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_rxq, + true, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); +else + cpfl_rxq->base.q_started = true; + } + } + +if (!cpfl_vport->p2p_manual_bind && + cpfl_vport->p2p_tx_complq !=NULL && + cpfl_vport->p2p_rx_bufq !=NULL ) { + err =cpfl_switch_hairpin_complq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + err =cpfl_switch_hairpin_bufq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx bufq" ); +return err; + } + } +return err; }
drivers/net/cpfl/cpfl_rxtx.c +146 -18
218 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +15 -0
@@ -41,6 +41,17 @@#define CPFL_RX_BUF_STRIDE 64 +/* 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 */ uint16_t peer_txp;
@@ -102,4 +113,8 @@ int cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport);int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq);int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport);int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq); +int cpfl_switch_hairpin_complq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_bufq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_rxtx_queue (struct cpfl_vport *cpfl_vport,uint16_t qid, +bool rx,bool on);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v7 10/14 common/idpf: add irq map config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports idpf_vport_irq_map_config_by_qids API.
--- drivers/common/idpf/idpf_common_device.c | 75 ++++++++++++++++++++++++ drivers/common/idpf/idpf_common_device.h | 4 ++ drivers/common/idpf/version.map | 1 + 3 files changed, 80 insertions(+)
drivers/common/idpf/idpf_common_device.c +75 -0
@@ -667,6 +667,81 @@ idpf_vport_irq_map_config(struct idpf_vport *vport, uint16_t nb_rx_queues)return ret; } +int +idpf_vport_irq_map_config_by_qids (struct idpf_vport *vport,uint32_t *qids,uint16_t nb_rx_queues) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_queue_vector *qv_map; +struct idpf_hw *hw = &adapter->hw; +uint32_t dynctl_val, itrn_val; +uint32_t dynctl_reg_start; +uint32_t itrn_reg_start; +uint16_t i; +int ret; + + qv_map =rte_zmalloc ("qv_map" , + nb_rx_queues * +sizeof (struct virtchnl2_queue_vector ),0 ); +if (qv_map ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate %d queue-vector map" , + nb_rx_queues); + ret = -ENOMEM ; + goto qv_map_alloc_err; + } + +/* Rx interrupt disabled, Map interrupt only for writeback */ + +/* The capability flags adapter->caps.other_caps should be +* compared with bit VIRTCHNL2_CAP_WB_ON_ITR here. The if +* condition should be updated when the FW can return the +* correct flag bits. +*/ + dynctl_reg_start = + vport->recv_vectors->vchunks.vchunks->dynctl_reg_start; + itrn_reg_start = + vport->recv_vectors->vchunks.vchunks->itrn_reg_start; + dynctl_val =IDPF_READ_REG (hw, dynctl_reg_start); +DRV_LOG (DEBUG ,"Value of dynctl_reg_start is 0x%x" , dynctl_val); + itrn_val =IDPF_READ_REG (hw, itrn_reg_start); +DRV_LOG (DEBUG ,"Value of itrn_reg_start is 0x%x" , itrn_val); +/* Force write-backs by setting WB_ON_ITR bit in DYN_CTL +* register. WB_ON_ITR and INTENA are mutually exclusive +* bits. Setting WB_ON_ITR bits means TX and RX Descs +* are written back based on ITR expiration irrespective +* of INTENA setting. +*/ +/* TBD: need to tune INTERVAL value for better performance. */ + itrn_val = (itrn_val ==0 ) ?IDPF_DFLT_INTERVAL : itrn_val; + dynctl_val =VIRTCHNL2_ITR_IDX_0 << +PF_GLINT_DYN_CTL_ITR_INDX_S | +PF_GLINT_DYN_CTL_WB_ON_ITR_M | + itrn_val <<PF_GLINT_DYN_CTL_INTERVAL_S ; +IDPF_WRITE_REG (hw, dynctl_reg_start, dynctl_val); + +for (i =0 ; i < nb_rx_queues; i++) { +/* map all queues to the same vector */ + qv_map[i].queue_id = qids[i]; + qv_map[i].vector_id = + vport->recv_vectors->vchunks.vchunks->start_vector_id; + } + vport->qv_map = qv_map; + + ret =idpf_vc_irq_map_unmap_config (vport, nb_rx_queues, true); +if (ret !=0 ) { +DRV_LOG (ERR ,"config interrupt mapping failed" ); + goto config_irq_map_err; + } + +return 0 ; + +config_irq_map_err: +rte_free (vport->qv_map); + vport->qv_map =NULL ; + +qv_map_alloc_err: +return ret; +} +int idpf_vport_irq_unmap_config (struct idpf_vport *vport,uint16_t nb_rx_queues) {
drivers/common/idpf/idpf_common_device.h +4 -0
@@ -200,5 +200,9 @@ int idpf_vport_info_init(struct idpf_vport *vport, struct virtchnl2_create_vport *vport_info);__rte_internal void idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes); +__rte_internal +int idpf_vport_irq_map_config_by_qids(struct idpf_vport *vport, +uint32_t *qids, +uint16_t nb_rx_queues);#endif /* _IDPF_COMMON_DEVICE_H_ */
drivers/common/idpf/version.map +1 -0
@@ -69,6 +69,7 @@ INTERNAL { idpf_vport_info_init; idpf_vport_init; idpf_vport_irq_map_config; + idpf_vport_irq_map_config_by_qids; idpf_vport_irq_unmap_config; idpf_vport_rss_config; idpf_vport_stats_update;
Signature · 1 line
2.26.2
PATCH v7 11/14 net/cpfl: enable write back based on ITR expire
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch enables write back based on ITR expire
(WR_ON_ITR) for hairpin queues.
--- drivers/net/cpfl/cpfl_ethdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +12 -1
@@ -735,11 +735,22 @@ cpfl_dev_configure(struct rte_eth_dev *dev)static int cpfl_config_rx_queues_irqs (struct rte_eth_dev *dev) { +uint32_t qids[CPFL_MAX_P2P_NB_QUEUES +IDPF_DEFAULT_RXQ_NUM ] = {0 };struct cpfl_vport *cpfl_vport = dev->data->dev_private;struct idpf_vport *vport = &cpfl_vport->base;uint16_t nb_rx_queues = dev->data->nb_rx_queues; +struct cpfl_rx_queue *cpfl_rxq; +int i; -return idpf_vport_irq_map_config (vport, nb_rx_queues); +for (i =0 ; i < nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q) + qids[i] =cpfl_hw_qid_get (cpfl_vport->p2p_q_chunks_info->rx_start_qid, + (i - cpfl_vport->nb_data_rxq)); +else + qids[i] =cpfl_hw_qid_get (vport->chunks_info.rx_start_qid, i); + } +return idpf_vport_irq_map_config_by_qids (vport, qids, nb_rx_queues); }/* Update hairpin_info for dev's tx hairpin queue */
Signature · 1 line
2.26.2
PATCH v7 12/14 net/cpfl: support peer ports get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports get hairpin peer ports.
--- drivers/net/cpfl/cpfl_ethdev.c | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +40 -0
@@ -1080,6 +1080,45 @@ cpfl_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_hairpin_get_peer_ports (struct rte_eth_dev *dev,uint16_t *peer_ports, +size_t len,uint32_t tx) +{ +struct cpfl_vport *cpfl_vport = + (struct cpfl_vport *)dev->data->dev_private; +struct idpf_tx_queue *txq; +struct idpf_rx_queue *rxq; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i, j; + +if (len <=0 ) +return -EINVAL ; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + +if (tx >0 ) { +for (i = cpfl_vport->nb_data_txq, j =0 ; i < dev->data->nb_tx_queues; i++, j++) { + txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +return -EINVAL ; + cpfl_txq = (struct cpfl_tx_queue *)txq; + peer_ports[j] = cpfl_txq->hairpin_info.peer_rxp; + } + }else if (tx ==0 ) { +for (i = cpfl_vport->nb_data_rxq, j =0 ; i < dev->data->nb_rx_queues; i++, j++) { + rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +return -EINVAL ; + cpfl_rxq = (struct cpfl_rx_queue *)rxq; + peer_ports[j] = cpfl_rxq->hairpin_info.peer_txp; + } + } + +return j; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1109,6 +1148,7 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, }; static int
Signature · 1 line
2.26.2
PATCH v7 13/14 net/cpfl: support hairpin bind/unbind
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports hairpin_bind/unbind ops.
--- drivers/net/cpfl/cpfl_ethdev.c | 137 +++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +137 -0
@@ -1119,6 +1119,141 @@ cpfl_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,return j; } +static int +cpfl_hairpin_bind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct idpf_vport *tx_vport = &cpfl_tx_vport->base; +struct cpfl_vport *cpfl_rx_vport; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +struct rte_eth_dev *peer_dev; +struct idpf_vport *rx_vport; +int err =0 ; +int i; + + err =cpfl_txq_hairpin_info_update (dev, rx_port); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info." ); +return err; + } + +/* configure hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_hairpin_txq_config (tx_vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + + err =cpfl_hairpin_tx_complq_config (cpfl_tx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" ); +return err; + } + + peer_dev = &rte_eth_devices[rx_port]; + cpfl_rx_vport = (struct cpfl_vport *)peer_dev->data->dev_private; + rx_vport = &cpfl_rx_vport->base; +cpfl_rxq_hairpin_mz_bind (peer_dev); + + err =cpfl_hairpin_rx_bufq_config (cpfl_rx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_hairpin_rxq_config (rx_vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (peer_dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } + } + +/* enable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +return err; + } + cpfl_txq->base.q_started = true; + } + + err =cpfl_switch_hairpin_complq (cpfl_tx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); + } + cpfl_rxq->base.q_started = true; + } + + err =cpfl_switch_hairpin_bufq (cpfl_rx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx buffer queue" ); +return err; + } + +return 0 ; +} + +static int +cpfl_hairpin_unbind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; + +/* disable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, false); + cpfl_txq->base.q_started = false; + } + +cpfl_switch_hairpin_complq (cpfl_tx_vport, false); + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, false); + cpfl_rxq->base.q_started = false; + } + +cpfl_switch_hairpin_bufq (cpfl_rx_vport, false); + +return 0 ; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1149,6 +1284,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, + .hairpin_unbind = cpfl_hairpin_unbind, }; static int
Signature · 1 line
2.26.2
PATCH v7 14/14 doc: update the doc of CPFL PMD
In reply to [email protected]From: Beilei Xing <[email protected]>
Update cpfl.rst to clarify hairpin support.
--- doc/guides/nics/cpfl.rst | 7 +++++++ 1 file changed, 7 insertions(+)
doc/guides/nics/cpfl.rst +7 -0
@@ -106,3 +106,10 @@ The paths are chosen based on 2 conditions: A value "P" means the offload feature is not supported by vector path. If any not supported features are used, cpfl vector PMD is disabled and the scalar paths are chosen. + +Hairpin queue +~~~~~~~~~~~~~ + + E2100 Series can loopback packets from RX port to TX port, this feature is + called port-to-port or hairpin. + Currently, the PMD only supports single port hairpin.
Signature · 1 line
2.26.2
v8 cover net/cpfl: add hairpin queue support
In reply to [email protected]From: Beilei Xing <[email protected]>
This patchset adds hairpin queue support.
v2 changes:
- change hairpin rx queus configuration sequence.
- code refine.
v3 changes:
- Refine the patchset based on the latest code.
v4 change:
- Remove hairpin rx buffer queue's sw_ring.
- Change hairpin rx queus configuration sequence in cpfl_hairpin_bind function.
- Refind hairpin queue setup and release.
v5 change:
- Fix memory leak during queue setup.
- Refine hairpin Rxq/Txq start/stop.
v6 change:
- Add sign-off.
v7 change:
- Update cpfl.rst
v8 change:
- Fix Intel-compilation failure.
Beilei Xing (14):
net/cpfl: refine structures
common/idpf: support queue groups add/delete net/cpfl: add haipin queue group during vport init net/cpfl: support hairpin queue capbility get net/cpfl: support hairpin queue setup and release common/idpf: add queue config API net/cpfl: support hairpin queue configuration common/idpf: add switch queue API net/cpfl: support hairpin queue start/stop common/idpf: add irq map config API net/cpfl: enable write back based on ITR expire net/cpfl: support peer ports get
net/cpfl: support hairpin bind/unbind
doc: update the doc of CPFL PMD
doc/guides/nics/cpfl.rst | 7 + drivers/common/idpf/idpf_common_device.c | 75 ++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 138 +++- drivers/common/idpf/idpf_common_virtchnl.h | 18 + drivers/common/idpf/version.map | 6 + drivers/net/cpfl/cpfl_ethdev.c | 611 ++++++++++++++-- drivers/net/cpfl/cpfl_ethdev.h | 35 +- drivers/net/cpfl/cpfl_rxtx.c | 781 +++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.h | 76 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 21 +- 11 files changed, 1653 insertions(+), 119 deletions(-)
Signature · 1 line
2.26.2
PATCH v8 1/14 net/cpfl: refine structures
From: Beilei Xing <[email protected]>
This patch refines some structures to support hairpin queue, cpfl_rx_queue/cpfl_tx_queue/cpfl_vport.
--- drivers/net/cpfl/cpfl_ethdev.c | 85 +++++++----- drivers/net/cpfl/cpfl_ethdev.h | 6 +- drivers/net/cpfl/cpfl_rxtx.c | 175 +++++++++++++++++------- drivers/net/cpfl/cpfl_rxtx.h | 8 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 17 +-- 5 files changed, 196 insertions(+), 95 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +49 -36
@@ -124,7 +124,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_link new_link;unsigned int i;
@@ -156,7 +157,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter; dev_info->max_rx_queues = base->caps.max_rx_q;
@@ -216,7 +218,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;/* mtu setting is forbidden if port is start */ if (dev->data->dev_started) {
@@ -256,12 +259,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); }
@@ -271,8 +274,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -305,20 +308,20 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -343,8 +346,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;unsigned int i;int ret;
@@ -459,7 +462,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -498,7 +502,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -536,7 +541,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -601,7 +607,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -638,7 +645,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_conf *conf = &dev->data->dev_conf;struct idpf_adapter *base = vport->adapter;int ret;
@@ -710,7 +718,8 @@ 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 = 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);
@@ -719,14 +728,14 @@ 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 ) {
@@ -736,8 +745,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 ) {
@@ -752,7 +761,8 @@ 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 = 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;
@@ -813,7 +823,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;if (dev->data->dev_started ==0 )return 0 ;
@@ -832,7 +843,8 @@ 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 = 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);
@@ -842,7 +854,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 ; }
@@ -1047,7 +1059,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
@@ -1275,7 +1287,8 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)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 = 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 */
@@ -1300,7 +1313,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++;
@@ -1415,7 +1428,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 )
@@ -1433,7 +1446,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 +5 -1
@@ -69,13 +69,17 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct cpfl_vport { +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 +125 -50
401 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +8 -0
@@ -23,6 +23,14 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rx_queue { +struct idpf_rx_queue base; +}; + +struct cpfl_tx_queue { +struct idpf_tx_queue base; +}; +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 +9 -8
@@ -76,15 +76,16 @@ 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 = 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 +101,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.26.2
PATCH v8 2/14 common/idpf: support queue groups add/delete
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds queue group add/delete virtual channel support.
--- drivers/common/idpf/idpf_common_virtchnl.c | 66 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 9 +++ drivers/common/idpf/version.map | 2 + 3 files changed, 77 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +66 -0
@@ -359,6 +359,72 @@ idpf_vc_vport_destroy(struct idpf_vport *vport)return err; } +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_queue_grps_out) +{ +struct idpf_adapter *adapter = vport->adapter; +struct idpf_cmd_info args; +int size, qg_info_size; +int err =-1 ; + + size =sizeof (*p2p_queue_grps_info) + + (p2p_queue_grps_info->qg_info.num_queue_groups -1 ) * +sizeof (struct virtchnl2_queue_group_info ); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_ADD_QUEUE_GROUPS ; + args.in_args = (uint8_t *)p2p_queue_grps_info; + args.in_args_size = size; + 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_ADD_QUEUE_GROUPS" ); +return err; + } + +rte_memcpy (p2p_queue_grps_out, args.out_buffer,IDPF_DFLT_MBX_BUF_SIZE ); +return 0 ; +} + +int idpf_vc_queue_grps_del (struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_delete_queue_groups *vc_del_q_grps; +struct idpf_cmd_info args; +int size; +int err; + + size =sizeof (*vc_del_q_grps) + + (num_q_grps -1 ) *sizeof (struct virtchnl2_queue_group_id ); + vc_del_q_grps =rte_zmalloc ("vc_del_q_grps" , size,0 ); + + vc_del_q_grps->vport_id = vport->vport_id; + vc_del_q_grps->num_queue_groups = num_q_grps; +memcpy (vc_del_q_grps->qg_ids, qg_ids, + num_q_grps *sizeof (struct virtchnl2_queue_group_id )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_DEL_QUEUE_GROUPS ; + args.in_args = (uint8_t *)vc_del_q_grps; + args.in_args_size = size; + 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_DEL_QUEUE_GROUPS" ); + +rte_free (vc_del_q_grps); +return err; +} +int idpf_vc_rss_key_set (struct idpf_vport *vport) {
drivers/common/idpf/idpf_common_virtchnl.h +9 -0
@@ -64,4 +64,13 @@ 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_queue_grps_del(struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids); +__rte_internal +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *ptp_queue_grps_info, +uint8_t *ptp_queue_grps_out);#endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +2 -0
@@ -43,6 +43,8 @@ INTERNAL { idpf_vc_irq_map_unmap_config; idpf_vc_one_msg_read; idpf_vc_ptype_info_query; + idpf_vc_queue_grps_add; + idpf_vc_queue_grps_del; idpf_vc_queue_switch; idpf_vc_queues_ena_dis; idpf_vc_rss_hash_get;
Signature · 1 line
2.26.2
PATCH v8 3/14 net/cpfl: add haipin queue group during vport init
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds haipin queue group during vport init.
--- drivers/net/cpfl/cpfl_ethdev.c | 133 +++++++++++++++++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 18 +++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 158 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +133 -0
@@ -840,6 +840,20 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) +{ +struct virtchnl2_queue_group_id qg_ids[CPFL_P2P_NB_QUEUE_GRPS ] = {0 }; +int ret =0 ; + + qg_ids[0 ].queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids[0 ].queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret =idpf_vc_queue_grps_del (vport,CPFL_P2P_NB_QUEUE_GRPS , qg_ids); +if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close (struct rte_eth_dev *dev) {
@@ -848,7 +862,12 @@ cpfl_dev_close(struct rte_eth_dev *dev)struct cpfl_adapter_ext *adapter =CPFL_ADAPTER_TO_EXT (vport->adapter);cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;
@@ -1284,6 +1303,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_complq =CPFL_P2P_NB_TX_COMPLQ ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + p2p_queue_grps_info->qg_info.groups[0 ].rx_q_grp_info.rss_lut_size =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.pir_weight =0 ; + + ret =idpf_vc_queue_grps_add (vport, p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, +struct virtchnl2_add_queue_groups *p2p_q_vc_out_info) +{ +struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport->p2p_q_chunks_info; +struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init (struct rte_eth_dev *dev,void *init_params) {
@@ -1293,6 +1402,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ; dev->dev_ops = &cpfl_eth_dev_ops;
@@ -1327,6 +1438,28 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { +memset (&p2p_queue_grps_info,0 ,sizeof (p2p_queue_grps_info)); + ret =cpfl_p2p_q_grps_add (vport, &p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to add p2p queue group." ); +return 0 ; + } + cpfl_vport->p2p_q_chunks_info =rte_zmalloc (NULL , +sizeof (struct p2p_queue_chunks_info ),0 ); +if (cpfl_vport->p2p_q_chunks_info ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret =cpfl_p2p_queue_info_init (cpfl_vport, + (struct virtchnl2_add_queue_groups *)p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); + } + } +return 0 ; err_mac_addrs:
drivers/net/cpfl/cpfl_ethdev.h +18 -0
@@ -56,6 +56,7 @@/* Device IDs */ #define IDPF_DEV_ID_CPF 0x1453 +#define VIRTCHNL2_QUEUE_GROUP_P2P 0x100struct cpfl_vport_param {struct cpfl_adapter_ext *adapter;
@@ -69,8 +70,25 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct p2p_queue_chunks_info { +uint32_t tx_start_qid; +uint32_t rx_start_qid; +uint32_t tx_compl_start_qid; +uint32_t rx_buf_start_qid; + +uint64_t tx_qtail_start; +uint32_t tx_qtail_spacing; +uint64_t rx_qtail_start; +uint32_t rx_qtail_spacing; +uint64_t tx_compl_qtail_start; +uint32_t tx_compl_qtail_spacing; +uint64_t rx_buf_qtail_start; +uint32_t rx_buf_qtail_spacing; +}; +struct cpfl_vport {struct idpf_vport base; +struct p2p_queue_chunks_info *p2p_q_chunks_info; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -13,6 +13,13 @@#define CPFL_MIN_RING_DESC 32#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 + +#define CPFL_MAX_P2P_NB_QUEUES 16 +#define CPFL_P2P_NB_RX_BUFQ 1 +#define CPFL_P2P_NB_TX_COMPLQ 1 +#define CPFL_P2P_NB_QUEUE_GRPS 1 +#define CPFL_P2P_QUEUE_GRP_ID 1 +/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
Signature · 1 line
2.26.2
RE: [PATCH v8 03/14] net/cpfl: add haipin queue group during vport init
Quoted 200 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, June 5, 2023 2:17 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Liu, Mingxia <[email protected]>; Xing, Beilei <[email protected]>
Subject: [PATCH v8 03/14] net/cpfl: add haipin queue group during vport initFrom: Beilei Xing <[email protected]>
This patch adds haipin queue group during vport init.
Signed-off-by Mingxia Liu <[email protected]>Signed-off-by Beilei Xing <[email protected]>--- drivers/net/cpfl/cpfl_ethdev.c | 133 +++++++++++++++++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 18 +++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 158 insertions(+)drivers/net/cpfl/cpfl_ethdev.c +31
-0@@ -840,6 +840,20 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) +{ +struct virtchnl2_queue_group_id qg_ids[CPFL_P2P_NB_QUEUE_GRPS ] = {0 }; +int ret =0 ; + + qg_ids[0 ].queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids[0 ].queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret =idpf_vc_queue_grps_del (vport,CPFL_P2P_NB_QUEUE_GRPS , qg_ids); +if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close (struct rte_eth_dev *dev) {@@ -848,7 +862,12 @@ cpfl_dev_close(struct rte_eth_dev *dev)struct cpfl_adapter_ext *adapter =CPFL_ADAPTER_TO_EXT (vport->adapter);cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;@@ -1284,6 +1303,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0].num_tx_q =
CPFL_MAX_P2P_NB_QUEUES;drivers/net/cpfl/cpfl_ethdev.c +1
-0+ p2p_queue_grps_info->qg_info.groups[0].num_tx_complq =
CPFL_P2P_NB_TX_COMPLQ;drivers/net/cpfl/cpfl_ethdev.c +1
-0+ p2p_queue_grps_info->qg_info.groups[0].qg_id.queue_group_id =
CPFL_P2P_QUEUE_GRP_ID;drivers/net/cpfl/cpfl_ethdev.c +1
-0+ p2p_queue_grps_info->qg_info.groups[0].qg_id.queue_group_type =
VIRTCHNL2_QUEUE_GROUP_P2P;drivers/net/cpfl/cpfl_ethdev.c +7
-0+ p2p_queue_grps_info->qg_info.groups[0 ].rx_q_grp_info.rss_lut_size =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.pir_weight =0 ; + + ret = idpf_vc_queue_grps_add(vport, p2p_queue_grps_info,
p2p_q_vc_out_info);drivers/net/cpfl/cpfl_ethdev.c +13
-0+if (ret !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, +struct virtchnl2_add_queue_groups *p2p_q_vc_out_info) +{ + struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport-Quoted 1 line
p2p_q_chunks_info;drivers/net/cpfl/cpfl_ethdev.c +57
-0+struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init (struct rte_eth_dev *dev,void *init_params) {@@ -1293,6 +1402,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ;drivers/net/cpfl/cpfl_ethdev.c +16
-0dev->dev_ops = &cpfl_eth_dev_ops;@@ -1327,6 +1438,28 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { +memset (&p2p_queue_grps_info,0 ,sizeof (p2p_queue_grps_info)); + ret =cpfl_p2p_q_grps_add (vport, &p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to add p2p queue group." ); +return 0 ; + } + cpfl_vport->p2p_q_chunks_info =rte_zmalloc (NULL , +sizeof (struct p2p_queue_chunks_info ),0 ); +if (cpfl_vport->p2p_q_chunks_info ==NULL ) { +PMD_INIT_LOG (ERR ,"Failed to allocate p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret = cpfl_p2p_queue_info_init(cpfl_vport, + (struct virtchnl2_add_queue_groups*)p2p_q_vc_out_info);
drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params) · line 1459
Quoted 3 lines
drivers/net/cpfl/cpfl_ethdev.c +3
-0+if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init p2p queue info." ); +cpfl_p2p_queue_grps_del (vport);
Forgot to free p2p_q_chunks_info?
And better to use WARNING, as it is not returned with negative value.
RE: [PATCH v8 03/14] net/cpfl: add haipin queue group during vport init
Quoted 215 lines
-----Original Message-----
From: Wu, Jingjing <[email protected]>
Sent: Monday, June 5, 2023 4:36 PM
To: Xing, Beilei <[email protected]>
Cc: [email protected]; Liu, Mingxia <[email protected]>
Subject: RE: [PATCH v8 03/14] net/cpfl: add haipin queue group during vport initQuoted 11 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, June 5, 2023 2:17 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Liu, Mingxia <[email protected]>; Xing, Beilei <[email protected]>
Subject: [PATCH v8 03/14] net/cpfl: add haipin queue group during vport initFrom: Beilei Xing <[email protected]>
Quoted 7 lines
This patch adds haipin queue group during vport init.
Signed-off-by Mingxia Liu <[email protected]>Signed-off-by Beilei Xing <[email protected]>--- drivers/net/cpfl/cpfl_ethdev.c | 133+++++++++++++++++++++++++++++++++
drivers/net/cpfl/cpfl_ethdev.h| 18+++++
Quoted 8 lines
drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 158 insertions(+)(quoted diff) +0
-0
b/drivers/net/cpfl/cpfl_ethdev.cindexe587155db6..c1273a7478100644drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_stop(struct rte_eth_dev *dev) · line 845
Quoted 6 lines
drivers/net/cpfl/cpfl_ethdev.c +3
-0@@ -840,6 +840,20 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) { +struct virtchnl2_queue_group_id qg_ids[CPFL_P2P_NB_QUEUE_GRPS ]= {0};
drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_stop(struct rte_eth_dev *dev)
Quoted 5 lines
drivers/net/cpfl/cpfl_ethdev.c +5
-0+int ret =0 ; + + qg_ids[0 ].queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids[0 ].queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret = idpf_vc_queue_grps_del(vport, CPFL_P2P_NB_QUEUE_GRPS,
qg_ids);drivers/net/cpfl/cpfl_ethdev.c cpfl_vport_idx_alloc(struct cpfl_adapter_ext
Quoted 22 lines
drivers/net/cpfl/cpfl_ethdev.c +5
-0+if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close(struct rte_eth_dev *dev) { @@ -848,7 +862,12 @@ cpfl_dev_close(struct rte_eth_dev *dev) struct cpfl_adapter_ext *adapter =
CPFL_ADAPTER_TO_EXT(vport->adapter);drivers/net/cpfl/cpfl_ethdev.c +5
-0cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;@@ -1284,6 +1303,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext*adapter)
Quoted 25 lines
drivers/net/cpfl/cpfl_ethdev.c +12
-0return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0].num_tx_q =
CPFL_MAX_P2P_NB_QUEUES;drivers/net/cpfl/cpfl_ethdev.c +1
-0+ p2p_queue_grps_info->qg_info.groups[0].num_tx_complq =
CPFL_P2P_NB_TX_COMPLQ;drivers/net/cpfl/cpfl_ethdev.c +1
-0+ p2p_queue_grps_info->qg_info.groups[0].qg_id.queue_group_id =
CPFL_P2P_QUEUE_GRP_ID;drivers/net/cpfl/cpfl_ethdev.c +1
-0+ p2p_queue_grps_info->qg_info.groups[0].qg_id.queue_group_type =
VIRTCHNL2_QUEUE_GROUP_P2P;drivers/net/cpfl/cpfl_ethdev.c
Quoted 1 line
drivers/net/cpfl/cpfl_ethdev.c +1
-0+ p2p_queue_grps_info->qg_info.groups[0].rx_q_grp_info.rss_lut_size =0;
drivers/net/cpfl/cpfl_ethdev.c cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)
Quoted 4 lines
drivers/net/cpfl/cpfl_ethdev.c +4
-0+ p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0].tx_q_grp_info.pir_weight =0;
Quoted 4 lines
drivers/net/cpfl/cpfl_ethdev.c +2
-0+ + ret = idpf_vc_queue_grps_add(vport, p2p_queue_grps_info,
p2p_q_vc_out_info);drivers/net/cpfl/cpfl_ethdev.c +1
-0+if (ret !=0 ) {drivers/net/cpfl/cpfl_ethdev.c cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)
Quoted 10 lines
drivers/net/cpfl/cpfl_ethdev.c +10
-0+PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, + struct virtchnl2_add_queue_groups
*p2p_q_vc_out_info) {Quoted 74 lines
drivers/net/cpfl/cpfl_ethdev.c +1
-0+ struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport-Quoted 1 line
p2p_q_chunks_info;drivers/net/cpfl/cpfl_ethdev.c +55
-1+struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params) { @@ -1293,6 +1402,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void
*init_params)drivers/net/cpfl/cpfl_ethdev.c +2
-0struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ; dev->dev_ops = &cpfl_eth_dev_ops;@@ -1327,6 +1438,28 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev,void
*init_params)
rte_ether_addr_copy((structrte_ether_addr*)vport-default_mac_addr,drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)
Quoted 4 lines
drivers/net/cpfl/cpfl_ethdev.c +2
-0&dev->data->mac_addrs[0]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { + memset(&p2p_queue_grps_info, 0,
sizeof(p2p_queue_grps_info));drivers/net/cpfl/cpfl_ethdev.c
Quoted 4 lines
drivers/net/cpfl/cpfl_ethdev.c +1
-0+ ret = cpfl_p2p_q_grps_add(vport, &p2p_queue_grps_info,
p2p_q_vc_out_info);drivers/net/cpfl/cpfl_ethdev.c +2
-0+if (ret !=0 ) { + PMD_INIT_LOG(ERR, "Failed to add p2p queuegroup.");
drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)
Quoted 4 lines
drivers/net/cpfl/cpfl_ethdev.c +4
-0+return 0 ; + } + cpfl_vport->p2p_q_chunks_info = rte_zmalloc(NULL, + sizeof(struct
p2p_queue_chunks_info),drivers/net/cpfl/cpfl_ethdev.c
Quoted 3 lines
0);
drivers/net/cpfl/cpfl_ethdev.c +2
-0+if (cpfl_vport->p2p_q_chunks_info ==NULL ) { + PMD_INIT_LOG(ERR, "Failed to allocate p2p queueinfo.");
Quoted 12 lines
drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params) · line 1459
Quoted 9 lines
drivers/net/cpfl/cpfl_ethdev.c +5
-0+cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret = cpfl_p2p_queue_info_init(cpfl_vport, + (struct virtchnl2_add_queue_groups*)p2p_q_vc_out_info);
drivers/net/cpfl/cpfl_ethdev.c +3
-0+if (ret !=0 ) { +PMD_INIT_LOG (ERR ,"Failed to init p2p queue info." ); +cpfl_p2p_queue_grps_del (vport);Forgot to free
p2p_q_chunks_info?
And better to use WARNING, as it is not returned with negative value.
Yes, need to free p2p_q_chunks_info. Will fix in next version.
PATCH v8 4/14 net/cpfl: support hairpin queue capbility get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds hairpin_cap_get ops support.
--- drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 3 +++ 2 files changed, 21 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -154,6 +154,23 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,return rte_eth_linkstatus_set (dev, &new_link); } +static int +cpfl_hairpin_cap_get (struct rte_eth_dev *dev, +struct rte_eth_hairpin_cap *cap) +{ +struct cpfl_vport *cpfl_vport = dev->data->dev_private; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + + cap->max_nb_queues =CPFL_MAX_P2P_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) {
@@ -904,6 +921,7 @@ 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, }; static int
drivers/net/cpfl/cpfl_rxtx.h +3 -0
@@ -14,6 +14,9 @@#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 +#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_P2P_NB_QUEUES 16#define CPFL_P2P_NB_RX_BUFQ 1#define CPFL_P2P_NB_TX_COMPLQ 1
Signature · 1 line
2.26.2
PATCH v8 5/14 net/cpfl: support hairpin queue setup and release
In reply to [email protected]From: Beilei Xing <[email protected]>
Support hairpin Rx/Tx queue setup and release.
--- drivers/net/cpfl/cpfl_ethdev.c | 6 + drivers/net/cpfl/cpfl_ethdev.h | 11 + drivers/net/cpfl/cpfl_rxtx.c | 364 +++++++++++++++++++++++- drivers/net/cpfl/cpfl_rxtx.h | 36 +++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 + 5 files changed, 420 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +6 -0
@@ -879,6 +879,10 @@ cpfl_dev_close(struct rte_eth_dev *dev)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 ; + }if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq)cpfl_p2p_queue_grps_del (vport);
@@ -922,6 +926,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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 int
drivers/net/cpfl/cpfl_ethdev.h +11 -0
@@ -89,6 +89,17 @@ struct p2p_queue_chunks_info {struct cpfl_vport {struct idpf_vport base;struct p2p_queue_chunks_info *p2p_q_chunks_info; + +struct rte_mempool *p2p_mp; + +uint16_t nb_data_rxq; +uint16_t nb_data_txq; +uint16_t nb_p2p_rxq; +uint16_t nb_p2p_txq; + +struct idpf_rx_queue *p2p_rx_bufq; +struct idpf_tx_queue *p2p_tx_complq; +bool p2p_manual_bind; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.c +363 -1
400 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +36 -0
@@ -22,6 +22,11 @@#define CPFL_P2P_NB_TX_COMPLQ 1#define CPFL_P2P_NB_QUEUE_GRPS 1#define CPFL_P2P_QUEUE_GRP_ID 1 +#define CPFL_P2P_DESC_LEN 16 +#define CPFL_P2P_NB_MBUF 4096 +#define CPFL_P2P_CACHE_SIZE 250 +#define CPFL_P2P_MBUF_SIZE 2048 +#define CPFL_P2P_RING_BUF 128/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
@@ -33,14 +38,40 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rxq_hairpin_info { +bool hairpin_q;/* if rx queue is a hairpin queue */ +uint16_t peer_txp; +uint16_t peer_txq_id; +}; +struct cpfl_rx_queue {struct idpf_rx_queue base; +struct cpfl_rxq_hairpin_info hairpin_info; +}; + +struct cpfl_txq_hairpin_info { +bool hairpin_q;/* if tx queue is a hairpin queue */ +uint16_t peer_rxp; +uint16_t peer_rxq_id; };struct cpfl_tx_queue {struct idpf_tx_queue base; +struct cpfl_txq_hairpin_info hairpin_info; }; +static inline uint16_t +cpfl_hw_qid_get (uint16_t start_qid,uint16_t offset) +{ +return start_qid + offset; +} + +static inline uint64_t +cpfl_hw_qtail_get (uint64_t tail_start,uint16_t offset,uint64_t tail_spacing) +{ +return tail_start + offset * tail_spacing; +} +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);
@@ -59,4 +90,9 @@ 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_ */
drivers/net/cpfl/cpfl_rxtx_vec_common.h +4 -0
@@ -85,6 +85,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 {
@@ -106,6 +108,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.26.2
PATCH v8 6/14 common/idpf: add queue config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx queue configuration APIs.
--- drivers/common/idpf/idpf_common_virtchnl.c | 70 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 6 ++ drivers/common/idpf/version.map | 2 + 3 files changed, 78 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +70 -0
@@ -1050,6 +1050,41 @@ idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq)return err; } +int idpf_vc_rxq_config_by_info (struct idpf_vport *vport,struct virtchnl2_rxq_info *rxq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_rx_queues *vc_rxqs =NULL ; +struct idpf_cmd_info args; +int size, err, i; + + size =sizeof (*vc_rxqs) + (num_qs -1 ) * +sizeof (struct virtchnl2_rxq_info ); + vc_rxqs =rte_zmalloc ("cfg_rxqs" , size,0 ); +if (vc_rxqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_rx_queues" ); + err = -ENOMEM ; +return err; + } + vc_rxqs->vport_id = vport->vport_id; + vc_rxqs->num_qinfo = num_qs; +memcpy (vc_rxqs->qinfo, rxq_info, num_qs *sizeof (struct virtchnl2_rxq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_RX_QUEUES ; + args.in_args = (uint8_t *)vc_rxqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_rxqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_RX_QUEUES" ); + +return err; +} +int idpf_vc_txq_config (struct idpf_vport *vport,struct idpf_tx_queue *txq) {
@@ -1121,6 +1156,41 @@ idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)return err; } +int +idpf_vc_txq_config_by_info (struct idpf_vport *vport,struct virtchnl2_txq_info *txq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_tx_queues *vc_txqs =NULL ; +struct idpf_cmd_info args; +int size, err; + + size =sizeof (*vc_txqs) + (num_qs -1 ) *sizeof (struct virtchnl2_txq_info ); + vc_txqs =rte_zmalloc ("cfg_txqs" , size,0 ); +if (vc_txqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_tx_queues" ); + err = -ENOMEM ; +return err; + } + vc_txqs->vport_id = vport->vport_id; + vc_txqs->num_qinfo = num_qs; +memcpy (vc_txqs->qinfo, txq_info, num_qs *sizeof (struct virtchnl2_txq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_TX_QUEUES ; + args.in_args = (uint8_t *)vc_txqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_txqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_TX_QUEUES" ); + +return err; +} +int idpf_vc_ctlq_recv (struct idpf_ctlq_info *cq,u16 *num_q_msg,struct idpf_ctlq_msg *q_msg)
drivers/common/idpf/idpf_common_virtchnl.h +6 -0
@@ -65,6 +65,12 @@ __rte_internalint 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_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_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +2 -0
@@ -54,8 +54,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;
Signature · 1 line
2.26.2
PATCH v8 7/14 net/cpfl: support hairpin queue configuration
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue configuration.
--- drivers/net/cpfl/cpfl_ethdev.c | 136 +++++++++++++++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.c | 80 +++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 217 insertions(+), 6 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +130 -6
@@ -742,33 +742,157 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)return idpf_vport_irq_map_config (vport, nb_rx_queues); } +/* Update hairpin_info for dev's tx hairpin queue */ +static int +cpfl_txq_hairpin_info_update (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_txq_hairpin_info *hairpin_info; +struct cpfl_tx_queue *cpfl_txq; +int i; + +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + hairpin_info = &cpfl_txq->hairpin_info; +if (hairpin_info->peer_rxp != rx_port) { +PMD_DRV_LOG (ERR ,"port %d is not the peer port" , rx_port); +return -EINVAL ; + } + hairpin_info->peer_rxq_id = +cpfl_hw_qid_get (cpfl_rx_vport->p2p_q_chunks_info->rx_start_qid, + hairpin_info->peer_rxq_id - cpfl_rx_vport->nb_data_rxq); + } + +return 0 ; +} + +/* Bind Rx hairpin queue's memory zone to peer Tx hairpin queue's memory zone */ +static void +cpfl_rxq_hairpin_mz_bind (struct rte_eth_dev *dev) +{ +struct cpfl_vport *cpfl_rx_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_rx_vport->base; +struct idpf_adapter *adapter = vport->adapter; +struct idpf_hw *hw = &adapter->hw; +struct cpfl_rx_queue *cpfl_rxq; +struct cpfl_tx_queue *cpfl_txq; +struct rte_eth_dev *peer_dev; +const struct rte_memzone *mz; +uint16_t peer_tx_port; +uint16_t peer_tx_qid; +int i; + +for (i = cpfl_rx_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; + peer_tx_port = cpfl_rxq->hairpin_info.peer_txp; + peer_tx_qid = cpfl_rxq->hairpin_info.peer_txq_id; + peer_dev = &rte_eth_devices[peer_tx_port]; + cpfl_txq = peer_dev->data->tx_queues[peer_tx_qid]; + +/* bind rx queue */ + mz = cpfl_txq->base.mz; + cpfl_rxq->base.rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.rx_ring = mz->addr; + cpfl_rxq->base.mz = mz; + +/* bind rx buffer queue */ + mz = cpfl_txq->base.complq->mz; + cpfl_rxq->base.bufq1->rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.bufq1->rx_ring = mz->addr; + cpfl_rxq->base.bufq1->mz = mz; + cpfl_rxq->base.bufq1->qrx_tail = hw->hw_addr + +cpfl_hw_qtail_get (cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_start, +0 , cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_spacing); + } +} +static int cpfl_start_queues (struct rte_eth_dev *dev) { +struct cpfl_vport *cpfl_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct cpfl_rx_queue *cpfl_rxq;struct cpfl_tx_queue *cpfl_txq; +int update_flag =0 ;int err =0 ;int i; +/* For normal data queues, configure, init and enale Txq. +* For non-manual bind hairpin queues, configure Txq. +*/ 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 ; - err =cpfl_tx_queue_start (dev, i); +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_vport->p2p_manual_bind) { +if (update_flag ==0 ) { + err =cpfl_txq_hairpin_info_update (dev, + cpfl_txq->hairpin_info.peer_rxp); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info" ); +return err; + } + update_flag =1 ; + } + err =cpfl_hairpin_txq_config (vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + } + +/* For non-manual bind hairpin queues, configure Tx completion queue first.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_tx_complq !=NULL ) { + err =cpfl_hairpin_tx_complq_config (cpfl_vport);if (err !=0 ) { -PMD_DRV_LOG (ERR ,"Fail to start Tx queue %u" , i); +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" );return err; } } +/* For non-manual bind hairpin queues, configure Rx buffer queue.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_rx_bufq !=NULL ) { +cpfl_rxq_hairpin_mz_bind (dev); + err =cpfl_hairpin_rx_bufq_config (cpfl_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + } + +/* For normal data queues, configure, init and enale Rxq. +* For non-manual bind hairpin queues, configure Rxq, and then init Rxq. +*/ for (i =0 ; i < dev->data->nb_rx_queues; i++) { 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_vport->p2p_manual_bind) { + err =cpfl_hairpin_rxq_config (vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } } }
drivers/net/cpfl/cpfl_rxtx.c +80 -0
86 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -32,12 +32,15 @@#define CPFL_RING_BASE_ALIGN 128#define CPFL_DEFAULT_RX_FREE_THRESH 32 +#define CPFL_RXBUF_LOW_WATERMARK 64#define CPFL_DEFAULT_TX_RS_THRESH 32#define CPFL_DEFAULT_TX_FREE_THRESH 32#define CPFL_SUPPORT_CHAIN_NUM 5 +#define CPFL_RX_BUF_STRIDE 64 +struct cpfl_rxq_hairpin_info {bool hairpin_q;/* if rx queue is a hairpin queue */ uint16_t peer_txp;
@@ -95,4 +98,8 @@ int cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,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); +int cpfl_hairpin_tx_complq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq); +int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v8 8/14 common/idpf: add switch queue API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds idpf_vc_ena_dis_one_queue API.
--- drivers/common/idpf/idpf_common_virtchnl.c | 2 +- drivers/common/idpf/idpf_common_virtchnl.h | 3 +++ drivers/common/idpf/version.map | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/common/idpf/idpf_common_virtchnl.c +1 -1
@@ -733,7 +733,7 @@ idpf_vc_vectors_dealloc(struct idpf_vport *vport)return err; } -static int +int idpf_vc_ena_dis_one_queue (struct idpf_vport *vport,uint16_t qid,uint32_t type,bool on) {
drivers/common/idpf/idpf_common_virtchnl.h +3 -0
@@ -71,6 +71,9 @@ __rte_internalint 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); +__rte_internal int idpf_vc_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +1 -0
@@ -40,6 +40,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;
Signature · 1 line
2.26.2
PATCH v8 9/14 net/cpfl: support hairpin queue start/stop
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue start/stop.
--- drivers/net/cpfl/cpfl_ethdev.c | 46 +++++++++ drivers/net/cpfl/cpfl_rxtx.c | 164 +++++++++++++++++++++++++++++---- drivers/net/cpfl/cpfl_rxtx.h | 15 +++ 3 files changed, 207 insertions(+), 18 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +46 -0
@@ -896,6 +896,52 @@ cpfl_start_queues(struct rte_eth_dev *dev) } } +/* For non-manual bind hairpin queues, enable Tx queue and Rx queue, +* then enable Tx completion queue and Rx buffer queue. +*/ +for (i = cpfl_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +if (cpfl_txq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_txq, + false, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +else + cpfl_txq->base.q_started = true; + } + } + +for (i = cpfl_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_rxq, + true, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); +else + cpfl_rxq->base.q_started = true; + } + } + +if (!cpfl_vport->p2p_manual_bind && + cpfl_vport->p2p_tx_complq !=NULL && + cpfl_vport->p2p_rx_bufq !=NULL ) { + err =cpfl_switch_hairpin_complq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + err =cpfl_switch_hairpin_bufq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx bufq" ); +return err; + } + } +return err; }
drivers/net/cpfl/cpfl_rxtx.c +146 -18
218 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +15 -0
@@ -41,6 +41,17 @@#define CPFL_RX_BUF_STRIDE 64 +/* 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 */ uint16_t peer_txp;
@@ -102,4 +113,8 @@ int cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport);int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq);int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport);int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq); +int cpfl_switch_hairpin_complq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_bufq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_rxtx_queue (struct cpfl_vport *cpfl_vport,uint16_t qid, +bool rx,bool on);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v8 10/14 common/idpf: add irq map config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports idpf_vport_irq_map_config_by_qids API.
--- drivers/common/idpf/idpf_common_device.c | 75 ++++++++++++++++++++++++ drivers/common/idpf/idpf_common_device.h | 4 ++ drivers/common/idpf/version.map | 1 + 3 files changed, 80 insertions(+)
drivers/common/idpf/idpf_common_device.c +75 -0
@@ -667,6 +667,81 @@ idpf_vport_irq_map_config(struct idpf_vport *vport, uint16_t nb_rx_queues)return ret; } +int +idpf_vport_irq_map_config_by_qids (struct idpf_vport *vport,uint32_t *qids,uint16_t nb_rx_queues) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_queue_vector *qv_map; +struct idpf_hw *hw = &adapter->hw; +uint32_t dynctl_val, itrn_val; +uint32_t dynctl_reg_start; +uint32_t itrn_reg_start; +uint16_t i; +int ret; + + qv_map =rte_zmalloc ("qv_map" , + nb_rx_queues * +sizeof (struct virtchnl2_queue_vector ),0 ); +if (qv_map ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate %d queue-vector map" , + nb_rx_queues); + ret = -ENOMEM ; + goto qv_map_alloc_err; + } + +/* Rx interrupt disabled, Map interrupt only for writeback */ + +/* The capability flags adapter->caps.other_caps should be +* compared with bit VIRTCHNL2_CAP_WB_ON_ITR here. The if +* condition should be updated when the FW can return the +* correct flag bits. +*/ + dynctl_reg_start = + vport->recv_vectors->vchunks.vchunks->dynctl_reg_start; + itrn_reg_start = + vport->recv_vectors->vchunks.vchunks->itrn_reg_start; + dynctl_val =IDPF_READ_REG (hw, dynctl_reg_start); +DRV_LOG (DEBUG ,"Value of dynctl_reg_start is 0x%x" , dynctl_val); + itrn_val =IDPF_READ_REG (hw, itrn_reg_start); +DRV_LOG (DEBUG ,"Value of itrn_reg_start is 0x%x" , itrn_val); +/* Force write-backs by setting WB_ON_ITR bit in DYN_CTL +* register. WB_ON_ITR and INTENA are mutually exclusive +* bits. Setting WB_ON_ITR bits means TX and RX Descs +* are written back based on ITR expiration irrespective +* of INTENA setting. +*/ +/* TBD: need to tune INTERVAL value for better performance. */ + itrn_val = (itrn_val ==0 ) ?IDPF_DFLT_INTERVAL : itrn_val; + dynctl_val =VIRTCHNL2_ITR_IDX_0 << +PF_GLINT_DYN_CTL_ITR_INDX_S | +PF_GLINT_DYN_CTL_WB_ON_ITR_M | + itrn_val <<PF_GLINT_DYN_CTL_INTERVAL_S ; +IDPF_WRITE_REG (hw, dynctl_reg_start, dynctl_val); + +for (i =0 ; i < nb_rx_queues; i++) { +/* map all queues to the same vector */ + qv_map[i].queue_id = qids[i]; + qv_map[i].vector_id = + vport->recv_vectors->vchunks.vchunks->start_vector_id; + } + vport->qv_map = qv_map; + + ret =idpf_vc_irq_map_unmap_config (vport, nb_rx_queues, true); +if (ret !=0 ) { +DRV_LOG (ERR ,"config interrupt mapping failed" ); + goto config_irq_map_err; + } + +return 0 ; + +config_irq_map_err: +rte_free (vport->qv_map); + vport->qv_map =NULL ; + +qv_map_alloc_err: +return ret; +} +int idpf_vport_irq_unmap_config (struct idpf_vport *vport,uint16_t nb_rx_queues) {
drivers/common/idpf/idpf_common_device.h +4 -0
@@ -200,5 +200,9 @@ int idpf_vport_info_init(struct idpf_vport *vport, struct virtchnl2_create_vport *vport_info);__rte_internal void idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes); +__rte_internal +int idpf_vport_irq_map_config_by_qids(struct idpf_vport *vport, +uint32_t *qids, +uint16_t nb_rx_queues);#endif /* _IDPF_COMMON_DEVICE_H_ */
drivers/common/idpf/version.map +1 -0
@@ -69,6 +69,7 @@ INTERNAL { idpf_vport_info_init; idpf_vport_init; idpf_vport_irq_map_config; + idpf_vport_irq_map_config_by_qids; idpf_vport_irq_unmap_config; idpf_vport_rss_config; idpf_vport_stats_update;
Signature · 1 line
2.26.2
PATCH v8 11/14 net/cpfl: enable write back based on ITR expire
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch enables write back based on ITR expire
(WR_ON_ITR) for hairpin queues.
--- drivers/net/cpfl/cpfl_ethdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +12 -1
@@ -735,11 +735,22 @@ cpfl_dev_configure(struct rte_eth_dev *dev)static int cpfl_config_rx_queues_irqs (struct rte_eth_dev *dev) { +uint32_t qids[CPFL_MAX_P2P_NB_QUEUES +IDPF_DEFAULT_RXQ_NUM ] = {0 };struct cpfl_vport *cpfl_vport = dev->data->dev_private;struct idpf_vport *vport = &cpfl_vport->base;uint16_t nb_rx_queues = dev->data->nb_rx_queues; +struct cpfl_rx_queue *cpfl_rxq; +int i; -return idpf_vport_irq_map_config (vport, nb_rx_queues); +for (i =0 ; i < nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q) + qids[i] =cpfl_hw_qid_get (cpfl_vport->p2p_q_chunks_info->rx_start_qid, + (i - cpfl_vport->nb_data_rxq)); +else + qids[i] =cpfl_hw_qid_get (vport->chunks_info.rx_start_qid, i); + } +return idpf_vport_irq_map_config_by_qids (vport, qids, nb_rx_queues); }/* Update hairpin_info for dev's tx hairpin queue */
Signature · 1 line
2.26.2
PATCH v8 12/14 net/cpfl: support peer ports get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports get hairpin peer ports.
--- drivers/net/cpfl/cpfl_ethdev.c | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +41 -0
@@ -1080,6 +1080,46 @@ cpfl_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_hairpin_get_peer_ports (struct rte_eth_dev *dev,uint16_t *peer_ports, +size_t len,uint32_t tx) +{ +struct cpfl_vport *cpfl_vport = + (struct cpfl_vport *)dev->data->dev_private; +struct idpf_tx_queue *txq; +struct idpf_rx_queue *rxq; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; +int j =0 ; + +if (len <=0 ) +return -EINVAL ; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + +if (tx >0 ) { +for (i = cpfl_vport->nb_data_txq, j =0 ; i < dev->data->nb_tx_queues; i++, j++) { + txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +return -EINVAL ; + cpfl_txq = (struct cpfl_tx_queue *)txq; + peer_ports[j] = cpfl_txq->hairpin_info.peer_rxp; + } + }else if (tx ==0 ) { +for (i = cpfl_vport->nb_data_rxq, j =0 ; i < dev->data->nb_rx_queues; i++, j++) { + rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +return -EINVAL ; + cpfl_rxq = (struct cpfl_rx_queue *)rxq; + peer_ports[j] = cpfl_rxq->hairpin_info.peer_txp; + } + } + +return j; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1109,6 +1149,7 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, }; static int
Signature · 1 line
2.26.2
RE: [PATCH v8 12/14] net/cpfl: support peer ports get
Quoted 45 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Monday, June 5, 2023 2:17 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Liu, Mingxia <[email protected]>; Xing, Beilei <[email protected]>; Wang, Xiao W <[email protected]>
Subject: [PATCH v8 12/14] net/cpfl: support peer ports getFrom: Beilei Xing <[email protected]>
This patch supports get hairpin peer ports.
Signed-off-by Xiao Wang <[email protected]>Signed-off-by Beilei Xing <[email protected]>--- drivers/net/cpfl/cpfl_ethdev.c | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)drivers/net/cpfl/cpfl_ethdev.c +17
-0@@ -1080,6 +1080,46 @@ cpfl_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_hairpin_get_peer_ports (struct rte_eth_dev *dev,uint16_t *peer_ports, +size_t len,uint32_t tx) +{ +struct cpfl_vport *cpfl_vport = + (struct cpfl_vport *)dev->data->dev_private; +struct idpf_tx_queue *txq; +struct idpf_rx_queue *rxq; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; +int j =0 ; + +if (len <=0 ) +return -EINVAL ; + +if (cpfl_vport->p2p_q_chunks_info ==NULL )
drivers/net/cpfl/cpfl_ethdev.c cpfl_dev_close(struct rte_eth_dev *dev) · line 1109
Quoted 10 lines
drivers/net/cpfl/cpfl_ethdev.c +9
-0+return -ENOTSUP ; + +if (tx >0 ) { +for (i = cpfl_vport->nb_data_txq, j =0 ; i < dev->data->nb_tx_queues; i++, j++) { + txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +return -EINVAL ; + cpfl_txq = (struct cpfl_tx_queue *)txq; + peer_ports[j] = cpfl_txq->hairpin_info.peer_rxp;
Shouldn't access the peer_ports[j] if j >= len.
PATCH v8 13/14 net/cpfl: support hairpin bind/unbind
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports hairpin_bind/unbind ops.
--- drivers/net/cpfl/cpfl_ethdev.c | 137 +++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +137 -0
@@ -1120,6 +1120,141 @@ cpfl_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,return j; } +static int +cpfl_hairpin_bind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct idpf_vport *tx_vport = &cpfl_tx_vport->base; +struct cpfl_vport *cpfl_rx_vport; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +struct rte_eth_dev *peer_dev; +struct idpf_vport *rx_vport; +int err =0 ; +int i; + + err =cpfl_txq_hairpin_info_update (dev, rx_port); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info." ); +return err; + } + +/* configure hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_hairpin_txq_config (tx_vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + + err =cpfl_hairpin_tx_complq_config (cpfl_tx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" ); +return err; + } + + peer_dev = &rte_eth_devices[rx_port]; + cpfl_rx_vport = (struct cpfl_vport *)peer_dev->data->dev_private; + rx_vport = &cpfl_rx_vport->base; +cpfl_rxq_hairpin_mz_bind (peer_dev); + + err =cpfl_hairpin_rx_bufq_config (cpfl_rx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_hairpin_rxq_config (rx_vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (peer_dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } + } + +/* enable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +return err; + } + cpfl_txq->base.q_started = true; + } + + err =cpfl_switch_hairpin_complq (cpfl_tx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); + } + cpfl_rxq->base.q_started = true; + } + + err =cpfl_switch_hairpin_bufq (cpfl_rx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx buffer queue" ); +return err; + } + +return 0 ; +} + +static int +cpfl_hairpin_unbind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; + +/* disable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, false); + cpfl_txq->base.q_started = false; + } + +cpfl_switch_hairpin_complq (cpfl_tx_vport, false); + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, false); + cpfl_rxq->base.q_started = false; + } + +cpfl_switch_hairpin_bufq (cpfl_rx_vport, false); + +return 0 ; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1150,6 +1285,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, + .hairpin_unbind = cpfl_hairpin_unbind, }; static int
Signature · 1 line
2.26.2
PATCH v8 14/14 doc: update the doc of CPFL PMD
In reply to [email protected]From: Beilei Xing <[email protected]>
Update cpfl.rst to clarify hairpin support.
--- doc/guides/nics/cpfl.rst | 7 +++++++ 1 file changed, 7 insertions(+)
doc/guides/nics/cpfl.rst +7 -0
@@ -106,3 +106,10 @@ The paths are chosen based on 2 conditions: A value "P" means the offload feature is not supported by vector path. If any not supported features are used, cpfl vector PMD is disabled and the scalar paths are chosen. + +Hairpin queue +~~~~~~~~~~~~~ + + E2100 Series can loopback packets from RX port to TX port, this feature is + called port-to-port or hairpin. + Currently, the PMD only supports single port hairpin.
Signature · 1 line
2.26.2
v9 cover net/cpfl: add hairpin queue support
In reply to [email protected]From: Beilei Xing <[email protected]>
This patchset adds hairpin queue support.
v2 changes:
- change hairpin rx queus configuration sequence.
- code refine.
v3 changes:
- Refine the patchset based on the latest code.
v4 change:
- Remove hairpin rx buffer queue's sw_ring.
- Change hairpin rx queus configuration sequence in cpfl_hairpin_bind function.
- Refind hairpin queue setup and release.
v5 change:
- Fix memory leak during queue setup.
- Refine hairpin Rxq/Txq start/stop.
v6 change:
- Add sign-off.
v7 change:
- Update cpfl.rst
v8 change:
- Fix Intel-compilation failure.
v9 change:
- Fix memory leak if fail to init queue group.
- Change log level.
Beilei Xing (14):
net/cpfl: refine structures
common/idpf: support queue groups add/delete net/cpfl: add haipin queue group during vport init net/cpfl: support hairpin queue capbility get net/cpfl: support hairpin queue setup and release common/idpf: add queue config API net/cpfl: support hairpin queue configuration common/idpf: add switch queue API net/cpfl: support hairpin queue start/stop common/idpf: add irq map config API net/cpfl: enable write back based on ITR expire net/cpfl: support peer ports get
net/cpfl: support hairpin bind/unbind
doc: update the doc of CPFL PMD
doc/guides/nics/cpfl.rst | 7 + drivers/common/idpf/idpf_common_device.c | 75 ++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 138 +++- drivers/common/idpf/idpf_common_virtchnl.h | 18 + drivers/common/idpf/version.map | 6 + drivers/net/cpfl/cpfl_ethdev.c | 612 ++++++++++++++-- drivers/net/cpfl/cpfl_ethdev.h | 35 +- drivers/net/cpfl/cpfl_rxtx.c | 789 +++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.h | 76 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 21 +- 11 files changed, 1662 insertions(+), 119 deletions(-)
Signature · 1 line
2.26.2
PATCH v9 1/14 net/cpfl: refine structures
From: Beilei Xing <[email protected]>
This patch refines some structures to support hairpin queue, cpfl_rx_queue/cpfl_tx_queue/cpfl_vport.
--- drivers/net/cpfl/cpfl_ethdev.c | 85 +++++++----- drivers/net/cpfl/cpfl_ethdev.h | 6 +- drivers/net/cpfl/cpfl_rxtx.c | 175 +++++++++++++++++------- drivers/net/cpfl/cpfl_rxtx.h | 8 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 17 +-- 5 files changed, 196 insertions(+), 95 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +49 -36
@@ -124,7 +124,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_link new_link;unsigned int i;
@@ -156,7 +157,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter; dev_info->max_rx_queues = base->caps.max_rx_q;
@@ -216,7 +218,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;/* mtu setting is forbidden if port is start */ if (dev->data->dev_started) {
@@ -256,12 +259,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); }
@@ -271,8 +274,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -305,20 +308,20 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -343,8 +346,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;unsigned int i;int ret;
@@ -459,7 +462,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -498,7 +502,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -536,7 +541,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -601,7 +607,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -638,7 +645,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_conf *conf = &dev->data->dev_conf;struct idpf_adapter *base = vport->adapter;int ret;
@@ -710,7 +718,8 @@ 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 = 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);
@@ -719,14 +728,14 @@ 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 ) {
@@ -736,8 +745,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 ) {
@@ -752,7 +761,8 @@ 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 = 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;
@@ -813,7 +823,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;if (dev->data->dev_started ==0 )return 0 ;
@@ -832,7 +843,8 @@ 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 = 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);
@@ -842,7 +854,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 ; }
@@ -1047,7 +1059,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
@@ -1275,7 +1287,8 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)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 = 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 */
@@ -1300,7 +1313,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++;
@@ -1415,7 +1428,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 )
@@ -1433,7 +1446,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 +5 -1
@@ -69,13 +69,17 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct cpfl_vport { +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 +125 -50
401 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +8 -0
@@ -23,6 +23,14 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rx_queue { +struct idpf_rx_queue base; +}; + +struct cpfl_tx_queue { +struct idpf_tx_queue base; +}; +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 +9 -8
@@ -76,15 +76,16 @@ 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 = 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 +101,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.26.2
PATCH v9 2/14 common/idpf: support queue groups add/delete
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds queue group add/delete virtual channel support.
--- drivers/common/idpf/idpf_common_virtchnl.c | 66 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 9 +++ drivers/common/idpf/version.map | 2 + 3 files changed, 77 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +66 -0
@@ -359,6 +359,72 @@ idpf_vc_vport_destroy(struct idpf_vport *vport)return err; } +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_queue_grps_out) +{ +struct idpf_adapter *adapter = vport->adapter; +struct idpf_cmd_info args; +int size, qg_info_size; +int err =-1 ; + + size =sizeof (*p2p_queue_grps_info) + + (p2p_queue_grps_info->qg_info.num_queue_groups -1 ) * +sizeof (struct virtchnl2_queue_group_info ); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_ADD_QUEUE_GROUPS ; + args.in_args = (uint8_t *)p2p_queue_grps_info; + args.in_args_size = size; + 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_ADD_QUEUE_GROUPS" ); +return err; + } + +rte_memcpy (p2p_queue_grps_out, args.out_buffer,IDPF_DFLT_MBX_BUF_SIZE ); +return 0 ; +} + +int idpf_vc_queue_grps_del (struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_delete_queue_groups *vc_del_q_grps; +struct idpf_cmd_info args; +int size; +int err; + + size =sizeof (*vc_del_q_grps) + + (num_q_grps -1 ) *sizeof (struct virtchnl2_queue_group_id ); + vc_del_q_grps =rte_zmalloc ("vc_del_q_grps" , size,0 ); + + vc_del_q_grps->vport_id = vport->vport_id; + vc_del_q_grps->num_queue_groups = num_q_grps; +memcpy (vc_del_q_grps->qg_ids, qg_ids, + num_q_grps *sizeof (struct virtchnl2_queue_group_id )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_DEL_QUEUE_GROUPS ; + args.in_args = (uint8_t *)vc_del_q_grps; + args.in_args_size = size; + 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_DEL_QUEUE_GROUPS" ); + +rte_free (vc_del_q_grps); +return err; +} +int idpf_vc_rss_key_set (struct idpf_vport *vport) {
drivers/common/idpf/idpf_common_virtchnl.h +9 -0
@@ -64,4 +64,13 @@ 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_queue_grps_del(struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids); +__rte_internal +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *ptp_queue_grps_info, +uint8_t *ptp_queue_grps_out);#endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +2 -0
@@ -43,6 +43,8 @@ INTERNAL { idpf_vc_irq_map_unmap_config; idpf_vc_one_msg_read; idpf_vc_ptype_info_query; + idpf_vc_queue_grps_add; + idpf_vc_queue_grps_del; idpf_vc_queue_switch; idpf_vc_queues_ena_dis; idpf_vc_rss_hash_get;
Signature · 1 line
2.26.2
PATCH v9 3/14 net/cpfl: add haipin queue group during vport init
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds haipin queue group during vport init.
--- drivers/net/cpfl/cpfl_ethdev.c | 134 +++++++++++++++++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 18 +++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 159 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +134 -0
@@ -840,6 +840,20 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) +{ +struct virtchnl2_queue_group_id qg_ids[CPFL_P2P_NB_QUEUE_GRPS ] = {0 }; +int ret =0 ; + + qg_ids[0 ].queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids[0 ].queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret =idpf_vc_queue_grps_del (vport,CPFL_P2P_NB_QUEUE_GRPS , qg_ids); +if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close (struct rte_eth_dev *dev) {
@@ -848,7 +862,12 @@ cpfl_dev_close(struct rte_eth_dev *dev)struct cpfl_adapter_ext *adapter =CPFL_ADAPTER_TO_EXT (vport->adapter);cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;
@@ -1284,6 +1303,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_complq =CPFL_P2P_NB_TX_COMPLQ ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + p2p_queue_grps_info->qg_info.groups[0 ].rx_q_grp_info.rss_lut_size =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.pir_weight =0 ; + + ret =idpf_vc_queue_grps_add (vport, p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, +struct virtchnl2_add_queue_groups *p2p_q_vc_out_info) +{ +struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport->p2p_q_chunks_info; +struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init (struct rte_eth_dev *dev,void *init_params) {
@@ -1293,6 +1402,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ; dev->dev_ops = &cpfl_eth_dev_ops;
@@ -1327,6 +1438,29 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { +memset (&p2p_queue_grps_info,0 ,sizeof (p2p_queue_grps_info)); + ret =cpfl_p2p_q_grps_add (vport, &p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (WARNING ,"Failed to add p2p queue group." ); +return 0 ; + } + cpfl_vport->p2p_q_chunks_info =rte_zmalloc (NULL , +sizeof (struct p2p_queue_chunks_info ),0 ); +if (cpfl_vport->p2p_q_chunks_info ==NULL ) { +PMD_INIT_LOG (WARNING ,"Failed to allocate p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret =cpfl_p2p_queue_info_init (cpfl_vport, + (struct virtchnl2_add_queue_groups *)p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (WARNING ,"Failed to init p2p queue info." ); +rte_free (cpfl_vport->p2p_q_chunks_info); +cpfl_p2p_queue_grps_del (vport); + } + } +return 0 ; err_mac_addrs:
drivers/net/cpfl/cpfl_ethdev.h +18 -0
@@ -56,6 +56,7 @@/* Device IDs */ #define IDPF_DEV_ID_CPF 0x1453 +#define VIRTCHNL2_QUEUE_GROUP_P2P 0x100struct cpfl_vport_param {struct cpfl_adapter_ext *adapter;
@@ -69,8 +70,25 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct p2p_queue_chunks_info { +uint32_t tx_start_qid; +uint32_t rx_start_qid; +uint32_t tx_compl_start_qid; +uint32_t rx_buf_start_qid; + +uint64_t tx_qtail_start; +uint32_t tx_qtail_spacing; +uint64_t rx_qtail_start; +uint32_t rx_qtail_spacing; +uint64_t tx_compl_qtail_start; +uint32_t tx_compl_qtail_spacing; +uint64_t rx_buf_qtail_start; +uint32_t rx_buf_qtail_spacing; +}; +struct cpfl_vport {struct idpf_vport base; +struct p2p_queue_chunks_info *p2p_q_chunks_info; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -13,6 +13,13 @@#define CPFL_MIN_RING_DESC 32#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 + +#define CPFL_MAX_P2P_NB_QUEUES 16 +#define CPFL_P2P_NB_RX_BUFQ 1 +#define CPFL_P2P_NB_TX_COMPLQ 1 +#define CPFL_P2P_NB_QUEUE_GRPS 1 +#define CPFL_P2P_QUEUE_GRP_ID 1 +/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
Signature · 1 line
2.26.2
PATCH v9 4/14 net/cpfl: support hairpin queue capbility get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds hairpin_cap_get ops support.
--- drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 3 +++ 2 files changed, 21 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -154,6 +154,23 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,return rte_eth_linkstatus_set (dev, &new_link); } +static int +cpfl_hairpin_cap_get (struct rte_eth_dev *dev, +struct rte_eth_hairpin_cap *cap) +{ +struct cpfl_vport *cpfl_vport = dev->data->dev_private; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + + cap->max_nb_queues =CPFL_MAX_P2P_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) {
@@ -904,6 +921,7 @@ 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, }; static int
drivers/net/cpfl/cpfl_rxtx.h +3 -0
@@ -14,6 +14,9 @@#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 +#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_P2P_NB_QUEUES 16#define CPFL_P2P_NB_RX_BUFQ 1#define CPFL_P2P_NB_TX_COMPLQ 1
Signature · 1 line
2.26.2
PATCH v9 5/14 net/cpfl: support hairpin queue setup and release
In reply to [email protected]From: Beilei Xing <[email protected]>
Support hairpin Rx/Tx queue setup and release.
--- drivers/net/cpfl/cpfl_ethdev.c | 6 + drivers/net/cpfl/cpfl_ethdev.h | 11 + drivers/net/cpfl/cpfl_rxtx.c | 364 +++++++++++++++++++++++- drivers/net/cpfl/cpfl_rxtx.h | 36 +++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 + 5 files changed, 420 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +6 -0
@@ -879,6 +879,10 @@ cpfl_dev_close(struct rte_eth_dev *dev)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 ; + }if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq)cpfl_p2p_queue_grps_del (vport);
@@ -922,6 +926,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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 int
drivers/net/cpfl/cpfl_ethdev.h +11 -0
@@ -89,6 +89,17 @@ struct p2p_queue_chunks_info {struct cpfl_vport {struct idpf_vport base;struct p2p_queue_chunks_info *p2p_q_chunks_info; + +struct rte_mempool *p2p_mp; + +uint16_t nb_data_rxq; +uint16_t nb_data_txq; +uint16_t nb_p2p_rxq; +uint16_t nb_p2p_txq; + +struct idpf_rx_queue *p2p_rx_bufq; +struct idpf_tx_queue *p2p_tx_complq; +bool p2p_manual_bind; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.c +363 -1
400 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +36 -0
@@ -22,6 +22,11 @@#define CPFL_P2P_NB_TX_COMPLQ 1#define CPFL_P2P_NB_QUEUE_GRPS 1#define CPFL_P2P_QUEUE_GRP_ID 1 +#define CPFL_P2P_DESC_LEN 16 +#define CPFL_P2P_NB_MBUF 4096 +#define CPFL_P2P_CACHE_SIZE 250 +#define CPFL_P2P_MBUF_SIZE 2048 +#define CPFL_P2P_RING_BUF 128/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
@@ -33,14 +38,40 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rxq_hairpin_info { +bool hairpin_q;/* if rx queue is a hairpin queue */ +uint16_t peer_txp; +uint16_t peer_txq_id; +}; +struct cpfl_rx_queue {struct idpf_rx_queue base; +struct cpfl_rxq_hairpin_info hairpin_info; +}; + +struct cpfl_txq_hairpin_info { +bool hairpin_q;/* if tx queue is a hairpin queue */ +uint16_t peer_rxp; +uint16_t peer_rxq_id; };struct cpfl_tx_queue {struct idpf_tx_queue base; +struct cpfl_txq_hairpin_info hairpin_info; }; +static inline uint16_t +cpfl_hw_qid_get (uint16_t start_qid,uint16_t offset) +{ +return start_qid + offset; +} + +static inline uint64_t +cpfl_hw_qtail_get (uint64_t tail_start,uint16_t offset,uint64_t tail_spacing) +{ +return tail_start + offset * tail_spacing; +} +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);
@@ -59,4 +90,9 @@ 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_ */
drivers/net/cpfl/cpfl_rxtx_vec_common.h +4 -0
@@ -85,6 +85,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 {
@@ -106,6 +108,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.26.2
PATCH v9 6/14 common/idpf: add queue config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx queue configuration APIs.
--- drivers/common/idpf/idpf_common_virtchnl.c | 70 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 6 ++ drivers/common/idpf/version.map | 2 + 3 files changed, 78 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +70 -0
@@ -1050,6 +1050,41 @@ idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq)return err; } +int idpf_vc_rxq_config_by_info (struct idpf_vport *vport,struct virtchnl2_rxq_info *rxq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_rx_queues *vc_rxqs =NULL ; +struct idpf_cmd_info args; +int size, err, i; + + size =sizeof (*vc_rxqs) + (num_qs -1 ) * +sizeof (struct virtchnl2_rxq_info ); + vc_rxqs =rte_zmalloc ("cfg_rxqs" , size,0 ); +if (vc_rxqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_rx_queues" ); + err = -ENOMEM ; +return err; + } + vc_rxqs->vport_id = vport->vport_id; + vc_rxqs->num_qinfo = num_qs; +memcpy (vc_rxqs->qinfo, rxq_info, num_qs *sizeof (struct virtchnl2_rxq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_RX_QUEUES ; + args.in_args = (uint8_t *)vc_rxqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_rxqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_RX_QUEUES" ); + +return err; +} +int idpf_vc_txq_config (struct idpf_vport *vport,struct idpf_tx_queue *txq) {
@@ -1121,6 +1156,41 @@ idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)return err; } +int +idpf_vc_txq_config_by_info (struct idpf_vport *vport,struct virtchnl2_txq_info *txq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_tx_queues *vc_txqs =NULL ; +struct idpf_cmd_info args; +int size, err; + + size =sizeof (*vc_txqs) + (num_qs -1 ) *sizeof (struct virtchnl2_txq_info ); + vc_txqs =rte_zmalloc ("cfg_txqs" , size,0 ); +if (vc_txqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_tx_queues" ); + err = -ENOMEM ; +return err; + } + vc_txqs->vport_id = vport->vport_id; + vc_txqs->num_qinfo = num_qs; +memcpy (vc_txqs->qinfo, txq_info, num_qs *sizeof (struct virtchnl2_txq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_TX_QUEUES ; + args.in_args = (uint8_t *)vc_txqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_txqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_TX_QUEUES" ); + +return err; +} +int idpf_vc_ctlq_recv (struct idpf_ctlq_info *cq,u16 *num_q_msg,struct idpf_ctlq_msg *q_msg)
drivers/common/idpf/idpf_common_virtchnl.h +6 -0
@@ -65,6 +65,12 @@ __rte_internalint 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_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_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +2 -0
@@ -54,8 +54,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;
Signature · 1 line
2.26.2
PATCH v9 7/14 net/cpfl: support hairpin queue configuration
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue configuration.
--- drivers/net/cpfl/cpfl_ethdev.c | 136 +++++++++++++++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.c | 88 +++++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 225 insertions(+), 6 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +130 -6
@@ -742,33 +742,157 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)return idpf_vport_irq_map_config (vport, nb_rx_queues); } +/* Update hairpin_info for dev's tx hairpin queue */ +static int +cpfl_txq_hairpin_info_update (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_txq_hairpin_info *hairpin_info; +struct cpfl_tx_queue *cpfl_txq; +int i; + +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + hairpin_info = &cpfl_txq->hairpin_info; +if (hairpin_info->peer_rxp != rx_port) { +PMD_DRV_LOG (ERR ,"port %d is not the peer port" , rx_port); +return -EINVAL ; + } + hairpin_info->peer_rxq_id = +cpfl_hw_qid_get (cpfl_rx_vport->p2p_q_chunks_info->rx_start_qid, + hairpin_info->peer_rxq_id - cpfl_rx_vport->nb_data_rxq); + } + +return 0 ; +} + +/* Bind Rx hairpin queue's memory zone to peer Tx hairpin queue's memory zone */ +static void +cpfl_rxq_hairpin_mz_bind (struct rte_eth_dev *dev) +{ +struct cpfl_vport *cpfl_rx_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_rx_vport->base; +struct idpf_adapter *adapter = vport->adapter; +struct idpf_hw *hw = &adapter->hw; +struct cpfl_rx_queue *cpfl_rxq; +struct cpfl_tx_queue *cpfl_txq; +struct rte_eth_dev *peer_dev; +const struct rte_memzone *mz; +uint16_t peer_tx_port; +uint16_t peer_tx_qid; +int i; + +for (i = cpfl_rx_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; + peer_tx_port = cpfl_rxq->hairpin_info.peer_txp; + peer_tx_qid = cpfl_rxq->hairpin_info.peer_txq_id; + peer_dev = &rte_eth_devices[peer_tx_port]; + cpfl_txq = peer_dev->data->tx_queues[peer_tx_qid]; + +/* bind rx queue */ + mz = cpfl_txq->base.mz; + cpfl_rxq->base.rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.rx_ring = mz->addr; + cpfl_rxq->base.mz = mz; + +/* bind rx buffer queue */ + mz = cpfl_txq->base.complq->mz; + cpfl_rxq->base.bufq1->rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.bufq1->rx_ring = mz->addr; + cpfl_rxq->base.bufq1->mz = mz; + cpfl_rxq->base.bufq1->qrx_tail = hw->hw_addr + +cpfl_hw_qtail_get (cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_start, +0 , cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_spacing); + } +} +static int cpfl_start_queues (struct rte_eth_dev *dev) { +struct cpfl_vport *cpfl_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct cpfl_rx_queue *cpfl_rxq;struct cpfl_tx_queue *cpfl_txq; +int update_flag =0 ;int err =0 ;int i; +/* For normal data queues, configure, init and enale Txq. +* For non-manual bind hairpin queues, configure Txq. +*/ 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 ; - err =cpfl_tx_queue_start (dev, i); +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_vport->p2p_manual_bind) { +if (update_flag ==0 ) { + err =cpfl_txq_hairpin_info_update (dev, + cpfl_txq->hairpin_info.peer_rxp); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info" ); +return err; + } + update_flag =1 ; + } + err =cpfl_hairpin_txq_config (vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + } + +/* For non-manual bind hairpin queues, configure Tx completion queue first.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_tx_complq !=NULL ) { + err =cpfl_hairpin_tx_complq_config (cpfl_vport);if (err !=0 ) { -PMD_DRV_LOG (ERR ,"Fail to start Tx queue %u" , i); +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" );return err; } } +/* For non-manual bind hairpin queues, configure Rx buffer queue.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_rx_bufq !=NULL ) { +cpfl_rxq_hairpin_mz_bind (dev); + err =cpfl_hairpin_rx_bufq_config (cpfl_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + } + +/* For normal data queues, configure, init and enale Rxq. +* For non-manual bind hairpin queues, configure Rxq, and then init Rxq. +*/ for (i =0 ; i < dev->data->nb_rx_queues; i++) { 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_vport->p2p_manual_bind) { + err =cpfl_hairpin_rxq_config (vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } } }
drivers/net/cpfl/cpfl_rxtx.c +88 -0
94 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -32,12 +32,15 @@#define CPFL_RING_BASE_ALIGN 128#define CPFL_DEFAULT_RX_FREE_THRESH 32 +#define CPFL_RXBUF_LOW_WATERMARK 64#define CPFL_DEFAULT_TX_RS_THRESH 32#define CPFL_DEFAULT_TX_FREE_THRESH 32#define CPFL_SUPPORT_CHAIN_NUM 5 +#define CPFL_RX_BUF_STRIDE 64 +struct cpfl_rxq_hairpin_info {bool hairpin_q;/* if rx queue is a hairpin queue */ uint16_t peer_txp;
@@ -95,4 +98,8 @@ int cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,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); +int cpfl_hairpin_tx_complq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq); +int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v9 8/14 common/idpf: add switch queue API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds idpf_vc_ena_dis_one_queue API.
--- drivers/common/idpf/idpf_common_virtchnl.c | 2 +- drivers/common/idpf/idpf_common_virtchnl.h | 3 +++ drivers/common/idpf/version.map | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/common/idpf/idpf_common_virtchnl.c +1 -1
@@ -733,7 +733,7 @@ idpf_vc_vectors_dealloc(struct idpf_vport *vport)return err; } -static int +int idpf_vc_ena_dis_one_queue (struct idpf_vport *vport,uint16_t qid,uint32_t type,bool on) {
drivers/common/idpf/idpf_common_virtchnl.h +3 -0
@@ -71,6 +71,9 @@ __rte_internalint 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); +__rte_internal int idpf_vc_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +1 -0
@@ -40,6 +40,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;
Signature · 1 line
2.26.2
PATCH v9 9/14 net/cpfl: support hairpin queue start/stop
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue start/stop.
--- drivers/net/cpfl/cpfl_ethdev.c | 46 +++++++++ drivers/net/cpfl/cpfl_rxtx.c | 164 +++++++++++++++++++++++++++++---- drivers/net/cpfl/cpfl_rxtx.h | 15 +++ 3 files changed, 207 insertions(+), 18 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +46 -0
@@ -896,6 +896,52 @@ cpfl_start_queues(struct rte_eth_dev *dev) } } +/* For non-manual bind hairpin queues, enable Tx queue and Rx queue, +* then enable Tx completion queue and Rx buffer queue. +*/ +for (i = cpfl_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +if (cpfl_txq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_txq, + false, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +else + cpfl_txq->base.q_started = true; + } + } + +for (i = cpfl_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_rxq, + true, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); +else + cpfl_rxq->base.q_started = true; + } + } + +if (!cpfl_vport->p2p_manual_bind && + cpfl_vport->p2p_tx_complq !=NULL && + cpfl_vport->p2p_rx_bufq !=NULL ) { + err =cpfl_switch_hairpin_complq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + err =cpfl_switch_hairpin_bufq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx bufq" ); +return err; + } + } +return err; }
drivers/net/cpfl/cpfl_rxtx.c +146 -18
218 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +15 -0
@@ -41,6 +41,17 @@#define CPFL_RX_BUF_STRIDE 64 +/* 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 */ uint16_t peer_txp;
@@ -102,4 +113,8 @@ int cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport);int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq);int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport);int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq); +int cpfl_switch_hairpin_complq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_bufq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_rxtx_queue (struct cpfl_vport *cpfl_vport,uint16_t qid, +bool rx,bool on);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v9 10/14 common/idpf: add irq map config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports idpf_vport_irq_map_config_by_qids API.
--- drivers/common/idpf/idpf_common_device.c | 75 ++++++++++++++++++++++++ drivers/common/idpf/idpf_common_device.h | 4 ++ drivers/common/idpf/version.map | 1 + 3 files changed, 80 insertions(+)
drivers/common/idpf/idpf_common_device.c +75 -0
@@ -667,6 +667,81 @@ idpf_vport_irq_map_config(struct idpf_vport *vport, uint16_t nb_rx_queues)return ret; } +int +idpf_vport_irq_map_config_by_qids (struct idpf_vport *vport,uint32_t *qids,uint16_t nb_rx_queues) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_queue_vector *qv_map; +struct idpf_hw *hw = &adapter->hw; +uint32_t dynctl_val, itrn_val; +uint32_t dynctl_reg_start; +uint32_t itrn_reg_start; +uint16_t i; +int ret; + + qv_map =rte_zmalloc ("qv_map" , + nb_rx_queues * +sizeof (struct virtchnl2_queue_vector ),0 ); +if (qv_map ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate %d queue-vector map" , + nb_rx_queues); + ret = -ENOMEM ; + goto qv_map_alloc_err; + } + +/* Rx interrupt disabled, Map interrupt only for writeback */ + +/* The capability flags adapter->caps.other_caps should be +* compared with bit VIRTCHNL2_CAP_WB_ON_ITR here. The if +* condition should be updated when the FW can return the +* correct flag bits. +*/ + dynctl_reg_start = + vport->recv_vectors->vchunks.vchunks->dynctl_reg_start; + itrn_reg_start = + vport->recv_vectors->vchunks.vchunks->itrn_reg_start; + dynctl_val =IDPF_READ_REG (hw, dynctl_reg_start); +DRV_LOG (DEBUG ,"Value of dynctl_reg_start is 0x%x" , dynctl_val); + itrn_val =IDPF_READ_REG (hw, itrn_reg_start); +DRV_LOG (DEBUG ,"Value of itrn_reg_start is 0x%x" , itrn_val); +/* Force write-backs by setting WB_ON_ITR bit in DYN_CTL +* register. WB_ON_ITR and INTENA are mutually exclusive +* bits. Setting WB_ON_ITR bits means TX and RX Descs +* are written back based on ITR expiration irrespective +* of INTENA setting. +*/ +/* TBD: need to tune INTERVAL value for better performance. */ + itrn_val = (itrn_val ==0 ) ?IDPF_DFLT_INTERVAL : itrn_val; + dynctl_val =VIRTCHNL2_ITR_IDX_0 << +PF_GLINT_DYN_CTL_ITR_INDX_S | +PF_GLINT_DYN_CTL_WB_ON_ITR_M | + itrn_val <<PF_GLINT_DYN_CTL_INTERVAL_S ; +IDPF_WRITE_REG (hw, dynctl_reg_start, dynctl_val); + +for (i =0 ; i < nb_rx_queues; i++) { +/* map all queues to the same vector */ + qv_map[i].queue_id = qids[i]; + qv_map[i].vector_id = + vport->recv_vectors->vchunks.vchunks->start_vector_id; + } + vport->qv_map = qv_map; + + ret =idpf_vc_irq_map_unmap_config (vport, nb_rx_queues, true); +if (ret !=0 ) { +DRV_LOG (ERR ,"config interrupt mapping failed" ); + goto config_irq_map_err; + } + +return 0 ; + +config_irq_map_err: +rte_free (vport->qv_map); + vport->qv_map =NULL ; + +qv_map_alloc_err: +return ret; +} +int idpf_vport_irq_unmap_config (struct idpf_vport *vport,uint16_t nb_rx_queues) {
drivers/common/idpf/idpf_common_device.h +4 -0
@@ -200,5 +200,9 @@ int idpf_vport_info_init(struct idpf_vport *vport, struct virtchnl2_create_vport *vport_info);__rte_internal void idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes); +__rte_internal +int idpf_vport_irq_map_config_by_qids(struct idpf_vport *vport, +uint32_t *qids, +uint16_t nb_rx_queues);#endif /* _IDPF_COMMON_DEVICE_H_ */
drivers/common/idpf/version.map +1 -0
@@ -69,6 +69,7 @@ INTERNAL { idpf_vport_info_init; idpf_vport_init; idpf_vport_irq_map_config; + idpf_vport_irq_map_config_by_qids; idpf_vport_irq_unmap_config; idpf_vport_rss_config; idpf_vport_stats_update;
Signature · 1 line
2.26.2
PATCH v9 11/14 net/cpfl: enable write back based on ITR expire
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch enables write back based on ITR expire
(WR_ON_ITR) for hairpin queues.
--- drivers/net/cpfl/cpfl_ethdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +12 -1
@@ -735,11 +735,22 @@ cpfl_dev_configure(struct rte_eth_dev *dev)static int cpfl_config_rx_queues_irqs (struct rte_eth_dev *dev) { +uint32_t qids[CPFL_MAX_P2P_NB_QUEUES +IDPF_DEFAULT_RXQ_NUM ] = {0 };struct cpfl_vport *cpfl_vport = dev->data->dev_private;struct idpf_vport *vport = &cpfl_vport->base;uint16_t nb_rx_queues = dev->data->nb_rx_queues; +struct cpfl_rx_queue *cpfl_rxq; +int i; -return idpf_vport_irq_map_config (vport, nb_rx_queues); +for (i =0 ; i < nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q) + qids[i] =cpfl_hw_qid_get (cpfl_vport->p2p_q_chunks_info->rx_start_qid, + (i - cpfl_vport->nb_data_rxq)); +else + qids[i] =cpfl_hw_qid_get (vport->chunks_info.rx_start_qid, i); + } +return idpf_vport_irq_map_config_by_qids (vport, qids, nb_rx_queues); }/* Update hairpin_info for dev's tx hairpin queue */
Signature · 1 line
2.26.2
PATCH v9 12/14 net/cpfl: support peer ports get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports get hairpin peer ports.
--- drivers/net/cpfl/cpfl_ethdev.c | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +41 -0
@@ -1080,6 +1080,46 @@ cpfl_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_hairpin_get_peer_ports (struct rte_eth_dev *dev,uint16_t *peer_ports, +size_t len,uint32_t tx) +{ +struct cpfl_vport *cpfl_vport = + (struct cpfl_vport *)dev->data->dev_private; +struct idpf_tx_queue *txq; +struct idpf_rx_queue *rxq; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; +int j =0 ; + +if (len <=0 ) +return -EINVAL ; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + +if (tx >0 ) { +for (i = cpfl_vport->nb_data_txq, j =0 ; i < dev->data->nb_tx_queues; i++, j++) { + txq = dev->data->tx_queues[i]; +if (txq ==NULL ) +return -EINVAL ; + cpfl_txq = (struct cpfl_tx_queue *)txq; + peer_ports[j] = cpfl_txq->hairpin_info.peer_rxp; + } + }else if (tx ==0 ) { +for (i = cpfl_vport->nb_data_rxq, j =0 ; i < dev->data->nb_rx_queues; i++, j++) { + rxq = dev->data->rx_queues[i]; +if (rxq ==NULL ) +return -EINVAL ; + cpfl_rxq = (struct cpfl_rx_queue *)rxq; + peer_ports[j] = cpfl_rxq->hairpin_info.peer_txp; + } + } + +return j; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1109,6 +1149,7 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, }; static int
Signature · 1 line
2.26.2
PATCH v9 13/14 net/cpfl: support hairpin bind/unbind
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports hairpin_bind/unbind ops.
--- drivers/net/cpfl/cpfl_ethdev.c | 137 +++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +137 -0
@@ -1120,6 +1120,141 @@ cpfl_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,return j; } +static int +cpfl_hairpin_bind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct idpf_vport *tx_vport = &cpfl_tx_vport->base; +struct cpfl_vport *cpfl_rx_vport; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +struct rte_eth_dev *peer_dev; +struct idpf_vport *rx_vport; +int err =0 ; +int i; + + err =cpfl_txq_hairpin_info_update (dev, rx_port); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info." ); +return err; + } + +/* configure hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_hairpin_txq_config (tx_vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + + err =cpfl_hairpin_tx_complq_config (cpfl_tx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" ); +return err; + } + + peer_dev = &rte_eth_devices[rx_port]; + cpfl_rx_vport = (struct cpfl_vport *)peer_dev->data->dev_private; + rx_vport = &cpfl_rx_vport->base; +cpfl_rxq_hairpin_mz_bind (peer_dev); + + err =cpfl_hairpin_rx_bufq_config (cpfl_rx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_hairpin_rxq_config (rx_vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (peer_dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } + } + +/* enable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +return err; + } + cpfl_txq->base.q_started = true; + } + + err =cpfl_switch_hairpin_complq (cpfl_tx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); + } + cpfl_rxq->base.q_started = true; + } + + err =cpfl_switch_hairpin_bufq (cpfl_rx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx buffer queue" ); +return err; + } + +return 0 ; +} + +static int +cpfl_hairpin_unbind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; + +/* disable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, false); + cpfl_txq->base.q_started = false; + } + +cpfl_switch_hairpin_complq (cpfl_tx_vport, false); + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, false); + cpfl_rxq->base.q_started = false; + } + +cpfl_switch_hairpin_bufq (cpfl_rx_vport, false); + +return 0 ; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1150,6 +1285,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, + .hairpin_unbind = cpfl_hairpin_unbind, }; static int
Signature · 1 line
2.26.2
PATCH v9 14/14 doc: update the doc of CPFL PMD
In reply to [email protected]From: Beilei Xing <[email protected]>
Update cpfl.rst to clarify hairpin support.
--- doc/guides/nics/cpfl.rst | 7 +++++++ 1 file changed, 7 insertions(+)
doc/guides/nics/cpfl.rst +7 -0
@@ -106,3 +106,10 @@ The paths are chosen based on 2 conditions: A value "P" means the offload feature is not supported by vector path. If any not supported features are used, cpfl vector PMD is disabled and the scalar paths are chosen. + +Hairpin queue +~~~~~~~~~~~~~ + + E2100 Series can loopback packets from RX port to TX port, this feature is + called port-to-port or hairpin. + Currently, the PMD only supports single port hairpin.
Signature · 1 line
2.26.2
v10 cover net/cpfl: add hairpin queue support
In reply to [email protected]From: Beilei Xing <[email protected]>
This patchset adds hairpin queue support.
v2 changes:
- change hairpin rx queus configuration sequence.
- code refine.
v3 changes:
- Refine the patchset based on the latest code.
v4 change:
- Remove hairpin rx buffer queue's sw_ring.
- Change hairpin rx queus configuration sequence in cpfl_hairpin_bind function.
- Refind hairpin queue setup and release.
v5 change:
- Fix memory leak during queue setup.
- Refine hairpin Rxq/Txq start/stop.
v6 change:
- Add sign-off.
v7 change:
- Update cpfl.rst
v8 change:
- Fix Intel-compilation failure.
v9 change:
- Fix memory leak if fail to init queue group.
- Change log level.
v10 change:
- Avoid accessing out-of-bounds.
Beilei Xing (14):
net/cpfl: refine structures
common/idpf: support queue groups add/delete net/cpfl: add haipin queue group during vport init net/cpfl: support hairpin queue capbility get net/cpfl: support hairpin queue setup and release common/idpf: add queue config API net/cpfl: support hairpin queue configuration common/idpf: add switch queue API net/cpfl: support hairpin queue start/stop common/idpf: add irq map config API net/cpfl: enable write back based on ITR expire net/cpfl: support peer ports get
net/cpfl: support hairpin bind/unbind
doc: update the doc of CPFL PMD
doc/guides/nics/cpfl.rst | 7 + drivers/common/idpf/idpf_common_device.c | 75 ++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 138 +++- drivers/common/idpf/idpf_common_virtchnl.h | 18 + drivers/common/idpf/version.map | 6 + drivers/net/cpfl/cpfl_ethdev.c | 613 ++++++++++++++-- drivers/net/cpfl/cpfl_ethdev.h | 35 +- drivers/net/cpfl/cpfl_rxtx.c | 789 +++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.h | 76 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 21 +- 11 files changed, 1663 insertions(+), 119 deletions(-)
Signature · 1 line
2.26.2
PATCH v10 1/14 net/cpfl: refine structures
From: Beilei Xing <[email protected]>
This patch refines some structures to support hairpin queue, cpfl_rx_queue/cpfl_tx_queue/cpfl_vport.
--- drivers/net/cpfl/cpfl_ethdev.c | 85 +++++++----- drivers/net/cpfl/cpfl_ethdev.h | 6 +- drivers/net/cpfl/cpfl_rxtx.c | 175 +++++++++++++++++------- drivers/net/cpfl/cpfl_rxtx.h | 8 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 17 +-- 5 files changed, 196 insertions(+), 95 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +49 -36
@@ -124,7 +124,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_link new_link;unsigned int i;
@@ -156,7 +157,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter; dev_info->max_rx_queues = base->caps.max_rx_q;
@@ -216,7 +218,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;/* mtu setting is forbidden if port is start */ if (dev->data->dev_started) {
@@ -256,12 +259,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); }
@@ -271,8 +274,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -305,20 +308,20 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;int ret;
@@ -343,8 +346,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct virtchnl2_vport_stats *pstats =NULL ;unsigned int i;int ret;
@@ -459,7 +462,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -498,7 +502,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;uint16_t idx, shift;int ret =0 ;
@@ -536,7 +541,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -601,7 +607,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct idpf_adapter *base = vport->adapter;int ret =0 ;
@@ -638,7 +645,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct rte_eth_conf *conf = &dev->data->dev_conf;struct idpf_adapter *base = vport->adapter;int ret;
@@ -710,7 +718,8 @@ 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 = 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);
@@ -719,14 +728,14 @@ 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 ) {
@@ -736,8 +745,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 ) {
@@ -752,7 +761,8 @@ 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 = 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;
@@ -813,7 +823,8 @@ 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 = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;if (dev->data->dev_started ==0 )return 0 ;
@@ -832,7 +843,8 @@ 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 = 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);
@@ -842,7 +854,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 ; }
@@ -1047,7 +1059,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
@@ -1275,7 +1287,8 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)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 = 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 */
@@ -1300,7 +1313,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++;
@@ -1415,7 +1428,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 )
@@ -1433,7 +1446,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 +5 -1
@@ -69,13 +69,17 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct cpfl_vport { +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 +125 -50
401 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +8 -0
@@ -23,6 +23,14 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rx_queue { +struct idpf_rx_queue base; +}; + +struct cpfl_tx_queue { +struct idpf_tx_queue base; +}; +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 +9 -8
@@ -76,15 +76,16 @@ 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 = 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 +101,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.26.2
PATCH v10 2/14 common/idpf: support queue groups add/delete
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds queue group add/delete virtual channel support.
--- drivers/common/idpf/idpf_common_virtchnl.c | 66 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 9 +++ drivers/common/idpf/version.map | 2 + 3 files changed, 77 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +66 -0
@@ -359,6 +359,72 @@ idpf_vc_vport_destroy(struct idpf_vport *vport)return err; } +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_queue_grps_out) +{ +struct idpf_adapter *adapter = vport->adapter; +struct idpf_cmd_info args; +int size, qg_info_size; +int err =-1 ; + + size =sizeof (*p2p_queue_grps_info) + + (p2p_queue_grps_info->qg_info.num_queue_groups -1 ) * +sizeof (struct virtchnl2_queue_group_info ); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_ADD_QUEUE_GROUPS ; + args.in_args = (uint8_t *)p2p_queue_grps_info; + args.in_args_size = size; + 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_ADD_QUEUE_GROUPS" ); +return err; + } + +rte_memcpy (p2p_queue_grps_out, args.out_buffer,IDPF_DFLT_MBX_BUF_SIZE ); +return 0 ; +} + +int idpf_vc_queue_grps_del (struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_delete_queue_groups *vc_del_q_grps; +struct idpf_cmd_info args; +int size; +int err; + + size =sizeof (*vc_del_q_grps) + + (num_q_grps -1 ) *sizeof (struct virtchnl2_queue_group_id ); + vc_del_q_grps =rte_zmalloc ("vc_del_q_grps" , size,0 ); + + vc_del_q_grps->vport_id = vport->vport_id; + vc_del_q_grps->num_queue_groups = num_q_grps; +memcpy (vc_del_q_grps->qg_ids, qg_ids, + num_q_grps *sizeof (struct virtchnl2_queue_group_id )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_DEL_QUEUE_GROUPS ; + args.in_args = (uint8_t *)vc_del_q_grps; + args.in_args_size = size; + 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_DEL_QUEUE_GROUPS" ); + +rte_free (vc_del_q_grps); +return err; +} +int idpf_vc_rss_key_set (struct idpf_vport *vport) {
drivers/common/idpf/idpf_common_virtchnl.h +9 -0
@@ -64,4 +64,13 @@ 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_queue_grps_del(struct idpf_vport *vport, +uint16_t num_q_grps, +struct virtchnl2_queue_group_id *qg_ids); +__rte_internal +int +idpf_vc_queue_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *ptp_queue_grps_info, +uint8_t *ptp_queue_grps_out);#endif /* _IDPF_COMMON_VIRTCHNL_H_ */
drivers/common/idpf/version.map +2 -0
@@ -43,6 +43,8 @@ INTERNAL { idpf_vc_irq_map_unmap_config; idpf_vc_one_msg_read; idpf_vc_ptype_info_query; + idpf_vc_queue_grps_add; + idpf_vc_queue_grps_del; idpf_vc_queue_switch; idpf_vc_queues_ena_dis; idpf_vc_rss_hash_get;
Signature · 1 line
2.26.2
PATCH v10 3/14 net/cpfl: add haipin queue group during vport init
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds haipin queue group during vport init.
--- drivers/net/cpfl/cpfl_ethdev.c | 135 +++++++++++++++++++++++++++++++++ drivers/net/cpfl/cpfl_ethdev.h | 18 +++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 160 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +135 -0
@@ -840,6 +840,21 @@ cpfl_dev_stop(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_p2p_queue_grps_del (struct idpf_vport *vport) +{ +struct virtchnl2_queue_group_id qg_ids; +int ret =0 ; + +memset (&qg_ids,0 ,sizeof (qg_ids)); + qg_ids.queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + qg_ids.queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + ret =idpf_vc_queue_grps_del (vport,CPFL_P2P_NB_QUEUE_GRPS , &qg_ids); +if (ret) +PMD_DRV_LOG (ERR ,"Failed to delete p2p queue groups" ); +return ret; +} +static int cpfl_dev_close (struct rte_eth_dev *dev) {
@@ -848,7 +863,12 @@ cpfl_dev_close(struct rte_eth_dev *dev)struct cpfl_adapter_ext *adapter =CPFL_ADAPTER_TO_EXT (vport->adapter);cpfl_dev_stop (dev); + +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) +cpfl_p2p_queue_grps_del (vport); +idpf_vport_deinit (vport); +rte_free (cpfl_vport->p2p_q_chunks_info); adapter->cur_vports &= ~RTE_BIT32 (vport->devarg_id); adapter->cur_vport_nb--;
@@ -1284,6 +1304,96 @@ cpfl_vport_idx_alloc(struct cpfl_adapter_ext *adapter)return vport_idx; } +static int +cpfl_p2p_q_grps_add (struct idpf_vport *vport, +struct virtchnl2_add_queue_groups *p2p_queue_grps_info, +uint8_t *p2p_q_vc_out_info) +{ +int ret; + + p2p_queue_grps_info->vport_id = vport->vport_id; + p2p_queue_grps_info->qg_info.num_queue_groups =CPFL_P2P_NB_QUEUE_GRPS ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_rx_bufq =CPFL_P2P_NB_RX_BUFQ ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_q =CPFL_MAX_P2P_NB_QUEUES ; + p2p_queue_grps_info->qg_info.groups[0 ].num_tx_complq =CPFL_P2P_NB_TX_COMPLQ ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_id =CPFL_P2P_QUEUE_GRP_ID ; + p2p_queue_grps_info->qg_info.groups[0 ].qg_id.queue_group_type =VIRTCHNL2_QUEUE_GROUP_P2P ; + p2p_queue_grps_info->qg_info.groups[0 ].rx_q_grp_info.rss_lut_size =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.tx_tc =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.priority =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.is_sp =0 ; + p2p_queue_grps_info->qg_info.groups[0 ].tx_q_grp_info.pir_weight =0 ; + + ret =idpf_vc_queue_grps_add (vport, p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to add p2p queue groups." ); +return ret; + } + +return ret; +} + +static int +cpfl_p2p_queue_info_init (struct cpfl_vport *cpfl_vport, +struct virtchnl2_add_queue_groups *p2p_q_vc_out_info) +{ +struct p2p_queue_chunks_info *p2p_q_chunks_info = cpfl_vport->p2p_q_chunks_info; +struct virtchnl2_queue_reg_chunks *vc_chunks_out; +int i, type; + +if (p2p_q_vc_out_info->qg_info.groups[0 ].qg_id.queue_group_type != +VIRTCHNL2_QUEUE_GROUP_P2P ) { +PMD_DRV_LOG (ERR ,"Add queue group response mismatch." ); +return -EINVAL ; + } + + vc_chunks_out = &p2p_q_vc_out_info->qg_info.groups[0 ].chunks; + +for (i =0 ; i < vc_chunks_out->num_chunks; i++) { + type = vc_chunks_out->chunks[i].type; +switch (type) { +case VIRTCHNL2_QUEUE_TYPE_TX : + p2p_q_chunks_info->tx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX : + p2p_q_chunks_info->rx_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION : + p2p_q_chunks_info->tx_compl_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->tx_compl_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->tx_compl_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +case VIRTCHNL2_QUEUE_TYPE_RX_BUFFER : + p2p_q_chunks_info->rx_buf_start_qid = + vc_chunks_out->chunks[i].start_queue_id; + p2p_q_chunks_info->rx_buf_qtail_start = + vc_chunks_out->chunks[i].qtail_reg_start; + p2p_q_chunks_info->rx_buf_qtail_spacing = + vc_chunks_out->chunks[i].qtail_reg_spacing; +break ; +default : +PMD_DRV_LOG (ERR ,"Unsupported queue type" ); +break ; + } + } + +return 0 ; +} +static int cpfl_dev_vport_init (struct rte_eth_dev *dev,void *init_params) {
@@ -1293,6 +1403,8 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)struct cpfl_adapter_ext *adapter = param->adapter;/* for sending create vport virtchnl msg prepare */ struct virtchnl2_create_vport create_vport_info; +struct virtchnl2_add_queue_groups p2p_queue_grps_info; +uint8_t p2p_q_vc_out_info[IDPF_DFLT_MBX_BUF_SIZE ] = {0 };int ret =0 ; dev->dev_ops = &cpfl_eth_dev_ops;
@@ -1327,6 +1439,29 @@ cpfl_dev_vport_init(struct rte_eth_dev *dev, void *init_params)rte_ether_addr_copy ((struct rte_ether_addr *)vport->default_mac_addr, &dev->data->mac_addrs[0 ]); +if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq) { +memset (&p2p_queue_grps_info,0 ,sizeof (p2p_queue_grps_info)); + ret =cpfl_p2p_q_grps_add (vport, &p2p_queue_grps_info, p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (WARNING ,"Failed to add p2p queue group." ); +return 0 ; + } + cpfl_vport->p2p_q_chunks_info =rte_zmalloc (NULL , +sizeof (struct p2p_queue_chunks_info ),0 ); +if (cpfl_vport->p2p_q_chunks_info ==NULL ) { +PMD_INIT_LOG (WARNING ,"Failed to allocate p2p queue info." ); +cpfl_p2p_queue_grps_del (vport); +return 0 ; + } + ret =cpfl_p2p_queue_info_init (cpfl_vport, + (struct virtchnl2_add_queue_groups *)p2p_q_vc_out_info); +if (ret !=0 ) { +PMD_INIT_LOG (WARNING ,"Failed to init p2p queue info." ); +rte_free (cpfl_vport->p2p_q_chunks_info); +cpfl_p2p_queue_grps_del (vport); + } + } +return 0 ; err_mac_addrs:
drivers/net/cpfl/cpfl_ethdev.h +18 -0
@@ -56,6 +56,7 @@/* Device IDs */ #define IDPF_DEV_ID_CPF 0x1453 +#define VIRTCHNL2_QUEUE_GROUP_P2P 0x100struct cpfl_vport_param {struct cpfl_adapter_ext *adapter;
@@ -69,8 +70,25 @@ struct cpfl_devargs {uint16_t req_vport_nb; }; +struct p2p_queue_chunks_info { +uint32_t tx_start_qid; +uint32_t rx_start_qid; +uint32_t tx_compl_start_qid; +uint32_t rx_buf_start_qid; + +uint64_t tx_qtail_start; +uint32_t tx_qtail_spacing; +uint64_t rx_qtail_start; +uint32_t rx_qtail_spacing; +uint64_t tx_compl_qtail_start; +uint32_t tx_compl_qtail_spacing; +uint64_t rx_buf_qtail_start; +uint32_t rx_buf_qtail_spacing; +}; +struct cpfl_vport {struct idpf_vport base; +struct p2p_queue_chunks_info *p2p_q_chunks_info; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -13,6 +13,13 @@#define CPFL_MIN_RING_DESC 32#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 + +#define CPFL_MAX_P2P_NB_QUEUES 16 +#define CPFL_P2P_NB_RX_BUFQ 1 +#define CPFL_P2P_NB_TX_COMPLQ 1 +#define CPFL_P2P_NB_QUEUE_GRPS 1 +#define CPFL_P2P_QUEUE_GRP_ID 1 +/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
Signature · 1 line
2.26.2
PATCH v10 4/14 net/cpfl: support hairpin queue capbility get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds hairpin_cap_get ops support.
--- drivers/net/cpfl/cpfl_ethdev.c | 18 ++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 3 +++ 2 files changed, 21 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +18 -0
@@ -154,6 +154,23 @@ cpfl_dev_link_update(struct rte_eth_dev *dev,return rte_eth_linkstatus_set (dev, &new_link); } +static int +cpfl_hairpin_cap_get (struct rte_eth_dev *dev, +struct rte_eth_hairpin_cap *cap) +{ +struct cpfl_vport *cpfl_vport = dev->data->dev_private; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + + cap->max_nb_queues =CPFL_MAX_P2P_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) {
@@ -905,6 +922,7 @@ 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, }; static int
drivers/net/cpfl/cpfl_rxtx.h +3 -0
@@ -14,6 +14,9 @@#define CPFL_MAX_RING_DESC 4096#define CPFL_DMA_MEM_ALIGN 4096 +#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_P2P_NB_QUEUES 16#define CPFL_P2P_NB_RX_BUFQ 1#define CPFL_P2P_NB_TX_COMPLQ 1
Signature · 1 line
2.26.2
PATCH v10 5/14 net/cpfl: support hairpin queue setup and release
In reply to [email protected]From: Beilei Xing <[email protected]>
Support hairpin Rx/Tx queue setup and release.
--- drivers/net/cpfl/cpfl_ethdev.c | 6 + drivers/net/cpfl/cpfl_ethdev.h | 11 + drivers/net/cpfl/cpfl_rxtx.c | 364 +++++++++++++++++++++++- drivers/net/cpfl/cpfl_rxtx.h | 36 +++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 4 + 5 files changed, 420 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +6 -0
@@ -880,6 +880,10 @@ cpfl_dev_close(struct rte_eth_dev *dev)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 ; + }if (!adapter->base.is_rx_singleq && !adapter->base.is_tx_singleq)cpfl_p2p_queue_grps_del (vport);
@@ -923,6 +927,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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 int
drivers/net/cpfl/cpfl_ethdev.h +11 -0
@@ -89,6 +89,17 @@ struct p2p_queue_chunks_info {struct cpfl_vport {struct idpf_vport base;struct p2p_queue_chunks_info *p2p_q_chunks_info; + +struct rte_mempool *p2p_mp; + +uint16_t nb_data_rxq; +uint16_t nb_data_txq; +uint16_t nb_p2p_rxq; +uint16_t nb_p2p_txq; + +struct idpf_rx_queue *p2p_rx_bufq; +struct idpf_tx_queue *p2p_tx_complq; +bool p2p_manual_bind; };struct cpfl_adapter_ext {
drivers/net/cpfl/cpfl_rxtx.c +363 -1
400 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +36 -0
@@ -22,6 +22,11 @@#define CPFL_P2P_NB_TX_COMPLQ 1#define CPFL_P2P_NB_QUEUE_GRPS 1#define CPFL_P2P_QUEUE_GRP_ID 1 +#define CPFL_P2P_DESC_LEN 16 +#define CPFL_P2P_NB_MBUF 4096 +#define CPFL_P2P_CACHE_SIZE 250 +#define CPFL_P2P_MBUF_SIZE 2048 +#define CPFL_P2P_RING_BUF 128/* Base address of the HW descriptor ring should be 128B aligned. */ #define CPFL_RING_BASE_ALIGN 128
@@ -33,14 +38,40 @@#define CPFL_SUPPORT_CHAIN_NUM 5 +struct cpfl_rxq_hairpin_info { +bool hairpin_q;/* if rx queue is a hairpin queue */ +uint16_t peer_txp; +uint16_t peer_txq_id; +}; +struct cpfl_rx_queue {struct idpf_rx_queue base; +struct cpfl_rxq_hairpin_info hairpin_info; +}; + +struct cpfl_txq_hairpin_info { +bool hairpin_q;/* if tx queue is a hairpin queue */ +uint16_t peer_rxp; +uint16_t peer_rxq_id; };struct cpfl_tx_queue {struct idpf_tx_queue base; +struct cpfl_txq_hairpin_info hairpin_info; }; +static inline uint16_t +cpfl_hw_qid_get (uint16_t start_qid,uint16_t offset) +{ +return start_qid + offset; +} + +static inline uint64_t +cpfl_hw_qtail_get (uint64_t tail_start,uint16_t offset,uint64_t tail_spacing) +{ +return tail_start + offset * tail_spacing; +} +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);
@@ -59,4 +90,9 @@ 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_ */
drivers/net/cpfl/cpfl_rxtx_vec_common.h +4 -0
@@ -85,6 +85,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 {
@@ -106,6 +108,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.26.2
PATCH v10 6/14 common/idpf: add queue config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx queue configuration APIs.
--- drivers/common/idpf/idpf_common_virtchnl.c | 70 ++++++++++++++++++++++ drivers/common/idpf/idpf_common_virtchnl.h | 6 ++ drivers/common/idpf/version.map | 2 + 3 files changed, 78 insertions(+)
drivers/common/idpf/idpf_common_virtchnl.c +70 -0
@@ -1050,6 +1050,41 @@ idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq)return err; } +int idpf_vc_rxq_config_by_info (struct idpf_vport *vport,struct virtchnl2_rxq_info *rxq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_rx_queues *vc_rxqs =NULL ; +struct idpf_cmd_info args; +int size, err, i; + + size =sizeof (*vc_rxqs) + (num_qs -1 ) * +sizeof (struct virtchnl2_rxq_info ); + vc_rxqs =rte_zmalloc ("cfg_rxqs" , size,0 ); +if (vc_rxqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_rx_queues" ); + err = -ENOMEM ; +return err; + } + vc_rxqs->vport_id = vport->vport_id; + vc_rxqs->num_qinfo = num_qs; +memcpy (vc_rxqs->qinfo, rxq_info, num_qs *sizeof (struct virtchnl2_rxq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_RX_QUEUES ; + args.in_args = (uint8_t *)vc_rxqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_rxqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_RX_QUEUES" ); + +return err; +} +int idpf_vc_txq_config (struct idpf_vport *vport,struct idpf_tx_queue *txq) {
@@ -1121,6 +1156,41 @@ idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)return err; } +int +idpf_vc_txq_config_by_info (struct idpf_vport *vport,struct virtchnl2_txq_info *txq_info, +uint16_t num_qs) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_config_tx_queues *vc_txqs =NULL ; +struct idpf_cmd_info args; +int size, err; + + size =sizeof (*vc_txqs) + (num_qs -1 ) *sizeof (struct virtchnl2_txq_info ); + vc_txqs =rte_zmalloc ("cfg_txqs" , size,0 ); +if (vc_txqs ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate virtchnl2_config_tx_queues" ); + err = -ENOMEM ; +return err; + } + vc_txqs->vport_id = vport->vport_id; + vc_txqs->num_qinfo = num_qs; +memcpy (vc_txqs->qinfo, txq_info, num_qs *sizeof (struct virtchnl2_txq_info )); + +memset (&args,0 ,sizeof (args)); + args.ops =VIRTCHNL2_OP_CONFIG_TX_QUEUES ; + args.in_args = (uint8_t *)vc_txqs; + args.in_args_size = size; + args.out_buffer = adapter->mbx_resp; + args.out_size =IDPF_DFLT_MBX_BUF_SIZE ; + + err =idpf_vc_cmd_execute (adapter, &args); +rte_free (vc_txqs); +if (err !=0 ) +DRV_LOG (ERR ,"Failed to execute command of VIRTCHNL2_OP_CONFIG_TX_QUEUES" ); + +return err; +} +int idpf_vc_ctlq_recv (struct idpf_ctlq_info *cq,u16 *num_q_msg,struct idpf_ctlq_msg *q_msg)
drivers/common/idpf/idpf_common_virtchnl.h +6 -0
@@ -65,6 +65,12 @@ __rte_internalint 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_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_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +2 -0
@@ -54,8 +54,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;
Signature · 1 line
2.26.2
PATCH v10 7/14 net/cpfl: support hairpin queue configuration
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue configuration.
--- drivers/net/cpfl/cpfl_ethdev.c | 136 +++++++++++++++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.c | 88 +++++++++++++++++++++ drivers/net/cpfl/cpfl_rxtx.h | 7 ++ 3 files changed, 225 insertions(+), 6 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +130 -6
@@ -742,33 +742,157 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)return idpf_vport_irq_map_config (vport, nb_rx_queues); } +/* Update hairpin_info for dev's tx hairpin queue */ +static int +cpfl_txq_hairpin_info_update (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_txq_hairpin_info *hairpin_info; +struct cpfl_tx_queue *cpfl_txq; +int i; + +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + hairpin_info = &cpfl_txq->hairpin_info; +if (hairpin_info->peer_rxp != rx_port) { +PMD_DRV_LOG (ERR ,"port %d is not the peer port" , rx_port); +return -EINVAL ; + } + hairpin_info->peer_rxq_id = +cpfl_hw_qid_get (cpfl_rx_vport->p2p_q_chunks_info->rx_start_qid, + hairpin_info->peer_rxq_id - cpfl_rx_vport->nb_data_rxq); + } + +return 0 ; +} + +/* Bind Rx hairpin queue's memory zone to peer Tx hairpin queue's memory zone */ +static void +cpfl_rxq_hairpin_mz_bind (struct rte_eth_dev *dev) +{ +struct cpfl_vport *cpfl_rx_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_rx_vport->base; +struct idpf_adapter *adapter = vport->adapter; +struct idpf_hw *hw = &adapter->hw; +struct cpfl_rx_queue *cpfl_rxq; +struct cpfl_tx_queue *cpfl_txq; +struct rte_eth_dev *peer_dev; +const struct rte_memzone *mz; +uint16_t peer_tx_port; +uint16_t peer_tx_qid; +int i; + +for (i = cpfl_rx_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; + peer_tx_port = cpfl_rxq->hairpin_info.peer_txp; + peer_tx_qid = cpfl_rxq->hairpin_info.peer_txq_id; + peer_dev = &rte_eth_devices[peer_tx_port]; + cpfl_txq = peer_dev->data->tx_queues[peer_tx_qid]; + +/* bind rx queue */ + mz = cpfl_txq->base.mz; + cpfl_rxq->base.rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.rx_ring = mz->addr; + cpfl_rxq->base.mz = mz; + +/* bind rx buffer queue */ + mz = cpfl_txq->base.complq->mz; + cpfl_rxq->base.bufq1->rx_ring_phys_addr = mz->iova; + cpfl_rxq->base.bufq1->rx_ring = mz->addr; + cpfl_rxq->base.bufq1->mz = mz; + cpfl_rxq->base.bufq1->qrx_tail = hw->hw_addr + +cpfl_hw_qtail_get (cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_start, +0 , cpfl_rx_vport->p2p_q_chunks_info->rx_buf_qtail_spacing); + } +} +static int cpfl_start_queues (struct rte_eth_dev *dev) { +struct cpfl_vport *cpfl_vport = dev->data->dev_private; +struct idpf_vport *vport = &cpfl_vport->base;struct cpfl_rx_queue *cpfl_rxq;struct cpfl_tx_queue *cpfl_txq; +int update_flag =0 ;int err =0 ;int i; +/* For normal data queues, configure, init and enale Txq. +* For non-manual bind hairpin queues, configure Txq. +*/ 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 ; - err =cpfl_tx_queue_start (dev, i); +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_vport->p2p_manual_bind) { +if (update_flag ==0 ) { + err =cpfl_txq_hairpin_info_update (dev, + cpfl_txq->hairpin_info.peer_rxp); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info" ); +return err; + } + update_flag =1 ; + } + err =cpfl_hairpin_txq_config (vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + } + +/* For non-manual bind hairpin queues, configure Tx completion queue first.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_tx_complq !=NULL ) { + err =cpfl_hairpin_tx_complq_config (cpfl_vport);if (err !=0 ) { -PMD_DRV_LOG (ERR ,"Fail to start Tx queue %u" , i); +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" );return err; } } +/* For non-manual bind hairpin queues, configure Rx buffer queue.*/ +if (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_rx_bufq !=NULL ) { +cpfl_rxq_hairpin_mz_bind (dev); + err =cpfl_hairpin_rx_bufq_config (cpfl_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + } + +/* For normal data queues, configure, init and enale Rxq. +* For non-manual bind hairpin queues, configure Rxq, and then init Rxq. +*/ for (i =0 ; i < dev->data->nb_rx_queues; i++) { 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_vport->p2p_manual_bind) { + err =cpfl_hairpin_rxq_config (vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } } }
drivers/net/cpfl/cpfl_rxtx.c +88 -0
94 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +7 -0
@@ -32,12 +32,15 @@#define CPFL_RING_BASE_ALIGN 128#define CPFL_DEFAULT_RX_FREE_THRESH 32 +#define CPFL_RXBUF_LOW_WATERMARK 64#define CPFL_DEFAULT_TX_RS_THRESH 32#define CPFL_DEFAULT_TX_FREE_THRESH 32#define CPFL_SUPPORT_CHAIN_NUM 5 +#define CPFL_RX_BUF_STRIDE 64 +struct cpfl_rxq_hairpin_info {bool hairpin_q;/* if rx queue is a hairpin queue */ uint16_t peer_txp;
@@ -95,4 +98,8 @@ int cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,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); +int cpfl_hairpin_tx_complq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq); +int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport); +int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v10 8/14 common/idpf: add switch queue API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch adds idpf_vc_ena_dis_one_queue API.
--- drivers/common/idpf/idpf_common_virtchnl.c | 2 +- drivers/common/idpf/idpf_common_virtchnl.h | 3 +++ drivers/common/idpf/version.map | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)
drivers/common/idpf/idpf_common_virtchnl.c +1 -1
@@ -733,7 +733,7 @@ idpf_vc_vectors_dealloc(struct idpf_vport *vport)return err; } -static int +int idpf_vc_ena_dis_one_queue (struct idpf_vport *vport,uint16_t qid,uint32_t type,bool on) {
drivers/common/idpf/idpf_common_virtchnl.h +3 -0
@@ -71,6 +71,9 @@ __rte_internalint 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); +__rte_internal int idpf_vc_queue_grps_del(struct idpf_vport *vport,uint16_t num_q_grps,struct virtchnl2_queue_group_id *qg_ids);
drivers/common/idpf/version.map +1 -0
@@ -40,6 +40,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;
Signature · 1 line
2.26.2
PATCH v10 9/14 net/cpfl: support hairpin queue start/stop
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports Rx/Tx hairpin queue start/stop.
--- drivers/net/cpfl/cpfl_ethdev.c | 46 +++++++++ drivers/net/cpfl/cpfl_rxtx.c | 164 +++++++++++++++++++++++++++++---- drivers/net/cpfl/cpfl_rxtx.h | 15 +++ 3 files changed, 207 insertions(+), 18 deletions(-)
drivers/net/cpfl/cpfl_ethdev.c +46 -0
@@ -896,6 +896,52 @@ cpfl_start_queues(struct rte_eth_dev *dev) } } +/* For non-manual bind hairpin queues, enable Tx queue and Rx queue, +* then enable Tx completion queue and Rx buffer queue. +*/ +for (i = cpfl_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +if (cpfl_txq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_txq, + false, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +else + cpfl_txq->base.q_started = true; + } + } + +for (i = cpfl_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q && !cpfl_vport->p2p_manual_bind) { + err =cpfl_switch_hairpin_rxtx_queue (cpfl_vport, + i - cpfl_vport->nb_data_rxq, + true, true); +if (err) +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); +else + cpfl_rxq->base.q_started = true; + } + } + +if (!cpfl_vport->p2p_manual_bind && + cpfl_vport->p2p_tx_complq !=NULL && + cpfl_vport->p2p_rx_bufq !=NULL ) { + err =cpfl_switch_hairpin_complq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + err =cpfl_switch_hairpin_bufq (cpfl_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx bufq" ); +return err; + } + } +return err; }
drivers/net/cpfl/cpfl_rxtx.c +146 -18
218 lines not on this page · raw message
drivers/net/cpfl/cpfl_rxtx.h +15 -0
@@ -41,6 +41,17 @@#define CPFL_RX_BUF_STRIDE 64 +/* 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 */ uint16_t peer_txp;
@@ -102,4 +113,8 @@ int cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport);int cpfl_hairpin_txq_config (struct idpf_vport *vport,struct cpfl_tx_queue *cpfl_txq);int cpfl_hairpin_rx_bufq_config (struct cpfl_vport *cpfl_vport);int cpfl_hairpin_rxq_config (struct idpf_vport *vport,struct cpfl_rx_queue *cpfl_rxq); +int cpfl_switch_hairpin_complq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_bufq (struct cpfl_vport *cpfl_vport,bool on); +int cpfl_switch_hairpin_rxtx_queue (struct cpfl_vport *cpfl_vport,uint16_t qid, +bool rx,bool on);#endif /* _CPFL_RXTX_H_ */
Signature · 1 line
2.26.2
PATCH v10 10/14 common/idpf: add irq map config API
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports idpf_vport_irq_map_config_by_qids API.
--- drivers/common/idpf/idpf_common_device.c | 75 ++++++++++++++++++++++++ drivers/common/idpf/idpf_common_device.h | 4 ++ drivers/common/idpf/version.map | 1 + 3 files changed, 80 insertions(+)
drivers/common/idpf/idpf_common_device.c +75 -0
@@ -667,6 +667,81 @@ idpf_vport_irq_map_config(struct idpf_vport *vport, uint16_t nb_rx_queues)return ret; } +int +idpf_vport_irq_map_config_by_qids (struct idpf_vport *vport,uint32_t *qids,uint16_t nb_rx_queues) +{ +struct idpf_adapter *adapter = vport->adapter; +struct virtchnl2_queue_vector *qv_map; +struct idpf_hw *hw = &adapter->hw; +uint32_t dynctl_val, itrn_val; +uint32_t dynctl_reg_start; +uint32_t itrn_reg_start; +uint16_t i; +int ret; + + qv_map =rte_zmalloc ("qv_map" , + nb_rx_queues * +sizeof (struct virtchnl2_queue_vector ),0 ); +if (qv_map ==NULL ) { +DRV_LOG (ERR ,"Failed to allocate %d queue-vector map" , + nb_rx_queues); + ret = -ENOMEM ; + goto qv_map_alloc_err; + } + +/* Rx interrupt disabled, Map interrupt only for writeback */ + +/* The capability flags adapter->caps.other_caps should be +* compared with bit VIRTCHNL2_CAP_WB_ON_ITR here. The if +* condition should be updated when the FW can return the +* correct flag bits. +*/ + dynctl_reg_start = + vport->recv_vectors->vchunks.vchunks->dynctl_reg_start; + itrn_reg_start = + vport->recv_vectors->vchunks.vchunks->itrn_reg_start; + dynctl_val =IDPF_READ_REG (hw, dynctl_reg_start); +DRV_LOG (DEBUG ,"Value of dynctl_reg_start is 0x%x" , dynctl_val); + itrn_val =IDPF_READ_REG (hw, itrn_reg_start); +DRV_LOG (DEBUG ,"Value of itrn_reg_start is 0x%x" , itrn_val); +/* Force write-backs by setting WB_ON_ITR bit in DYN_CTL +* register. WB_ON_ITR and INTENA are mutually exclusive +* bits. Setting WB_ON_ITR bits means TX and RX Descs +* are written back based on ITR expiration irrespective +* of INTENA setting. +*/ +/* TBD: need to tune INTERVAL value for better performance. */ + itrn_val = (itrn_val ==0 ) ?IDPF_DFLT_INTERVAL : itrn_val; + dynctl_val =VIRTCHNL2_ITR_IDX_0 << +PF_GLINT_DYN_CTL_ITR_INDX_S | +PF_GLINT_DYN_CTL_WB_ON_ITR_M | + itrn_val <<PF_GLINT_DYN_CTL_INTERVAL_S ; +IDPF_WRITE_REG (hw, dynctl_reg_start, dynctl_val); + +for (i =0 ; i < nb_rx_queues; i++) { +/* map all queues to the same vector */ + qv_map[i].queue_id = qids[i]; + qv_map[i].vector_id = + vport->recv_vectors->vchunks.vchunks->start_vector_id; + } + vport->qv_map = qv_map; + + ret =idpf_vc_irq_map_unmap_config (vport, nb_rx_queues, true); +if (ret !=0 ) { +DRV_LOG (ERR ,"config interrupt mapping failed" ); + goto config_irq_map_err; + } + +return 0 ; + +config_irq_map_err: +rte_free (vport->qv_map); + vport->qv_map =NULL ; + +qv_map_alloc_err: +return ret; +} +int idpf_vport_irq_unmap_config (struct idpf_vport *vport,uint16_t nb_rx_queues) {
drivers/common/idpf/idpf_common_device.h +4 -0
@@ -200,5 +200,9 @@ int idpf_vport_info_init(struct idpf_vport *vport, struct virtchnl2_create_vport *vport_info);__rte_internal void idpf_vport_stats_update(struct virtchnl2_vport_stats *oes, struct virtchnl2_vport_stats *nes); +__rte_internal +int idpf_vport_irq_map_config_by_qids(struct idpf_vport *vport, +uint32_t *qids, +uint16_t nb_rx_queues);#endif /* _IDPF_COMMON_DEVICE_H_ */
drivers/common/idpf/version.map +1 -0
@@ -69,6 +69,7 @@ INTERNAL { idpf_vport_info_init; idpf_vport_init; idpf_vport_irq_map_config; + idpf_vport_irq_map_config_by_qids; idpf_vport_irq_unmap_config; idpf_vport_rss_config; idpf_vport_stats_update;
Signature · 1 line
2.26.2
PATCH v10 11/14 net/cpfl: enable write back based on ITR expire
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch enables write back based on ITR expire
(WR_ON_ITR) for hairpin queues.
--- drivers/net/cpfl/cpfl_ethdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/net/cpfl/cpfl_ethdev.c +12 -1
@@ -735,11 +735,22 @@ cpfl_dev_configure(struct rte_eth_dev *dev)static int cpfl_config_rx_queues_irqs (struct rte_eth_dev *dev) { +uint32_t qids[CPFL_MAX_P2P_NB_QUEUES +IDPF_DEFAULT_RXQ_NUM ] = {0 };struct cpfl_vport *cpfl_vport = dev->data->dev_private;struct idpf_vport *vport = &cpfl_vport->base;uint16_t nb_rx_queues = dev->data->nb_rx_queues; +struct cpfl_rx_queue *cpfl_rxq; +int i; -return idpf_vport_irq_map_config (vport, nb_rx_queues); +for (i =0 ; i < nb_rx_queues; i++) { + cpfl_rxq = dev->data->rx_queues[i]; +if (cpfl_rxq->hairpin_info.hairpin_q) + qids[i] =cpfl_hw_qid_get (cpfl_vport->p2p_q_chunks_info->rx_start_qid, + (i - cpfl_vport->nb_data_rxq)); +else + qids[i] =cpfl_hw_qid_get (vport->chunks_info.rx_start_qid, i); + } +return idpf_vport_irq_map_config_by_qids (vport, qids, nb_rx_queues); }/* Update hairpin_info for dev's tx hairpin queue */
Signature · 1 line
2.26.2
PATCH v10 12/14 net/cpfl: support peer ports get
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports get hairpin peer ports.
--- drivers/net/cpfl/cpfl_ethdev.c | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +41 -0
@@ -1081,6 +1081,46 @@ cpfl_dev_close(struct rte_eth_dev *dev)return 0 ; } +static int +cpfl_hairpin_get_peer_ports (struct rte_eth_dev *dev,uint16_t *peer_ports, +size_t len,uint32_t tx) +{ +struct cpfl_vport *cpfl_vport = + (struct cpfl_vport *)dev->data->dev_private; +struct idpf_tx_queue *txq; +struct idpf_rx_queue *rxq; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +uint16_t i; +uint16_t j =0 ; + +if (len <=0 ) +return -EINVAL ; + +if (cpfl_vport->p2p_q_chunks_info ==NULL ) +return -ENOTSUP ; + +if (tx >0 ) { +for (i = cpfl_vport->nb_data_txq, j =0 ; i < dev->data->nb_tx_queues; i++, j++) { + txq = dev->data->tx_queues[i]; +if (txq ==NULL || j >= len) +return -EINVAL ; + cpfl_txq = (struct cpfl_tx_queue *)txq; + peer_ports[j] = cpfl_txq->hairpin_info.peer_rxp; + } + }else if (tx ==0 ) { +for (i = cpfl_vport->nb_data_rxq, j =0 ; i < dev->data->nb_rx_queues; i++, j++) { + rxq = dev->data->rx_queues[i]; +if (rxq ==NULL || j >= len) +return -EINVAL ; + cpfl_rxq = (struct cpfl_rx_queue *)rxq; + peer_ports[j] = cpfl_rxq->hairpin_info.peer_txp; + } + } + +return j; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1110,6 +1150,7 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, }; static int
Signature · 1 line
2.26.2
PATCH v10 13/14 net/cpfl: support hairpin bind/unbind
In reply to [email protected]From: Beilei Xing <[email protected]>
This patch supports hairpin_bind/unbind ops.
--- drivers/net/cpfl/cpfl_ethdev.c | 137 +++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+)
drivers/net/cpfl/cpfl_ethdev.c +137 -0
@@ -1121,6 +1121,141 @@ cpfl_hairpin_get_peer_ports(struct rte_eth_dev *dev, uint16_t *peer_ports,return j; } +static int +cpfl_hairpin_bind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct idpf_vport *tx_vport = &cpfl_tx_vport->base; +struct cpfl_vport *cpfl_rx_vport; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +struct rte_eth_dev *peer_dev; +struct idpf_vport *rx_vport; +int err =0 ; +int i; + + err =cpfl_txq_hairpin_info_update (dev, rx_port); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to update Tx hairpin queue info." ); +return err; + } + +/* configure hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_hairpin_txq_config (tx_vport, cpfl_txq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Tx queue %u" , i); +return err; + } + } + + err =cpfl_hairpin_tx_complq_config (cpfl_tx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Tx completion queue" ); +return err; + } + + peer_dev = &rte_eth_devices[rx_port]; + cpfl_rx_vport = (struct cpfl_vport *)peer_dev->data->dev_private; + rx_vport = &cpfl_rx_vport->base; +cpfl_rxq_hairpin_mz_bind (peer_dev); + + err =cpfl_hairpin_rx_bufq_config (cpfl_rx_vport); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to config Rx buffer queue" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_hairpin_rxq_config (rx_vport, cpfl_rxq); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to configure hairpin Rx queue %u" , i); +return err; + } + err =cpfl_rx_queue_init (peer_dev, i); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Fail to init hairpin Rx queue %u" , i); +return err; + } + } + +/* enable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin TX queue %u on" , + i); +return err; + } + cpfl_txq->base.q_started = true; + } + + err =cpfl_switch_hairpin_complq (cpfl_tx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Tx complq" ); +return err; + } + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; + err =cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin RX queue %u on" , + i); + } + cpfl_rxq->base.q_started = true; + } + + err =cpfl_switch_hairpin_bufq (cpfl_rx_vport, true); +if (err !=0 ) { +PMD_DRV_LOG (ERR ,"Failed to switch hairpin Rx buffer queue" ); +return err; + } + +return 0 ; +} + +static int +cpfl_hairpin_unbind (struct rte_eth_dev *dev,uint16_t rx_port) +{ +struct cpfl_vport *cpfl_tx_vport = dev->data->dev_private; +struct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port]; +struct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private; +struct cpfl_tx_queue *cpfl_txq; +struct cpfl_rx_queue *cpfl_rxq; +int i; + +/* disable hairpin queues */ +for (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) { + cpfl_txq = dev->data->tx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_tx_vport, + i - cpfl_tx_vport->nb_data_txq, + false, false); + cpfl_txq->base.q_started = false; + } + +cpfl_switch_hairpin_complq (cpfl_tx_vport, false); + +for (i = cpfl_rx_vport->nb_data_rxq; i < peer_dev->data->nb_rx_queues; i++) { + cpfl_rxq = peer_dev->data->rx_queues[i]; +cpfl_switch_hairpin_rxtx_queue (cpfl_rx_vport, + i - cpfl_rx_vport->nb_data_rxq, + true, false); + cpfl_rxq->base.q_started = false; + } + +cpfl_switch_hairpin_bufq (cpfl_rx_vport, false); + +return 0 ; +} +static const struct eth_dev_ops cpfl_eth_dev_ops = { .dev_configure = cpfl_dev_configure, .dev_close = cpfl_dev_close,
@@ -1151,6 +1286,8 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = { .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, + .hairpin_unbind = cpfl_hairpin_unbind, }; static int
Signature · 1 line
2.26.2
PATCH v10 14/14 doc: update the doc of CPFL PMD
In reply to [email protected]From: Beilei Xing <[email protected]>
Update cpfl.rst to clarify hairpin support.
--- doc/guides/nics/cpfl.rst | 7 +++++++ 1 file changed, 7 insertions(+)
doc/guides/nics/cpfl.rst +7 -0
@@ -106,3 +106,10 @@ The paths are chosen based on 2 conditions: A value "P" means the offload feature is not supported by vector path. If any not supported features are used, cpfl vector PMD is disabled and the scalar paths are chosen. + +Hairpin queue +~~~~~~~~~~~~~ + + E2100 Series can loopback packets from RX port to TX port, this feature is + called port-to-port or hairpin. + Currently, the PMD only supports single port hairpin.
Signature · 1 line
2.26.2
RE: [PATCH v10 00/14] net/cpfl: add hairpin queue support
In reply to [email protected]Quoted 75 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Tuesday, June 6, 2023 6:03 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Liu, Mingxia <[email protected]>; Xing, Beilei <[email protected]>
Subject: [PATCH v10 00/14] net/cpfl: add hairpin queue supportFrom: Beilei Xing <[email protected]>
This patchset adds hairpin queue support.
v2 changes:
- change hairpin rx queus configuration sequence.
- code refine.v3 changes:
- Refine the patchset based on the latest code.v4 change:
- Remove hairpin rx buffer queue'ssw_ring.
- Change hairpin rx queus configuration sequence incpfl_hairpin_bindfunction.
- Refind hairpin queue setup and release.v5 change:
- Fix memory leak during queue setup.
- Refine hairpin Rxq/Txq start/stop.v6 change:
- Add sign-off.v7 change:
- Updatecpfl.rstv8 change:
- Fix Intel-compilation failure.v9 change:
- Fix memory leak if fail to init queue group.
- Change log level.v10 change:
- Avoid accessing out-of-bounds.Beilei Xing (14):
net/cpfl: refine structures
common/idpf: support queue groups add/delete net/cpfl: add haipin queue group during vport init net/cpfl: support hairpin queue capbility get net/cpfl: support hairpin queue setup and release common/idpf: add queue config API net/cpfl: support hairpin queue configuration common/idpf: add switch queue API net/cpfl: support hairpin queue start/stop common/idpf: add irq map config API net/cpfl: enable write back based on ITR expire net/cpfl: support peer ports get
net/cpfl: support hairpin bind/unbind
doc: update the doc of CPFL PMDdoc/guides/nics/cpfl.rst | 7 + drivers/common/idpf/idpf_common_device.c | 75 ++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 138 +++- drivers/common/idpf/idpf_common_virtchnl.h | 18 + drivers/common/idpf/version.map | 6 + drivers/net/cpfl/cpfl_ethdev.c | 613 ++++++++++++++-- drivers/net/cpfl/cpfl_ethdev.h | 35 +- drivers/net/cpfl/cpfl_rxtx.c | 789 +++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.h | 76 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 21 +- 11 files changed, 1663 insertions(+), 119 deletions(-)
Quoted 2 lines
--
2.26.2
Zhang, Qi Z
AppliedRE: [PATCH v10 00/14] net/cpfl: add hairpin queue support
Quoted 85 lines
-----Original Message-----
From: Wu, Jingjing <[email protected]>
Sent: Tuesday, June 6, 2023 2:41 PM
To: Xing, Beilei <[email protected]>
Cc: [email protected]; Liu, Mingxia <[email protected]>
Subject: RE: [PATCH v10 00/14] net/cpfl: add hairpin queue supportQuoted 16 lines
-----Original Message-----
From: Xing, Beilei <[email protected]>
Sent: Tuesday, June 6, 2023 6:03 PM
To: Wu, Jingjing <[email protected]>
Cc: [email protected]; Liu, Mingxia <[email protected]>; Xing, Beilei <[email protected]>
Subject: [PATCH v10 00/14] net/cpfl: add hairpin queue supportFrom: Beilei Xing <[email protected]>
This patchset adds hairpin queue support.
v2 changes:
- change hairpin rx queus configuration sequence.
- code refine.Quoted 6 lines
v3 changes:
- Refine the patchset based on the latest code.v4 change:
- Remove hairpin rx buffer queue'ssw_ring.
- Change hairpin rx queus configuration sequence incpfl_hairpin_bindfunction.
Quoted 51 lines
- Refind hairpin queue setup and release.
v5 change:
- Fix memory leak during queue setup.
- Refine hairpin Rxq/Txq start/stop.v6 change:
- Add sign-off.v7 change:
- Updatecpfl.rstv8 change:
- Fix Intel-compilation failure.v9 change:
- Fix memory leak if fail to init queue group.
- Change log level.v10 change:
- Avoid accessing out-of-bounds.Beilei Xing (14):
net/cpfl: refine structures
common/idpf: support queue groups add/delete net/cpfl: add haipin queue group during vport init net/cpfl: support hairpin queue capbility get net/cpfl: support hairpin queue setup and release common/idpf: add queue config API net/cpfl: support hairpin queue configuration common/idpf: add switch queue API net/cpfl: support hairpin queue start/stop common/idpf: add irq map config API net/cpfl: enable write back based on ITR expire net/cpfl: support peer ports get
net/cpfl: support hairpin bind/unbind
doc: update the doc of CPFL PMDdoc/guides/nics/cpfl.rst | 7 + drivers/common/idpf/idpf_common_device.c | 75 ++ drivers/common/idpf/idpf_common_device.h | 4 + drivers/common/idpf/idpf_common_virtchnl.c | 138 +++- drivers/common/idpf/idpf_common_virtchnl.h | 18 + drivers/common/idpf/version.map | 6 + drivers/net/cpfl/cpfl_ethdev.c | 613 ++++++++++++++-- drivers/net/cpfl/cpfl_ethdev.h | 35 +- drivers/net/cpfl/cpfl_rxtx.c | 789 +++++++++++++++++++-- drivers/net/cpfl/cpfl_rxtx.h | 76 ++ drivers/net/cpfl/cpfl_rxtx_vec_common.h | 21 +- 11 files changed, 1663 insertions(+), 119 deletions(-)
Quoted 4 lines
Quoted 2 lines
--
2.26.2Acked-by Jingjing Wu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi