Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/68235/?format=api
{ "id": 68235, "url": "https://patches.dpdk.org/api/patches/68235/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1586740309-449310-10-git-send-email-suanmingm@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": "<1586740309-449310-10-git-send-email-suanmingm@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1586740309-449310-10-git-send-email-suanmingm@mellanox.com", "date": "2020-04-13T01:11:48", "name": "[09/10] net/mlx5: convert hrxq to indexed", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ac18de9c7e19868b7a90ff9bd699963030d2bc0e", "submitter": { "id": 1358, "url": "https://patches.dpdk.org/api/people/1358/?format=api", "name": "Suanming Mou", "email": "suanmingm@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/1586740309-449310-10-git-send-email-suanmingm@mellanox.com/mbox/", "series": [ { "id": 9321, "url": "https://patches.dpdk.org/api/series/9321/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=9321", "date": "2020-04-13T01:11:39", "name": "net/mlx5: optimize flow resource allocation", "version": 1, "mbox": "https://patches.dpdk.org/series/9321/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/68235/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/68235/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 B2EF7A0577;\n\tMon, 13 Apr 2020 03:13:27 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1C9E41BF31;\n\tMon, 13 Apr 2020 03:12:15 +0200 (CEST)", "from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130])\n by dpdk.org (Postfix) with ESMTP id 115AC1BFD9\n for <dev@dpdk.org>; Mon, 13 Apr 2020 03:12:13 +0200 (CEST)" ], "From": "Suanming Mou <suanmingm@mellanox.com>", "To": "Matan Azrad <matan@mellanox.com>, Shahaf Shuler <shahafs@mellanox.com>,\n Viacheslav Ovsiienko <viacheslavo@mellanox.com>", "Cc": "rasland@mellanox.com,\n\tdev@dpdk.org", "Date": "Mon, 13 Apr 2020 09:11:48 +0800", "Message-Id": "<1586740309-449310-10-git-send-email-suanmingm@mellanox.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1586740309-449310-1-git-send-email-suanmingm@mellanox.com>", "References": "<1586740309-449310-1-git-send-email-suanmingm@mellanox.com>", "Subject": "[dpdk-dev] [PATCH 09/10] net/mlx5: convert hrxq to indexed", "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": "This commit converts hrxq to indexed.\n\nUsing the uint32_t index instead of pointer saves 4 bytes memory for the\nflow handle. For millions flows, it will save several MBytes of memory.\n\nSigned-off-by: Suanming Mou <suanmingm@mellanox.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>\n---\n drivers/net/mlx5/mlx5.c | 31 +++++++++++++++++--------\n drivers/net/mlx5/mlx5.h | 3 ++-\n drivers/net/mlx5/mlx5_flow.h | 2 +-\n drivers/net/mlx5/mlx5_flow_dv.c | 46 ++++++++++++++++++++-----------------\n drivers/net/mlx5/mlx5_flow_verbs.c | 24 +++++++++++--------\n drivers/net/mlx5/mlx5_rxq.c | 47 ++++++++++++++++++++++++--------------\n drivers/net/mlx5/mlx5_rxtx.h | 22 +++++++++---------\n 7 files changed, 104 insertions(+), 71 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 9a66ed5..b108c0e 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -250,6 +250,17 @@ struct mlx5_dev_spawn_data {\n \t\t.free = rte_free,\n \t\t.type = \"mlx5_jump_ipool\",\n \t},\n+\t{\n+\t\t.size = (sizeof(struct mlx5_hrxq) + MLX5_RSS_HASH_KEY_LEN),\n+\t\t.trunk_size = 64,\n+\t\t.grow_trunk = 3,\n+\t\t.grow_shift = 2,\n+\t\t.need_lock = 0,\n+\t\t.release_mem_en = 1,\n+\t\t.malloc = rte_malloc_socket,\n+\t\t.free = rte_free,\n+\t\t.type = \"mlx5_jump_ipool\",\n+\t},\n };\n \n \n@@ -1386,16 +1397,6 @@ struct mlx5_flow_id_pool *\n \t\tclose(priv->nl_socket_rdma);\n \tif (priv->vmwa_context)\n \t\tmlx5_vlan_vmwa_exit(priv->vmwa_context);\n-\tif (priv->sh) {\n-\t\t/*\n-\t\t * Free the shared context in last turn, because the cleanup\n-\t\t * routines above may use some shared fields, like\n-\t\t * mlx5_nl_mac_addr_flush() uses ibdev_path for retrieveing\n-\t\t * ifindex if Netlink fails.\n-\t\t */\n-\t\tmlx5_free_shared_ibctx(priv->sh);\n-\t\tpriv->sh = NULL;\n-\t}\n \tret = mlx5_hrxq_verify(dev);\n \tif (ret)\n \t\tDRV_LOG(WARNING, \"port %u some hash Rx queue still remain\",\n@@ -1424,6 +1425,16 @@ struct mlx5_flow_id_pool *\n \tif (ret)\n \t\tDRV_LOG(WARNING, \"port %u some flows still remain\",\n \t\t\tdev->data->port_id);\n+\tif (priv->sh) {\n+\t\t/*\n+\t\t * Free the shared context in last turn, because the cleanup\n+\t\t * routines above may use some shared fields, like\n+\t\t * mlx5_nl_mac_addr_flush() uses ibdev_path for retrieveing\n+\t\t * ifindex if Netlink fails.\n+\t\t */\n+\t\tmlx5_free_shared_ibctx(priv->sh);\n+\t\tpriv->sh = NULL;\n+\t}\n \tif (priv->domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) {\n \t\tunsigned int c = 0;\n \t\tuint16_t port_id;\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 2a05c09..3a01c82 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -57,6 +57,7 @@ enum mlx5_ipool_index {\n \tMLX5_IPOOL_TAG, /* Pool for tag resource. */\n \tMLX5_IPOOL_PORT_ID, /* Pool for port id resource. */\n \tMLX5_IPOOL_JUMP, /* Pool for jump resource. */\n+\tMLX5_IPOOL_HRXQ, /* Pool for hrxq resource. */\n \tMLX5_IPOOL_MAX,\n };\n \n@@ -534,7 +535,7 @@ struct mlx5_priv {\n \tint flow_idx; /* Intermediate device flow index. */\n \tLIST_HEAD(rxq, mlx5_rxq_ctrl) rxqsctrl; /* DPDK 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+\tuint32_t hrxqs; /* Verbs Hash Rx queues. */\n \tLIST_HEAD(txq, mlx5_txq_ctrl) txqsctrl; /* DPDK Tx queues. */\n \tLIST_HEAD(txqobj, mlx5_txq_obj) txqsobj; /* Verbs/DevX Tx queues. */\n \t/* Indirection tables. */\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex ce7e929..fcc887d 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -509,7 +509,7 @@ struct mlx5_flow_handle {\n \tuint64_t act_flags;\n \t/**< Bit-fields of detected actions, see MLX5_FLOW_ACTION_*. */\n \tvoid *ib_flow; /**< Verbs flow pointer. */\n-\tstruct mlx5_hrxq *hrxq; /**< Hash Rx queue object. */\n+\tuint32_t hrxq; /**< Hash Rx queue object index. */\n \tstruct mlx5_vf_vlan vf_vlan; /**< Structure for VF VLAN workaround. */\n \tunion {\n \t\tuint32_t qrss_id; /**< Uniqie Q/RSS suffix subflow tag. */\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 9fe0446..6489213 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -8080,8 +8080,9 @@ struct field_modify_info modify_tcp[] = {\n \t\t\tif (dv->transfer) {\n \t\t\t\tdv->actions[n++] = priv->sh->esw_drop_action;\n \t\t\t} else {\n-\t\t\t\tdh->hrxq = mlx5_hrxq_drop_new(dev);\n-\t\t\t\tif (!dh->hrxq) {\n+\t\t\t\tstruct mlx5_hrxq *drop_hrxq;\n+\t\t\t\tdrop_hrxq = mlx5_hrxq_drop_new(dev);\n+\t\t\t\tif (!drop_hrxq) {\n \t\t\t\t\trte_flow_error_set\n \t\t\t\t\t\t(error, errno,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n@@ -8089,28 +8090,31 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\t\t \"cannot get drop hash queue\");\n \t\t\t\t\tgoto error;\n \t\t\t\t}\n-\t\t\t\tdv->actions[n++] = dh->hrxq->action;\n+\t\t\t\tdv->actions[n++] = drop_hrxq->action;\n \t\t\t}\n \t\t} else if (dh->act_flags &\n \t\t\t (MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)) {\n \t\t\tstruct mlx5_hrxq *hrxq;\n+\t\t\tuint32_t hrxq_idx;\n \n \t\t\tMLX5_ASSERT(flow->rss.queue);\n-\t\t\thrxq = mlx5_hrxq_get(dev, flow->rss.key,\n-\t\t\t\t\t MLX5_RSS_HASH_KEY_LEN,\n-\t\t\t\t\t dev_flow->hash_fields,\n-\t\t\t\t\t (*flow->rss.queue),\n-\t\t\t\t\t flow->rss.queue_num);\n-\t\t\tif (!hrxq) {\n-\t\t\t\thrxq = mlx5_hrxq_new\n-\t\t\t\t\t(dev, flow->rss.key,\n-\t\t\t\t\t MLX5_RSS_HASH_KEY_LEN,\n-\t\t\t\t\t dev_flow->hash_fields,\n-\t\t\t\t\t (*flow->rss.queue),\n-\t\t\t\t\t flow->rss.queue_num,\n-\t\t\t\t\t !!(dh->layers &\n-\t\t\t\t\t MLX5_FLOW_LAYER_TUNNEL));\n+\t\t\thrxq_idx = mlx5_hrxq_get(dev, flow->rss.key,\n+\t\t\t\t\t\t MLX5_RSS_HASH_KEY_LEN,\n+\t\t\t\t\t\t dev_flow->hash_fields,\n+\t\t\t\t\t\t (*flow->rss.queue),\n+\t\t\t\t\t\t flow->rss.queue_num);\n+\t\t\tif (!hrxq_idx) {\n+\t\t\t\thrxq_idx = mlx5_hrxq_new\n+\t\t\t\t\t\t(dev, flow->rss.key,\n+\t\t\t\t\t\tMLX5_RSS_HASH_KEY_LEN,\n+\t\t\t\t\t\tdev_flow->hash_fields,\n+\t\t\t\t\t\t(*flow->rss.queue),\n+\t\t\t\t\t\tflow->rss.queue_num,\n+\t\t\t\t\t\t!!(dh->layers &\n+\t\t\t\t\t\tMLX5_FLOW_LAYER_TUNNEL));\n \t\t\t}\n+\t\t\thrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ],\n+\t\t\t\t\t hrxq_idx);\n \t\t\tif (!hrxq) {\n \t\t\t\trte_flow_error_set\n \t\t\t\t\t(error, rte_errno,\n@@ -8118,8 +8122,8 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\t\t \"cannot get hash queue\");\n \t\t\t\tgoto error;\n \t\t\t}\n-\t\t\tdh->hrxq = hrxq;\n-\t\t\tdv->actions[n++] = dh->hrxq->action;\n+\t\t\tdh->hrxq = hrxq_idx;\n+\t\t\tdv->actions[n++] = hrxq->action;\n \t\t}\n \t\tdh->ib_flow =\n \t\t\tmlx5_glue->dv_create_flow(dv_h->matcher->matcher_object,\n@@ -8152,7 +8156,7 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\tmlx5_hrxq_drop_release(dev);\n \t\t\telse\n \t\t\t\tmlx5_hrxq_release(dev, dh->hrxq);\n-\t\t\tdh->hrxq = NULL;\n+\t\t\tdh->hrxq = 0;\n \t\t}\n \t\tif (dh->vf_vlan.tag && dh->vf_vlan.created)\n \t\t\tmlx5_vlan_vmwa_release(dev, &dh->vf_vlan);\n@@ -8416,7 +8420,7 @@ struct field_modify_info modify_tcp[] = {\n \t\t\t\tmlx5_hrxq_drop_release(dev);\n \t\t\telse\n \t\t\t\tmlx5_hrxq_release(dev, dh->hrxq);\n-\t\t\tdh->hrxq = NULL;\n+\t\t\tdh->hrxq = 0;\n \t\t}\n \t\tif (dh->vf_vlan.tag && dh->vf_vlan.created)\n \t\t\tmlx5_vlan_vmwa_release(dev, &dh->vf_vlan);\ndiff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c\nindex ccd3395..5f4b701 100644\n--- a/drivers/net/mlx5/mlx5_flow_verbs.c\n+++ b/drivers/net/mlx5/mlx5_flow_verbs.c\n@@ -1656,7 +1656,7 @@\n \t\t\t\tmlx5_hrxq_drop_release(dev);\n \t\t\telse\n \t\t\t\tmlx5_hrxq_release(dev, handle->hrxq);\n-\t\t\thandle->hrxq = NULL;\n+\t\t\thandle->hrxq = 0;\n \t\t}\n \t\tif (handle->vf_vlan.tag && handle->vf_vlan.created)\n \t\t\tmlx5_vlan_vmwa_release(dev, &handle->vf_vlan);\n@@ -1710,6 +1710,7 @@\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_flow_handle *handle;\n \tstruct mlx5_flow *dev_flow;\n+\tstruct mlx5_hrxq *hrxq;\n \tint err;\n \tint idx;\n \n@@ -1717,8 +1718,8 @@\n \t\tdev_flow = &((struct mlx5_flow *)priv->inter_flows)[idx];\n \t\thandle = dev_flow->handle;\n \t\tif (handle->act_flags & MLX5_FLOW_ACTION_DROP) {\n-\t\t\thandle->hrxq = mlx5_hrxq_drop_new(dev);\n-\t\t\tif (!handle->hrxq) {\n+\t\t\thrxq = mlx5_hrxq_drop_new(dev);\n+\t\t\tif (!hrxq) {\n \t\t\t\trte_flow_error_set\n \t\t\t\t\t(error, errno,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n@@ -1726,22 +1727,24 @@\n \t\t\t\tgoto error;\n \t\t\t}\n \t\t} else {\n-\t\t\tstruct mlx5_hrxq *hrxq;\n+\t\t\tuint32_t hrxq_idx;\n \n \t\t\tMLX5_ASSERT(flow->rss.queue);\n-\t\t\thrxq = mlx5_hrxq_get(dev, flow->rss.key,\n+\t\t\thrxq_idx = mlx5_hrxq_get(dev, flow->rss.key,\n \t\t\t\t\t MLX5_RSS_HASH_KEY_LEN,\n \t\t\t\t\t dev_flow->hash_fields,\n \t\t\t\t\t (*flow->rss.queue),\n \t\t\t\t\t flow->rss.queue_num);\n-\t\t\tif (!hrxq)\n-\t\t\t\thrxq = mlx5_hrxq_new(dev, flow->rss.key,\n+\t\t\tif (!hrxq_idx)\n+\t\t\t\thrxq_idx = mlx5_hrxq_new(dev, flow->rss.key,\n \t\t\t\t\t\tMLX5_RSS_HASH_KEY_LEN,\n \t\t\t\t\t\tdev_flow->hash_fields,\n \t\t\t\t\t\t(*flow->rss.queue),\n \t\t\t\t\t\tflow->rss.queue_num,\n \t\t\t\t\t\t!!(handle->layers &\n \t\t\t\t\t\tMLX5_FLOW_LAYER_TUNNEL));\n+\t\t\thrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ],\n+\t\t\t\t\t hrxq_idx);\n \t\t\tif (!hrxq) {\n \t\t\t\trte_flow_error_set\n \t\t\t\t\t(error, rte_errno,\n@@ -1749,9 +1752,10 @@\n \t\t\t\t\t \"cannot get hash queue\");\n \t\t\t\tgoto error;\n \t\t\t}\n-\t\t\thandle->hrxq = hrxq;\n+\t\t\thandle->hrxq = hrxq_idx;\n \t\t}\n-\t\thandle->ib_flow = mlx5_glue->create_flow(handle->hrxq->qp,\n+\t\tMLX5_ASSERT(hrxq);\n+\t\thandle->ib_flow = mlx5_glue->create_flow(hrxq->qp,\n \t\t\t\t\t\t &dev_flow->verbs.attr);\n \t\tif (!handle->ib_flow) {\n \t\t\trte_flow_error_set(error, errno,\n@@ -1780,7 +1784,7 @@\n \t\t\t\tmlx5_hrxq_drop_release(dev);\n \t\t\telse\n \t\t\t\tmlx5_hrxq_release(dev, handle->hrxq);\n-\t\t\thandle->hrxq = NULL;\n+\t\t\thandle->hrxq = 0;\n \t\t}\n \t\tif (handle->vf_vlan.tag && handle->vf_vlan.created)\n \t\t\tmlx5_vlan_vmwa_release(dev, &handle->vf_vlan);\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 0a95e3c..8203025 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -2381,9 +2381,9 @@ enum mlx5_rxq_type\n * Tunnel type.\n *\n * @return\n- * The Verbs/DevX object initialised, NULL otherwise and rte_errno is set.\n+ * The Verbs/DevX object initialised index, 0 otherwise and rte_errno is set.\n */\n-struct mlx5_hrxq *\n+uint32_t\n mlx5_hrxq_new(struct rte_eth_dev *dev,\n \t const uint8_t *rss_key, uint32_t rss_key_len,\n \t uint64_t hash_fields,\n@@ -2392,6 +2392,7 @@ struct mlx5_hrxq *\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_hrxq *hrxq;\n+\tuint32_t hrxq_idx = 0;\n \tstruct ibv_qp *qp = NULL;\n \tstruct mlx5_ind_table_obj *ind_tbl;\n \tint err;\n@@ -2411,7 +2412,7 @@ struct mlx5_hrxq *\n \t}\n \tif (!ind_tbl) {\n \t\trte_errno = ENOMEM;\n-\t\treturn NULL;\n+\t\treturn 0;\n \t}\n \tif (ind_tbl->type == MLX5_IND_TBL_TYPE_IBV) {\n #ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT\n@@ -2552,7 +2553,7 @@ struct mlx5_hrxq *\n \t\t\tgoto error;\n \t\t}\n \t}\n-\thrxq = rte_calloc(__func__, 1, sizeof(*hrxq) + rss_key_len, 0);\n+\thrxq = mlx5_ipool_zmalloc(priv->sh->ipool[MLX5_IPOOL_HRXQ], &hrxq_idx);\n \tif (!hrxq)\n \t\tgoto error;\n \thrxq->ind_table = ind_tbl;\n@@ -2581,8 +2582,9 @@ struct mlx5_hrxq *\n \thrxq->hash_fields = hash_fields;\n \tmemcpy(hrxq->rss_key, rss_key, rss_key_len);\n \trte_atomic32_inc(&hrxq->refcnt);\n-\tLIST_INSERT_HEAD(&priv->hrxqs, hrxq, next);\n-\treturn hrxq;\n+\tILIST_INSERT(priv->sh->ipool[MLX5_IPOOL_HRXQ], &priv->hrxqs, hrxq_idx,\n+\t\t hrxq, next);\n+\treturn hrxq_idx;\n error:\n \terr = rte_errno; /* Save rte_errno before cleanup. */\n \tmlx5_ind_table_obj_release(dev, ind_tbl);\n@@ -2591,7 +2593,7 @@ struct mlx5_hrxq *\n \telse if (tir)\n \t\tclaim_zero(mlx5_devx_cmd_destroy(tir));\n \trte_errno = err; /* Restore rte_errno. */\n-\treturn NULL;\n+\treturn 0;\n }\n \n /**\n@@ -2608,9 +2610,9 @@ struct mlx5_hrxq *\n * Number of queues.\n *\n * @return\n- * An hash Rx queue on success.\n+ * An hash Rx queue index on success.\n */\n-struct mlx5_hrxq *\n+uint32_t\n mlx5_hrxq_get(struct rte_eth_dev *dev,\n \t const uint8_t *rss_key, uint32_t rss_key_len,\n \t uint64_t hash_fields,\n@@ -2618,9 +2620,11 @@ struct mlx5_hrxq *\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_hrxq *hrxq;\n+\tuint32_t idx;\n \n \tqueues_n = hash_fields ? queues_n : 1;\n-\tLIST_FOREACH(hrxq, &priv->hrxqs, next) {\n+\tILIST_FOREACH(priv->sh->ipool[MLX5_IPOOL_HRXQ], priv->hrxqs, idx,\n+\t\t hrxq, next) {\n \t\tstruct mlx5_ind_table_obj *ind_tbl;\n \n \t\tif (hrxq->rss_key_len != rss_key_len)\n@@ -2637,9 +2641,9 @@ struct mlx5_hrxq *\n \t\t\tcontinue;\n \t\t}\n \t\trte_atomic32_inc(&hrxq->refcnt);\n-\t\treturn hrxq;\n+\t\treturn idx;\n \t}\n-\treturn NULL;\n+\treturn 0;\n }\n \n /**\n@@ -2648,14 +2652,20 @@ struct mlx5_hrxq *\n * @param dev\n * Pointer to Ethernet device.\n * @param hrxq\n- * Pointer to Hash Rx queue to release.\n+ * Index to Hash Rx queue to release.\n *\n * @return\n * 1 while a reference on it exists, 0 when freed.\n */\n int\n-mlx5_hrxq_release(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq)\n+mlx5_hrxq_release(struct rte_eth_dev *dev, uint32_t hrxq_idx)\n {\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_hrxq *hrxq;\n+\n+\thrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ], hrxq_idx);\n+\tif (!hrxq)\n+\t\treturn 0;\n \tif (rte_atomic32_dec_and_test(&hrxq->refcnt)) {\n #ifdef HAVE_IBV_FLOW_DV_SUPPORT\n \t\tmlx5_glue->destroy_flow_action(hrxq->action);\n@@ -2665,8 +2675,9 @@ struct mlx5_hrxq *\n \t\telse /* hrxq->ind_table->type == MLX5_IND_TBL_TYPE_DEVX */\n \t\t\tclaim_zero(mlx5_devx_cmd_destroy(hrxq->tir));\n \t\tmlx5_ind_table_obj_release(dev, hrxq->ind_table);\n-\t\tLIST_REMOVE(hrxq, next);\n-\t\trte_free(hrxq);\n+\t\tILIST_REMOVE(priv->sh->ipool[MLX5_IPOOL_HRXQ], &priv->hrxqs,\n+\t\t\t hrxq_idx, hrxq, next);\n+\t\tmlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_HRXQ], hrxq_idx);\n \t\treturn 0;\n \t}\n \tclaim_nonzero(mlx5_ind_table_obj_release(dev, hrxq->ind_table));\n@@ -2687,9 +2698,11 @@ struct mlx5_hrxq *\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_hrxq *hrxq;\n+\tuint32_t idx;\n \tint ret = 0;\n \n-\tLIST_FOREACH(hrxq, &priv->hrxqs, next) {\n+\tILIST_FOREACH(priv->sh->ipool[MLX5_IPOOL_HRXQ], priv->hrxqs, idx,\n+\t\t hrxq, next) {\n \t\tDRV_LOG(DEBUG,\n \t\t\t\"port %u hash Rx queue %p still referenced\",\n \t\t\tdev->data->port_id, (void *)hrxq);\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 939778a..b2d944b 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -231,7 +231,7 @@ struct mlx5_ind_table_obj {\n \n /* Hash Rx queue. */\n struct mlx5_hrxq {\n-\tLIST_ENTRY(mlx5_hrxq) next; /* Pointer to the next element. */\n+\tILIST_ENTRY(uint32_t)next; /* Index to the next element. */\n \trte_atomic32_t refcnt; /* Reference counter. */\n \tstruct mlx5_ind_table_obj *ind_table; /* Indirection table. */\n \tRTE_STD_C11\n@@ -406,16 +406,16 @@ struct mlx5_rxq_ctrl *mlx5_rxq_hairpin_new\n int mlx5_rxq_verify(struct rte_eth_dev *dev);\n int rxq_alloc_elts(struct mlx5_rxq_ctrl *rxq_ctrl);\n int mlx5_ind_table_obj_verify(struct rte_eth_dev *dev);\n-struct mlx5_hrxq *mlx5_hrxq_new(struct rte_eth_dev *dev,\n-\t\t\t\tconst uint8_t *rss_key, uint32_t rss_key_len,\n-\t\t\t\tuint64_t hash_fields,\n-\t\t\t\tconst uint16_t *queues, uint32_t queues_n,\n-\t\t\t\tint tunnel __rte_unused);\n-struct mlx5_hrxq *mlx5_hrxq_get(struct rte_eth_dev *dev,\n-\t\t\t\tconst uint8_t *rss_key, uint32_t rss_key_len,\n-\t\t\t\tuint64_t hash_fields,\n-\t\t\t\tconst uint16_t *queues, uint32_t queues_n);\n-int mlx5_hrxq_release(struct rte_eth_dev *dev, struct mlx5_hrxq *hxrq);\n+uint32_t mlx5_hrxq_new(struct rte_eth_dev *dev,\n+\t\t const uint8_t *rss_key, uint32_t rss_key_len,\n+\t\t uint64_t hash_fields,\n+\t\t const uint16_t *queues, uint32_t queues_n,\n+\t\t int tunnel __rte_unused);\n+uint32_t mlx5_hrxq_get(struct rte_eth_dev *dev,\n+\t\t const uint8_t *rss_key, uint32_t rss_key_len,\n+\t\t uint64_t hash_fields,\n+\t\t const uint16_t *queues, uint32_t queues_n);\n+int mlx5_hrxq_release(struct rte_eth_dev *dev, uint32_t hxrq_idx);\n int mlx5_hrxq_verify(struct rte_eth_dev *dev);\n enum mlx5_rxq_type mlx5_rxq_get_type(struct rte_eth_dev *dev, uint16_t idx);\n struct mlx5_hrxq *mlx5_hrxq_drop_new(struct rte_eth_dev *dev);\n", "prefixes": [ "09/10" ] }