Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136746/?format=api
{ "id": 136746, "url": "http://patches.dpdk.org/api/patches/136746/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240214073015.2060103-2-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": "<20240214073015.2060103-2-michaelba@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240214073015.2060103-2-michaelba@nvidia.com", "date": "2024-02-14T07:30:13", "name": "[v5,1/3] net/mlx5/hws: add support for compare matcher", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1d18fc48062b7d8b08711c37537b61dc40cfada4", "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/20240214073015.2060103-2-michaelba@nvidia.com/mbox/", "series": [ { "id": 31103, "url": "http://patches.dpdk.org/api/series/31103/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31103", "date": "2024-02-14T07:30:12", "name": "net/mlx5: add compare item support", "version": 5, "mbox": "http://patches.dpdk.org/series/31103/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/136746/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/136746/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 7707C43B27;\n\tWed, 14 Feb 2024 08:30:53 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 676CB42FBB;\n\tWed, 14 Feb 2024 08:30:53 +0100 (CET)", "from NAM12-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam12on2040.outbound.protection.outlook.com [40.107.237.40])\n by mails.dpdk.org (Postfix) with ESMTP id E22A542FA1\n for <dev@dpdk.org>; Wed, 14 Feb 2024 08:30:51 +0100 (CET)", "from DS7PR03CA0320.namprd03.prod.outlook.com (2603:10b6:8:2b::15) by\n SA1PR12MB6776.namprd12.prod.outlook.com (2603:10b6:806:25b::14) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.25; Wed, 14 Feb\n 2024 07:30:49 +0000", "from DS2PEPF0000343A.namprd02.prod.outlook.com\n (2603:10b6:8:2b:cafe::ff) by DS7PR03CA0320.outlook.office365.com\n (2603:10b6:8:2b::15) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.40 via Frontend\n Transport; Wed, 14 Feb 2024 07:30:49 +0000", "from mail.nvidia.com (216.228.117.161) by\n DS2PEPF0000343A.mail.protection.outlook.com (10.167.18.37) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.7292.25 via Frontend Transport; Wed, 14 Feb 2024 07:30:48 +0000", "from rnnvmail204.nvidia.com (10.129.68.6) 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, 13 Feb\n 2024 23:30:31 -0800", "from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail204.nvidia.com\n (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Tue, 13 Feb\n 2024 23:30:30 -0800", "from nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.8) 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, 13 Feb 2024 23:30:27 -0800" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=KdhMxdriEG/Uys1LXFOciqMDbHPoRqyaujWh0Nu9TG2FyxlPDo6WXuyBZvxahiFSSVXn9i96B2+Fya+rAcrgyTv3LldMD2MBBCT1KxC+PhrXZYSWaIWA19CI9QdogPbV0a79oZQ2r55klxuwhxCzlv3lpDsGg86utRTJ08xp/y3chgfrtAUh9LZW/BMV6+Hs7zgWbzOyxk8TY5/CL/EaRGDfnBmvmpIkXzQl2lhaxuuu3n/eFuich70oSEf1JUOT5tGdyTsa1v/kwzMRhtoGkhjrIYvscLWiGBj5U+2xp/OzD+d1VhTuthPcysEw6p5uwysa5zDQi/wV/5OVVVpgqw==", "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=IUAddiApJdB1CtknZdtOB7zTj1dUZoVv27YGFFuMyQo=;\n b=CqJOAd11C9KrfK6+B2nBiBc46RHUn2tDMFpROiVKwWjuF0qXJmjY3tfbceOejZUupwgNlSA3G0dsifWNaG7K7Iux4oB9qKlqKAI9WOXtlybFhq3ebd+67RZWyWhgkVTC/S0Cu4oTpiQoUvW2PLg4NWe9lMGlk9xtVjYG7Tf8b5RkV1DKV742IbpAMadKvWkB/7P4A8NHbnoQcFJNeGf88/V8xV0srba9MNkEBZMg+A+ArEbxswv7wKwdOX6dqToPBqDiaSbHlf3+hewyJ6QfR7/Ud3oOooVvfETZVGIviIiUzGzbC/DUV7subarBa2PWu+fH9xE85UK7yh4oXWsJRw==", "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=IUAddiApJdB1CtknZdtOB7zTj1dUZoVv27YGFFuMyQo=;\n b=RLMWIa0MYzl9N4AkED4Wiz5147tH0t7+0S5e9T18n8m1LOjK0VkNb2esqlpiNvJ2F2Wi9bdzOzUqHsNRg8bCeQzLnpeHCEw05ZH+HO9LBTp/QPIsvW/1XyEsqcTFfvYFMHrJKjSH+pC+Z1WsATADKr0uv5B0KRzgbiCKqxzIrh4Men3IzTbNfiG/4iWn0KH5hoZKfepXscT6laBQEqfG7UgLdSujhRupGfKH8xt2GWsERgnhidV17z2x0GbcBLFQSw1x1KDTy/FORh6lyQE7aGu63t4tok96jXM0jecFUDRAXKeUbiTDpMbg5tvICFpAW6fjKxZMmZOyO0RFZOu+IQ==", "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>, Hamdan Igbaria <hamdani@nvidia.com>", "Subject": "[PATCH v5 1/3] net/mlx5/hws: add support for compare matcher", "Date": "Wed, 14 Feb 2024 09:30:13 +0200", "Message-ID": "<20240214073015.2060103-2-michaelba@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20240214073015.2060103-1-michaelba@nvidia.com>", "References": "<20240207161414.1583125-1-michaelba@nvidia.com>\n <20240214073015.2060103-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": "DS2PEPF0000343A:EE_|SA1PR12MB6776:EE_", "X-MS-Office365-Filtering-Correlation-Id": "c2cea802-ae85-48f8-ac10-08dc2d2eddae", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n BmZ8scVfiTmBiZjNflvgDVUbdffkZYgEOdc7J2+gMliSGQMgNuRWBVHJcSWsDUU9vZj/UpJuaTU2BJfq/R2HBrqbBR9WjxZy/56HGO5w1L2up7NmJF5VadRHOCGohF3ieuAMoneRUwb9146G5BMgufmWDqSFkr3HN4crRhi78oKZ+MjDFePoHz2y/0orxVhjIXGWHpqzxEqvRTiMG+cO8VfoDHuIJwg4aCtTurWSUSL68zmPm1fdyIWlmdukoIYfqHx0AxFoLmnKl90a/i4SPEUjSAbhxWPRou6gnduSAxHJKN8YxUgg8anV1SvhaN+060Nc2P7t3LBnKhUWHhFdH3CFjfIpAnZM8GzBRYg1VpMXm0TQpgWK9R/y8/285z2UGYoSW3OvpPhlXYip+W0kgaPslqIaI0isV0J7M1gbu6+JsAZjXHM9kvXIDo33daSGM5gQ57nWpvspYUGckMi1wF3AIQotflNGBhRCxinMjVxnv8R0Vw7OjBnKfp87QNC3LsSIxHPI1CNTfbMl1w32kWPE7r0jsNSZqewKZryWZoAAmr2gD/G4iAr7aDQZykDnSg7FRuCorFJzxPtAIbMCshRgEfq+JaBAmK8hyICzS48=", "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)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(64100799003)(451199024)(1800799012)(82310400011)(186009)(36840700001)(46966006)(40470700004)(478600001)(36756003)(1076003)(107886003)(2616005)(86362001)(83380400001)(30864003)(6666004)(426003)(336012)(356005)(26005)(7696005)(6286002)(8936002)(2906002)(5660300002)(6916009)(8676002)(4326008)(70206006)(70586007)(54906003)(316002)(7636003)(82740400003)(55016003)(41300700001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "14 Feb 2024 07:30:48.9162 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n c2cea802-ae85-48f8-ac10-08dc2d2eddae", "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 DS2PEPF0000343A.namprd02.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SA1PR12MB6776", "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": "From: Hamdan Igbaria <hamdani@nvidia.com>\n\nAdd support for compare matcher, this matcher will allow\ndirect comparison between two packet fields, or a packet\nfield and a value, with fully masked DW.\nFor now this matcher hash table is limited to size 1x1,\nthus it supports only 1 rule STE.\n\nSigned-off-by: Hamdan Igbaria <hamdani@nvidia.com>\nSigned-off-by: Michael Baum <michaelba@nvidia.com>\n---\n drivers/common/mlx5/mlx5_prm.h | 16 ++\n drivers/net/mlx5/hws/mlx5dr_cmd.c | 9 +-\n drivers/net/mlx5/hws/mlx5dr_cmd.h | 1 +\n drivers/net/mlx5/hws/mlx5dr_debug.c | 4 +-\n drivers/net/mlx5/hws/mlx5dr_debug.h | 1 +\n drivers/net/mlx5/hws/mlx5dr_definer.c | 243 +++++++++++++++++++++++++-\n drivers/net/mlx5/hws/mlx5dr_definer.h | 33 ++++\n drivers/net/mlx5/hws/mlx5dr_matcher.c | 48 +++++\n drivers/net/mlx5/hws/mlx5dr_matcher.h | 12 +-\n 9 files changed, 358 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h\nindex 0035a1e616..f8956c8a87 100644\n--- a/drivers/common/mlx5/mlx5_prm.h\n+++ b/drivers/common/mlx5/mlx5_prm.h\n@@ -3459,6 +3459,7 @@ enum mlx5_ifc_rtc_ste_format {\n \tMLX5_IFC_RTC_STE_FORMAT_8DW = 0x4,\n \tMLX5_IFC_RTC_STE_FORMAT_11DW = 0x5,\n \tMLX5_IFC_RTC_STE_FORMAT_RANGE = 0x7,\n+\tMLX5_IFC_RTC_STE_FORMAT_4DW_RANGE = 0x8,\n };\n \n enum mlx5_ifc_rtc_reparse_mode {\n@@ -3497,6 +3498,21 @@ struct mlx5_ifc_rtc_bits {\n \tu8 reserved_at_1a0[0x260];\n };\n \n+struct mlx5_ifc_ste_match_4dw_range_ctrl_dw_bits {\n+\tu8 match[0x1];\n+\tu8 reserved_at_1[0x2];\n+\tu8 base1[0x1];\n+\tu8 inverse1[0x1];\n+\tu8 reserved_at_5[0x1];\n+\tu8 operator1[0x2];\n+\tu8 reserved_at_8[0x3];\n+\tu8 base0[0x1];\n+\tu8 inverse0[0x1];\n+\tu8 reserved_at_a[0x1];\n+\tu8 operator0[0x2];\n+\tu8 compare_delta[0x10];\n+};\n+\n struct mlx5_ifc_alias_context_bits {\n \tu8 vhca_id_to_be_accessed[0x10];\n \tu8 reserved_at_10[0xd];\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.c b/drivers/net/mlx5/hws/mlx5dr_cmd.c\nindex 876a47147d..702d6fadac 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_cmd.c\n+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.c\n@@ -370,9 +370,12 @@ mlx5dr_cmd_rtc_create(struct ibv_context *ctx,\n \t\t attr, obj_type, MLX5_GENERAL_OBJ_TYPE_RTC);\n \n \tattr = MLX5_ADDR_OF(create_rtc_in, in, rtc);\n-\tMLX5_SET(rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ?\n-\t\tMLX5_IFC_RTC_STE_FORMAT_11DW :\n-\t\tMLX5_IFC_RTC_STE_FORMAT_8DW);\n+\tif (rtc_attr->is_compare) {\n+\t\tMLX5_SET(rtc, attr, ste_format_0, MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE);\n+\t} else {\n+\t\tMLX5_SET(rtc, attr, ste_format_0, rtc_attr->is_frst_jumbo ?\n+\t\t\t MLX5_IFC_RTC_STE_FORMAT_11DW : MLX5_IFC_RTC_STE_FORMAT_8DW);\n+\t}\n \n \tif (rtc_attr->is_scnd_range) {\n \t\tMLX5_SET(rtc, attr, ste_format_1, MLX5_IFC_RTC_STE_FORMAT_RANGE);\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_cmd.h b/drivers/net/mlx5/hws/mlx5dr_cmd.h\nindex 18c2b07fc8..073ffd9633 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_cmd.h\n+++ b/drivers/net/mlx5/hws/mlx5dr_cmd.h\n@@ -82,6 +82,7 @@ struct mlx5dr_cmd_rtc_create_attr {\n \tuint8_t reparse_mode;\n \tbool is_frst_jumbo;\n \tbool is_scnd_range;\n+\tbool is_compare;\n };\n \n struct mlx5dr_cmd_alias_obj_create_attr {\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_debug.c b/drivers/net/mlx5/hws/mlx5dr_debug.c\nindex 11557bcab8..a9094cd35b 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_debug.c\n+++ b/drivers/net/mlx5/hws/mlx5dr_debug.c\n@@ -99,6 +99,7 @@ static int\n mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher)\n {\n \tbool is_root = matcher->tbl->level == MLX5DR_ROOT_LEVEL;\n+\tbool is_compare = mlx5dr_matcher_is_compare(matcher);\n \tenum mlx5dr_debug_res_type type;\n \tint i, ret;\n \n@@ -117,7 +118,8 @@ mlx5dr_debug_dump_matcher_match_template(FILE *f, struct mlx5dr_matcher *matcher\n \t\t\treturn rte_errno;\n \t\t}\n \n-\t\ttype = MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER;\n+\t\ttype = is_compare ? MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER :\n+\t\t\t\t MLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_MATCH_DEFINER;\n \t\tret = mlx5dr_debug_dump_matcher_template_definer(f, mt, mt->definer, type);\n \t\tif (ret)\n \t\t\treturn ret;\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_debug.h b/drivers/net/mlx5/hws/mlx5dr_debug.h\nindex 5cffdb10b5..a89a6a0b1d 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_debug.h\n+++ b/drivers/net/mlx5/hws/mlx5dr_debug.h\n@@ -24,6 +24,7 @@ enum mlx5dr_debug_res_type {\n \tMLX5DR_DEBUG_RES_TYPE_MATCHER_ACTION_TEMPLATE = 4204,\n \tMLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_HASH_DEFINER = 4205,\n \tMLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_RANGE_DEFINER = 4206,\n+\tMLX5DR_DEBUG_RES_TYPE_MATCHER_TEMPLATE_COMPARE_MATCH_DEFINER = 4207,\n };\n \n static inline uint64_t\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c\nindex 79d98bbf78..2d86175ca2 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_definer.c\n+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c\n@@ -383,6 +383,86 @@ mlx5dr_definer_ptype_frag_set(struct mlx5dr_definer_fc *fc,\n \tDR_SET(tag, !!packet_type, fc->byte_off, fc->bit_off, fc->bit_mask);\n }\n \n+static void\n+mlx5dr_definer_compare_base_value_set(const void *item_spec,\n+\t\t\t\t uint8_t *tag)\n+{\n+\tuint32_t *ctrl = &(((uint32_t *)tag)[MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1]);\n+\tuint32_t *base = &(((uint32_t *)tag)[MLX5DR_DEFINER_COMPARE_STE_BASE_0]);\n+\tconst struct rte_flow_item_compare *v = item_spec;\n+\tconst struct rte_flow_field_data *a = &v->a;\n+\tconst struct rte_flow_field_data *b = &v->b;\n+\tconst uint32_t *value;\n+\n+\tvalue = (const uint32_t *)&b->value[0];\n+\n+\tif (a->field == RTE_FLOW_FIELD_RANDOM)\n+\t\t*base = htobe32(*value << 16);\n+\telse\n+\t\t*base = htobe32(*value);\n+\n+\tMLX5_SET(ste_match_4dw_range_ctrl_dw, ctrl, base0, 1);\n+}\n+\n+static void\n+mlx5dr_definer_compare_op_translate(enum rte_flow_item_compare_op op,\n+\t\t\t\t uint8_t *tag)\n+{\n+\tuint32_t *ctrl = &(((uint32_t *)tag)[MLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1]);\n+\tuint8_t operator = 0;\n+\tuint8_t inverse = 0;\n+\n+\tswitch (op) {\n+\tcase RTE_FLOW_ITEM_COMPARE_EQ:\n+\t\toperator = 2;\n+\t\tbreak;\n+\tcase RTE_FLOW_ITEM_COMPARE_NE:\n+\t\toperator = 2;\n+\t\tinverse = 1;\n+\t\tbreak;\n+\tcase RTE_FLOW_ITEM_COMPARE_LT:\n+\t\tinverse = 1;\n+\t\tbreak;\n+\tcase RTE_FLOW_ITEM_COMPARE_LE:\n+\t\toperator = 1;\n+\t\tbreak;\n+\tcase RTE_FLOW_ITEM_COMPARE_GT:\n+\t\toperator = 1;\n+\t\tinverse = 1;\n+\t\tbreak;\n+\tcase RTE_FLOW_ITEM_COMPARE_GE:\n+\t\tbreak;\n+\tdefault:\n+\t\tDR_LOG(ERR, \"Invalid operation type %d\", op);\n+\t\tassert(false);\n+\t}\n+\n+\tMLX5_SET(ste_match_4dw_range_ctrl_dw, ctrl, inverse0, inverse);\n+\tMLX5_SET(ste_match_4dw_range_ctrl_dw, ctrl, operator0, operator);\n+}\n+\n+static void\n+mlx5dr_definer_compare_arg_set(const void *item_spec,\n+\t\t\t uint8_t *tag)\n+{\n+\tconst struct rte_flow_item_compare *v = item_spec;\n+\tenum rte_flow_item_compare_op op = v->operation;\n+\n+\tmlx5dr_definer_compare_op_translate(op, tag);\n+}\n+\n+static void\n+mlx5dr_definer_compare_set(struct mlx5dr_definer_fc *fc,\n+\t\t\t const void *item_spec,\n+\t\t\t uint8_t *tag)\n+{\n+\tif (fc->compare_idx == MLX5DR_DEFINER_COMPARE_ARGUMENT_0) {\n+\t\tmlx5dr_definer_compare_arg_set(item_spec, tag);\n+\t\tif (fc->compare_set_base)\n+\t\t\tmlx5dr_definer_compare_base_value_set(item_spec, tag);\n+\t}\n+}\n+\n static void\n mlx5dr_definer_integrity_set(struct mlx5dr_definer_fc *fc,\n \t\t\t const void *item_spec,\n@@ -2739,10 +2819,124 @@ mlx5dr_definer_conv_item_vxlan_gpe(struct mlx5dr_definer_conv_data *cd,\n \treturn 0;\n }\n \n+static int\n+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_definer_compare_dw_selectors dw_offset)\n+{\n+\tstruct mlx5dr_definer_fc *fc = NULL;\n+\tint reg;\n+\n+\tif (f->offset) {\n+\t\tDR_LOG(ERR, \"field offset %u is not supported, only offset zero supported\",\n+\t\t f->offset);\n+\t\tgoto err_notsup;\n+\t}\n+\n+\tswitch (f->field) {\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, -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+\t\t\treturn rte_errno;\n+\t\t}\n+\n+\t\tfc = mlx5dr_definer_get_register_fc(cd, reg);\n+\t\tif (!fc)\n+\t\t\treturn rte_errno;\n+\n+\t\tfc->item_idx = item_idx;\n+\t\tfc->tag_set = &mlx5dr_definer_compare_set;\n+\t\tfc->tag_mask_set = &mlx5dr_definer_ones_set;\n+\t\tfc->compare_idx = dw_offset;\n+\t\tbreak;\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 f->tag_index);\n+\t\tif (reg <= 0) {\n+\t\t\tDR_LOG(ERR, \"Invalid register for compare tag field\");\n+\t\t\trte_errno = EINVAL;\n+\t\t\treturn rte_errno;\n+\t\t}\n+\n+\t\tfc = mlx5dr_definer_get_register_fc(cd, reg);\n+\t\tif (!fc)\n+\t\t\treturn rte_errno;\n+\n+\t\tfc->item_idx = item_idx;\n+\t\tfc->tag_set = &mlx5dr_definer_compare_set;\n+\t\tfc->tag_mask_set = &mlx5dr_definer_ones_set;\n+\t\tfc->compare_idx = dw_offset;\n+\t\tbreak;\n+\tcase RTE_FLOW_FIELD_VALUE:\n+\t\tif (dw_offset == MLX5DR_DEFINER_COMPARE_ARGUMENT_0) {\n+\t\t\tDR_LOG(ERR, \"Argument field does not support immediate value\");\n+\t\t\tgoto err_notsup;\n+\t\t}\n+\t\tbreak;\n+\tcase RTE_FLOW_FIELD_RANDOM:\n+\t\tfc = &cd->fc[MLX5DR_DEFINER_FNAME_RANDOM_NUM];\n+\t\tfc->item_idx = item_idx;\n+\t\tfc->tag_set = &mlx5dr_definer_compare_set;\n+\t\tfc->tag_mask_set = &mlx5dr_definer_ones_set;\n+\t\tfc->compare_idx = dw_offset;\n+\t\tDR_CALC_SET_HDR(fc, random_number, random_number);\n+\t\tbreak;\n+\tdefault:\n+\t\tDR_LOG(ERR, \"%u field is not supported\", f->field);\n+\t\tgoto err_notsup;\n+\t}\n+\n+\tif (fc && other_f && other_f->field == RTE_FLOW_FIELD_VALUE)\n+\t\tfc->compare_set_base = true;\n+\n+\treturn 0;\n+\n+err_notsup:\n+\trte_errno = ENOTSUP;\n+\treturn rte_errno;\n+}\n+\n+static int\n+mlx5dr_definer_conv_item_compare(struct mlx5dr_definer_conv_data *cd,\n+\t\t\t\t struct rte_flow_item *item,\n+\t\t\t\t int item_idx)\n+{\n+\tconst struct rte_flow_item_compare *m = item->mask;\n+\tconst struct rte_flow_field_data *a = &m->a;\n+\tconst struct rte_flow_field_data *b = &m->b;\n+\tint ret;\n+\n+\tif (m->width != 0xffffffff) {\n+\t\tDR_LOG(ERR, \"compare item width of 0x%x is not supported, only full DW supported\",\n+\t\t\t\tm->width);\n+\t\trte_errno = ENOTSUP;\n+\t\treturn rte_errno;\n+\t}\n+\n+\tret = mlx5dr_definer_conv_item_compare_field(a, b, cd, item_idx,\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 MLX5DR_DEFINER_COMPARE_BASE_0);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn 0;\n+}\n+\n static int\n mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,\n \t\t\t\tstruct mlx5dr_match_template *mt,\n-\t\t\t\tuint8_t *hl)\n+\t\t\t\tuint8_t *hl,\n+\t\t\t\tstruct mlx5dr_matcher *matcher)\n {\n \tstruct mlx5dr_definer_fc fc[MLX5DR_DEFINER_FNAME_MAX] = {{0}};\n \tstruct mlx5dr_definer_conv_data cd = {0};\n@@ -2762,6 +2956,11 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,\n \t\tif (ret)\n \t\t\treturn ret;\n \n+\t\tif (mlx5dr_matcher_is_compare(matcher)) {\n+\t\t\tDR_LOG(ERR, \"Compare matcher not supported for more than one item\");\n+\t\t\tgoto not_supp;\n+\t\t}\n+\n \t\tswitch ((int)items->type) {\n \t\tcase RTE_FLOW_ITEM_TYPE_ETH:\n \t\t\tret = mlx5dr_definer_conv_item_eth(&cd, items, i);\n@@ -2907,10 +3106,18 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,\n \t\t\tret = mlx5dr_definer_conv_item_vxlan_gpe(&cd, items, i);\n \t\t\titem_flags |= MLX5_FLOW_LAYER_VXLAN_GPE;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_COMPARE:\n+\t\t\tif (i) {\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, items, i);\n+\t\t\titem_flags |= MLX5_FLOW_ITEM_COMPARE;\n+\t\t\tmatcher->flags |= MLX5DR_MATCHER_FLAGS_COMPARE;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tDR_LOG(ERR, \"Unsupported item type %d\", items->type);\n-\t\t\trte_errno = ENOTSUP;\n-\t\t\treturn rte_errno;\n+\t\t\tgoto not_supp;\n \t\t}\n \n \t\tcd.last_item = items->type;\n@@ -2931,6 +3138,10 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,\n \t}\n \n \treturn 0;\n+\n+not_supp:\n+\trte_errno = ENOTSUP;\n+\treturn rte_errno;\n }\n \n static int\n@@ -3318,6 +3529,7 @@ mlx5dr_definer_calc_layout(struct mlx5dr_matcher *matcher,\n {\n \tstruct mlx5dr_context *ctx = matcher->tbl->ctx;\n \tstruct mlx5dr_match_template *mt = matcher->mt;\n+\tstruct mlx5dr_definer_fc *fc;\n \tuint8_t *match_hl;\n \tint i, ret;\n \n@@ -3335,13 +3547,35 @@ mlx5dr_definer_calc_layout(struct mlx5dr_matcher *matcher,\n \t * and allocate the match and range field copy array (fc & fcr).\n \t */\n \tfor (i = 0; i < matcher->num_of_mt; i++) {\n-\t\tret = mlx5dr_definer_conv_items_to_hl(ctx, &mt[i], match_hl);\n+\t\tret = mlx5dr_definer_conv_items_to_hl(ctx, &mt[i], match_hl, matcher);\n \t\tif (ret) {\n \t\t\tDR_LOG(ERR, \"Failed to convert items to header layout\");\n \t\t\tgoto free_fc;\n \t\t}\n \t}\n \n+\tif (mlx5dr_matcher_is_compare(matcher)) {\n+\t\tret = mlx5dr_matcher_validate_compare_attr(matcher);\n+\t\tif (ret)\n+\t\t\tgoto free_fc;\n+\n+\t\t/* Due some HW limitation need to fill unused\n+\t\t * DW's 0-5 and byte selectors with 0xff.\n+\t\t */\n+\t\tfor (i = 0; i < DW_SELECTORS_MATCH; i++)\n+\t\t\tmatch_definer->dw_selector[i] = 0xff;\n+\n+\t\tfor (i = 0; i < BYTE_SELECTORS; i++)\n+\t\t\tmatch_definer->byte_selector[i] = 0xff;\n+\n+\t\tfor (i = 0; i < mt[0].fc_sz; i++) {\n+\t\t\tfc = &mt[0].fc[i];\n+\t\t\tmatch_definer->dw_selector[fc->compare_idx] = fc->byte_off / DW_SIZE;\n+\t\t}\n+\n+\t\tgoto out;\n+\t}\n+\n \t/* Find the match definer layout for header layout match union */\n \tret = mlx5dr_definer_find_best_match_fit(ctx, match_definer, match_hl);\n \tif (ret) {\n@@ -3356,6 +3590,7 @@ mlx5dr_definer_calc_layout(struct mlx5dr_matcher *matcher,\n \t\tgoto free_fc;\n \t}\n \n+out:\n \tsimple_free(match_hl);\n \treturn 0;\n \ndiff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h b/drivers/net/mlx5/hws/mlx5dr_definer.h\nindex ced9d9da13..9f2b5e7dc9 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_definer.h\n+++ b/drivers/net/mlx5/hws/mlx5dr_definer.h\n@@ -17,6 +17,37 @@\n #define DW_SELECTORS_RANGE 2\n #define BYTE_SELECTORS_RANGE 8\n \n+enum mlx5dr_definer_compare_ste_dw_offset {\n+\t/* In compare STE the matching DW's starts after the 3 actions */\n+\tMLX5DR_DEFINER_COMPARE_STE_ARGUMENT_1 = 3,\n+\tMLX5DR_DEFINER_COMPARE_STE_ARGUMENT_0,\n+\tMLX5DR_DEFINER_COMPARE_STE_BASE_1,\n+\tMLX5DR_DEFINER_COMPARE_STE_BASE_0,\n+\tMLX5DR_DEFINER_COMPARE_STE_TAG_DW_3,\n+\tMLX5DR_DEFINER_COMPARE_STE_TAG_DW_2,\n+\tMLX5DR_DEFINER_COMPARE_STE_TAG_DW_1,\n+\tMLX5DR_DEFINER_COMPARE_STE_TAG_DW_0,\n+};\n+\n+enum mlx5dr_definer_dw_selectors {\n+\tMLX5DR_DEFINER_SELECTOR_DW0,\n+\tMLX5DR_DEFINER_SELECTOR_DW1,\n+\tMLX5DR_DEFINER_SELECTOR_DW2,\n+\tMLX5DR_DEFINER_SELECTOR_DW3,\n+\tMLX5DR_DEFINER_SELECTOR_DW4,\n+\tMLX5DR_DEFINER_SELECTOR_DW5,\n+\tMLX5DR_DEFINER_SELECTOR_DW6,\n+\tMLX5DR_DEFINER_SELECTOR_DW7,\n+\tMLX5DR_DEFINER_SELECTOR_DW8,\n+};\n+\n+enum mlx5dr_definer_compare_dw_selectors {\n+\tMLX5DR_DEFINER_COMPARE_ARGUMENT_0 = MLX5DR_DEFINER_SELECTOR_DW4,\n+\tMLX5DR_DEFINER_COMPARE_ARGUMENT_1 = MLX5DR_DEFINER_SELECTOR_DW5,\n+\tMLX5DR_DEFINER_COMPARE_BASE_0 = MLX5DR_DEFINER_SELECTOR_DW2,\n+\tMLX5DR_DEFINER_COMPARE_BASE_1 = MLX5DR_DEFINER_SELECTOR_DW3,\n+};\n+\n enum mlx5dr_definer_fname {\n \tMLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_O,\n \tMLX5DR_DEFINER_FNAME_ETH_SMAC_48_16_I,\n@@ -188,6 +219,8 @@ struct mlx5dr_definer_fc {\n \tuint8_t item_idx;\n \tuint8_t is_range;\n \tuint16_t extra_data;\n+\tuint8_t compare_idx;\n+\tbool compare_set_base;\n \tuint32_t byte_off;\n \tint bit_off;\n \tuint32_t bit_mask;\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.c b/drivers/net/mlx5/hws/mlx5dr_matcher.c\nindex 4ea161eae6..cede24237f 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_matcher.c\n+++ b/drivers/net/mlx5/hws/mlx5dr_matcher.c\n@@ -485,6 +485,7 @@ static int mlx5dr_matcher_create_rtc(struct mlx5dr_matcher *matcher,\n \t\trtc_attr.log_depth = attr->table.sz_col_log;\n \t\trtc_attr.is_frst_jumbo = mlx5dr_matcher_mt_is_jumbo(mt);\n \t\trtc_attr.is_scnd_range = mlx5dr_matcher_mt_is_range(mt);\n+\t\trtc_attr.is_compare = mlx5dr_matcher_is_compare(matcher);\n \t\trtc_attr.miss_ft_id = matcher->end_ft->id;\n \n \t\tif (attr->insert_mode == MLX5DR_MATCHER_INSERT_BY_HASH) {\n@@ -497,6 +498,10 @@ static int mlx5dr_matcher_create_rtc(struct mlx5dr_matcher *matcher,\n \t\t\t\trtc_attr.num_hash_definer = 1;\n \t\t\t\trtc_attr.match_definer_0 =\n \t\t\t\t\tmlx5dr_definer_get_id(matcher->hash_definer);\n+\t\t\t} else if (mlx5dr_matcher_is_compare(matcher)) {\n+\t\t\t\trtc_attr.match_definer_0 = ctx->caps->trivial_match_definer;\n+\t\t\t\trtc_attr.fw_gen_wqe = true;\n+\t\t\t\trtc_attr.num_hash_definer = 1;\n \t\t\t} else {\n \t\t\t\t/* The first mt is used since all share the same definer */\n \t\t\t\trtc_attr.match_definer_0 = mlx5dr_definer_get_id(mt->definer);\n@@ -1452,3 +1457,46 @@ int mlx5dr_match_template_destroy(struct mlx5dr_match_template *mt)\n \tsimple_free(mt);\n \treturn 0;\n }\n+\n+int mlx5dr_matcher_validate_compare_attr(struct mlx5dr_matcher *matcher)\n+{\n+\tstruct mlx5dr_cmd_query_caps *caps = matcher->tbl->ctx->caps;\n+\tstruct mlx5dr_matcher_attr *attr = &matcher->attr;\n+\n+\tif (mlx5dr_table_is_root(matcher->tbl)) {\n+\t\tDR_LOG(ERR, \"Compare matcher is not supported for root tables\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (attr->mode != MLX5DR_MATCHER_RESOURCE_MODE_HTABLE) {\n+\t\tDR_LOG(ERR, \"Compare matcher is only supported with pre-defined table size\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (attr->insert_mode != MLX5DR_MATCHER_INSERT_BY_HASH ||\n+\t\tattr->distribute_mode != MLX5DR_MATCHER_DISTRIBUTE_BY_HASH) {\n+\t\tDR_LOG(ERR, \"Gen WQE for compare matcher must be inserted and distribute by hash\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (matcher->num_of_mt != 1 || matcher->num_of_at != 1) {\n+\t\tDR_LOG(ERR, \"Compare matcher match templates and action templates must be 1 for each\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (attr->table.sz_col_log || attr->table.sz_row_log) {\n+\t\tDR_LOG(ERR, \"Compare matcher supports only 1x1 table size\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (!IS_BIT_SET(caps->supp_ste_format_gen_wqe, MLX5_IFC_RTC_STE_FORMAT_4DW_RANGE)) {\n+\t\tDR_LOG(ERR, \"Gen WQE Compare match format not supported\");\n+\t\tgoto err;\n+\t}\n+\n+\treturn 0;\n+\n+err:\n+\trte_errno = ENOTSUP;\n+\treturn rte_errno;\n+}\ndiff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.h b/drivers/net/mlx5/hws/mlx5dr_matcher.h\nindex 363a61fd41..ca6c212536 100644\n--- a/drivers/net/mlx5/hws/mlx5dr_matcher.h\n+++ b/drivers/net/mlx5/hws/mlx5dr_matcher.h\n@@ -26,6 +26,7 @@ enum mlx5dr_matcher_flags {\n \tMLX5DR_MATCHER_FLAGS_RANGE_DEFINER\t= 1 << 0,\n \tMLX5DR_MATCHER_FLAGS_HASH_DEFINER\t= 1 << 1,\n \tMLX5DR_MATCHER_FLAGS_COLLISION\t\t= 1 << 2,\n+\tMLX5DR_MATCHER_FLAGS_COMPARE\t\t= 1 << 4,\n };\n \n struct mlx5dr_match_template {\n@@ -89,12 +90,19 @@ mlx5dr_matcher_mt_is_range(struct mlx5dr_match_template *mt)\n \treturn (!!mt->range_definer);\n }\n \n+static inline bool\n+mlx5dr_matcher_is_compare(struct mlx5dr_matcher *matcher)\n+{\n+\treturn !!(matcher->flags & MLX5DR_MATCHER_FLAGS_COMPARE);\n+}\n+\n static inline bool mlx5dr_matcher_req_fw_wqe(struct mlx5dr_matcher *matcher)\n {\n \t/* Currently HWS doesn't support hash different from match or range */\n \treturn unlikely(matcher->flags &\n \t\t\t(MLX5DR_MATCHER_FLAGS_HASH_DEFINER |\n-\t\t\t MLX5DR_MATCHER_FLAGS_RANGE_DEFINER));\n+\t\t\t MLX5DR_MATCHER_FLAGS_RANGE_DEFINER |\n+\t\t\t MLX5DR_MATCHER_FLAGS_COMPARE));\n }\n \n int mlx5dr_matcher_conv_items_to_prm(uint64_t *match_buf,\n@@ -120,4 +128,6 @@ int mlx5dr_matcher_free_rtc_pointing(struct mlx5dr_context *ctx,\n \t\t\t\t enum mlx5dr_table_type type,\n \t\t\t\t struct mlx5dr_devx_obj *devx_obj);\n \n+int mlx5dr_matcher_validate_compare_attr(struct mlx5dr_matcher *matcher);\n+\n #endif /* MLX5DR_MATCHER_H_ */\n", "prefixes": [ "v5", "1/3" ] }