Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/56839/?format=api
{ "id": 56839, "url": "https://patches.dpdk.org/api/patches/56839/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1563786795-14027-15-git-send-email-matan@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": "<1563786795-14027-15-git-send-email-matan@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1563786795-14027-15-git-send-email-matan@mellanox.com", "date": "2019-07-22T09:13:01", "name": "[14/28] net/mlx5: rename RxQ verbs to general RxQ object", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6e8e9a9622a1acf756ec826ef1b0b4343df9322f", "submitter": { "id": 796, "url": "https://patches.dpdk.org/api/people/796/?format=api", "name": "Matan Azrad", "email": "matan@mellanox.com" }, "delegate": { "id": 3268, "url": "https://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1563786795-14027-15-git-send-email-matan@mellanox.com/mbox/", "series": [ { "id": 5639, "url": "https://patches.dpdk.org/api/series/5639/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=5639", "date": "2019-07-22T09:12:48", "name": "net/mlx5: support LRO", "version": 1, "mbox": "https://patches.dpdk.org/series/5639/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/56839/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/56839/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D91391BE4A;\n\tMon, 22 Jul 2019 11:14:03 +0200 (CEST)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n\tby dpdk.org (Postfix) with ESMTP id 197061BDF1\n\tfor <dev@dpdk.org>; Mon, 22 Jul 2019 11:13:29 +0200 (CEST)", "from Internal Mail-Server by MTLPINE2 (envelope-from\n\tmatan@mellanox.com)\n\twith ESMTPS (AES256-SHA encrypted); 22 Jul 2019 12:13:23 +0300", "from pegasus07.mtr.labs.mlnx (pegasus07.mtr.labs.mlnx\n\t[10.210.16.112])\n\tby labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x6M9DMjd010084;\n\tMon, 22 Jul 2019 12:13:23 +0300" ], "From": "Matan Azrad <matan@mellanox.com>", "To": "Shahaf Shuler <shahafs@mellanox.com>, Yongseok Koh <yskoh@mellanox.com>, \n\tViacheslav Ovsiienko <viacheslavo@mellanox.com>", "Cc": "dev@dpdk.org, Dekel Peled <dekelp@mellanox.com>", "Date": "Mon, 22 Jul 2019 09:13:01 +0000", "Message-Id": "<1563786795-14027-15-git-send-email-matan@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1563786795-14027-1-git-send-email-matan@mellanox.com>", "References": "<1563786795-14027-1-git-send-email-matan@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 14/28] net/mlx5: rename RxQ verbs to general RxQ\n\tobject", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Dekel Peled <dekelp@mellanox.com>\n\nPrepare for introducing of DevX RxQ object.\nRxQ object is currently created using verbs only.\nThe next patches will add the option to create RxQ object using DevX.\nThis patch renames rxq_ibv to rxq_obj wherever relevant, and adds the\nDevX items to relevant structs.\n\nSigned-off-by: Dekel Peled <dekelp@mellanox.com>\nAcked-by: Matan Azrad <matan@mellanox.com>\n---\n drivers/net/mlx5/mlx5.c | 4 +-\n drivers/net/mlx5/mlx5.h | 4 +-\n drivers/net/mlx5/mlx5_rxq.c | 142 ++++++++++++++++++++--------------------\n drivers/net/mlx5/mlx5_rxtx.c | 2 +-\n drivers/net/mlx5/mlx5_rxtx.h | 24 +++++--\n drivers/net/mlx5/mlx5_trigger.c | 6 +-\n drivers/net/mlx5/mlx5_vlan.c | 4 +-\n 7 files changed, 98 insertions(+), 88 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 6b878da..7d267a6 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -823,9 +823,9 @@ struct mlx5_dev_spawn_data {\n \tif (ret)\n \t\tDRV_LOG(WARNING, \"port %u some indirection table still remain\",\n \t\t\tdev->data->port_id);\n-\tret = mlx5_rxq_ibv_verify(dev);\n+\tret = mlx5_rxq_obj_verify(dev);\n \tif (ret)\n-\t\tDRV_LOG(WARNING, \"port %u some Verbs Rx queue still remain\",\n+\t\tDRV_LOG(WARNING, \"port %u some Rx queue objects still remain\",\n \t\t\tdev->data->port_id);\n \tret = mlx5_rxq_verify(dev);\n \tif (ret)\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 1543aaf..fcbaaae 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -375,7 +375,7 @@ struct mlx5_verbs_alloc_ctx {\n /* Flow drop context necessary due to Verbs API. */\n struct mlx5_drop {\n \tstruct mlx5_hrxq *hrxq; /* Hash Rx queue queue. */\n-\tstruct mlx5_rxq_ibv *rxq; /* Verbs Rx queue. */\n+\tstruct mlx5_rxq_obj *rxq; /* Rx queue object. */\n };\n \n #define MLX5_COUNTERS_PER_POOL 512\n@@ -612,7 +612,7 @@ struct mlx5_priv {\n \tstruct mlx5_flows flows; /* RTE Flow rules. */\n \tstruct mlx5_flows ctrl_flows; /* Control flow rules. */\n \tLIST_HEAD(rxq, mlx5_rxq_ctrl) rxqsctrl; /* DPDK Rx queues. */\n-\tLIST_HEAD(rxqibv, mlx5_rxq_ibv) rxqsibv; /* Verbs Rx queues. */\n+\tLIST_HEAD(rxqobj, mlx5_rxq_obj) rxqsobj; /* Verbs/DevX Rx queues. */\n \tLIST_HEAD(hrxq, mlx5_hrxq) hrxqs; /* Verbs Hash Rx queues. */\n \tLIST_HEAD(txq, mlx5_txq_ctrl) txqsctrl; /* DPDK Tx queues. */\n \tLIST_HEAD(txqibv, mlx5_txq_ibv) txqsibv; /* Verbs Tx queues. */\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 8567ee5..20a4695 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -533,7 +533,7 @@\n }\n \n /**\n- * Get an Rx queue Verbs object.\n+ * Get an Rx queue Verbs/DevX object.\n *\n * @param dev\n * Pointer to Ethernet device.\n@@ -541,10 +541,10 @@\n * Queue index in DPDK Rx queue array\n *\n * @return\n- * The Verbs object if it exists.\n+ * The Verbs/DevX object if it exists.\n */\n-static struct mlx5_rxq_ibv *\n-mlx5_rxq_ibv_get(struct rte_eth_dev *dev, uint16_t idx)\n+static struct mlx5_rxq_obj *\n+mlx5_rxq_obj_get(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@@ -555,35 +555,35 @@\n \tif (!rxq_data)\n \t\treturn NULL;\n \trxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n-\tif (rxq_ctrl->ibv)\n-\t\trte_atomic32_inc(&rxq_ctrl->ibv->refcnt);\n-\treturn rxq_ctrl->ibv;\n+\tif (rxq_ctrl->obj)\n+\t\trte_atomic32_inc(&rxq_ctrl->obj->refcnt);\n+\treturn rxq_ctrl->obj;\n }\n \n /**\n- * Release an Rx verbs queue object.\n+ * Release an Rx verbs/DevX queue object.\n *\n- * @param rxq_ibv\n- * Verbs Rx queue object.\n+ * @param rxq_obj\n+ * Verbs/DevX Rx queue object.\n *\n * @return\n * 1 while a reference on it exists, 0 when freed.\n */\n static int\n-mlx5_rxq_ibv_release(struct mlx5_rxq_ibv *rxq_ibv)\n+mlx5_rxq_obj_release(struct mlx5_rxq_obj *rxq_obj)\n {\n-\tassert(rxq_ibv);\n-\tassert(rxq_ibv->wq);\n-\tassert(rxq_ibv->cq);\n-\tif (rte_atomic32_dec_and_test(&rxq_ibv->refcnt)) {\n-\t\trxq_free_elts(rxq_ibv->rxq_ctrl);\n-\t\tclaim_zero(mlx5_glue->destroy_wq(rxq_ibv->wq));\n-\t\tclaim_zero(mlx5_glue->destroy_cq(rxq_ibv->cq));\n-\t\tif (rxq_ibv->channel)\n+\tassert(rxq_obj);\n+\tassert(rxq_obj->wq);\n+\tassert(rxq_obj->cq);\n+\tif (rte_atomic32_dec_and_test(&rxq_obj->refcnt)) {\n+\t\trxq_free_elts(rxq_obj->rxq_ctrl);\n+\t\tclaim_zero(mlx5_glue->destroy_wq(rxq_obj->wq));\n+\t\tclaim_zero(mlx5_glue->destroy_cq(rxq_obj->cq));\n+\t\tif (rxq_obj->channel)\n \t\t\tclaim_zero(mlx5_glue->destroy_comp_channel\n-\t\t\t\t (rxq_ibv->channel));\n-\t\tLIST_REMOVE(rxq_ibv, next);\n-\t\trte_free(rxq_ibv);\n+\t\t\t\t (rxq_obj->channel));\n+\t\tLIST_REMOVE(rxq_obj, next);\n+\t\trte_free(rxq_obj);\n \t\treturn 0;\n \t}\n \treturn 1;\n@@ -622,14 +622,14 @@\n \t}\n \tintr_handle->type = RTE_INTR_HANDLE_EXT;\n \tfor (i = 0; i != n; ++i) {\n-\t\t/* This rxq ibv must not be released in this function. */\n-\t\tstruct mlx5_rxq_ibv *rxq_ibv = mlx5_rxq_ibv_get(dev, i);\n+\t\t/* This rxq obj must not be released in this function. */\n+\t\tstruct mlx5_rxq_obj *rxq_obj = mlx5_rxq_obj_get(dev, i);\n \t\tint fd;\n \t\tint flags;\n \t\tint rc;\n \n \t\t/* Skip queues that cannot request interrupts. */\n-\t\tif (!rxq_ibv || !rxq_ibv->channel) {\n+\t\tif (!rxq_obj || !rxq_obj->channel) {\n \t\t\t/* Use invalid intr_vec[] index to disable entry. */\n \t\t\tintr_handle->intr_vec[i] =\n \t\t\t\tRTE_INTR_VEC_RXTX_OFFSET +\n@@ -646,7 +646,7 @@\n \t\t\trte_errno = ENOMEM;\n \t\t\treturn -rte_errno;\n \t\t}\n-\t\tfd = rxq_ibv->channel->fd;\n+\t\tfd = rxq_obj->channel->fd;\n \t\tflags = fcntl(fd, F_GETFL);\n \t\trc = fcntl(fd, F_SETFL, flags | O_NONBLOCK);\n \t\tif (rc < 0) {\n@@ -702,8 +702,8 @@\n \t\t */\n \t\trxq_data = (*priv->rxqs)[i];\n \t\trxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n-\t\tif (rxq_ctrl->ibv)\n-\t\t\tmlx5_rxq_ibv_release(rxq_ctrl->ibv);\n+\t\tif (rxq_ctrl->obj)\n+\t\t\tmlx5_rxq_obj_release(rxq_ctrl->obj);\n \t}\n free:\n \trte_intr_free_epoll_fd(intr_handle);\n@@ -763,15 +763,15 @@\n \t}\n \trxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n \tif (rxq_ctrl->irq) {\n-\t\tstruct mlx5_rxq_ibv *rxq_ibv;\n+\t\tstruct mlx5_rxq_obj *rxq_obj;\n \n-\t\trxq_ibv = mlx5_rxq_ibv_get(dev, rx_queue_id);\n-\t\tif (!rxq_ibv) {\n+\t\trxq_obj = mlx5_rxq_obj_get(dev, rx_queue_id);\n+\t\tif (!rxq_obj) {\n \t\t\trte_errno = EINVAL;\n \t\t\treturn -rte_errno;\n \t\t}\n \t\tmlx5_arm_cq(rxq_data, rxq_data->cq_arm_sn);\n-\t\tmlx5_rxq_ibv_release(rxq_ibv);\n+\t\tmlx5_rxq_obj_release(rxq_obj);\n \t}\n \treturn 0;\n }\n@@ -793,7 +793,7 @@\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_rxq_data *rxq_data;\n \tstruct mlx5_rxq_ctrl *rxq_ctrl;\n-\tstruct mlx5_rxq_ibv *rxq_ibv = NULL;\n+\tstruct mlx5_rxq_obj *rxq_obj = NULL;\n \tstruct ibv_cq *ev_cq;\n \tvoid *ev_ctx;\n \tint ret;\n@@ -806,24 +806,24 @@\n \trxq_ctrl = container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);\n \tif (!rxq_ctrl->irq)\n \t\treturn 0;\n-\trxq_ibv = mlx5_rxq_ibv_get(dev, rx_queue_id);\n-\tif (!rxq_ibv) {\n+\trxq_obj = mlx5_rxq_obj_get(dev, rx_queue_id);\n+\tif (!rxq_obj) {\n \t\trte_errno = EINVAL;\n \t\treturn -rte_errno;\n \t}\n-\tret = mlx5_glue->get_cq_event(rxq_ibv->channel, &ev_cq, &ev_ctx);\n-\tif (ret || ev_cq != rxq_ibv->cq) {\n+\tret = mlx5_glue->get_cq_event(rxq_obj->channel, &ev_cq, &ev_ctx);\n+\tif (ret || ev_cq != rxq_obj->cq) {\n \t\trte_errno = EINVAL;\n \t\tgoto exit;\n \t}\n \trxq_data->cq_arm_sn++;\n-\tmlx5_glue->ack_cq_events(rxq_ibv->cq, 1);\n-\tmlx5_rxq_ibv_release(rxq_ibv);\n+\tmlx5_glue->ack_cq_events(rxq_obj->cq, 1);\n+\tmlx5_rxq_obj_release(rxq_obj);\n \treturn 0;\n exit:\n \tret = rte_errno; /* Save rte_errno before cleanup. */\n-\tif (rxq_ibv)\n-\t\tmlx5_rxq_ibv_release(rxq_ibv);\n+\tif (rxq_obj)\n+\t\tmlx5_rxq_obj_release(rxq_obj);\n \tDRV_LOG(WARNING, \"port %u unable to disable interrupt on Rx queue %d\",\n \t\tdev->data->port_id, rx_queue_id);\n \trte_errno = ret; /* Restore rte_errno. */\n@@ -831,7 +831,7 @@\n }\n \n /**\n- * Create the Rx queue Verbs object.\n+ * Create the Rx queue Verbs/DevX object.\n *\n * @param dev\n * Pointer to Ethernet device.\n@@ -839,10 +839,10 @@\n * Queue index in DPDK Rx queue array\n *\n * @return\n- * The Verbs object initialised, NULL otherwise and rte_errno is set.\n+ * The Verbs/DevX object initialised, NULL otherwise and rte_errno is set.\n */\n-struct mlx5_rxq_ibv *\n-mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)\n+struct mlx5_rxq_obj *\n+mlx5_rxq_obj_new(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@@ -863,7 +863,7 @@ struct mlx5_rxq_ibv *\n \t} attr;\n \tunsigned int cqe_n;\n \tunsigned int wqe_n = 1 << rxq_data->elts_n;\n-\tstruct mlx5_rxq_ibv *tmpl = NULL;\n+\tstruct mlx5_rxq_obj *tmpl = NULL;\n \tstruct mlx5dv_cq cq_info;\n \tstruct mlx5dv_rwq rwq;\n \tint ret = 0;\n@@ -1062,7 +1062,7 @@ struct mlx5_rxq_ibv *\n \tDRV_LOG(DEBUG, \"port %u rxq %u updated with %p\", dev->data->port_id,\n \t\tidx, (void *)&tmpl);\n \trte_atomic32_inc(&tmpl->refcnt);\n-\tLIST_INSERT_HEAD(&priv->rxqsibv, tmpl, next);\n+\tLIST_INSERT_HEAD(&priv->rxqsobj, tmpl, next);\n \tpriv->verbs_alloc_ctx.type = MLX5_VERBS_ALLOC_TYPE_NONE;\n \treturn tmpl;\n error:\n@@ -1083,24 +1083,24 @@ struct mlx5_rxq_ibv *\n }\n \n /**\n- * Verify the Verbs Rx queue list is empty\n+ * Verify the Rx queue objects list is empty\n *\n * @param dev\n * Pointer to Ethernet device.\n *\n * @return\n- * The number of object not released.\n+ * The number of objects not released.\n */\n int\n-mlx5_rxq_ibv_verify(struct rte_eth_dev *dev)\n+mlx5_rxq_obj_verify(struct rte_eth_dev *dev)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tint ret = 0;\n-\tstruct mlx5_rxq_ibv *rxq_ibv;\n+\tstruct mlx5_rxq_obj *rxq_obj;\n \n-\tLIST_FOREACH(rxq_ibv, &priv->rxqsibv, next) {\n-\t\tDRV_LOG(DEBUG, \"port %u Verbs Rx queue %u still referenced\",\n-\t\t\tdev->data->port_id, rxq_ibv->rxq_ctrl->rxq.idx);\n+\tLIST_FOREACH(rxq_obj, &priv->rxqsobj, next) {\n+\t\tDRV_LOG(DEBUG, \"port %u Rx queue %u still referenced\",\n+\t\t\tdev->data->port_id, rxq_obj->rxq_ctrl->rxq.idx);\n \t\t++ret;\n \t}\n \treturn ret;\n@@ -1502,7 +1502,7 @@ struct mlx5_rxq_ctrl *\n \t\trxq_ctrl = container_of((*priv->rxqs)[idx],\n \t\t\t\t\tstruct mlx5_rxq_ctrl,\n \t\t\t\t\trxq);\n-\t\tmlx5_rxq_ibv_get(dev, idx);\n+\t\tmlx5_rxq_obj_get(dev, idx);\n \t\trte_atomic32_inc(&rxq_ctrl->refcnt);\n \t}\n \treturn rxq_ctrl;\n@@ -1529,8 +1529,8 @@ struct mlx5_rxq_ctrl *\n \t\treturn 0;\n \trxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq);\n \tassert(rxq_ctrl->priv);\n-\tif (rxq_ctrl->ibv && !mlx5_rxq_ibv_release(rxq_ctrl->ibv))\n-\t\trxq_ctrl->ibv = NULL;\n+\tif (rxq_ctrl->obj && !mlx5_rxq_obj_release(rxq_ctrl->obj))\n+\t\trxq_ctrl->obj = NULL;\n \tif (rte_atomic32_dec_and_test(&rxq_ctrl->refcnt)) {\n \t\tmlx5_mr_btree_free(&rxq_ctrl->rxq.mr_ctrl.cache_bh);\n \t\tLIST_REMOVE(rxq_ctrl, next);\n@@ -1602,7 +1602,7 @@ struct mlx5_rxq_ctrl *\n \n \t\tif (!rxq)\n \t\t\tgoto error;\n-\t\twq[i] = rxq->ibv->wq;\n+\t\twq[i] = rxq->obj->wq;\n \t\tind_tbl->queues[i] = queues[i];\n \t}\n \tind_tbl->queues_n = queues_n;\n@@ -1953,22 +1953,22 @@ struct mlx5_hrxq *\n }\n \n /**\n- * Create a drop Rx queue Verbs object.\n+ * Create a drop Rx queue Verbs/DevX object.\n *\n * @param dev\n * Pointer to Ethernet device.\n *\n * @return\n- * The Verbs object initialised, NULL otherwise and rte_errno is set.\n+ * The Verbs/DevX object initialised, NULL otherwise and rte_errno is set.\n */\n-static struct mlx5_rxq_ibv *\n-mlx5_rxq_ibv_drop_new(struct rte_eth_dev *dev)\n+static struct mlx5_rxq_obj *\n+mlx5_rxq_obj_drop_new(struct rte_eth_dev *dev)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct ibv_context *ctx = priv->sh->ctx;\n \tstruct ibv_cq *cq;\n \tstruct ibv_wq *wq = NULL;\n-\tstruct mlx5_rxq_ibv *rxq;\n+\tstruct mlx5_rxq_obj *rxq;\n \n \tif (priv->drop_queue.rxq)\n \t\treturn priv->drop_queue.rxq;\n@@ -2013,19 +2013,19 @@ struct mlx5_hrxq *\n }\n \n /**\n- * Release a drop Rx queue Verbs object.\n+ * Release a drop Rx queue Verbs/DevX object.\n *\n * @param dev\n * Pointer to Ethernet device.\n *\n * @return\n- * The Verbs object initialised, NULL otherwise and rte_errno is set.\n+ * The Verbs/DevX object initialised, NULL otherwise and rte_errno is set.\n */\n static void\n-mlx5_rxq_ibv_drop_release(struct rte_eth_dev *dev)\n+mlx5_rxq_obj_drop_release(struct rte_eth_dev *dev)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n-\tstruct mlx5_rxq_ibv *rxq = priv->drop_queue.rxq;\n+\tstruct mlx5_rxq_obj *rxq = priv->drop_queue.rxq;\n \n \tif (rxq->wq)\n \t\tclaim_zero(mlx5_glue->destroy_wq(rxq->wq));\n@@ -2049,10 +2049,10 @@ struct mlx5_hrxq *\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_ind_table_ibv *ind_tbl;\n-\tstruct mlx5_rxq_ibv *rxq;\n+\tstruct mlx5_rxq_obj *rxq;\n \tstruct mlx5_ind_table_ibv tmpl;\n \n-\trxq = mlx5_rxq_ibv_drop_new(dev);\n+\trxq = mlx5_rxq_obj_drop_new(dev);\n \tif (!rxq)\n \t\treturn NULL;\n \ttmpl.ind_table = mlx5_glue->create_rwq_ind_table\n@@ -2077,7 +2077,7 @@ struct mlx5_hrxq *\n \tind_tbl->ind_table = tmpl.ind_table;\n \treturn ind_tbl;\n error:\n-\tmlx5_rxq_ibv_drop_release(dev);\n+\tmlx5_rxq_obj_drop_release(dev);\n \treturn NULL;\n }\n \n@@ -2094,7 +2094,7 @@ struct mlx5_hrxq *\n \tstruct mlx5_ind_table_ibv *ind_tbl = priv->drop_queue.hrxq->ind_table;\n \n \tclaim_zero(mlx5_glue->destroy_rwq_ind_table(ind_tbl->ind_table));\n-\tmlx5_rxq_ibv_drop_release(dev);\n+\tmlx5_rxq_obj_drop_release(dev);\n \trte_free(ind_tbl);\n \tpriv->drop_queue.hrxq->ind_table = NULL;\n }\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c\nindex 35d60f4..9bfb002 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.c\n+++ b/drivers/net/mlx5/mlx5_rxtx.c\n@@ -815,7 +815,7 @@ enum mlx5_txcmp_code {\n \t\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n \t\t\tcontainer_of(rxq, struct mlx5_rxq_ctrl, rxq);\n \n-\t\tret = mlx5_glue->modify_wq(rxq_ctrl->ibv->wq, &mod);\n+\t\tret = mlx5_glue->modify_wq(rxq_ctrl->obj->wq, &mod);\n \t\tif (ret) {\n \t\t\tDRV_LOG(ERR, \"Cannot change Rx WQ state to %u - %s\\n\",\n \t\t\t\t\tsm->state, strerror(errno));\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 436b453..eb20a07 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -141,13 +141,23 @@ struct mlx5_rxq_data {\n \tuint32_t tunnel; /* Tunnel information. */\n } __rte_cache_aligned;\n \n-/* Verbs Rx queue elements. */\n-struct mlx5_rxq_ibv {\n-\tLIST_ENTRY(mlx5_rxq_ibv) next; /* Pointer to the next element. */\n+enum mlx5_rxq_obj_type {\n+\tMLX5_RXQ_OBJ_TYPE_IBV,\t\t/* mlx5_rxq_obj with ibv_wq. */\n+\tMLX5_RXQ_OBJ_TYPE_DEVX_RQ,\t/* mlx5_rxq_obj with mlx5_devx_rq. */\n+};\n+\n+/* Verbs/DevX Rx queue elements. */\n+struct mlx5_rxq_obj {\n+\tLIST_ENTRY(mlx5_rxq_obj) next; /* Pointer to the next element. */\n \trte_atomic32_t refcnt; /* Reference counter. */\n \tstruct mlx5_rxq_ctrl *rxq_ctrl; /* Back pointer to parent. */\n \tstruct ibv_cq *cq; /* Completion Queue. */\n-\tstruct ibv_wq *wq; /* Work Queue. */\n+\tenum mlx5_rxq_obj_type type;\n+\tRTE_STD_C11\n+\tunion {\n+\t\tstruct ibv_wq *wq; /* Work Queue. */\n+\t\tstruct mlx5_devx_obj *rq; /* DevX object for Rx Queue. */\n+\t};\n \tstruct ibv_comp_channel *channel;\n };\n \n@@ -156,7 +166,7 @@ struct mlx5_rxq_ctrl {\n \tstruct mlx5_rxq_data rxq; /* Data path structure. */\n \tLIST_ENTRY(mlx5_rxq_ctrl) next; /* Pointer to the next element. */\n \trte_atomic32_t refcnt; /* Reference counter. */\n-\tstruct mlx5_rxq_ibv *ibv; /* Verbs elements. */\n+\tstruct mlx5_rxq_obj *obj; /* Verbs/DevX elements. */\n \tstruct mlx5_priv *priv; /* Back pointer to private data. */\n \tunsigned int socket; /* CPU socket ID for allocations. */\n \tunsigned int irq:1; /* Whether IRQ is enabled. */\n@@ -300,8 +310,8 @@ int mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n void mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev);\n int mlx5_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n int mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n-struct mlx5_rxq_ibv *mlx5_rxq_ibv_new(struct rte_eth_dev *dev, uint16_t idx);\n-int mlx5_rxq_ibv_verify(struct rte_eth_dev *dev);\n+struct mlx5_rxq_obj *mlx5_rxq_obj_new(struct rte_eth_dev *dev, uint16_t idx);\n+int mlx5_rxq_obj_verify(struct rte_eth_dev *dev);\n struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx,\n \t\t\t\t uint16_t desc, unsigned int socket,\n \t\t\t\t const struct rte_eth_rxconf *conf,\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex 864c985..54353ee 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -123,10 +123,10 @@\n \t\tret = rxq_alloc_elts(rxq_ctrl);\n \t\tif (ret)\n \t\t\tgoto error;\n-\t\trxq_ctrl->ibv = mlx5_rxq_ibv_new(dev, i);\n-\t\tif (!rxq_ctrl->ibv)\n+\t\trxq_ctrl->obj = mlx5_rxq_obj_new(dev, i);\n+\t\tif (!rxq_ctrl->obj)\n \t\t\tgoto error;\n-\t\trxq_ctrl->wqn = rxq_ctrl->ibv->wq->wq_num;\n+\t\trxq_ctrl->wqn = rxq_ctrl->obj->wq->wq_num;\n \t}\n \treturn 0;\n error:\ndiff --git a/drivers/net/mlx5/mlx5_vlan.c b/drivers/net/mlx5/mlx5_vlan.c\nindex 4004930..67518c2 100644\n--- a/drivers/net/mlx5/mlx5_vlan.c\n+++ b/drivers/net/mlx5/mlx5_vlan.c\n@@ -127,7 +127,7 @@\n \t}\n \tDRV_LOG(DEBUG, \"port %u set VLAN offloads 0x%x for port %uqueue %d\",\n \t\tdev->data->port_id, vlan_offloads, rxq->port_id, queue);\n-\tif (!rxq_ctrl->ibv) {\n+\tif (!rxq_ctrl->obj) {\n \t\t/* Update related bits in RX queue. */\n \t\trxq->vlan_strip = !!on;\n \t\treturn;\n@@ -137,7 +137,7 @@\n \t\t.flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,\n \t\t.flags = vlan_offloads,\n \t};\n-\tret = mlx5_glue->modify_wq(rxq_ctrl->ibv->wq, &mod);\n+\tret = mlx5_glue->modify_wq(rxq_ctrl->obj->wq, &mod);\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"port %u failed to modified stripping mode: %s\",\n \t\t\tdev->data->port_id, strerror(rte_errno));\n", "prefixes": [ "14/28" ] }