Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/95410/?format=api
{ "id": 95410, "url": "https://patches.dpdk.org/api/patches/95410/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210706133257.3353-24-suanmingm@nvidia.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": "<20210706133257.3353-24-suanmingm@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210706133257.3353-24-suanmingm@nvidia.com", "date": "2021-07-06T13:32:54", "name": "[v4,23/26] net/mlx5: optimize hash list table allocate on demand", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "a905e84779df00410783406a3dce6367c009419f", "submitter": { "id": 1887, "url": "https://patches.dpdk.org/api/people/1887/?format=api", "name": "Suanming Mou", "email": "suanmingm@nvidia.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/20210706133257.3353-24-suanmingm@nvidia.com/mbox/", "series": [ { "id": 17668, "url": "https://patches.dpdk.org/api/series/17668/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17668", "date": "2021-07-06T13:32:31", "name": "net/mlx5: insertion rate optimization", "version": 4, "mbox": "https://patches.dpdk.org/series/17668/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/95410/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/95410/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E525EA0C47;\n\tTue, 6 Jul 2021 15:36:36 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 93A994147B;\n\tTue, 6 Jul 2021 15:34:02 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2072.outbound.protection.outlook.com [40.107.94.72])\n by mails.dpdk.org (Postfix) with ESMTP id 5BFD641469\n for <dev@dpdk.org>; Tue, 6 Jul 2021 15:34:00 +0200 (CEST)", "from BN9PR03CA0608.namprd03.prod.outlook.com (2603:10b6:408:106::13)\n by MN2PR12MB4111.namprd12.prod.outlook.com (2603:10b6:208:1de::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.31; Tue, 6 Jul\n 2021 13:33:58 +0000", "from BN8NAM11FT056.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:106:cafe::7c) by BN9PR03CA0608.outlook.office365.com\n (2603:10b6:408:106::13) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.19 via Frontend\n Transport; Tue, 6 Jul 2021 13:33:58 +0000", "from mail.nvidia.com (216.228.112.34) by\n BN8NAM11FT056.mail.protection.outlook.com (10.13.177.26) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4287.22 via Frontend Transport; Tue, 6 Jul 2021 13:33:58 +0000", "from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 6 Jul\n 2021 13:33:56 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=JbcPj16zCMTWNvWspB6tN3n4/ynJX46m4EtDpai+bagHj3rJ3+e5mL2QCF03ntksq/n/IUTJqxq7X07vhCnfGB/Kz50nBlJ+pdZfp+nsusPeIr9t1kbzLTAMDBrQJwyLQa8hZs1GY+MfbGv+OTHdlH46d3lMDMMB67L5/dxjbXPV5futbpOSPVjDBlJzwZn8C/nUJC+fCpISv9M0nyFzGw5tthjHfzB1E9GA1LI8RjSuqMjhyVyXHgZq/Da5Rr9yRISpwvcqgFpgrqK2q5mFg8NsjPEmm6Kv8BKluaQG61XCrkTVbpdM8y47SIq30xw4CFXIDUvkg8GiFr+IFMQ1vw==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=EeVGVDWyeP0Ze8qVaLFaLuEsRVMOVctc48PXA36wPjk=;\n b=XyEDJHuikKNQRgSzzfYFYyRNg7sUXNoeHfp3TMBQUtlyPE40s5JYRZ8WdBza9oSvDXZTg77K6LJHp3pYh4oFx/nrWh+X01Ru6oRhCKQ61+ZmPOpIBJ62CzzSL2P+GbZL+0+/2YEWxB4ZgeLlSf9GVe5ieWRt4YdDM8n7o0nIg5ZzTsWuOIAI8kdWFP08ipwsWiBHIYUycsxKPi32Ukh06ofA9bBXJ2u4FPaqkq6T+niB/09GxePGIWyKYeI5M8q+Hig98qx9jxiC/PC0xAgVAZ8SQM0LasO+WuvushKBGhSyPiIa8HQpHPAz6uypnx5PlymEn+01PJNj+LGsDlrZ4Q==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=EeVGVDWyeP0Ze8qVaLFaLuEsRVMOVctc48PXA36wPjk=;\n b=tLLAy+VTCKdgYu99nSgzZEJayTqUa20phRH7fiH8quemFsCnWezJ76bvWSXcBMdpJT5VIdLvlHa+9DJiGEwJ1jjUlYQEuazavwnXVUR+o1YUcjzuCQx/lz44U5/c3RF/k9Il4kDJXsp6bQVrmHAFQf43Y085byw1PwAIgcPMN+uwEZDdLLeZQS9z//3qYQW9jmiAP9KFUj/VfavmfTwu4wQ+f7y/r/xfs5JrIJD2SJqB86LIRCHLBbJLR40CiIa8Ac8Qdduj7JlRU0o2OYtvGnuiRBRNpgUdx6kt3MaBsA8n4an1xJ518CcPpwespib2vwrISY0KxK2C14TAsasubg==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.112.34 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.112.34; helo=mail.nvidia.com;", "From": "Suanming Mou <suanmingm@nvidia.com>", "To": "<viacheslavo@nvidia.com>, <matan@nvidia.com>", "CC": "<rasland@nvidia.com>, <orika@nvidia.com>, <dev@dpdk.org>", "Date": "Tue, 6 Jul 2021 16:32:54 +0300", "Message-ID": "<20210706133257.3353-24-suanmingm@nvidia.com>", "X-Mailer": "git-send-email 2.18.1", "In-Reply-To": "<20210706133257.3353-1-suanmingm@nvidia.com>", "References": "<20210527093403.1153127-1-suanmingm@nvidia.com>\n <20210706133257.3353-1-suanmingm@nvidia.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.6]", "X-ClientProxiedBy": "HQMAIL101.nvidia.com (172.20.187.10) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "77648a6b-6738-4875-6d52-08d94082b5b4", "X-MS-TrafficTypeDiagnostic": "MN2PR12MB4111:", "X-Microsoft-Antispam-PRVS": "\n <MN2PR12MB4111D4F68794A5E001D25B76C11B9@MN2PR12MB4111.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:6;", "X-MS-Exchange-SenderADCheck": "1", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n pXDHyqHtTJK2RU9sS/8g4mU+/WWv5Gnc83NG0rAJxR7LXPoLDEUU5u4vXK2PcSiZs2ddItjKWQ3jAixMNrW5ipfUbYBilxsLDO5Scg7tvp8YZkd0tPjeLSD/TKjKd3BF0dIzPj5Ic7ua/M3Wb+B3cDNGFwj1V3QkSFDQo9hQaw7XzDuMczoxa/Fh/RmI8v0sFgrC3tGbpkPGeOilo1XrHhbjZyjUl+w6f+X/qhEz7P8rtKdIDM7Lu+c/k6yHp06Ok+RYdno6chGsbfgHBHRY6g66uQpUwworFlnPpkxby23RTG0AJGPuA0qNPsk4rm0cw6iT+fSv/ZBvkqEunNqEvavSuBlkVl0yA6p7K/vPgkXePL56TvIFDLmGF40jJ1QoXCKMEe2i+ciDaKqBxr9Fe4lHrlvs6sq5C6wFH/XwMbEsxpNlO5D0eRUS4tSKVuIO4pzA+xQu/sEFey3prz/bLz7JbvvzqOSmfUN8Q3Sc3VdQT8l7yM/vz/4EcLzkcQCikqFz6zVPafYY+4O+4RAayuRClceEwgYMdr/zv0Hn+zr4wsl75tEHCkX1cKV6vFaLOALUe7hn/e+vsnw0Mdjqn/F17TmMKHe7Taz3h9hwY6RE59TjsJvClF2fTpRCbPUT3wsVPIWtnJJui0COziJ/ngHZcK8uANXrTgD5dyZyPrnVCujWevBCzZx391IC+eSeizFgCAN5ng0GsxzwZAXhXg==", "X-Forefront-Antispam-Report": "CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;\n SFS:(4636009)(346002)(39860400002)(136003)(376002)(396003)(36840700001)(46966006)(55016002)(2616005)(86362001)(478600001)(4326008)(7636003)(7696005)(36906005)(16526019)(316002)(426003)(336012)(70206006)(186003)(1076003)(47076005)(5660300002)(356005)(36756003)(54906003)(83380400001)(6286002)(82740400003)(82310400003)(70586007)(26005)(2906002)(110136005)(8936002)(6636002)(36860700001)(8676002);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "06 Jul 2021 13:33:58.5364 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 77648a6b-6738-4875-6d52-08d94082b5b4", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n BN8NAM11FT056.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MN2PR12MB4111", "Subject": "[dpdk-dev] [PATCH v4 23/26] net/mlx5: optimize hash list table\n allocate on demand", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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": "Currently, all the hash list tables are allocated during start up.\nSince different applications may only use dedicated limited actions,\noptimized the hash list table allocate on demand will save initial\nmemory.\n\nThis commit optimizes hash list table allocate on demand.\n\nSigned-off-by: Suanming Mou <suanmingm@nvidia.com>\nAcked-by: Matan Azrad <matan@nvidia.com>\n---\n drivers/net/mlx5/linux/mlx5_os.c | 44 +----------------\n drivers/net/mlx5/mlx5_defs.h | 6 +++\n drivers/net/mlx5/mlx5_flow_dv.c | 79 ++++++++++++++++++++++++++++--\n drivers/net/mlx5/windows/mlx5_os.c | 2 -\n 4 files changed, 82 insertions(+), 49 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex cfb33251cf..38c5672436 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -50,8 +50,6 @@\n #include \"mlx5_nl.h\"\n #include \"mlx5_devx.h\"\n \n-#define MLX5_TAGS_HLIST_ARRAY_SIZE\t(1 << 15)\n-\n #ifndef HAVE_IBV_MLX5_MOD_MPW\n #define MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED (1 << 2)\n #define MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW (1 << 3)\n@@ -312,46 +310,6 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)\n \t\t\t\t\t flow_dv_dest_array_clone_free_cb);\n \tif (!sh->dest_array_list)\n \t\tgoto error;\n-\t/* Create tags hash list table. */\n-\tsnprintf(s, sizeof(s), \"%s_tags\", sh->ibdev_name);\n-\tsh->tag_table = mlx5_hlist_create(s, MLX5_TAGS_HLIST_ARRAY_SIZE, false,\n-\t\t\t\t\t false, sh, flow_dv_tag_create_cb,\n-\t\t\t\t\t flow_dv_tag_match_cb,\n-\t\t\t\t\t flow_dv_tag_remove_cb,\n-\t\t\t\t\t flow_dv_tag_clone_cb,\n-\t\t\t\t\t flow_dv_tag_clone_free_cb);\n-\tif (!sh->tag_table) {\n-\t\tDRV_LOG(ERR, \"tags with hash creation failed.\");\n-\t\terr = ENOMEM;\n-\t\tgoto error;\n-\t}\n-\tsnprintf(s, sizeof(s), \"%s_hdr_modify\", sh->ibdev_name);\n-\tsh->modify_cmds = mlx5_hlist_create(s, MLX5_FLOW_HDR_MODIFY_HTABLE_SZ,\n-\t\t\t\t\t true, false, sh,\n-\t\t\t\t\t flow_dv_modify_create_cb,\n-\t\t\t\t\t flow_dv_modify_match_cb,\n-\t\t\t\t\t flow_dv_modify_remove_cb,\n-\t\t\t\t\t flow_dv_modify_clone_cb,\n-\t\t\t\t\t flow_dv_modify_clone_free_cb);\n-\tif (!sh->modify_cmds) {\n-\t\tDRV_LOG(ERR, \"hdr modify hash creation failed\");\n-\t\terr = ENOMEM;\n-\t\tgoto error;\n-\t}\n-\tsnprintf(s, sizeof(s), \"%s_encaps_decaps\", sh->ibdev_name);\n-\tsh->encaps_decaps = mlx5_hlist_create(s,\n-\t\t\t\t\t MLX5_FLOW_ENCAP_DECAP_HTABLE_SZ,\n-\t\t\t\t\t true, true, sh,\n-\t\t\t\t\t flow_dv_encap_decap_create_cb,\n-\t\t\t\t\t flow_dv_encap_decap_match_cb,\n-\t\t\t\t\t flow_dv_encap_decap_remove_cb,\n-\t\t\t\t\t flow_dv_encap_decap_clone_cb,\n-\t\t\t\t\t flow_dv_encap_decap_clone_free_cb);\n-\tif (!sh->encaps_decaps) {\n-\t\tDRV_LOG(ERR, \"encap decap hash creation failed\");\n-\t\terr = ENOMEM;\n-\t\tgoto error;\n-\t}\n #endif\n #ifdef HAVE_MLX5DV_DR\n \tvoid *domain;\n@@ -396,7 +354,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)\n \t\tgoto error;\n \t}\n #endif\n-\tif (!sh->tunnel_hub)\n+\tif (!sh->tunnel_hub && priv->config.dv_miss_info)\n \t\terr = mlx5_alloc_tunnel_hub(sh);\n \tif (err) {\n \t\tDRV_LOG(ERR, \"mlx5_alloc_tunnel_hub failed err=%d\", err);\ndiff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h\nindex ca67ce8213..fe86bb40d3 100644\n--- a/drivers/net/mlx5/mlx5_defs.h\n+++ b/drivers/net/mlx5/mlx5_defs.h\n@@ -188,6 +188,12 @@\n /* Size of the simple hash table for encap decap table. */\n #define MLX5_FLOW_ENCAP_DECAP_HTABLE_SZ (1 << 12)\n \n+/* Size of the hash table for tag table. */\n+#define MLX5_TAGS_HLIST_ARRAY_SIZE\t(1 << 15)\n+\n+/* Size fo the hash table for SFT table. */\n+#define MLX5_FLOW_SFT_HLIST_ARRAY_SIZE\t4096\n+\n /* Hairpin TX/RX queue configuration parameters. */\n #define MLX5_HAIRPIN_QUEUE_STRIDE 6\n #define MLX5_HAIRPIN_JUMBO_LOG_SIZE (14 + 2)\ndiff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex b30e5a82ce..9fc50a5daa 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -310,6 +310,41 @@ mlx5_flow_tunnel_ip_check(const struct rte_flow_item *item __rte_unused,\n \t}\n }\n \n+static inline struct mlx5_hlist *\n+flow_dv_hlist_prepare(struct mlx5_dev_ctx_shared *sh, struct mlx5_hlist **phl,\n+\t\t const char *name, uint32_t size, bool direct_key,\n+\t\t bool lcores_share, void *ctx,\n+\t\t mlx5_list_create_cb cb_create,\n+\t\t mlx5_list_match_cb cb_match,\n+\t\t mlx5_list_remove_cb cb_remove,\n+\t\t mlx5_list_clone_cb cb_clone,\n+\t\t mlx5_list_clone_free_cb cb_clone_free)\n+{\n+\tstruct mlx5_hlist *hl;\n+\tstruct mlx5_hlist *expected = NULL;\n+\tchar s[MLX5_NAME_SIZE];\n+\n+\thl = __atomic_load_n(phl, __ATOMIC_SEQ_CST);\n+\tif (likely(hl))\n+\t\treturn hl;\n+\tsnprintf(s, sizeof(s), \"%s_%s\", sh->ibdev_name, name);\n+\thl = mlx5_hlist_create(s, size, direct_key, lcores_share,\n+\t\t\tctx, cb_create, cb_match, cb_remove, cb_clone,\n+\t\t\tcb_clone_free);\n+\tif (!hl) {\n+\t\tDRV_LOG(ERR, \"%s hash creation failed\", name);\n+\t\trte_errno = ENOMEM;\n+\t\treturn NULL;\n+\t}\n+\tif (!__atomic_compare_exchange_n(phl, &expected, hl, false,\n+\t\t\t\t\t __ATOMIC_SEQ_CST,\n+\t\t\t\t\t __ATOMIC_SEQ_CST)) {\n+\t\tmlx5_hlist_destroy(hl);\n+\t\thl = __atomic_load_n(phl, __ATOMIC_SEQ_CST);\n+\t}\n+\treturn hl;\n+}\n+\n /* Update VLAN's VID/PCP based on input rte_flow_action.\n *\n * @param[in] action\n@@ -3724,8 +3759,20 @@ flow_dv_encap_decap_resource_register\n \t\t.error = error,\n \t\t.data = resource,\n \t};\n+\tstruct mlx5_hlist *encaps_decaps;\n \tuint64_t key64;\n \n+\tencaps_decaps = flow_dv_hlist_prepare(sh, &sh->encaps_decaps,\n+\t\t\t\t\"encaps_decaps\",\n+\t\t\t\tMLX5_FLOW_ENCAP_DECAP_HTABLE_SZ,\n+\t\t\t\ttrue, true, sh,\n+\t\t\t\tflow_dv_encap_decap_create_cb,\n+\t\t\t\tflow_dv_encap_decap_match_cb,\n+\t\t\t\tflow_dv_encap_decap_remove_cb,\n+\t\t\t\tflow_dv_encap_decap_clone_cb,\n+\t\t\t\tflow_dv_encap_decap_clone_free_cb);\n+\tif (unlikely(!encaps_decaps))\n+\t\treturn -rte_errno;\n \tresource->flags = dev_flow->dv.group ? 0 : 1;\n \tkey64 = __rte_raw_cksum(&encap_decap_key.v32,\n \t\t\t\t sizeof(encap_decap_key.v32), 0);\n@@ -3733,7 +3780,7 @@ flow_dv_encap_decap_resource_register\n \t MLX5DV_FLOW_ACTION_PACKET_REFORMAT_TYPE_L2_TUNNEL_TO_L2 &&\n \t resource->size)\n \t\tkey64 = __rte_raw_cksum(resource->buf, resource->size, key64);\n-\tentry = mlx5_hlist_register(sh->encaps_decaps, key64, &ctx);\n+\tentry = mlx5_hlist_register(encaps_decaps, key64, &ctx);\n \tif (!entry)\n \t\treturn -rte_errno;\n \tresource = container_of(entry, typeof(*resource), entry);\n@@ -5739,8 +5786,20 @@ flow_dv_modify_hdr_resource_register\n \t\t.error = error,\n \t\t.data = resource,\n \t};\n+\tstruct mlx5_hlist *modify_cmds;\n \tuint64_t key64;\n \n+\tmodify_cmds = flow_dv_hlist_prepare(sh, &sh->modify_cmds,\n+\t\t\t\t\"hdr_modify\",\n+\t\t\t\tMLX5_FLOW_HDR_MODIFY_HTABLE_SZ,\n+\t\t\t\ttrue, false, sh,\n+\t\t\t\tflow_dv_modify_create_cb,\n+\t\t\t\tflow_dv_modify_match_cb,\n+\t\t\t\tflow_dv_modify_remove_cb,\n+\t\t\t\tflow_dv_modify_clone_cb,\n+\t\t\t\tflow_dv_modify_clone_free_cb);\n+\tif (unlikely(!modify_cmds))\n+\t\treturn -rte_errno;\n \tresource->root = !dev_flow->dv.group;\n \tif (resource->actions_num > flow_dv_modify_hdr_action_max(dev,\n \t\t\t\t\t\t\t\tresource->root))\n@@ -5748,7 +5807,7 @@ flow_dv_modify_hdr_resource_register\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION, NULL,\n \t\t\t\t\t \"too many modify header items\");\n \tkey64 = __rte_raw_cksum(&resource->ft_type, key_len, 0);\n-\tentry = mlx5_hlist_register(sh->modify_cmds, key64, &ctx);\n+\tentry = mlx5_hlist_register(modify_cmds, key64, &ctx);\n \tif (!entry)\n \t\treturn -rte_errno;\n \tresource = container_of(entry, typeof(*resource), entry);\n@@ -10530,8 +10589,20 @@ flow_dv_tag_resource_register\n \t\t\t\t\t.error = error,\n \t\t\t\t\t.data = &tag_be24,\n \t\t\t\t\t};\n-\n-\tentry = mlx5_hlist_register(priv->sh->tag_table, tag_be24, &ctx);\n+\tstruct mlx5_hlist *tag_table;\n+\n+\ttag_table = flow_dv_hlist_prepare(priv->sh, &priv->sh->tag_table,\n+\t\t\t\t \"tags\",\n+\t\t\t\t MLX5_TAGS_HLIST_ARRAY_SIZE,\n+\t\t\t\t false, false, priv->sh,\n+\t\t\t\t flow_dv_tag_create_cb,\n+\t\t\t\t flow_dv_tag_match_cb,\n+\t\t\t\t flow_dv_tag_remove_cb,\n+\t\t\t\t flow_dv_tag_clone_cb,\n+\t\t\t\t flow_dv_tag_clone_free_cb);\n+\tif (unlikely(!tag_table))\n+\t\treturn -rte_errno;\n+\tentry = mlx5_hlist_register(tag_table, tag_be24, &ctx);\n \tif (entry) {\n \t\tresource = container_of(entry, struct mlx5_flow_dv_tag_resource,\n \t\t\t\t\tentry);\ndiff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c\nindex a04f93e1d4..5da362a9d5 100644\n--- a/drivers/net/mlx5/windows/mlx5_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_os.c\n@@ -30,8 +30,6 @@\n #include \"mlx5_flow.h\"\n #include \"mlx5_devx.h\"\n \n-#define MLX5_TAGS_HLIST_ARRAY_SIZE 8192\n-\n static const char *MZ_MLX5_PMD_SHARED_DATA = \"mlx5_pmd_shared_data\";\n \n /* Spinlock for mlx5_shared_data allocation. */\n", "prefixes": [ "v4", "23/26" ] }