Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/127097/?format=api
{ "id": 127097, "url": "http://patches.dpdk.org/api/patches/127097/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230519073116.56749-7-beilei.xing@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230519073116.56749-7-beilei.xing@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230519073116.56749-7-beilei.xing@intel.com", "date": "2023-05-19T07:31:12", "name": "[v3,06/10] net/cpfl: support hairpin queue configuration", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ea25765f8a10e8cb3695342ed808fe511cad11c4", "submitter": { "id": 410, "url": "http://patches.dpdk.org/api/people/410/?format=api", "name": "Xing, Beilei", "email": "beilei.xing@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230519073116.56749-7-beilei.xing@intel.com/mbox/", "series": [ { "id": 28087, "url": "http://patches.dpdk.org/api/series/28087/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=28087", "date": "2023-05-19T07:31:06", "name": "net/cpfl: add hairpin queue support", "version": 3, "mbox": "http://patches.dpdk.org/series/28087/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/127097/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/127097/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 546A442B45;\n\tFri, 19 May 2023 09:56:03 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0A3D942D5F;\n\tFri, 19 May 2023 09:55:36 +0200 (CEST)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n by mails.dpdk.org (Postfix) with ESMTP id 665CC42D3A\n for <dev@dpdk.org>; Fri, 19 May 2023 09:55:33 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 19 May 2023 00:55:32 -0700", "from dpdk-beileix-3.sh.intel.com ([10.67.110.253])\n by orsmga007.jf.intel.com with ESMTP; 19 May 2023 00:55:30 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1684482933; x=1716018933;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=mthdaujnlLzhq1F+VFRQ0LwHFfzve+brJVgp/cXROdo=;\n b=EdcPYY8h+T+nNIFg4MURgwqXRYl2GRTKwlsb/fP35f9xiFKsdxczIRkz\n rYT3H972l1qWtAOzDJ5my0pcgdbsPT2wbJkcgA8gFtQ7nav1HROuC3VER\n 6AQZvJB1llYLIEfswuH5Gq87pDBSwpqLIZoiGHuqRx/MTulExhGoKaqDD\n wC876cOQfxItecgAdhQZLcCOT/xsswLe4mOP72jufGknC6Ey0ndjIJ0tq\n f+J1UTiMzcBKZpeqZ+nPiBuu+f5HT4V/1SGqbbk6bR/YtzQ1ssByCNCJl\n ZY99aW75tBrzA1/kgsUPWsP9yzrdO/tLV5Mi1lqAk3zoYldHbyxdhK89Q A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10714\"; a=\"349824939\"", "E=Sophos;i=\"6.00,176,1681196400\"; d=\"scan'208\";a=\"349824939\"", "E=McAfee;i=\"6600,9927,10714\"; a=\"696611342\"", "E=Sophos;i=\"6.00,176,1681196400\"; d=\"scan'208\";a=\"696611342\"" ], "X-ExtLoop1": "1", "From": "beilei.xing@intel.com", "To": "jingjing.wu@intel.com", "Cc": "dev@dpdk.org, mingxia.liu@intel.com, Beilei Xing <beilei.xing@intel.com>,\n Xiao Wang <xiao.w.wang@intel.com>", "Subject": "[PATCH v3 06/10] net/cpfl: support hairpin queue configuration", "Date": "Fri, 19 May 2023 07:31:12 +0000", "Message-Id": "<20230519073116.56749-7-beilei.xing@intel.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20230519073116.56749-1-beilei.xing@intel.com>", "References": "<20230519051055.106893-1-beilei.xing@intel.com>\n <20230519073116.56749-1-beilei.xing@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Beilei Xing <beilei.xing@intel.com>\n\nThis patch supports Rx/Tx hairpin queue configuration.\n\nSigned-off-by: Xiao Wang <xiao.w.wang@intel.com>\nSigned-off-by: Mingxia Liu <mingxia.liu@intel.com>\nSigned-off-by: Beilei Xing <beilei.xing@intel.com>\n---\n drivers/common/idpf/idpf_common_virtchnl.c | 70 +++++++++++\n drivers/common/idpf/idpf_common_virtchnl.h | 6 +\n drivers/common/idpf/version.map | 2 +\n drivers/net/cpfl/cpfl_ethdev.c | 136 ++++++++++++++++++++-\n drivers/net/cpfl/cpfl_rxtx.c | 80 ++++++++++++\n drivers/net/cpfl/cpfl_rxtx.h | 7 ++\n 6 files changed, 295 insertions(+), 6 deletions(-)", "diff": "diff --git a/drivers/common/idpf/idpf_common_virtchnl.c b/drivers/common/idpf/idpf_common_virtchnl.c\nindex a3fe55c897..211b44a88e 100644\n--- a/drivers/common/idpf/idpf_common_virtchnl.c\n+++ b/drivers/common/idpf/idpf_common_virtchnl.c\n@@ -1050,6 +1050,41 @@ idpf_vc_rxq_config(struct idpf_vport *vport, struct idpf_rx_queue *rxq)\n \treturn err;\n }\n \n+int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_info *rxq_info,\n+\t\t\t uint16_t num_qs)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct virtchnl2_config_rx_queues *vc_rxqs = NULL;\n+\tstruct idpf_cmd_info args;\n+\tint size, err, i;\n+\n+\tsize = sizeof(*vc_rxqs) + (num_qs - 1) *\n+\t\tsizeof(struct virtchnl2_rxq_info);\n+\tvc_rxqs = rte_zmalloc(\"cfg_rxqs\", size, 0);\n+\tif (vc_rxqs == NULL) {\n+\t\tDRV_LOG(ERR, \"Failed to allocate virtchnl2_config_rx_queues\");\n+\t\terr = -ENOMEM;\n+\t\treturn err;\n+\t}\n+\tvc_rxqs->vport_id = vport->vport_id;\n+\tvc_rxqs->num_qinfo = num_qs;\n+\tmemcpy(vc_rxqs->qinfo, rxq_info, num_qs * sizeof(struct virtchnl2_rxq_info));\n+\n+\tmemset(&args, 0, sizeof(args));\n+\targs.ops = VIRTCHNL2_OP_CONFIG_RX_QUEUES;\n+\targs.in_args = (uint8_t *)vc_rxqs;\n+\targs.in_args_size = size;\n+\targs.out_buffer = adapter->mbx_resp;\n+\targs.out_size = IDPF_DFLT_MBX_BUF_SIZE;\n+\n+\terr = idpf_vc_cmd_execute(adapter, &args);\n+\trte_free(vc_rxqs);\n+\tif (err != 0)\n+\t\tDRV_LOG(ERR, \"Failed to execute command of VIRTCHNL2_OP_CONFIG_RX_QUEUES\");\n+\n+\treturn err;\n+}\n+\n int\n idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)\n {\n@@ -1121,6 +1156,41 @@ idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq)\n \treturn err;\n }\n \n+int\n+idpf_vc_txq_config_by_info(struct idpf_vport *vport, struct virtchnl2_txq_info *txq_info,\n+\t\t uint16_t num_qs)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct virtchnl2_config_tx_queues *vc_txqs = NULL;\n+\tstruct idpf_cmd_info args;\n+\tint size, err;\n+\n+\tsize = sizeof(*vc_txqs) + (num_qs - 1) * sizeof(struct virtchnl2_txq_info);\n+\tvc_txqs = rte_zmalloc(\"cfg_txqs\", size, 0);\n+\tif (vc_txqs == NULL) {\n+\t\tDRV_LOG(ERR, \"Failed to allocate virtchnl2_config_tx_queues\");\n+\t\terr = -ENOMEM;\n+\t\treturn err;\n+\t}\n+\tvc_txqs->vport_id = vport->vport_id;\n+\tvc_txqs->num_qinfo = num_qs;\n+\tmemcpy(vc_txqs->qinfo, txq_info, num_qs * sizeof(struct virtchnl2_txq_info));\n+\n+\tmemset(&args, 0, sizeof(args));\n+\targs.ops = VIRTCHNL2_OP_CONFIG_TX_QUEUES;\n+\targs.in_args = (uint8_t *)vc_txqs;\n+\targs.in_args_size = size;\n+\targs.out_buffer = adapter->mbx_resp;\n+\targs.out_size = IDPF_DFLT_MBX_BUF_SIZE;\n+\n+\terr = idpf_vc_cmd_execute(adapter, &args);\n+\trte_free(vc_txqs);\n+\tif (err != 0)\n+\t\tDRV_LOG(ERR, \"Failed to execute command of VIRTCHNL2_OP_CONFIG_TX_QUEUES\");\n+\n+\treturn err;\n+}\n+\n int\n idpf_vc_ctlq_recv(struct idpf_ctlq_info *cq, u16 *num_q_msg,\n \t\t struct idpf_ctlq_msg *q_msg)\ndiff --git a/drivers/common/idpf/idpf_common_virtchnl.h b/drivers/common/idpf/idpf_common_virtchnl.h\nindex 58b16e1c5d..db83761a5e 100644\n--- a/drivers/common/idpf/idpf_common_virtchnl.h\n+++ b/drivers/common/idpf/idpf_common_virtchnl.h\n@@ -65,6 +65,12 @@ __rte_internal\n int idpf_vc_ctlq_post_rx_buffs(struct idpf_hw *hw, struct idpf_ctlq_info *cq,\n \t\t\t u16 *buff_count, struct idpf_dma_mem **buffs);\n __rte_internal\n+int idpf_vc_rxq_config_by_info(struct idpf_vport *vport, struct virtchnl2_rxq_info *rxq_info,\n+\t\t\t uint16_t num_qs);\n+__rte_internal\n+int idpf_vc_txq_config_by_info(struct idpf_vport *vport, struct virtchnl2_txq_info *txq_info,\n+\t\t\t uint16_t num_qs);\n+__rte_internal\n int idpf_vc_queue_grps_del(struct idpf_vport *vport,\n \t\t\t uint16_t num_q_grps,\n \t\t\t struct virtchnl2_queue_group_id *qg_ids);\ndiff --git a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map\nindex 01d18f3f3f..17e77884ce 100644\n--- a/drivers/common/idpf/version.map\n+++ b/drivers/common/idpf/version.map\n@@ -54,8 +54,10 @@ INTERNAL {\n \tidpf_vc_rss_lut_get;\n \tidpf_vc_rss_lut_set;\n \tidpf_vc_rxq_config;\n+\tidpf_vc_rxq_config_by_info;\n \tidpf_vc_stats_query;\n \tidpf_vc_txq_config;\n+\tidpf_vc_txq_config_by_info;\n \tidpf_vc_vectors_alloc;\n \tidpf_vc_vectors_dealloc;\n \tidpf_vc_vport_create;\ndiff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c\nindex 03813716ce..2921e52757 100644\n--- a/drivers/net/cpfl/cpfl_ethdev.c\n+++ b/drivers/net/cpfl/cpfl_ethdev.c\n@@ -737,33 +737,157 @@ cpfl_config_rx_queues_irqs(struct rte_eth_dev *dev)\n \treturn idpf_vport_irq_map_config(vport, nb_rx_queues);\n }\n \n+/* Update hairpin_info for dev's tx hairpin queue */\n+static int\n+cpfl_txq_hairpin_info_update(struct rte_eth_dev *dev, uint16_t rx_port)\n+{\n+\tstruct cpfl_vport *cpfl_tx_vport = dev->data->dev_private;\n+\tstruct rte_eth_dev *peer_dev = &rte_eth_devices[rx_port];\n+\tstruct cpfl_vport *cpfl_rx_vport = peer_dev->data->dev_private;\n+\tstruct cpfl_txq_hairpin_info *hairpin_info;\n+\tstruct cpfl_tx_queue *cpfl_txq;\n+\tint i;\n+\n+\tfor (i = cpfl_tx_vport->nb_data_txq; i < dev->data->nb_tx_queues; i++) {\n+\t\tcpfl_txq = dev->data->tx_queues[i];\n+\t\thairpin_info = &cpfl_txq->hairpin_info;\n+\t\tif (hairpin_info->peer_rxp != rx_port) {\n+\t\t\tPMD_DRV_LOG(ERR, \"port %d is not the peer port\", rx_port);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\thairpin_info->peer_rxq_id =\n+\t\t\tcpfl_hw_qid_get(cpfl_rx_vport->p2p_q_chunks_info.rx_start_qid,\n+\t\t\t\t\thairpin_info->peer_rxq_id - cpfl_rx_vport->nb_data_rxq);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/* Bind Rx hairpin queue's memory zone to peer Tx hairpin queue's memory zone */\n+static void\n+cpfl_rxq_hairpin_mz_bind(struct rte_eth_dev *dev)\n+{\n+\tstruct cpfl_vport *cpfl_rx_vport = dev->data->dev_private;\n+\tstruct idpf_vport *vport = &cpfl_rx_vport->base;\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct idpf_hw *hw = &adapter->hw;\n+\tstruct cpfl_rx_queue *cpfl_rxq;\n+\tstruct cpfl_tx_queue *cpfl_txq;\n+\tstruct rte_eth_dev *peer_dev;\n+\tconst struct rte_memzone *mz;\n+\tuint16_t peer_tx_port;\n+\tuint16_t peer_tx_qid;\n+\tint i;\n+\n+\tfor (i = cpfl_rx_vport->nb_data_rxq; i < dev->data->nb_rx_queues; i++) {\n+\t\tcpfl_rxq = dev->data->rx_queues[i];\n+\t\tpeer_tx_port = cpfl_rxq->hairpin_info.peer_txp;\n+\t\tpeer_tx_qid = cpfl_rxq->hairpin_info.peer_txq_id;\n+\t\tpeer_dev = &rte_eth_devices[peer_tx_port];\n+\t\tcpfl_txq = peer_dev->data->tx_queues[peer_tx_qid];\n+\n+\t\t/* bind rx queue */\n+\t\tmz = cpfl_txq->base.mz;\n+\t\tcpfl_rxq->base.rx_ring_phys_addr = mz->iova;\n+\t\tcpfl_rxq->base.rx_ring = mz->addr;\n+\t\tcpfl_rxq->base.mz = mz;\n+\n+\t\t/* bind rx buffer queue */\n+\t\tmz = cpfl_txq->base.complq->mz;\n+\t\tcpfl_rxq->base.bufq1->rx_ring_phys_addr = mz->iova;\n+\t\tcpfl_rxq->base.bufq1->rx_ring = mz->addr;\n+\t\tcpfl_rxq->base.bufq1->mz = mz;\n+\t\tcpfl_rxq->base.bufq1->qrx_tail = hw->hw_addr +\n+\t\t\tcpfl_hw_qtail_get(cpfl_rx_vport->p2p_q_chunks_info.rx_buf_qtail_start,\n+\t\t\t\t\t 0, cpfl_rx_vport->p2p_q_chunks_info.rx_buf_qtail_spacing);\n+\t}\n+}\n+\n static int\n cpfl_start_queues(struct rte_eth_dev *dev)\n {\n+\tstruct cpfl_vport *cpfl_vport = dev->data->dev_private;\n+\tstruct idpf_vport *vport = &cpfl_vport->base;\n \tstruct cpfl_rx_queue *cpfl_rxq;\n \tstruct cpfl_tx_queue *cpfl_txq;\n+\tint update_flag = 0;\n \tint err = 0;\n \tint i;\n \n+\t/* For normal data queues, configure, init and enale Txq.\n+\t * For non-manual bind hairpin queues, configure Txq.\n+\t */\n \tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n \t\tcpfl_txq = dev->data->tx_queues[i];\n \t\tif (cpfl_txq == NULL || cpfl_txq->base.tx_deferred_start)\n \t\t\tcontinue;\n-\t\terr = cpfl_tx_queue_start(dev, i);\n+\t\tif (!cpfl_txq->hairpin_info.hairpin_q) {\n+\t\t\terr = cpfl_tx_queue_start(dev, i);\n+\t\t\tif (err != 0) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Fail to start Tx queue %u\", i);\n+\t\t\t\treturn err;\n+\t\t\t}\n+\t\t} else if (!cpfl_vport->p2p_manual_bind) {\n+\t\t\tif (update_flag == 0) {\n+\t\t\t\terr = cpfl_txq_hairpin_info_update(dev,\n+\t\t\t\t\t\t\t\t cpfl_txq->hairpin_info.peer_rxp);\n+\t\t\t\tif (err != 0) {\n+\t\t\t\t\tPMD_DRV_LOG(ERR, \"Fail to update Tx hairpin queue info\");\n+\t\t\t\t\treturn err;\n+\t\t\t\t}\n+\t\t\t\tupdate_flag = 1;\n+\t\t\t}\n+\t\t\terr = cpfl_hairpin_txq_config(vport, cpfl_txq);\n+\t\t\tif (err != 0) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Fail to configure hairpin Tx queue %u\", i);\n+\t\t\t\treturn err;\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\t/* For non-manual bind hairpin queues, configure Tx completion queue first.*/\n+\tif (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_tx_complq != NULL) {\n+\t\terr = cpfl_hairpin_tx_complq_config(cpfl_vport);\n \t\tif (err != 0) {\n-\t\t\tPMD_DRV_LOG(ERR, \"Fail to start Tx queue %u\", i);\n+\t\t\tPMD_DRV_LOG(ERR, \"Fail to config Tx completion queue\");\n \t\t\treturn err;\n \t\t}\n \t}\n \n+\t/* For non-manual bind hairpin queues, configure Rx buffer queue.*/\n+\tif (!cpfl_vport->p2p_manual_bind && cpfl_vport->p2p_rx_bufq != NULL) {\n+\t\tcpfl_rxq_hairpin_mz_bind(dev);\n+\t\terr = cpfl_hairpin_rx_bufq_config(cpfl_vport);\n+\t\tif (err != 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Fail to config Rx buffer queue\");\n+\t\t\treturn err;\n+\t\t}\n+\t}\n+\n+\t/* For normal data queues, configure, init and enale Rxq.\n+\t * For non-manual bind hairpin queues, configure Rxq, and then init Rxq.\n+\t */\n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n \t\tcpfl_rxq = dev->data->rx_queues[i];\n \t\tif (cpfl_rxq == NULL || cpfl_rxq->base.rx_deferred_start)\n \t\t\tcontinue;\n-\t\terr = cpfl_rx_queue_start(dev, i);\n-\t\tif (err != 0) {\n-\t\t\tPMD_DRV_LOG(ERR, \"Fail to start Rx queue %u\", i);\n-\t\t\treturn err;\n+\t\tif (!cpfl_rxq->hairpin_info.hairpin_q) {\n+\t\t\terr = cpfl_rx_queue_start(dev, i);\n+\t\t\tif (err != 0) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Fail to start Rx queue %u\", i);\n+\t\t\t\treturn err;\n+\t\t\t}\n+\t\t} else if (!cpfl_vport->p2p_manual_bind) {\n+\t\t\terr = cpfl_hairpin_rxq_config(vport, cpfl_rxq);\n+\t\t\tif (err != 0) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Fail to configure hairpin Rx queue %u\", i);\n+\t\t\t\treturn err;\n+\t\t\t}\n+\t\t\terr = cpfl_rx_queue_init(dev, i);\n+\t\t\tif (err != 0) {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"Fail to init hairpin Rx queue %u\", i);\n+\t\t\t\treturn err;\n+\t\t\t}\n \t\t}\n \t}\n \ndiff --git a/drivers/net/cpfl/cpfl_rxtx.c b/drivers/net/cpfl/cpfl_rxtx.c\nindex 333a399e73..91d1ab1ffc 100644\n--- a/drivers/net/cpfl/cpfl_rxtx.c\n+++ b/drivers/net/cpfl/cpfl_rxtx.c\n@@ -931,6 +931,86 @@ cpfl_tx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \treturn 0;\n }\n \n+int\n+cpfl_hairpin_rx_bufq_config(struct cpfl_vport *cpfl_vport)\n+{\n+\tstruct idpf_rx_queue *rx_bufq = cpfl_vport->p2p_rx_bufq;\n+\tstruct virtchnl2_rxq_info rxq_info[1] = {0};\n+\n+\trxq_info[0].type = VIRTCHNL2_QUEUE_TYPE_RX_BUFFER;\n+\trxq_info[0].queue_id = rx_bufq->queue_id;\n+\trxq_info[0].ring_len = rx_bufq->nb_rx_desc;\n+\trxq_info[0].dma_ring_addr = rx_bufq->rx_ring_phys_addr;\n+\trxq_info[0].desc_ids = VIRTCHNL2_RXDID_2_FLEX_SPLITQ_M;\n+\trxq_info[0].rx_buffer_low_watermark = CPFL_RXBUF_LOW_WATERMARK;\n+\trxq_info[0].model = VIRTCHNL2_QUEUE_MODEL_SPLIT;\n+\trxq_info[0].data_buffer_size = rx_bufq->rx_buf_len;\n+\trxq_info[0].buffer_notif_stride = CPFL_RX_BUF_STRIDE;\n+\n+\treturn idpf_vc_rxq_config_by_info(&cpfl_vport->base, rxq_info, 1);\n+}\n+\n+int\n+cpfl_hairpin_rxq_config(struct idpf_vport *vport, struct cpfl_rx_queue *cpfl_rxq)\n+{\n+\tstruct virtchnl2_rxq_info rxq_info[1] = {0};\n+\tstruct idpf_rx_queue *rxq = &cpfl_rxq->base;\n+\n+\trxq_info[0].type = VIRTCHNL2_QUEUE_TYPE_RX;\n+\trxq_info[0].queue_id = rxq->queue_id;\n+\trxq_info[0].ring_len = rxq->nb_rx_desc;\n+\trxq_info[0].dma_ring_addr = rxq->rx_ring_phys_addr;\n+\trxq_info[0].rx_bufq1_id = rxq->bufq1->queue_id;\n+\trxq_info[0].max_pkt_size = vport->max_pkt_len;\n+\trxq_info[0].desc_ids = VIRTCHNL2_RXDID_2_FLEX_SPLITQ_M;\n+\trxq_info[0].qflags |= VIRTCHNL2_RX_DESC_SIZE_16BYTE;\n+\n+\trxq_info[0].data_buffer_size = rxq->rx_buf_len;\n+\trxq_info[0].model = VIRTCHNL2_QUEUE_MODEL_SPLIT;\n+\trxq_info[0].rx_buffer_low_watermark = CPFL_RXBUF_LOW_WATERMARK;\n+\n+\tPMD_DRV_LOG(NOTICE, \"hairpin: vport %u, Rxq id 0x%x\",\n+\t\tvport->vport_id, rxq_info[0].queue_id);\n+\n+\treturn idpf_vc_rxq_config_by_info(vport, rxq_info, 1);\n+}\n+\n+int\n+cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport)\n+{\n+\tstruct idpf_tx_queue *tx_complq = cpfl_vport->p2p_tx_complq;\n+\tstruct virtchnl2_txq_info txq_info[1] = {0};\n+\n+\ttxq_info[0].dma_ring_addr = tx_complq->tx_ring_phys_addr;\n+\ttxq_info[0].type = VIRTCHNL2_QUEUE_TYPE_TX_COMPLETION;\n+\ttxq_info[0].queue_id = tx_complq->queue_id;\n+\ttxq_info[0].ring_len = tx_complq->nb_tx_desc;\n+\ttxq_info[0].peer_rx_queue_id = cpfl_vport->p2p_rx_bufq->queue_id;\n+\ttxq_info[0].model = VIRTCHNL2_QUEUE_MODEL_SPLIT;\n+\ttxq_info[0].sched_mode = VIRTCHNL2_TXQ_SCHED_MODE_FLOW;\n+\n+\treturn idpf_vc_txq_config_by_info(&cpfl_vport->base, txq_info, 1);\n+}\n+\n+int\n+cpfl_hairpin_txq_config(struct idpf_vport *vport, struct cpfl_tx_queue *cpfl_txq)\n+{\n+\tstruct idpf_tx_queue *txq = &cpfl_txq->base;\n+\tstruct virtchnl2_txq_info txq_info[1] = {0};\n+\n+\ttxq_info[0].dma_ring_addr = txq->tx_ring_phys_addr;\n+\ttxq_info[0].type = VIRTCHNL2_QUEUE_TYPE_TX;\n+\ttxq_info[0].queue_id = txq->queue_id;\n+\ttxq_info[0].ring_len = txq->nb_tx_desc;\n+\ttxq_info[0].tx_compl_queue_id = txq->complq->queue_id;\n+\ttxq_info[0].relative_queue_id = txq->queue_id;\n+\ttxq_info[0].peer_rx_queue_id = cpfl_txq->hairpin_info.peer_rxq_id;\n+\ttxq_info[0].model = VIRTCHNL2_QUEUE_MODEL_SPLIT;\n+\ttxq_info[0].sched_mode = VIRTCHNL2_TXQ_SCHED_MODE_FLOW;\n+\n+\treturn idpf_vc_txq_config_by_info(vport, txq_info, 1);\n+}\n+\n int\n cpfl_rx_queue_init(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n {\ndiff --git a/drivers/net/cpfl/cpfl_rxtx.h b/drivers/net/cpfl/cpfl_rxtx.h\nindex 5e9f2dada7..5e2ddd1ef9 100644\n--- a/drivers/net/cpfl/cpfl_rxtx.h\n+++ b/drivers/net/cpfl/cpfl_rxtx.h\n@@ -30,12 +30,15 @@\n #define CPFL_RING_BASE_ALIGN\t128\n \n #define CPFL_DEFAULT_RX_FREE_THRESH\t32\n+#define CPFL_RXBUF_LOW_WATERMARK\t64\n \n #define CPFL_DEFAULT_TX_RS_THRESH\t32\n #define CPFL_DEFAULT_TX_FREE_THRESH\t32\n \n #define CPFL_SUPPORT_CHAIN_NUM 5\n \n+#define CPFL_RX_BUF_STRIDE 64\n+\n struct cpfl_rxq_hairpin_info {\n \tbool hairpin_q;\t\t/* if rx queue is a hairpin queue */\n \tuint16_t peer_txp;\n@@ -83,4 +86,8 @@ int cpfl_rx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n int cpfl_tx_hairpin_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,\n \t\t\t\tuint16_t nb_desc,\n \t\t\t\tconst struct rte_eth_hairpin_conf *conf);\n+int cpfl_hairpin_tx_complq_config(struct cpfl_vport *cpfl_vport);\n+int cpfl_hairpin_txq_config(struct idpf_vport *vport, struct cpfl_tx_queue *cpfl_txq);\n+int cpfl_hairpin_rx_bufq_config(struct cpfl_vport *cpfl_vport);\n+int cpfl_hairpin_rxq_config(struct idpf_vport *vport, struct cpfl_rx_queue *cpfl_rxq);\n #endif /* _CPFL_RXTX_H_ */\n", "prefixes": [ "v3", "06/10" ] }