Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62256/?format=api
{ "id": 62256, "url": "https://patches.dpdk.org/api/patches/62256/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1572479604-178752-10-git-send-email-orika@mellanox.com/", "project": { "id": 1, "url": "https://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": "<1572479604-178752-10-git-send-email-orika@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1572479604-178752-10-git-send-email-orika@mellanox.com", "date": "2019-10-30T23:53:18", "name": "[v7,09/14] net/mlx5: add hairpin binding function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d11629430b0d5980a5f47b69809ac81b4d4224b9", "submitter": { "id": 795, "url": "https://patches.dpdk.org/api/people/795/?format=api", "name": "Ori Kam", "email": "orika@mellanox.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1572479604-178752-10-git-send-email-orika@mellanox.com/mbox/", "series": [ { "id": 7165, "url": "https://patches.dpdk.org/api/series/7165/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=7165", "date": "2019-10-30T23:53:09", "name": "add hairpin feature", "version": 7, "mbox": "https://patches.dpdk.org/series/7165/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/62256/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/62256/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B6BC1A00BE;\n\tThu, 31 Oct 2019 00:54:53 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 55EBE1C191;\n\tThu, 31 Oct 2019 00:53:55 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id 8D3551C190\n for <dev@dpdk.org>; Thu, 31 Oct 2019 00:53:45 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n orika@mellanox.com)\n with ESMTPS (AES256-SHA encrypted); 31 Oct 2019 01:53:41 +0200", "from pegasus04.mtr.labs.mlnx. (pegasus04.mtr.labs.mlnx\n [10.210.16.126])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x9UNrQvX007114;\n Thu, 31 Oct 2019 01:53:41 +0200" ], "From": "Ori Kam <orika@mellanox.com>", "To": "Matan Azrad <matan@mellanox.com>, Shahaf Shuler <shahafs@mellanox.com>,\n Viacheslav Ovsiienko <viacheslavo@mellanox.com>", "Cc": "dev@dpdk.org, orika@mellanox.com, jingjing.wu@intel.com,\n stephen@networkplumber.org", "Date": "Wed, 30 Oct 2019 23:53:18 +0000", "Message-Id": "<1572479604-178752-10-git-send-email-orika@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1572479604-178752-1-git-send-email-orika@mellanox.com>", "References": "<1569479349-36962-1-git-send-email-orika@mellanox.com>\n <1572479604-178752-1-git-send-email-orika@mellanox.com>", "Subject": "[dpdk-dev] [PATCH v7 09/14] net/mlx5: add hairpin binding function", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "When starting the port, in addition to creating the queues\nwe need to bind the hairpin queues.\n\nSigned-off-by: Ori Kam <orika@mellanox.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\n---\n drivers/net/mlx5/mlx5.h | 1 +\n drivers/net/mlx5/mlx5_devx_cmds.c | 1 +\n drivers/net/mlx5/mlx5_prm.h | 6 +++\n drivers/net/mlx5/mlx5_trigger.c | 97 +++++++++++++++++++++++++++++++++++++++\n 4 files changed, 105 insertions(+)", "diff": "diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 742bedd..33cfc5b 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -191,6 +191,7 @@ struct mlx5_hca_attr {\n \tuint32_t log_max_hairpin_queues:5;\n \tuint32_t log_max_hairpin_wq_data_sz:5;\n \tuint32_t log_max_hairpin_num_packets:5;\n+\tuint32_t vhca_id:16;\n };\n \n /* Flow list . */\ndiff --git a/drivers/net/mlx5/mlx5_devx_cmds.c b/drivers/net/mlx5/mlx5_devx_cmds.c\nindex a501f1f..3471a9b 100644\n--- a/drivers/net/mlx5/mlx5_devx_cmds.c\n+++ b/drivers/net/mlx5/mlx5_devx_cmds.c\n@@ -334,6 +334,7 @@ struct mlx5_devx_obj *\n \t\t\t\t\t\t log_max_hairpin_wq_data_sz);\n \tattr->log_max_hairpin_num_packets = MLX5_GET\n \t\t(cmd_hca_cap, hcattr, log_min_hairpin_wq_data_sz);\n+\tattr->vhca_id = MLX5_GET(cmd_hca_cap, hcattr, vhca_id);\n \tattr->eth_net_offloads = MLX5_GET(cmd_hca_cap, hcattr,\n \t\t\t\t\t eth_net_offloads);\n \tattr->eth_virt = MLX5_GET(cmd_hca_cap, hcattr, eth_virt);\ndiff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h\nindex c687cfb..e4b19f8 100644\n--- a/drivers/net/mlx5/mlx5_prm.h\n+++ b/drivers/net/mlx5/mlx5_prm.h\n@@ -1628,6 +1628,12 @@ struct mlx5_ifc_create_rqt_in_bits {\n #pragma GCC diagnostic error \"-Wpedantic\"\n #endif\n \n+enum {\n+\tMLX5_SQC_STATE_RST = 0x0,\n+\tMLX5_SQC_STATE_RDY = 0x1,\n+\tMLX5_SQC_STATE_ERR = 0x3,\n+};\n+\n struct mlx5_ifc_sqc_bits {\n \tu8 rlky[0x1];\n \tu8 cd_master[0x1];\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex 3ec86c4..a4fcdb3 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -162,6 +162,96 @@\n }\n \n /**\n+ * Binds Tx queues to Rx queues for hairpin.\n+ *\n+ * Binds Tx queues to the target Rx queues.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_hairpin_bind(struct rte_eth_dev *dev)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_devx_modify_sq_attr sq_attr = { 0 };\n+\tstruct mlx5_devx_modify_rq_attr rq_attr = { 0 };\n+\tstruct mlx5_txq_ctrl *txq_ctrl;\n+\tstruct mlx5_rxq_ctrl *rxq_ctrl;\n+\tstruct mlx5_devx_obj *sq;\n+\tstruct mlx5_devx_obj *rq;\n+\tunsigned int i;\n+\tint ret = 0;\n+\n+\tfor (i = 0; i != priv->txqs_n; ++i) {\n+\t\ttxq_ctrl = mlx5_txq_get(dev, i);\n+\t\tif (!txq_ctrl)\n+\t\t\tcontinue;\n+\t\tif (txq_ctrl->type != MLX5_TXQ_TYPE_HAIRPIN) {\n+\t\t\tmlx5_txq_release(dev, i);\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (!txq_ctrl->obj) {\n+\t\t\trte_errno = ENOMEM;\n+\t\t\tDRV_LOG(ERR, \"port %u no txq object found: %d\",\n+\t\t\t\tdev->data->port_id, i);\n+\t\t\tmlx5_txq_release(dev, i);\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t\tsq = txq_ctrl->obj->sq;\n+\t\trxq_ctrl = mlx5_rxq_get(dev,\n+\t\t\t\t\ttxq_ctrl->hairpin_conf.peers[0].queue);\n+\t\tif (!rxq_ctrl) {\n+\t\t\tmlx5_txq_release(dev, i);\n+\t\t\trte_errno = EINVAL;\n+\t\t\tDRV_LOG(ERR, \"port %u no rxq object found: %d\",\n+\t\t\t\tdev->data->port_id,\n+\t\t\t\ttxq_ctrl->hairpin_conf.peers[0].queue);\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t\tif (rxq_ctrl->type != MLX5_RXQ_TYPE_HAIRPIN ||\n+\t\t rxq_ctrl->hairpin_conf.peers[0].queue != i) {\n+\t\t\trte_errno = ENOMEM;\n+\t\t\tDRV_LOG(ERR, \"port %u Tx queue %d can't be binded to \"\n+\t\t\t\t\"Rx queue %d\", dev->data->port_id,\n+\t\t\t\ti, txq_ctrl->hairpin_conf.peers[0].queue);\n+\t\t\tgoto error;\n+\t\t}\n+\t\trq = rxq_ctrl->obj->rq;\n+\t\tif (!rq) {\n+\t\t\trte_errno = ENOMEM;\n+\t\t\tDRV_LOG(ERR, \"port %u hairpin no matching rxq: %d\",\n+\t\t\t\tdev->data->port_id,\n+\t\t\t\ttxq_ctrl->hairpin_conf.peers[0].queue);\n+\t\t\tgoto error;\n+\t\t}\n+\t\tsq_attr.state = MLX5_SQC_STATE_RDY;\n+\t\tsq_attr.sq_state = MLX5_SQC_STATE_RST;\n+\t\tsq_attr.hairpin_peer_rq = rq->id;\n+\t\tsq_attr.hairpin_peer_vhca = priv->config.hca_attr.vhca_id;\n+\t\tret = mlx5_devx_cmd_modify_sq(sq, &sq_attr);\n+\t\tif (ret)\n+\t\t\tgoto error;\n+\t\trq_attr.state = MLX5_SQC_STATE_RDY;\n+\t\trq_attr.rq_state = MLX5_SQC_STATE_RST;\n+\t\trq_attr.hairpin_peer_sq = sq->id;\n+\t\trq_attr.hairpin_peer_vhca = priv->config.hca_attr.vhca_id;\n+\t\tret = mlx5_devx_cmd_modify_rq(rq, &rq_attr);\n+\t\tif (ret)\n+\t\t\tgoto error;\n+\t\tmlx5_txq_release(dev, i);\n+\t\tmlx5_rxq_release(dev, txq_ctrl->hairpin_conf.peers[0].queue);\n+\t}\n+\treturn 0;\n+error:\n+\tmlx5_txq_release(dev, i);\n+\tmlx5_rxq_release(dev, txq_ctrl->hairpin_conf.peers[0].queue);\n+\treturn -rte_errno;\n+}\n+\n+/**\n * DPDK callback to start the device.\n *\n * Simulate device start by attaching all configured flows.\n@@ -192,6 +282,13 @@\n \t\tmlx5_txq_stop(dev);\n \t\treturn -rte_errno;\n \t}\n+\tret = mlx5_hairpin_bind(dev);\n+\tif (ret) {\n+\t\tDRV_LOG(ERR, \"port %u hairpin binding failed: %s\",\n+\t\t\tdev->data->port_id, strerror(rte_errno));\n+\t\tmlx5_txq_stop(dev);\n+\t\treturn -rte_errno;\n+\t}\n \tdev->data->dev_started = 1;\n \tret = mlx5_rx_intr_vec_enable(dev);\n \tif (ret) {\n", "prefixes": [ "v7", "09/14" ] }