Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/139427/?format=api
{ "id": 139427, "url": "http://patches.dpdk.org/api/patches/139427/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240416153054.3216706-5-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": "<20240416153054.3216706-5-michaelba@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240416153054.3216706-5-michaelba@nvidia.com", "date": "2024-04-16T15:30:54", "name": "[4/4] net/mlx5/hws: remove table type DONTCARE", "commit_ref": null, "pull_url": null, "state": "awaiting-upstream", "archived": false, "hash": "149ca4a3938fbddd52e0eddf008454ae5b2c9427", "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/20240416153054.3216706-5-michaelba@nvidia.com/mbox/", "series": [ { "id": 31758, "url": "http://patches.dpdk.org/api/series/31758/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31758", "date": "2024-04-16T15:30:53", "name": "net/mlx5: some unrelated fixes and improvements", "version": 1, "mbox": "http://patches.dpdk.org/series/31758/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/139427/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/139427/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 895D043E83;\n\tTue, 16 Apr 2024 17:32:08 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 31D044069D;\n\tTue, 16 Apr 2024 17:31:53 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2056.outbound.protection.outlook.com [40.107.94.56])\n by mails.dpdk.org (Postfix) with ESMTP id 4BDF040693\n for <dev@dpdk.org>; Tue, 16 Apr 2024 17:31:51 +0200 (CEST)", "from SA1P222CA0187.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c4::14)\n by PH7PR12MB5901.namprd12.prod.outlook.com (2603:10b6:510:1d5::19)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Tue, 16 Apr\n 2024 15:31:47 +0000", "from SA2PEPF00001509.namprd04.prod.outlook.com\n (2603:10b6:806:3c4:cafe::44) by SA1P222CA0187.outlook.office365.com\n (2603:10b6:806:3c4::14) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.20 via Frontend\n Transport; Tue, 16 Apr 2024 15:31:47 +0000", "from mail.nvidia.com (216.228.117.161) by\n SA2PEPF00001509.mail.protection.outlook.com (10.167.242.41) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.7452.22 via Frontend Transport; Tue, 16 Apr 2024 15:31:47 +0000", "from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com\n (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 16 Apr\n 2024 08:31:15 -0700", "from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail201.nvidia.com\n (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 16 Apr\n 2024 08:31:14 -0700", "from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.6) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12 via Frontend\n Transport; Tue, 16 Apr 2024 08:31:12 -0700" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=DAO6x/w9+pkX3rUTXcb9WM8NgakRCHbXbX9X70q1AKahw4sRhpfJebCH105dLl2go8sU8CdFuhGyz+XC243AQGGxyiypFDzw/c8pCZJJtUkDvdqkfSBUj6TJdfQgjpPb91gQq74HN20DgCE1Jh6Ibh2cw0BX8IhnihTJjr3oNq56YYN6aeZSdO017x5fWUbMomtjqAUQW4QARTUX/hNBVzDL3vDfX4+fKRuH2+iLOh1G9nyDJIXqG3o8TrS0LvS6ZqwaIuhFnOuI4OPWzWiXPx5/omtS/j69I9MapO/LtL+qGO48CnOBeP2j4i3t9X+tOvqiSIcrx8FaOA1FJ9w71A==", "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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=axifeJjSn6Up6OIzAOn37Rbs5xZ0+WmVFrTPKfE6ayo=;\n b=AaEvdOi2K0RrLsMp6et7hmn3rGKvV/hdvQkuU0yEU1hYAi+GkFDSZ4lUU7Fy8nhb2LT/noF0ZnxSc+ZAIpWiYKoer+o8jXwcbS4zfZXjs+fnHDkCUQZwq7QMbISZr1yd1A4ANdJ/1bAwO50Q6yhVY1q3t+TBP4fAnGwNnnyqTghTHxInaNSSBfAJZbFW0SPrG8FT/tD0inojV+RAWLCiHl9bhYxrgaO4W4iDsxZsXFh3DZRkZ6o8Em5TV9pA8RC4U8UpF2aui4BJDJ7nHHXWtraa9SQ6+zG7wRHtekgbSnyppj6DjJMrhtCvvGr4SUVCQFzKFLcPD8SGAoALbervdw==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none (0)", "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=axifeJjSn6Up6OIzAOn37Rbs5xZ0+WmVFrTPKfE6ayo=;\n b=T6f5ao7juIhlbUI+SUJL3X3AByYdLNOK+HW8dt28LN4U+OZZWnxmKIZ7fajpl9imb7Tp2+MVmWsr4p9n+Da+D5DJeres5dCYEITIuCwN+FWWQgnXyvSaAEAcF4JqFcvajUYKyenJ4VohdXCqpdu0h12g23UcxNPUtze1oihCgaVjcHT4nztWFHV4mNGTc+rDlLdSq7L3CCwnUyu3YOT6DUBg+hQser5SjbVx8XlsGW+yrgNDfGZva2vwghagpKznm/Lmk4sqduOSuPGDGKVADQA5uNBd4MZgCt90vnFjjJiFMqzAXSdqr9T8ShKbBboe0BTFGX05JztOLFIFPpq2Mw==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.117.161)\n smtp.mailfrom=nvidia.com;\n dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.117.161 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C", "From": "Michael Baum <michaelba@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "Matan Azrad <matan@nvidia.com>, Dariusz Sosnowski <dsosnowski@nvidia.com>,\n Raslan Darawsheh <rasland@nvidia.com>, Viacheslav Ovsiienko\n <viacheslavo@nvidia.com>, Ori Kam <orika@nvidia.com>, Suanming Mou\n <suanmingm@nvidia.com>, Alex Vesker <valex@nvidia.com>", "Subject": "[PATCH 4/4] net/mlx5/hws: remove table type DONTCARE", "Date": "Tue, 16 Apr 2024 18:30:54 +0300", "Message-ID": "<20240416153054.3216706-5-michaelba@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20240416153054.3216706-1-michaelba@nvidia.com>", "References": "<20240416153054.3216706-1-michaelba@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-NV-OnPremToCloud": "ExternallySecured", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SA2PEPF00001509:EE_|PH7PR12MB5901:EE_", "X-MS-Office365-Filtering-Correlation-Id": "ce175727-0918-494b-9045-08dc5e2a5446", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n qR90nx3ITC2xecx7xkrpAfMDIfryzJuRmzwxZP9TqbFNCMK+D4ib1vzJdgVAoQS2dliGLWHSELpv1iONEYcjfQyZWv9sfdiIE7c7JoOFu1kVhC6Lc4aq1H2fQ0n4c5sYVbOUO7xvauwVBG+OK+pwOpY2j1ulIF4i075/aGV38SzzIxfIJJjV9LxXtTzGbXVrEfBXfv5rbkbGwzf+szF6T+PmVsF0bYSKDl+xHzPiVm78ZEjFv/5JxZC7Wr0rIiNS/6GfzJvDpVRhb9N5XA1C7Dax2ph7jhKsgqeuGapS1SbU+E1oXdFn6IITji9bACJfaex1UrsDQ0pBMIsiJRooECDe2yWew1wOJ/CHc//NstkhpFCGXoMA26Um5bZwPH+2JwHURiAM75cCqkhO56hsKKVVL6snWHQmVFpq2LyrkwPFBYPH/JCwkjyZGCbTm3MNvwj4wzlPyM4+l42JysdupXwjAamCmsf/i1vbk18i44jZViDfPjSxQ/OJbSbJ1ly7mtQCg3b/kLM+jpULrb4W3VNqZ0+qrWZ+hpq6vdbmcnrdnYqUg9Udbt0cP2qNl8b4EMxkKnDRh7ZR5rXQVUfVaqGRvfyjSZhfRzPapbzB6wRp43ErPE5YNFlacZoXqhX4YBGPFsbG54rgQCEbsuNrqWWmTwlkS45wPFycymVBN2XxUuD/vyGjM/N8VR5c/jxs/lW5FAnTQ8K8ugI5pw48aDMO4TfcQg/VVK9tPsk/tT2IEatLJZAYfwjSFDSNIePi", "X-Forefront-Antispam-Report": "CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE;\n SFS:(13230031)(36860700004)(1800799015)(82310400014)(376005); DIR:OUT;\n SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "16 Apr 2024 15:31:47.3909 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n ce175727-0918-494b-9045-08dc5e2a5446", "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.117.161];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n SA2PEPF00001509.namprd04.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR12MB5901", "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" }, "content": "This patch removes the \"MLX5DR_TABLE_TYPE_DONTCARE\" enum value and use\nthe correct type instead even for places the type is \"don't care\".\n\nSigned-off-by: Michael Baum <michaelba@nvidia.com>\nReviewed-by: Alex Vesker <valex@nvidia.com>\nAcked-by: Dariusz Sosnowski <dsosnowski@nvidia.com>\n---\n drivers/net/mlx5/hws/mlx5dr.h | 1 -\n drivers/net/mlx5/hws/mlx5dr_definer.c | 26 +++++++++++---------------\n drivers/net/mlx5/mlx5_flow.h | 2 +-\n 3 files changed, 12 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/hws/mlx5dr.h b/drivers/net/mlx5/hws/mlx5dr.h\nindex 80e118a980..36ecccf9ac 100644\n--- a/drivers/net/mlx5/hws/mlx5dr.h\n+++ b/drivers/net/mlx5/hws/mlx5dr.h\n@@ -18,7 +18,6 @@ enum mlx5dr_table_type {\n \tMLX5DR_TABLE_TYPE_NIC_TX,\n \tMLX5DR_TABLE_TYPE_FDB,\n \tMLX5DR_TABLE_TYPE_MAX,\n-\tMLX5DR_TABLE_TYPE_DONTCARE = MLX5DR_TABLE_TYPE_MAX,\n };\n \n enum mlx5dr_matcher_resource_mode {\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c\nindex 7bb328e85e..a0f95c6923 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_definer.c\n+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c\n@@ -152,6 +152,7 @@ struct mlx5dr_definer_conv_data {\n \tuint8_t geneve_opt_ok_idx;\n \tuint8_t geneve_opt_data_idx;\n \tenum rte_flow_item_type last_item;\n+\tenum mlx5dr_table_type table_type;\n };\n \n /* Xmacro used to create generic item setter from items */\n@@ -1754,7 +1755,7 @@ mlx5dr_definer_conv_item_tag(struct mlx5dr_definer_conv_data *cd,\n \tif (item->type == RTE_FLOW_ITEM_TYPE_TAG)\n \t\treg = flow_hw_get_reg_id_from_ctx(cd->ctx,\n \t\t\t\t\t\t RTE_FLOW_ITEM_TYPE_TAG,\n-\t\t\t\t\t\t MLX5DR_TABLE_TYPE_DONTCARE,\n+\t\t\t\t\t\t cd->table_type,\n \t\t\t\t\t\t v->index);\n \telse\n \t\treg = (int)v->index;\n@@ -1817,8 +1818,7 @@ mlx5dr_definer_conv_item_quota(struct mlx5dr_definer_conv_data *cd,\n {\n \tint mtr_reg = flow_hw_get_reg_id_from_ctx(cd->ctx,\n \t\t\t\t\t\t RTE_FLOW_ITEM_TYPE_METER_COLOR,\n-\t\t\t\t\t\t MLX5DR_TABLE_TYPE_DONTCARE,\n-\t\t\t\t\t\t 0);\n+\t\t\t\t\t\t cd->table_type, 0);\n \tstruct mlx5dr_definer_fc *fc;\n \n \tif (mtr_reg < 0) {\n@@ -1837,7 +1837,6 @@ mlx5dr_definer_conv_item_quota(struct mlx5dr_definer_conv_data *cd,\n \n static int\n mlx5dr_definer_conv_item_metadata(struct mlx5dr_definer_conv_data *cd,\n-\t\t\t\t enum mlx5dr_table_type table_domain_type,\n \t\t\t\t struct rte_flow_item *item,\n \t\t\t\t int item_idx)\n {\n@@ -1850,7 +1849,7 @@ mlx5dr_definer_conv_item_metadata(struct mlx5dr_definer_conv_data *cd,\n \t\treturn 0;\n \n \treg = flow_hw_get_reg_id_from_ctx(cd->ctx, RTE_FLOW_ITEM_TYPE_META,\n-\t\t\t\t\t table_domain_type, -1);\n+\t\t\t\t\t cd->table_type, -1);\n \tif (reg <= 0) {\n \t\tDR_LOG(ERR, \"Invalid register for item metadata\");\n \t\trte_errno = EINVAL;\n@@ -2159,7 +2158,7 @@ mlx5dr_definer_conv_item_conntrack(struct mlx5dr_definer_conv_data *cd,\n \n \treg = flow_hw_get_reg_id_from_ctx(cd->ctx,\n \t\t\t\t\t RTE_FLOW_ITEM_TYPE_CONNTRACK,\n-\t\t\t\t\t MLX5DR_TABLE_TYPE_DONTCARE, -1);\n+\t\t\t\t\t cd->table_type, -1);\n \tif (reg <= 0) {\n \t\tDR_LOG(ERR, \"Invalid register for item conntrack\");\n \t\trte_errno = EINVAL;\n@@ -2302,7 +2301,7 @@ mlx5dr_definer_conv_item_meter_color(struct mlx5dr_definer_conv_data *cd,\n \n \treg = flow_hw_get_reg_id_from_ctx(cd->ctx,\n \t\t\t\t\t RTE_FLOW_ITEM_TYPE_METER_COLOR,\n-\t\t\t\t\t MLX5DR_TABLE_TYPE_DONTCARE, 0);\n+\t\t\t\t\t cd->table_type, 0);\n \tMLX5_ASSERT(reg > 0);\n \n \tfc = mlx5dr_definer_get_register_fc(cd, reg);\n@@ -2897,7 +2896,6 @@ mlx5dr_definer_conv_item_compare_field(const struct rte_flow_field_data *f,\n \t\t\t\t const struct rte_flow_field_data *other_f,\n \t\t\t\t struct mlx5dr_definer_conv_data *cd,\n \t\t\t\t int item_idx,\n-\t\t\t\t enum mlx5dr_table_type table_domain_type,\n \t\t\t\t enum mlx5dr_definer_compare_dw_selectors dw_offset)\n {\n \tstruct mlx5dr_definer_fc *fc = NULL;\n@@ -2913,7 +2911,7 @@ mlx5dr_definer_conv_item_compare_field(const struct rte_flow_field_data *f,\n \tcase RTE_FLOW_FIELD_META:\n \t\treg = flow_hw_get_reg_id_from_ctx(cd->ctx,\n \t\t\t\t\t\t RTE_FLOW_ITEM_TYPE_META,\n-\t\t\t\t\t\t table_domain_type, -1);\n+\t\t\t\t\t\t cd->table_type, -1);\n \t\tif (reg <= 0) {\n \t\t\tDR_LOG(ERR, \"Invalid register for compare metadata field\");\n \t\t\trte_errno = EINVAL;\n@@ -2932,7 +2930,7 @@ mlx5dr_definer_conv_item_compare_field(const struct rte_flow_field_data *f,\n \tcase RTE_FLOW_FIELD_TAG:\n \t\treg = flow_hw_get_reg_id_from_ctx(cd->ctx,\n \t\t\t\t\t\t RTE_FLOW_ITEM_TYPE_TAG,\n-\t\t\t\t\t\t MLX5DR_TABLE_TYPE_DONTCARE,\n+\t\t\t\t\t\t cd->table_type,\n \t\t\t\t\t\t f->tag_index);\n \t\tif (reg <= 0) {\n \t\t\tDR_LOG(ERR, \"Invalid register for compare tag field\");\n@@ -2988,7 +2986,6 @@ mlx5dr_definer_conv_item_compare_field(const struct rte_flow_field_data *f,\n \n static int\n mlx5dr_definer_conv_item_compare(struct mlx5dr_definer_conv_data *cd,\n-\t\t\t\t enum mlx5dr_table_type table_domain_type,\n \t\t\t\t struct rte_flow_item *item,\n \t\t\t\t int item_idx)\n {\n@@ -3005,13 +3002,11 @@ mlx5dr_definer_conv_item_compare(struct mlx5dr_definer_conv_data *cd,\n \t}\n \n \tret = mlx5dr_definer_conv_item_compare_field(a, b, cd, item_idx,\n-\t\t\t\t\t\t table_domain_type,\n \t\t\t\t\t\t MLX5DR_DEFINER_COMPARE_ARGUMENT_0);\n \tif (ret)\n \t\treturn ret;\n \n \tret = mlx5dr_definer_conv_item_compare_field(b, NULL, cd, item_idx,\n-\t\t\t\t\t\t table_domain_type,\n \t\t\t\t\t\t MLX5DR_DEFINER_COMPARE_BASE_0);\n \tif (ret)\n \t\treturn ret;\n@@ -3034,6 +3029,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,\n \tcd.fc = fc;\n \tcd.ctx = ctx;\n \tcd.relaxed = mt->flags & MLX5DR_MATCH_TEMPLATE_FLAG_RELAXED_MATCH;\n+\tcd.table_type = matcher->tbl->type;\n \n \t/* Collect all RTE fields to the field array and set header layout */\n \tfor (i = 0; items->type != RTE_FLOW_ITEM_TYPE_END; i++, items++) {\n@@ -3107,7 +3103,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,\n \t\t\titem_flags |= MLX5_FLOW_ITEM_TAG;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_META:\n-\t\t\tret = mlx5dr_definer_conv_item_metadata(&cd, matcher->tbl->type, items, i);\n+\t\t\tret = mlx5dr_definer_conv_item_metadata(&cd, items, i);\n \t\t\titem_flags |= MLX5_FLOW_ITEM_METADATA;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_GRE:\n@@ -3198,7 +3194,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,\n \t\t\t\tDR_LOG(ERR, \"Compare matcher not supported for more than one item\");\n \t\t\t\tgoto not_supp;\n \t\t\t}\n-\t\t\tret = mlx5dr_definer_conv_item_compare(&cd, matcher->tbl->type, items, i);\n+\t\t\tret = mlx5dr_definer_conv_item_compare(&cd, items, i);\n \t\t\titem_flags |= MLX5_FLOW_ITEM_COMPARE;\n \t\t\tmatcher->flags |= MLX5DR_MATCHER_FLAGS_COMPARE;\n \t\t\tbreak;\ndiff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h\nindex 34b5e0f45b..ee153cb3a4 100644\n--- a/drivers/net/mlx5/mlx5_flow.h\n+++ b/drivers/net/mlx5/mlx5_flow.h\n@@ -1992,7 +1992,7 @@ flow_hw_get_reg_id(struct rte_eth_dev *dev,\n {\n #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)\n \treturn flow_hw_get_reg_id_by_domain(dev, type,\n-\t\t\t\t\t MLX5DR_TABLE_TYPE_DONTCARE, id);\n+\t\t\t\t\t MLX5DR_TABLE_TYPE_MAX, id);\n #else\n \tRTE_SET_USED(dev);\n \tRTE_SET_USED(type);\n", "prefixes": [ "4/4" ] }