From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8CA2343A94; Tue, 6 Feb 2024 03:07:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 169BD40EE5; Tue, 6 Feb 2024 03:07:11 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2072.outbound.protection.outlook.com [40.107.237.72]) by mails.dpdk.org (Postfix) with ESMTP id 3EBB340E7C for ; Tue, 6 Feb 2024 03:07:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ccpc9uIp6GSP7au8cshDWTAERdxpHs77tWe9lER+REfC26yUHurMjdf+kunlfIFQAShnZRZPm9Ax8pJ4ca2pbloFcfhUHjn2qfYfSts9xQuiUWCEPtxx5EyNB1kzuOwgH2RQDD443APSQXu2dfQp1YGvCvhfbeQmZPNrzzbwuBFvxks3s4V0VDG0/thGoP7YhcAgfNNO4UEXO6FIwBtLzkQL5egM0uFuniujeV2v4sylr2NQUM4DiY1w+N7jS1/LhhZdqhIAuH/A4M28OCDIkzbtvs8Rkec1XD+eElhaDzysHFTbNAszfBzt0R21fxI/1y7b6kj5OgkRr/AoLzO0gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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; bh=PjeUYUsuIUoChmhAmFTc7el5JQmlheAZHA/YbmwUuuU=; b=T5GUzG56jzyF1UhsiPJfvvZYJtZDFgBEXGunhS8Gz50uu0B/9JEZu4WYvO8NzPYiB35a7/37zaEwvf9RYSfKRyDkLib29/twnd2qjDMSs1m88kRAKTIAW4akkGUI27jFCepz5JIvqaRrGPt+ghICrqGrpZ5uMTtyQIxTXDZLEF+dm5/EXrBIuSkaH+Gn0ffSRZqrd+xvjKQuFrYVTivieIOIu8cuie28upQC46VLqg0fRxxUBAm0YUcZdp2VGbYolp1uCUOC6aSoFXZ48OzdCoC6H5s8QxZx1MsXFSBk1u2X+Lreqip4+cjXy2qrC8Hzgz2SImOMPsNooeWn6xGV6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PjeUYUsuIUoChmhAmFTc7el5JQmlheAZHA/YbmwUuuU=; b=r/vTchPyfBj+lhNijWc1IXKHeHvw4moHCszDuAuQa7k/oJQiEYCI4XL/Ac+N1bV5gIuWl392d8+QvB2ULni+u76AdDwIgVHOB+jj14MNvG0BZP9ycbhH0Gns91MrmvRUgURx7EBswi+xYEQFR9hZ4k1HTxxMSOwaspdGD4EXQHZRejA2Z11Tt+NMVAgvL8cj7cmrGXqgtsL8DPh7KoR32U4v6eiUHjbv9Sdt8Ze2/CNG7dQ6jHicpTXW0Qi0H0tXNOBsvsSENdjwlU+DZSOkOl9cCBwCY2y0nt4XMSISloFO91fmpgmkQqOOtKwSTj450nASbRWXTcW6IA3T9Se8UA== Received: from SJ0PR03CA0005.namprd03.prod.outlook.com (2603:10b6:a03:33a::10) by MW4PR12MB6950.namprd12.prod.outlook.com (2603:10b6:303:207::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.13; Tue, 6 Feb 2024 02:07:06 +0000 Received: from SJ1PEPF00001CE4.namprd03.prod.outlook.com (2603:10b6:a03:33a:cafe::73) by SJ0PR03CA0005.outlook.office365.com (2603:10b6:a03:33a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36 via Frontend Transport; Tue, 6 Feb 2024 02:07:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ1PEPF00001CE4.mail.protection.outlook.com (10.167.242.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.16 via Frontend Transport; Tue, 6 Feb 2024 02:07:05 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 5 Feb 2024 18:06:54 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Mon, 5 Feb 2024 18:06:50 -0800 From: Suanming Mou To: , , Ori Kam , Aman Singh , Yuying Zhang , Andrew Rybchenko CC: Subject: [PATCH v7 3/4] ethdev: add compare item Date: Tue, 6 Feb 2024 10:06:24 +0800 Message-ID: <20240206020626.545946-4-suanmingm@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240206020626.545946-1-suanmingm@nvidia.com> References: <20231214031227.363911-1-suanmingm@nvidia.com> <20240206020626.545946-1-suanmingm@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE4:EE_|MW4PR12MB6950:EE_ X-MS-Office365-Filtering-Correlation-Id: ef788a96-af70-4bf5-0443-08dc26b850e6 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vthNGeQkDhokOdI0ylkMX5/QjjMamNv4s3kfJG/kiZKVSfl7hNbh6zOo8ACFpmufsOB7X+iWhE2ke143l0ZIKknYoPGmHV2qyrXBEI91uYaSy7Kj4eR7Wr+fw3aXw4XIfU/5qouRZa8nkFogWIno/ryUwEjBWHwjJRV5FrFERbh89dNWSODceiIi6UZRRFUxqXtAr8zpCIAfHvh0CR7CVCXFvRTamX2X7fFjvKuk0rB2ABUXPBK01MjotY6wymCamWIc834LnAHpEmY79bterkwQ5NjJ4Px+SqLatpWP710VRcVRiQi8TIocfEPL2AimeV9QEjVXWtvFHECHmGFXJbtGHcKi63QpA/AqRgNU5MJPmiEnpa4PWIk6bEMLbgGzIdSoBrPOqmjmF9Tf2yWYTsA5YTC7EI6k0da8V7awM387JY5PHdQIULH50CBIGSVoPCBe6B8BJhPAnL5/nOluqFgZ+vZzgvDiMnUQ/t9QCpkvmrYqG4gps1ngqOYELDiU+xRTiGUjP44a9wJxZEhkg4ZXiXgOq9eO/ZgYFXoaR89+wv18HRgRJCjwSRc3Ntjht+SldKqJGmQYm73PPo8WMJK7albhIlyfthsGh2xZv/voN4oxGM75TUIXKkVp361dMeH+w3wICQkKNc0HuZo4GDN/L/W6e3Ydoi5XCZaPbImaU5Z3O4Z+y1OSSAKTS/xEY7iGjsOG8vhWhD21s+KKZ/7KRYKHertm9/AecfLqWW9fazmiveyr0uucTqrJzz1I X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(396003)(136003)(376002)(39860400002)(230273577357003)(230922051799003)(186009)(451199024)(64100799003)(82310400011)(1800799012)(36840700001)(46966006)(40470700004)(5660300002)(30864003)(6666004)(478600001)(8676002)(4326008)(86362001)(316002)(7696005)(2616005)(70206006)(8936002)(110136005)(426003)(36756003)(36860700001)(6286002)(41300700001)(26005)(1076003)(82740400003)(7636003)(336012)(70586007)(83380400001)(356005)(47076005)(16526019)(55016003)(2906002)(40480700001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 02:07:05.1607 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef788a96-af70-4bf5-0443-08dc26b850e6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6950 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The new item type is added for the case user wants to match traffic based on packet field compare result with other fields or immediate value. e.g. take advantage the compare item user will be able to accumulate a IPv4/TCP packet's TCP data_offset and IPv4 IHL field to a tag register, then compare the tag register with IPv4 header total length to understand the packet has payload or not. The supported operations can be as below: - RTE_FLOW_ITEM_COMPARE_EQ (equal) - RTE_FLOW_ITEM_COMPARE_NE (not equal) - RTE_FLOW_ITEM_COMPARE_LT (less than) - RTE_FLOW_ITEM_COMPARE_LE (less than or equal) - RTE_FLOW_ITEM_COMPARE_GT (great than) - RTE_FLOW_ITEM_COMPARE_GE (great than or equal) A sample for create the comparison flow: flow pattern_template 0 create ingress pattern_template_id 1 template \ compare op mask le a_type mask tag a_tag_index mask 1 b_type \ mask tag b_tag_index mask 2 width mask 0xffffffff / end flow actions_template 0 create ingress actions_template_id 1 template \ count / drop / end mask count / drop / end flow template_table 0 create table_id 1 group 2 priority 1 ingress \ rules_number 1 pattern_template 1 actions_template 1 flow queue 0 create 0 template_table 1 pattern_template 0 \ actions_template 0 postpone no pattern compare op is le \ a_type is tag a_tag_index is 1 b_type is tag b_tag_index is 2 \ width is 32 / end actions count / drop / end Signed-off-by: Suanming Mou Acked-by: Ori Kam Acked-by: Andrew Rybchenko --- app/test-pmd/cmdline_flow.c | 394 ++++++++++++++++++++ doc/guides/nics/features/default.ini | 1 + doc/guides/prog_guide/rte_flow.rst | 7 + doc/guides/rel_notes/release_24_03.rst | 5 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 24 ++ lib/ethdev/rte_flow.c | 1 + lib/ethdev/rte_flow.h | 40 +- 7 files changed, 470 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 35030b5c47..06f8c82342 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -545,6 +545,28 @@ enum index { ITEM_PTYPE, ITEM_PTYPE_VALUE, ITEM_NSH, + ITEM_COMPARE, + ITEM_COMPARE_OP, + ITEM_COMPARE_OP_VALUE, + ITEM_COMPARE_FIELD_A_TYPE, + ITEM_COMPARE_FIELD_A_TYPE_VALUE, + ITEM_COMPARE_FIELD_A_LEVEL, + ITEM_COMPARE_FIELD_A_LEVEL_VALUE, + ITEM_COMPARE_FIELD_A_TAG_INDEX, + ITEM_COMPARE_FIELD_A_TYPE_ID, + ITEM_COMPARE_FIELD_A_CLASS_ID, + ITEM_COMPARE_FIELD_A_OFFSET, + ITEM_COMPARE_FIELD_B_TYPE, + ITEM_COMPARE_FIELD_B_TYPE_VALUE, + ITEM_COMPARE_FIELD_B_LEVEL, + ITEM_COMPARE_FIELD_B_LEVEL_VALUE, + ITEM_COMPARE_FIELD_B_TAG_INDEX, + ITEM_COMPARE_FIELD_B_TYPE_ID, + ITEM_COMPARE_FIELD_B_CLASS_ID, + ITEM_COMPARE_FIELD_B_OFFSET, + ITEM_COMPARE_FIELD_B_VALUE, + ITEM_COMPARE_FIELD_B_POINTER, + ITEM_COMPARE_FIELD_WIDTH, /* Validate/create actions. */ ACTIONS, @@ -744,6 +766,10 @@ enum index { #define ITEM_RAW_SIZE \ (sizeof(struct rte_flow_item_raw) + ITEM_RAW_PATTERN_SIZE) +static const char *const compare_ops[] = { + "eq", "ne", "lt", "le", "gt", "ge", NULL +}; + /** Maximum size for external pattern in struct rte_flow_field_data. */ #define FLOW_FIELD_PATTERN_SIZE 32 @@ -1596,6 +1622,7 @@ static const enum index next_item[] = { ITEM_IB_BTH, ITEM_PTYPE, ITEM_NSH, + ITEM_COMPARE, END_SET, ZERO, }; @@ -2133,6 +2160,38 @@ static const enum index item_nsh[] = { ZERO, }; +static const enum index item_compare_field[] = { + ITEM_COMPARE_OP, + ITEM_COMPARE_FIELD_A_TYPE, + ITEM_COMPARE_FIELD_B_TYPE, + ITEM_NEXT, + ZERO, +}; + +static const enum index compare_field_a[] = { + ITEM_COMPARE_FIELD_A_TYPE, + ITEM_COMPARE_FIELD_A_LEVEL, + ITEM_COMPARE_FIELD_A_TAG_INDEX, + ITEM_COMPARE_FIELD_A_TYPE_ID, + ITEM_COMPARE_FIELD_A_CLASS_ID, + ITEM_COMPARE_FIELD_A_OFFSET, + ITEM_COMPARE_FIELD_B_TYPE, + ZERO, +}; + +static const enum index compare_field_b[] = { + ITEM_COMPARE_FIELD_B_TYPE, + ITEM_COMPARE_FIELD_B_LEVEL, + ITEM_COMPARE_FIELD_B_TAG_INDEX, + ITEM_COMPARE_FIELD_B_TYPE_ID, + ITEM_COMPARE_FIELD_B_CLASS_ID, + ITEM_COMPARE_FIELD_B_OFFSET, + ITEM_COMPARE_FIELD_B_VALUE, + ITEM_COMPARE_FIELD_B_POINTER, + ITEM_COMPARE_FIELD_WIDTH, + ZERO, +}; + static const enum index next_action[] = { ACTION_END, ACTION_VOID, @@ -2882,6 +2941,24 @@ comp_quota_update_name(struct context *ctx, const struct token *token, static int comp_qu_mode_name(struct context *ctx, const struct token *token, unsigned int ent, char *buf, unsigned int size); +static int +comp_set_compare_field_id(struct context *ctx, const struct token *token, + unsigned int ent, char *buf, unsigned int size); +static int +comp_set_compare_op(struct context *ctx, const struct token *token, + unsigned int ent, char *buf, unsigned int size); +static int +parse_vc_compare_op(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size); +static int +parse_vc_compare_field_id(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size); +static int +parse_vc_compare_field_level(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size); struct indlst_conf { uint32_t id; @@ -6016,6 +6093,174 @@ static const struct token token_list[] = { .next = NEXT(item_nsh), .call = parse_vc, }, + [ITEM_COMPARE] = { + .name = "compare", + .help = "match with the comparison result", + .priv = PRIV_ITEM(COMPARE, sizeof(struct rte_flow_item_compare)), + .next = NEXT(NEXT_ENTRY(ITEM_COMPARE_OP)), + .call = parse_vc, + }, + [ITEM_COMPARE_OP] = { + .name = "op", + .help = "operation type", + .next = NEXT(item_compare_field, + NEXT_ENTRY(ITEM_COMPARE_OP_VALUE), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, operation)), + }, + [ITEM_COMPARE_OP_VALUE] = { + .name = "{operation}", + .help = "operation type value", + .call = parse_vc_compare_op, + .comp = comp_set_compare_op, + }, + [ITEM_COMPARE_FIELD_A_TYPE] = { + .name = "a_type", + .help = "compared field type", + .next = NEXT(compare_field_a, + NEXT_ENTRY(ITEM_COMPARE_FIELD_A_TYPE_VALUE), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, a.field)), + }, + [ITEM_COMPARE_FIELD_A_TYPE_VALUE] = { + .name = "{a_type}", + .help = "compared field type value", + .call = parse_vc_compare_field_id, + .comp = comp_set_compare_field_id, + }, + [ITEM_COMPARE_FIELD_A_LEVEL] = { + .name = "a_level", + .help = "compared field level", + .next = NEXT(compare_field_a, + NEXT_ENTRY(ITEM_COMPARE_FIELD_A_LEVEL_VALUE), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, a.level)), + }, + [ITEM_COMPARE_FIELD_A_LEVEL_VALUE] = { + .name = "{a_level}", + .help = "compared field level value", + .call = parse_vc_compare_field_level, + .comp = comp_none, + }, + [ITEM_COMPARE_FIELD_A_TAG_INDEX] = { + .name = "a_tag_index", + .help = "compared field tag array", + .next = NEXT(compare_field_a, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + a.tag_index)), + }, + [ITEM_COMPARE_FIELD_A_TYPE_ID] = { + .name = "a_type_id", + .help = "compared field type ID", + .next = NEXT(compare_field_a, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + a.type)), + }, + [ITEM_COMPARE_FIELD_A_CLASS_ID] = { + .name = "a_class", + .help = "compared field class ID", + .next = NEXT(compare_field_a, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_compare, + a.class_id)), + }, + [ITEM_COMPARE_FIELD_A_OFFSET] = { + .name = "a_offset", + .help = "compared field bit offset", + .next = NEXT(compare_field_a, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + a.offset)), + }, + [ITEM_COMPARE_FIELD_B_TYPE] = { + .name = "b_type", + .help = "comparator field type", + .next = NEXT(compare_field_b, + NEXT_ENTRY(ITEM_COMPARE_FIELD_B_TYPE_VALUE), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + b.field)), + }, + [ITEM_COMPARE_FIELD_B_TYPE_VALUE] = { + .name = "{b_type}", + .help = "comparator field type value", + .call = parse_vc_compare_field_id, + .comp = comp_set_compare_field_id, + }, + [ITEM_COMPARE_FIELD_B_LEVEL] = { + .name = "b_level", + .help = "comparator field level", + .next = NEXT(compare_field_b, + NEXT_ENTRY(ITEM_COMPARE_FIELD_B_LEVEL_VALUE), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + b.level)), + }, + [ITEM_COMPARE_FIELD_B_LEVEL_VALUE] = { + .name = "{b_level}", + .help = "comparator field level value", + .call = parse_vc_compare_field_level, + .comp = comp_none, + }, + [ITEM_COMPARE_FIELD_B_TAG_INDEX] = { + .name = "b_tag_index", + .help = "comparator field tag array", + .next = NEXT(compare_field_b, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + b.tag_index)), + }, + [ITEM_COMPARE_FIELD_B_TYPE_ID] = { + .name = "b_type_id", + .help = "comparator field type ID", + .next = NEXT(compare_field_b, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + b.type)), + }, + [ITEM_COMPARE_FIELD_B_CLASS_ID] = { + .name = "b_class", + .help = "comparator field class ID", + .next = NEXT(compare_field_b, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_compare, + b.class_id)), + }, + [ITEM_COMPARE_FIELD_B_OFFSET] = { + .name = "b_offset", + .help = "comparator field bit offset", + .next = NEXT(compare_field_b, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + b.offset)), + }, + [ITEM_COMPARE_FIELD_B_VALUE] = { + .name = "b_value", + .help = "comparator immediate value", + .next = NEXT(compare_field_b, + NEXT_ENTRY(COMMON_HEX), item_param), + .args = ARGS(ARGS_ENTRY_ARB(0, 0), + ARGS_ENTRY_ARB(0, 0), + ARGS_ENTRY(struct rte_flow_item_compare, + b.value)), + }, + [ITEM_COMPARE_FIELD_B_POINTER] = { + .name = "b_ptr", + .help = "pointer to comparator immediate value", + .next = NEXT(compare_field_b, + NEXT_ENTRY(COMMON_HEX), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + b.pvalue), + ARGS_ENTRY_ARB(0, 0), + ARGS_ENTRY_ARB + (sizeof(struct rte_flow_item_compare), + FLOW_FIELD_PATTERN_SIZE)), + }, + [ITEM_COMPARE_FIELD_WIDTH] = { + .name = "width", + .help = "number of bits to compare", + .next = NEXT(item_compare_field, + NEXT_ENTRY(COMMON_UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_compare, + width)), + }, /* Validate/create actions. */ [ACTIONS] = { @@ -8452,6 +8697,122 @@ parse_vc_item_l2tpv2_type(struct context *ctx, const struct token *token, return len; } +/** Parse operation for compare match item. */ +static int +parse_vc_compare_op(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size) +{ + struct rte_flow_item_compare *compare_item; + unsigned int i; + + (void)token; + (void)buf; + (void)size; + if (ctx->curr != ITEM_COMPARE_OP_VALUE) + return -1; + for (i = 0; compare_ops[i]; ++i) + if (!strcmp_partial(compare_ops[i], str, len)) + break; + if (!compare_ops[i]) + return -1; + if (!ctx->object) + return len; + compare_item = ctx->object; + compare_item->operation = (enum rte_flow_item_compare_op)i; + return len; +} + +/** Parse id for compare match item. */ +static int +parse_vc_compare_field_id(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size) +{ + struct rte_flow_item_compare *compare_item; + unsigned int i; + + (void)token; + (void)buf; + (void)size; + if (ctx->curr != ITEM_COMPARE_FIELD_A_TYPE_VALUE && + ctx->curr != ITEM_COMPARE_FIELD_B_TYPE_VALUE) + return -1; + for (i = 0; flow_field_ids[i]; ++i) + if (!strcmp_partial(flow_field_ids[i], str, len)) + break; + if (!flow_field_ids[i]) + return -1; + if (!ctx->object) + return len; + compare_item = ctx->object; + if (ctx->curr == ITEM_COMPARE_FIELD_A_TYPE_VALUE) + compare_item->a.field = (enum rte_flow_field_id)i; + else + compare_item->b.field = (enum rte_flow_field_id)i; + return len; +} + +/** Parse level for compare match item. */ +static int +parse_vc_compare_field_level(struct context *ctx, const struct token *token, + const char *str, unsigned int len, void *buf, + unsigned int size) +{ + struct rte_flow_item_compare *compare_item; + struct flex_item *fp = NULL; + uint32_t val; + struct buffer *out = buf; + char *end; + + (void)token; + (void)size; + if (ctx->curr != ITEM_COMPARE_FIELD_A_LEVEL_VALUE && + ctx->curr != ITEM_COMPARE_FIELD_B_LEVEL_VALUE) + return -1; + if (!ctx->object) + return len; + compare_item = ctx->object; + errno = 0; + val = strtoumax(str, &end, 0); + if (errno || (size_t)(end - str) != len) + return -1; + /* No need to validate action template mask value */ + if (out->args.vc.masks) { + if (ctx->curr == ITEM_COMPARE_FIELD_A_LEVEL_VALUE) + compare_item->a.level = val; + else + compare_item->b.level = val; + return len; + } + if ((ctx->curr == ITEM_COMPARE_FIELD_A_LEVEL_VALUE && + compare_item->a.field == RTE_FLOW_FIELD_FLEX_ITEM) || + (ctx->curr == ITEM_COMPARE_FIELD_B_LEVEL_VALUE && + compare_item->b.field == RTE_FLOW_FIELD_FLEX_ITEM)) { + if (val >= FLEX_MAX_PARSERS_NUM) { + printf("Bad flex item handle\n"); + return -1; + } + fp = flex_items[ctx->port][val]; + if (!fp) { + printf("Bad flex item handle\n"); + return -1; + } + } + if (ctx->curr == ITEM_COMPARE_FIELD_A_LEVEL_VALUE) { + if (compare_item->a.field != RTE_FLOW_FIELD_FLEX_ITEM) + compare_item->a.level = val; + else + compare_item->a.flex_handle = fp->flex_handle; + } else if (ctx->curr == ITEM_COMPARE_FIELD_B_LEVEL_VALUE) { + if (compare_item->b.field != RTE_FLOW_FIELD_FLEX_ITEM) + compare_item->b.level = val; + else + compare_item->b.flex_handle = fp->flex_handle; + } + return len; +} + /** Parse meter color action type. */ static int parse_vc_action_meter_color_type(struct context *ctx, const struct token *token, @@ -11938,6 +12299,39 @@ comp_rule_id(struct context *ctx, const struct token *token, return i; } +/** Complete operation for compare match item. */ +static int +comp_set_compare_op(struct context *ctx, const struct token *token, + unsigned int ent, char *buf, unsigned int size) +{ + RTE_SET_USED(ctx); + RTE_SET_USED(token); + if (!buf) + return RTE_DIM(compare_ops); + if (ent < RTE_DIM(compare_ops) - 1) + return strlcpy(buf, compare_ops[ent], size); + return -1; +} + +/** Complete field id for compare match item. */ +static int +comp_set_compare_field_id(struct context *ctx, const struct token *token, + unsigned int ent, char *buf, unsigned int size) +{ + const char *name; + + RTE_SET_USED(token); + if (!buf) + return RTE_DIM(flow_field_ids); + if (ent >= RTE_DIM(flow_field_ids) - 1) + return -1; + name = flow_field_ids[ent]; + if (ctx->curr == ITEM_COMPARE_FIELD_B_TYPE || + (strcmp(name, "pointer") && strcmp(name, "value"))) + return strlcpy(buf, name, size); + return -1; +} + /** Complete type field for RSS action. */ static int comp_vc_action_rss_type(struct context *ctx, const struct token *token, diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index a21168ba21..2488942db6 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -88,6 +88,7 @@ aggr_affinity = ah = any = arp_eth_ipv4 = +compare = conntrack = ecpri = esp = diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 9192d6ab01..34dc06ec66 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1587,6 +1587,13 @@ the packet. - ``value``: Specific value to match. +Item: ``COMPARE`` +^^^^^^^^^^^^^^^^^ + +Matches the comparison result between packet fields or value. + +- ``compare``: Comparison information. + Actions ~~~~~~~ diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index 222a091e8b..59eda27606 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -70,6 +70,11 @@ New Features * Added a fath path function ``rte_eth_tx_queue_count`` to get the number of used descriptors of a Tx queue. +* **Added flow matching with various comparison results.** + + Added ``RTE_FLOW_ITEM_TYPE_COMPARE`` to allow matching on comparison + result between packet fields or value. + * **Updated Atomic Rules' Arkville PMD.** * Added support for Atomic Rules' TK242 packet-capture family of devices diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 0eaccbea4b..53923ad7cc 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3856,6 +3856,13 @@ This section lists supported pattern items and their attributes, if any. - ``packet_type {unsigned}``: packet type. +- ``compare``: match the comparison result between packet fields or value. + + - ``op {string}``: comparison operation type. + - ``a_type {string}``: compared field. + - ``b_type {string}``: comparator field. + - ``width {unsigned}``: comparison width. + Actions list ^^^^^^^^^^^^ @@ -5324,6 +5331,23 @@ A RAW rule can be created as following using ``pattern_hex`` key and mask. pattern_hex mask 0000000000000000000000000000000000000000000000000000ffffffff / end actions queue index 4 / end +Sample match with comparison rule +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Match with comparison rule can be created as following using ``compare``. + +:: + + testpmd> flow pattern_template 0 create ingress pattern_template_id 1 template compare op mask le + a_type mask tag a_tag_index mask 1 b_type mask tag b_tag_index mask 2 width mask 0xffffffff / end + testpmd> flow actions_template 0 create ingress actions_template_id 1 template count / drop / end + mask count / drop / end + testpmd> flow template_table 0 create table_id 1 group 2 priority 1 ingress rules_number 1 + pattern_template 1 actions_template 1 + testpmd> flow queue 0 create 0 template_table 1 pattern_template 0 actions_template 0 postpone no + pattern compare op is le a_type is tag a_tag_index is 1 b_type is tag b_tag_index is 2 width is 32 / end + actions count / drop / end + BPF Functions -------------- diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 156545454c..b06da0cc00 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -170,6 +170,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(TX_QUEUE, sizeof(struct rte_flow_item_tx_queue)), MK_FLOW_ITEM(IB_BTH, sizeof(struct rte_flow_item_ib_bth)), MK_FLOW_ITEM(PTYPE, sizeof(struct rte_flow_item_ptype)), + MK_FLOW_ITEM(COMPARE, sizeof(struct rte_flow_item_compare)), }; /** Generate flow_action[] entry. */ diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index 958eb01a80..09c1b13381 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -714,6 +714,13 @@ enum rte_flow_item_type { * @see struct rte_flow_item_random. */ RTE_FLOW_ITEM_TYPE_RANDOM, + + /** + * Match packet with various comparison types. + * + * See struct rte_flow_item_compare. + */ + RTE_FLOW_ITEM_TYPE_COMPARE, }; /** @@ -2366,7 +2373,8 @@ static const struct rte_flow_item_ptype rte_flow_item_ptype_mask = { #endif /** - * Packet header field IDs, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD. + * Packet header field IDs, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD + * and RTE_FLOW_ITEM_TYPE_COMPARE. */ enum rte_flow_field_id { RTE_FLOW_FIELD_START = 0, /**< Start of a packet. */ @@ -2420,7 +2428,8 @@ enum rte_flow_field_id { * @warning * @b EXPERIMENTAL: this structure may change without prior notice * - * Packet header field descriptions, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD. + * Packet header field descriptions, used by RTE_FLOW_ACTION_TYPE_MODIFY_FIELD + * and RTE_FLOW_ITEM_TYPE_COMPARE. */ struct rte_flow_field_data { enum rte_flow_field_id field; /**< Field or memory type ID. */ @@ -2510,6 +2519,33 @@ struct rte_flow_field_data { }; }; +/** + * Expected operation types for compare item. + */ +enum rte_flow_item_compare_op { + RTE_FLOW_ITEM_COMPARE_EQ, /* Compare result equal. */ + RTE_FLOW_ITEM_COMPARE_NE, /* Compare result not equal. */ + RTE_FLOW_ITEM_COMPARE_LT, /* Compare result less than. */ + RTE_FLOW_ITEM_COMPARE_LE, /* Compare result less than or equal. */ + RTE_FLOW_ITEM_COMPARE_GT, /* Compare result great than. */ + RTE_FLOW_ITEM_COMPARE_GE, /* Compare result great than or equal. */ +}; + +/** + * + * RTE_FLOW_ITEM_TYPE_COMPARE + * + * Matches the packet with compare result. + * + * The operation means a compare with b result. + */ +struct rte_flow_item_compare { + enum rte_flow_item_compare_op operation; /* The compare operation. */ + struct rte_flow_field_data a; /* Field be compared. */ + struct rte_flow_field_data b; /* Field as comparator. */ + uint32_t width; /* Compare width. */ +}; + /** * Action types. * -- 2.34.1