Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/76388/?format=api
{ "id": 76388, "url": "http://patches.dpdk.org/api/patches/76388/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1599128029-2092-7-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-7-git-send-email-michaelba@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1599128029-2092-7-git-send-email-michaelba@nvidia.com", "date": "2020-09-03T10:13:37", "name": "[v1,06/18] net/mlx5: separate Rx interrupt handling", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "9bf1325b60156cd176049da4f986f541a2192e5d", "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-7-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/76388/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/76388/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 01432A04DB;\n\tThu, 3 Sep 2020 12:15:23 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id A937F1C114;\n\tThu, 3 Sep 2020 12:14:46 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by dpdk.org (Postfix) with ESMTP id EBBDB1C0D1\n for <dev@dpdk.org>; Thu, 3 Sep 2020 12:14:44 +0200 (CEST)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n michaelba@nvidia.com) with SMTP; 3 Sep 2020 13:14:43 +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 083AEP94031645;\n Thu, 3 Sep 2020 13:14:43 +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:37 +0000", "Message-Id": "<1599128029-2092-7-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 06/18] net/mlx5: separate Rx interrupt handling", "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": "Separate interrupt event handler into both Verbs and DevX modules.\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 | 30 ++++++++++++++++++++++++++++\n drivers/net/mlx5/mlx5.h | 1 +\n drivers/net/mlx5/mlx5_devx.c | 38 +++++++++++++++++++++++++++++++++++\n drivers/net/mlx5/mlx5_rxq.c | 40 ++++++++-----------------------------\n 4 files changed, 77 insertions(+), 32 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c\nindex ff71513..3af09db 100644\n--- a/drivers/net/mlx5/linux/mlx5_verbs.c\n+++ b/drivers/net/mlx5/linux/mlx5_verbs.c\n@@ -428,8 +428,38 @@\n \tmlx5_free(rxq_obj);\n }\n \n+/**\n+ * Get event for an Rx verbs queue object.\n+ *\n+ * @param rxq_obj\n+ * Verbs Rx queue object.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_rx_ibv_get_event(struct mlx5_rxq_obj *rxq_obj)\n+{\n+\tstruct ibv_cq *ev_cq;\n+\tvoid *ev_ctx;\n+\tint ret = mlx5_glue->get_cq_event(rxq_obj->ibv_channel,\n+\t\t\t\t\t &ev_cq, &ev_ctx);\n+\n+\tif (ret < 0 || ev_cq != rxq_obj->ibv_cq)\n+\t\tgoto exit;\n+\tmlx5_glue->ack_cq_events(rxq_obj->ibv_cq, 1);\n+\treturn 0;\n+exit:\n+\tif (ret < 0)\n+\t\trte_errno = errno;\n+\telse\n+\t\trte_errno = EINVAL;\n+\treturn -rte_errno;\n+}\n+\n struct mlx5_obj_ops ibv_obj_ops = {\n \t.rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_wq_vlan_strip,\n \t.rxq_obj_new = mlx5_rxq_ibv_obj_new,\n+\t.rxq_event_get = mlx5_rx_ibv_get_event,\n \t.rxq_obj_release = mlx5_rxq_ibv_obj_release,\n };\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex eba5df9..f0e2929 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -709,6 +709,7 @@ struct mlx5_obj_ops {\n \tint (*rxq_obj_modify_vlan_strip)(struct mlx5_rxq_obj *rxq_obj, int on);\n \tstruct mlx5_rxq_obj *(*rxq_obj_new)(struct rte_eth_dev *dev,\n \t\t\t\t\t uint16_t idx);\n+\tint (*rxq_event_get)(struct mlx5_rxq_obj *rxq_obj);\n \tvoid (*rxq_obj_release)(struct mlx5_rxq_obj *rxq_obj);\n };\n \ndiff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c\nindex 191b3c2..39e2ad5 100644\n--- a/drivers/net/mlx5/mlx5_devx.c\n+++ b/drivers/net/mlx5/mlx5_devx.c\n@@ -136,6 +136,43 @@\n }\n \n /**\n+ * Get event for an Rx DevX queue object.\n+ *\n+ * @param rxq_obj\n+ * DevX Rx queue object.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_rx_devx_get_event(struct mlx5_rxq_obj *rxq_obj)\n+{\n+#ifdef HAVE_IBV_DEVX_EVENT\n+\tunion {\n+\t\tstruct mlx5dv_devx_async_event_hdr event_resp;\n+\t\tuint8_t buf[sizeof(struct mlx5dv_devx_async_event_hdr) + 128];\n+\t} out;\n+\tint ret = mlx5_glue->devx_get_event(rxq_obj->devx_channel,\n+\t\t\t\t\t &out.event_resp,\n+\t\t\t\t\t sizeof(out.buf));\n+\n+\tif (ret < 0) {\n+\t\trte_errno = errno;\n+\t\treturn -rte_errno;\n+\t}\n+\tif (out.event_resp.cookie != (uint64_t)(uintptr_t)rxq_obj->devx_cq) {\n+\t\trte_errno = EINVAL;\n+\t\treturn -rte_errno;\n+\t}\n+\treturn 0;\n+#else\n+\t(void)rxq_obj;\n+\trte_errno = ENOTSUP;\n+\treturn -rte_errno;\n+#endif /* HAVE_IBV_DEVX_EVENT */\n+}\n+\n+/**\n * Fill common fields of create RQ attributes structure.\n *\n * @param rxq_data\n@@ -606,5 +643,6 @@\n struct mlx5_obj_ops devx_obj_ops = {\n \t.rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_rq_vlan_strip,\n \t.rxq_obj_new = mlx5_rxq_devx_obj_new,\n+\t.rxq_event_get = mlx5_rx_devx_get_event,\n \t.rxq_obj_release = mlx5_rxq_devx_obj_release,\n };\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex daa92b6..46d5f6c 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -1024,10 +1024,8 @@\n int\n mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)\n {\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_rxq_ctrl *rxq_ctrl;\n-\tstruct mlx5_rxq_obj *rxq_obj = NULL;\n-\tstruct ibv_cq *ev_cq;\n-\tvoid *ev_ctx;\n \tint ret = 0;\n \n \trxq_ctrl = mlx5_rxq_get(dev, rx_queue_id);\n@@ -1035,42 +1033,20 @@\n \t\trte_errno = EINVAL;\n \t\treturn -rte_errno;\n \t}\n-\tif (!rxq_ctrl->irq) {\n-\t\tmlx5_rxq_release(dev, rx_queue_id);\n-\t\treturn 0;\n-\t}\n-\trxq_obj = rxq_ctrl->obj;\n-\tif (!rxq_obj)\n+\tif (!rxq_ctrl->obj)\n \t\tgoto error;\n-\tif (rxq_obj->type == MLX5_RXQ_OBJ_TYPE_IBV) {\n-\t\tret = mlx5_glue->get_cq_event(rxq_obj->ibv_channel, &ev_cq,\n-\t\t\t\t\t &ev_ctx);\n-\t\tif (ret < 0 || ev_cq != rxq_obj->ibv_cq)\n-\t\t\tgoto error;\n-\t\tmlx5_glue->ack_cq_events(rxq_obj->ibv_cq, 1);\n-\t} else if (rxq_obj->type == MLX5_RXQ_OBJ_TYPE_DEVX_RQ) {\n-#ifdef HAVE_IBV_DEVX_EVENT\n-\t\tunion {\n-\t\t\tstruct mlx5dv_devx_async_event_hdr event_resp;\n-\t\t\tuint8_t buf[sizeof(struct mlx5dv_devx_async_event_hdr)\n-\t\t\t\t + 128];\n-\t\t} out;\n-\n-\t\tret = mlx5_glue->devx_get_event\n-\t\t\t\t(rxq_obj->devx_channel, &out.event_resp,\n-\t\t\t\t sizeof(out.buf));\n-\t\tif (ret < 0 || out.event_resp.cookie !=\n-\t\t\t\t(uint64_t)(uintptr_t)rxq_obj->devx_cq)\n+\tif (rxq_ctrl->irq) {\n+\t\tret = priv->obj_ops->rxq_event_get(rxq_ctrl->obj);\n+\t\tif (ret < 0)\n \t\t\tgoto error;\n-#endif /* HAVE_IBV_DEVX_EVENT */\n+\t\trxq_ctrl->rxq.cq_arm_sn++;\n \t}\n-\trxq_ctrl->rxq.cq_arm_sn++;\n \tmlx5_rxq_release(dev, rx_queue_id);\n \treturn 0;\n error:\n \t/**\n-\t * For ret < 0 save the errno (may be EAGAIN which means the get_event\n-\t * function was called before receiving one).\n+\t * The ret variable may be EAGAIN which means the get_event function was\n+\t * called before receiving one.\n \t */\n \tif (ret < 0)\n \t\trte_errno = errno;\n", "prefixes": [ "v1", "06/18" ] }