Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/76392/?format=api
{ "id": 76392, "url": "http://patches.dpdk.org/api/patches/76392/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1599128029-2092-10-git-send-email-michaelba@nvidia.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": "<1599128029-2092-10-git-send-email-michaelba@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1599128029-2092-10-git-send-email-michaelba@nvidia.com", "date": "2020-09-03T10:13:40", "name": "[v1,09/18] net/mlx5: rearrange the creation of WQ and CQ object", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "21f672d591092ae8d79beccaa8abaa3129eda3ad", "submitter": { "id": 1949, "url": "http://patches.dpdk.org/api/people/1949/?format=api", "name": "Michael Baum", "email": "michaelba@nvidia.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1599128029-2092-10-git-send-email-michaelba@nvidia.com/mbox/", "series": [ { "id": 11924, "url": "http://patches.dpdk.org/api/series/11924/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11924", "date": "2020-09-03T10:13:31", "name": "mlx5 Rx DevX/Verbs separation", "version": 1, "mbox": "http://patches.dpdk.org/series/11924/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/76392/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/76392/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 C7183A04DB;\n\tThu, 3 Sep 2020 12:16:15 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C5BF41C138;\n\tThu, 3 Sep 2020 12:14:56 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id 0EE531C132\n for <dev@dpdk.org>; Thu, 3 Sep 2020 12:14:54 +0200 (CEST)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n michaelba@nvidia.com) with SMTP; 3 Sep 2020 13:14:52 +0300", "from nvidia.com (pegasus07.mtr.labs.mlnx [10.210.16.112])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 083AEP97031645;\n Thu, 3 Sep 2020 13:14:52 +0300" ], "From": "Michael Baum <michaelba@nvidia.com>", "To": "dev@dpdk.org", "Cc": "Matan Azrad <matan@nvidia.com>, Raslan Darawsheh <rasland@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Date": "Thu, 3 Sep 2020 10:13:40 +0000", "Message-Id": "<1599128029-2092-10-git-send-email-michaelba@nvidia.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1599128029-2092-1-git-send-email-michaelba@nvidia.com>", "References": "<1599128029-2092-1-git-send-email-michaelba@nvidia.com>", "Subject": "[dpdk-dev] [PATCH v1 09/18] net/mlx5: rearrange the creation of WQ\n\tand CQ object", "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": "Rearrangement of WQ and CQ creation for Verbs Rx queue:\n1. Rename the allocation function.\n2. Reduce the number of arguments that the creation functions receive.\n\nSigned-off-by: Michael Baum <michaelba@nvidia.com>\nAcked-by: Matan Azrad <matan@nvidia.com>\n---\n drivers/net/mlx5/linux/mlx5_verbs.c | 52 ++++++++++++++-----------------------\n drivers/net/mlx5/mlx5_devx.c | 22 ----------------\n drivers/net/mlx5/mlx5_rxq.c | 22 ++++++++++++++++\n drivers/net/mlx5/mlx5_rxtx.h | 1 +\n 4 files changed, 43 insertions(+), 54 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c\nindex 16e5900..d9cf911 100644\n--- a/drivers/net/mlx5/linux/mlx5_verbs.c\n+++ b/drivers/net/mlx5/linux/mlx5_verbs.c\n@@ -96,23 +96,21 @@\n *\n * @param dev\n * Pointer to Ethernet device.\n- * @param priv\n- * Pointer to device private data.\n- * @param rxq_data\n- * Pointer to Rx queue data.\n- * @param cqe_n\n- * Number of CQEs in CQ.\n- * @param rxq_obj\n- * Pointer to Rx queue object data.\n+ * @param idx\n+ * Queue index in DPDK Rx queue array.\n *\n * @return\n- * The Verbs object initialized, NULL otherwise and rte_errno is set.\n+ * The Verbs CQ object initialized, NULL otherwise and rte_errno is set.\n */\n static struct ibv_cq *\n-mlx5_ibv_cq_new(struct rte_eth_dev *dev, struct mlx5_priv *priv,\n-\t\tstruct mlx5_rxq_data *rxq_data,\n-\t\tunsigned int cqe_n, struct mlx5_rxq_obj *rxq_obj)\n+mlx5_rxq_ibv_cq_create(struct rte_eth_dev *dev, uint16_t idx)\n {\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_rxq_data *rxq_data = (*priv->rxqs)[idx];\n+\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n+\t\tcontainer_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n+\tstruct mlx5_rxq_obj *rxq_obj = rxq_ctrl->obj;\n+\tunsigned int cqe_n = mlx5_rxq_cqe_num(rxq_data);\n \tstruct {\n \t\tstruct ibv_cq_init_attr_ex ibv;\n \t\tstruct mlx5dv_cq_init_attr mlx5;\n@@ -165,25 +163,21 @@\n *\n * @param dev\n * Pointer to Ethernet device.\n- * @param priv\n- * Pointer to device private data.\n- * @param rxq_data\n- * Pointer to Rx queue data.\n * @param idx\n * Queue index in DPDK Rx queue array.\n- * @param wqe_n\n- * Number of WQEs in WQ.\n- * @param rxq_obj\n- * Pointer to Rx queue object data.\n *\n * @return\n- * The Verbs object initialized, NULL otherwise and rte_errno is set.\n+ * The Verbs WQ object initialized, NULL otherwise and rte_errno is set.\n */\n static struct ibv_wq *\n-mlx5_ibv_wq_new(struct rte_eth_dev *dev, struct mlx5_priv *priv,\n-\t\tstruct mlx5_rxq_data *rxq_data, uint16_t idx,\n-\t\tunsigned int wqe_n, struct mlx5_rxq_obj *rxq_obj)\n+mlx5_rxq_ibv_wq_create(struct rte_eth_dev *dev, uint16_t idx)\n {\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_rxq_data *rxq_data = (*priv->rxqs)[idx];\n+\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n+\t\tcontainer_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n+\tstruct mlx5_rxq_obj *rxq_obj = rxq_ctrl->obj;\n+\tunsigned int wqe_n = 1 << rxq_data->elts_n;\n \tstruct {\n \t\tstruct ibv_wq_init_attr ibv;\n #ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT\n@@ -279,8 +273,6 @@\n \tstruct mlx5_rxq_ctrl *rxq_ctrl =\n \t\tcontainer_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n \tstruct ibv_wq_attr mod;\n-\tunsigned int cqe_n;\n-\tunsigned int wqe_n = 1 << rxq_data->elts_n;\n \tstruct mlx5_rxq_obj *tmpl = rxq_ctrl->obj;\n \tstruct mlx5dv_cq cq_info;\n \tstruct mlx5dv_rwq rwq;\n@@ -304,12 +296,8 @@\n \t\t}\n \t\ttmpl->fd = ((struct ibv_comp_channel *)(tmpl->ibv_channel))->fd;\n \t}\n-\tif (mlx5_rxq_mprq_enabled(rxq_data))\n-\t\tcqe_n = wqe_n * (1 << rxq_data->strd_num_n) - 1;\n-\telse\n-\t\tcqe_n = wqe_n - 1;\n \t/* Create CQ using Verbs API. */\n-\ttmpl->ibv_cq = mlx5_ibv_cq_new(dev, priv, rxq_data, cqe_n, tmpl);\n+\ttmpl->ibv_cq = mlx5_rxq_ibv_cq_create(dev, idx);\n \tif (!tmpl->ibv_cq) {\n \t\tDRV_LOG(ERR, \"Port %u Rx queue %u CQ creation failure.\",\n \t\t\tdev->data->port_id, idx);\n@@ -338,7 +326,7 @@\n \trxq_data->cq_uar = cq_info.cq_uar;\n \trxq_data->cqn = cq_info.cqn;\n \t/* Create WQ (RQ) using Verbs API. */\n-\ttmpl->wq = mlx5_ibv_wq_new(dev, priv, rxq_data, idx, wqe_n, tmpl);\n+\ttmpl->wq = mlx5_rxq_ibv_wq_create(dev, idx);\n \tif (!tmpl->wq) {\n \t\tDRV_LOG(ERR, \"Port %u Rx queue %u WQ creation failure.\",\n \t\t\tdev->data->port_id, idx);\ndiff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c\nindex 5a3ac49..8bbc664 100644\n--- a/drivers/net/mlx5/mlx5_devx.c\n+++ b/drivers/net/mlx5/mlx5_devx.c\n@@ -24,28 +24,6 @@\n \n \n /**\n- * Calculate the number of CQEs in CQ for the Rx queue.\n- *\n- * @param rxq_data\n- * Pointer to receive queue structure.\n- *\n- * @return\n- * Number of CQEs in CQ.\n- */\n-static unsigned int\n-mlx5_rxq_cqe_num(struct mlx5_rxq_data *rxq_data)\n-{\n-\tunsigned int cqe_n;\n-\tunsigned int wqe_n = 1 << rxq_data->elts_n;\n-\n-\tif (mlx5_rxq_mprq_enabled(rxq_data))\n-\t\tcqe_n = wqe_n * (1 << rxq_data->strd_num_n) - 1;\n-\telse\n-\t\tcqe_n = wqe_n - 1;\n-\treturn cqe_n;\n-}\n-\n-/**\n * Modify RQ vlan stripping offload\n *\n * @param rxq_obj\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 00ef230..3115f5a 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -123,6 +123,28 @@\n }\n \n /**\n+ * Calculate the number of CQEs in CQ for the Rx queue.\n+ *\n+ * @param rxq_data\n+ * Pointer to receive queue structure.\n+ *\n+ * @return\n+ * Number of CQEs in CQ.\n+ */\n+unsigned int\n+mlx5_rxq_cqe_num(struct mlx5_rxq_data *rxq_data)\n+{\n+\tunsigned int cqe_n;\n+\tunsigned int wqe_n = 1 << rxq_data->elts_n;\n+\n+\tif (mlx5_rxq_mprq_enabled(rxq_data))\n+\t\tcqe_n = wqe_n * (1 << rxq_data->strd_num_n) - 1;\n+\telse\n+\t\tcqe_n = wqe_n - 1;\n+\treturn cqe_n;\n+}\n+\n+/**\n * Allocate RX queue elements for Multi-Packet RQ.\n *\n * @param rxq_ctrl\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 6d135dd..75eedff 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -371,6 +371,7 @@ struct mlx5_txq_ctrl {\n int mlx5_check_mprq_support(struct rte_eth_dev *dev);\n int mlx5_rxq_mprq_enabled(struct mlx5_rxq_data *rxq);\n int mlx5_mprq_enabled(struct rte_eth_dev *dev);\n+unsigned int mlx5_rxq_cqe_num(struct mlx5_rxq_data *rxq_data);\n int mlx5_mprq_free_mp(struct rte_eth_dev *dev);\n int mlx5_mprq_alloc_mp(struct rte_eth_dev *dev);\n int mlx5_rx_queue_start(struct rte_eth_dev *dev, uint16_t queue_id);\n", "prefixes": [ "v1", "09/18" ] }