From patchwork Thu Dec 14 03:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 135180 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 53423436E9; Thu, 14 Dec 2023 04:13:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4237F42FA1; Thu, 14 Dec 2023 04:13:10 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2065.outbound.protection.outlook.com [40.107.92.65]) by mails.dpdk.org (Postfix) with ESMTP id 88E1442F9F for ; Thu, 14 Dec 2023 04:13:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UgAhIf/Nl/KYlr4BFdnKS9q3wk1iqyZBnHaT0wA6zUsjvXzhzrdIFOfJb4OzdPkhXY/S/0DTl4C2BaTLW7vzwgVhtJUBH2uPH9mD+ROv7/EbtAtG0lEMqxmJlUa5l7JEXDRXbyC2R5PIWi99qMDZq0x9SdQDenSWdIc1rsufaFWD75P9FqQxLmOE3nI3i0Xa3E729aQY1jjnaU+seM7G4DS0N7yyaRVdW5n2yn4mS6gJSHYHyPzonc+kxz7BAxrtsT8pqYFrlBvtFcpqAxuD5PEmR4HTX9z+Edmgc7K5pVL6ZcsFn4Un6jioa97CikDpzc6N+GR6d/adnimUDrbGuA== 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=OetwC9Tjc7p07UwItGa9F4oojT16yJxGU3QlF/Pp6aM=; b=EGlDQRQoSAIgCveGPjGAtlxyj5bHGKewNvKYpA8uZf3H444B+QTw5tsAjw3nhZDdeeewRItVxWXv+WGbdCdc8mxZ0XoP41avYx0FqGY72H8N83OCIKZwCX/YP1z40PFCLueggUnjQthhFsH+xozajHMhEPXI9ABC0aWSExg5GjD4S4iVM5WNUrfooZUVkN94TMaie+HS66rzwbVMxAe592oTgDH+3pO3udcJS95gEJ5uSvsTjNIdi4uNkk3nbt2kjQvPR2+NVej0T5GgNiE7GaeM66aQTQFvlzAoFFpT7ov8Q9Rd+sARG/wgYfnRLKux04QU5Q/2cZ0WQrYDNEBYlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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=OetwC9Tjc7p07UwItGa9F4oojT16yJxGU3QlF/Pp6aM=; b=EPyO65cXRRiuLrF/B6mR30CwrvjchucgCKPvSYYhb3GWC28TrnXwg9Bz6tgc67IoV6va7zlqZ5YHfgWLJ2baRo8eC18qZIJUJr1oiZO2Bo3BKxzNMjpmJvrE2EBfh7nkarDr4Byu1d+c9cIX8r/7SMO97JdP0ipKhfn6oRC/8SNWyUKYYhw42WWTcujB9ZiMeV4VoIsMiuUcJ4FuM5u5Wej4NSkhjh0x7iaiBV6PuMbEqOaCmoLfKAi3Eg0bg6NDgRMMudhdAQCchIXnsSbrJ8EnU3VwWq1gGauY4dPH/dGuremKZ5C1h6RrlvA4qcxgu6c4GOc9i4mFfi9OtOFxVw== Received: from CH2PR03CA0021.namprd03.prod.outlook.com (2603:10b6:610:59::31) by DM4PR12MB5168.namprd12.prod.outlook.com (2603:10b6:5:397::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 03:13:05 +0000 Received: from CO1PEPF000044FD.namprd21.prod.outlook.com (2603:10b6:610:59:cafe::fc) by CH2PR03CA0021.outlook.office365.com (2603:10b6:610:59::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26 via Frontend Transport; Thu, 14 Dec 2023 03:13:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044FD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.8 via Frontend Transport; Thu, 14 Dec 2023 03:13:05 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 13 Dec 2023 19:12:50 -0800 Received: from nvidia.com (10.126.231.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.986.41; Wed, 13 Dec 2023 19:12:45 -0800 From: Suanming Mou To: , Aman Singh , Yuying Zhang , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko CC: , Subject: [PATCH 1/2] ethdev: add RTE_FLOW_ITEM_TYPE_COMPARE Date: Thu, 14 Dec 2023 11:12:26 +0800 Message-ID: <20231214031227.363911-2-suanmingm@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214031227.363911-1-suanmingm@nvidia.com> References: <20231214031227.363911-1-suanmingm@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FD:EE_|DM4PR12MB5168:EE_ X-MS-Office365-Filtering-Correlation-Id: 263f1639-4674-4776-4ed3-08dbfc5296e7 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: e9rF5eh+O09Yf6N7Sq/LZI2CEooQPgBx7T5JPYBWeqGeQ8T1hcYVnuz8MMVTNo0vyFS9NqY8c2y7QP6CBvlCQGa2X+5E5RwEUiabSVIZ0ItdNssmTHKdiGAt3pGijAnXqo0tgpuFBrmnLdlTDMgdaY2DWnvCNWNLR8y5A6Dt5jQEDViTc20AXafjCT9fYUE1LC4n6hSn5kKr2P+yPOzMBicyQnj3UBOuVi8LnDwD/42uOTh3faKbHMqQpToYgDUPBMTk7kylJQp1KlSC7MMU791zR6qpa2zjJvJpMKyavssqAZ5Y38Yx70/9RKjOlRAOuJ9TOmE+iz8KJ3+nr67jT/J3E21ftWxjfDveRvPC/8r1JGkSaAhm4sLY7f7pjHYNODko5jOf/2BuuB5CZDXAN94Jrg8MnCAhGVsYQzTzjxW5KNhta1xZTZcq1ix2Y8cC+cgfe7iYXlz0UgpQD427qJ34gwVDomCq5ZK3NDfuosyAvFpmcJdrZuxZmQerSbRSP67ZeQ834ELY2WOOqiNzNZ/tU2l5uOQkOOp/mBF93CwAv6SbLunnIRH8+84/Aiac3Xd5/smTKrkaJL5l2H9DsGbMUtvxDAuVfqPQJKqvRaezD0v9tO+rLTpy/V+Zz+9zfJC9oCYR5Nraoekz87fN+raZEdzPDxmvdqPOY+7Xonbs54Y2hEgjWc5f/N14EzL47obFwYPnws7bRdsJW8UoM5IW/RVOMIsg4GQuHZtWX9STWx4IwJvHljX6HFSCbBuBX9/AXYJvaviTXEV7mz7oN0IFEbYHwHVpyP9a+weozvYFTnrUZCg6PMh+fvRsRxV6 X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(346002)(396003)(39860400002)(376002)(230273577357003)(230173577357003)(230922051799003)(186009)(64100799003)(451199024)(82310400011)(1800799012)(36840700001)(46966006)(40470700004)(40460700003)(83380400001)(426003)(2616005)(107886003)(16526019)(1076003)(26005)(336012)(6286002)(7636003)(47076005)(36860700001)(8676002)(8936002)(4326008)(110136005)(316002)(30864003)(2906002)(5660300002)(478600001)(41300700001)(6666004)(7696005)(54906003)(70206006)(70586007)(82740400003)(356005)(36756003)(86362001)(55016003)(40480700001)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 03:13:05.1378 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 263f1639-4674-4776-4ed3-08dbfc5296e7 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044FD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5168 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) As the two struct ``rte_flow_action_modify_data`` and ``rte_flow_field_data`` share the same information, the struct ``rte_flow_action_modify_data`` will be converge to the name more generic struct ``rte_flow_field_data`` in next release as well. Signed-off-by: Suanming Mou --- app/test-pmd/cmdline_flow.c | 416 +++++++++++++++++++- 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 | 6 + lib/ethdev/rte_flow.c | 1 + lib/ethdev/rte_flow.h | 230 ++++++++--- 7 files changed, 605 insertions(+), 61 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index ce71818705..4f448ff8ec 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -543,6 +543,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, @@ -740,13 +762,17 @@ enum index { #define ITEM_RAW_SIZE \ (sizeof(struct rte_flow_item_raw) + ITEM_RAW_PATTERN_SIZE) -/** Maximum size for external pattern in struct rte_flow_action_modify_data. */ -#define ACTION_MODIFY_PATTERN_SIZE 32 +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 /** Storage size for struct rte_flow_action_modify_field including pattern. */ #define ACTION_MODIFY_SIZE \ (sizeof(struct rte_flow_action_modify_field) + \ - ACTION_MODIFY_PATTERN_SIZE) + FLOW_FIELD_PATTERN_SIZE) /** Maximum number of queue indices in struct rte_flow_action_rss. */ #define ACTION_RSS_QUEUE_NUM 128 @@ -940,7 +966,7 @@ static const char *const modify_field_ops[] = { "set", "add", "sub", NULL }; -static const char *const modify_field_ids[] = { +static const char *const flow_field_ids[] = { "start", "mac_dst", "mac_src", "vlan_type", "vlan_id", "mac_type", "ipv4_dscp", "ipv4_ttl", "ipv4_src", "ipv4_dst", @@ -1590,6 +1616,7 @@ static const enum index next_item[] = { ITEM_IB_BTH, ITEM_PTYPE, ITEM_NSH, + ITEM_COMPARE, END_SET, ZERO, }; @@ -2121,6 +2148,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, @@ -2863,6 +2922,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; @@ -5982,6 +6059,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] = { @@ -6961,7 +7206,7 @@ static const struct token token_list[] = { ARGS_ENTRY_ARB(0, 0), ARGS_ENTRY_ARB (sizeof(struct rte_flow_action_modify_field), - ACTION_MODIFY_PATTERN_SIZE)), + FLOW_FIELD_PATTERN_SIZE)), .call = parse_vc_conf, }, [ACTION_MODIFY_FIELD_WIDTH] = { @@ -8404,6 +8649,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, @@ -9773,10 +10134,10 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token, if (ctx->curr != ACTION_MODIFY_FIELD_DST_TYPE_VALUE && ctx->curr != ACTION_MODIFY_FIELD_SRC_TYPE_VALUE) return -1; - for (i = 0; modify_field_ids[i]; ++i) - if (!strcmp_partial(modify_field_ids[i], str, len)) + for (i = 0; flow_field_ids[i]; ++i) + if (!strcmp_partial(flow_field_ids[i], str, len)) break; - if (!modify_field_ids[i]) + if (!flow_field_ids[i]) return -1; if (!ctx->object) return len; @@ -11890,6 +12251,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, @@ -12003,10 +12397,10 @@ comp_set_modify_field_id(struct context *ctx, const struct token *token, RTE_SET_USED(token); if (!buf) - return RTE_DIM(modify_field_ids); - if (ent >= RTE_DIM(modify_field_ids) - 1) + return RTE_DIM(flow_field_ids); + if (ent >= RTE_DIM(flow_field_ids) - 1) return -1; - name = modify_field_ids[ent]; + name = flow_field_ids[ent]; if (ctx->curr == ACTION_MODIFY_FIELD_SRC_TYPE || (strcmp(name, "pointer") && strcmp(name, "value"))) return strlcpy(buf, name, size); diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index 806cb033ff..565338731f 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -87,6 +87,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 627b845bfb..5afdd1dc0c 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1573,6 +1573,13 @@ Matches the packet type as defined in rte_mbuf_ptype. - ``packet_type``: L2/L3/L4 and tunnel information. +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 2c0e2930cc..71ebd67dbd 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -55,6 +55,11 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Added compare flow matching criteria.** + + Added ``RTE_FLOW_ITEM_TYPE_COMPARE`` to allow matching on compare + result between the packet fields or value. + * **Updated NVIDIA mlx5 driver.** * Added support for accumulating from src field to dst field. diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 447e28e694..220b396295 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3841,6 +3841,12 @@ 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 ^^^^^^^^^^^^ diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 549e329558..88cf003b2b 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -167,6 +167,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 affdc8121b..59ef6394e7 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -704,6 +704,13 @@ enum rte_flow_item_type { * */ RTE_FLOW_ITEM_TYPE_PTYPE, + + /** + * Matches the packet with compare result. + * + * See struct rte_flow_item_compare. + */ + RTE_FLOW_ITEM_TYPE_COMPARE, }; /** @@ -2336,6 +2343,177 @@ static const struct rte_flow_item_ptype rte_flow_item_ptype_mask = { }; #endif +/** + * Field IDs for packet field. + */ +enum rte_flow_field_id { + RTE_FLOW_FIELD_START = 0, /**< Start of a packet. */ + RTE_FLOW_FIELD_MAC_DST, /**< Destination MAC Address. */ + RTE_FLOW_FIELD_MAC_SRC, /**< Source MAC Address. */ + RTE_FLOW_FIELD_VLAN_TYPE, /**< VLAN Tag Identifier. */ + RTE_FLOW_FIELD_VLAN_ID, /**< VLAN Identifier. */ + RTE_FLOW_FIELD_MAC_TYPE, /**< EtherType. */ + RTE_FLOW_FIELD_IPV4_DSCP, /**< IPv4 DSCP. */ + RTE_FLOW_FIELD_IPV4_TTL, /**< IPv4 Time To Live. */ + RTE_FLOW_FIELD_IPV4_SRC, /**< IPv4 Source Address. */ + RTE_FLOW_FIELD_IPV4_DST, /**< IPv4 Destination Address. */ + RTE_FLOW_FIELD_IPV6_DSCP, /**< IPv6 DSCP. */ + RTE_FLOW_FIELD_IPV6_HOPLIMIT, /**< IPv6 Hop Limit. */ + RTE_FLOW_FIELD_IPV6_SRC, /**< IPv6 Source Address. */ + RTE_FLOW_FIELD_IPV6_DST, /**< IPv6 Destination Address. */ + RTE_FLOW_FIELD_TCP_PORT_SRC, /**< TCP Source Port Number. */ + RTE_FLOW_FIELD_TCP_PORT_DST, /**< TCP Destination Port Number. */ + RTE_FLOW_FIELD_TCP_SEQ_NUM, /**< TCP Sequence Number. */ + RTE_FLOW_FIELD_TCP_ACK_NUM, /**< TCP Acknowledgment Number. */ + RTE_FLOW_FIELD_TCP_FLAGS, /**< TCP Flags. */ + RTE_FLOW_FIELD_UDP_PORT_SRC, /**< UDP Source Port Number. */ + RTE_FLOW_FIELD_UDP_PORT_DST, /**< UDP Destination Port Number. */ + RTE_FLOW_FIELD_VXLAN_VNI, /**< VXLAN Network Identifier. */ + RTE_FLOW_FIELD_GENEVE_VNI, /**< GENEVE Network Identifier. */ + RTE_FLOW_FIELD_GTP_TEID, /**< GTP Tunnel Endpoint Identifier. */ + RTE_FLOW_FIELD_TAG, /**< Tag value. */ + RTE_FLOW_FIELD_MARK, /**< Mark value. */ + RTE_FLOW_FIELD_META, /**< Metadata value. */ + RTE_FLOW_FIELD_POINTER, /**< Memory pointer. */ + RTE_FLOW_FIELD_VALUE, /**< Immediate value. */ + RTE_FLOW_FIELD_IPV4_ECN, /**< IPv4 ECN. */ + RTE_FLOW_FIELD_IPV6_ECN, /**< IPv6 ECN. */ + RTE_FLOW_FIELD_GTP_PSC_QFI, /**< GTP QFI. */ + RTE_FLOW_FIELD_METER_COLOR, /**< Meter color marker. */ + RTE_FLOW_FIELD_IPV6_PROTO, /**< IPv6 next header. */ + RTE_FLOW_FIELD_FLEX_ITEM, /**< Flex item. */ + RTE_FLOW_FIELD_HASH_RESULT, /**< Hash result. */ + RTE_FLOW_FIELD_GENEVE_OPT_TYPE, /**< GENEVE option type. */ + RTE_FLOW_FIELD_GENEVE_OPT_CLASS,/**< GENEVE option class. */ + RTE_FLOW_FIELD_GENEVE_OPT_DATA, /**< GENEVE option data. */ + RTE_FLOW_FIELD_MPLS, /**< MPLS header. */ + RTE_FLOW_FIELD_TCP_DATA_OFFSET, /**< TCP data offset. */ + RTE_FLOW_FIELD_IPV4_IHL, /**< IPv4 IHL. */ + RTE_FLOW_FIELD_IPV4_TOTAL_LEN, /**< IPv4 total length. */ + RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN /**< IPv6 payload length. */ +}; + +/** + * @warning + * @b EXPERIMENTAL: this structure may change without prior notice + * + * Field description for packet field. + */ +struct rte_flow_field_data { + enum rte_flow_field_id field; /**< Field or memory type ID. */ + union { + struct { + /** Encapsulation level and tag index or flex item handle. */ + union { + struct { + /** + * Packet encapsulation level containing + * the field related with. + * + * - @p 0 requests the default behavior. + * Depending on the packet type, it + * can mean outermost, innermost or + * anything in between. + * + * It basically stands for the + * innermost encapsulation level. + * Modification can be performed + * according to PMD and device + * capabilities. + * + * - @p 1 requests modification to be + * performed on the outermost packet + * encapsulation level. + * + * - @p 2 and subsequent values request + * modification to be performed on + * the specified inner packet + * encapsulation level, from + * outermost to innermost (lower to + * higher values). + * + * Values other than @p 0 are not + * necessarily supported. + * + * @note that for MPLS field, + * encapsulation level also include + * tunnel since MPLS may appear in + * outer, inner or tunnel. + */ + uint8_t level; + union { + /** + * Tag index array inside + * encapsulation level. + * Used for VLAN, MPLS or TAG types. + */ + uint8_t tag_index; + /** + * Geneve option identifier. + * Relevant only for + * RTE_FLOW_FIELD_GENEVE_OPT_XXXX + * type. + */ + struct { + /** + * Geneve option type. + */ + uint8_t type; + /** + * Geneve option class. + */ + rte_be16_t class_id; + }; + }; + }; + struct rte_flow_item_flex_handle *flex_handle; + }; + /** Number of bits to skip from a field. */ + uint32_t offset; + }; + /** + * Immediate value for RTE_FLOW_FIELD_VALUE, presented in the + * same byte order and length as in relevant rte_flow_item_xxx. + * The immediate source bitfield offset is inherited from + * the destination's one. + */ + uint8_t value[16]; + /** + * Memory address for RTE_FLOW_FIELD_POINTER, memory layout + * should be the same as for relevant field in the + * rte_flow_item_xxx structure. + */ + void *pvalue; + }; +}; + +/** + * 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. * @@ -3857,56 +4035,8 @@ struct rte_flow_action_ethdev { }; /** - * Field IDs for MODIFY_FIELD action. - */ -enum rte_flow_field_id { - RTE_FLOW_FIELD_START = 0, /**< Start of a packet. */ - RTE_FLOW_FIELD_MAC_DST, /**< Destination MAC Address. */ - RTE_FLOW_FIELD_MAC_SRC, /**< Source MAC Address. */ - RTE_FLOW_FIELD_VLAN_TYPE, /**< VLAN Tag Identifier. */ - RTE_FLOW_FIELD_VLAN_ID, /**< VLAN Identifier. */ - RTE_FLOW_FIELD_MAC_TYPE, /**< EtherType. */ - RTE_FLOW_FIELD_IPV4_DSCP, /**< IPv4 DSCP. */ - RTE_FLOW_FIELD_IPV4_TTL, /**< IPv4 Time To Live. */ - RTE_FLOW_FIELD_IPV4_SRC, /**< IPv4 Source Address. */ - RTE_FLOW_FIELD_IPV4_DST, /**< IPv4 Destination Address. */ - RTE_FLOW_FIELD_IPV6_DSCP, /**< IPv6 DSCP. */ - RTE_FLOW_FIELD_IPV6_HOPLIMIT, /**< IPv6 Hop Limit. */ - RTE_FLOW_FIELD_IPV6_SRC, /**< IPv6 Source Address. */ - RTE_FLOW_FIELD_IPV6_DST, /**< IPv6 Destination Address. */ - RTE_FLOW_FIELD_TCP_PORT_SRC, /**< TCP Source Port Number. */ - RTE_FLOW_FIELD_TCP_PORT_DST, /**< TCP Destination Port Number. */ - RTE_FLOW_FIELD_TCP_SEQ_NUM, /**< TCP Sequence Number. */ - RTE_FLOW_FIELD_TCP_ACK_NUM, /**< TCP Acknowledgment Number. */ - RTE_FLOW_FIELD_TCP_FLAGS, /**< TCP Flags. */ - RTE_FLOW_FIELD_UDP_PORT_SRC, /**< UDP Source Port Number. */ - RTE_FLOW_FIELD_UDP_PORT_DST, /**< UDP Destination Port Number. */ - RTE_FLOW_FIELD_VXLAN_VNI, /**< VXLAN Network Identifier. */ - RTE_FLOW_FIELD_GENEVE_VNI, /**< GENEVE Network Identifier. */ - RTE_FLOW_FIELD_GTP_TEID, /**< GTP Tunnel Endpoint Identifier. */ - RTE_FLOW_FIELD_TAG, /**< Tag value. */ - RTE_FLOW_FIELD_MARK, /**< Mark value. */ - RTE_FLOW_FIELD_META, /**< Metadata value. */ - RTE_FLOW_FIELD_POINTER, /**< Memory pointer. */ - RTE_FLOW_FIELD_VALUE, /**< Immediate value. */ - RTE_FLOW_FIELD_IPV4_ECN, /**< IPv4 ECN. */ - RTE_FLOW_FIELD_IPV6_ECN, /**< IPv6 ECN. */ - RTE_FLOW_FIELD_GTP_PSC_QFI, /**< GTP QFI. */ - RTE_FLOW_FIELD_METER_COLOR, /**< Meter color marker. */ - RTE_FLOW_FIELD_IPV6_PROTO, /**< IPv6 next header. */ - RTE_FLOW_FIELD_FLEX_ITEM, /**< Flex item. */ - RTE_FLOW_FIELD_HASH_RESULT, /**< Hash result. */ - RTE_FLOW_FIELD_GENEVE_OPT_TYPE, /**< GENEVE option type. */ - RTE_FLOW_FIELD_GENEVE_OPT_CLASS,/**< GENEVE option class. */ - RTE_FLOW_FIELD_GENEVE_OPT_DATA, /**< GENEVE option data. */ - RTE_FLOW_FIELD_MPLS, /**< MPLS header. */ - RTE_FLOW_FIELD_TCP_DATA_OFFSET, /**< TCP data offset. */ - RTE_FLOW_FIELD_IPV4_IHL, /**< IPv4 IHL. */ - RTE_FLOW_FIELD_IPV4_TOTAL_LEN, /**< IPv4 total length. */ - RTE_FLOW_FIELD_IPV6_PAYLOAD_LEN /**< IPv6 payload length. */ -}; - -/** + * @deprecated + * @see rte_flow_field_data * @warning * @b EXPERIMENTAL: this structure may change without prior notice * From patchwork Thu Dec 14 03:12:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suanming Mou X-Patchwork-Id: 135181 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id EA4B2436E9; Thu, 14 Dec 2023 04:13:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF85C42FD9; Thu, 14 Dec 2023 04:13:12 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2089.outbound.protection.outlook.com [40.107.94.89]) by mails.dpdk.org (Postfix) with ESMTP id 3D98442F97 for ; Thu, 14 Dec 2023 04:13:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SzYFH/VcUd7lrYAOVjRbsbUujWiCKG2PzWBe4yp4Q0ps5w4atqPdTyu55YcanpObLFKYcCsi8ooo86vX5Vs8Bu1uM+1rk5OKHHCpftMkI1plph94NH389hNZ/OBkCf0BAhXPQnJ1F1YpWGC9JY+KUnskzqTzL/vvoWQw194pf6Fwx2XUxzPKWrMHH8+Onz93WkpJge+OXBAi2Lmv6z/YUGKqIdIJ+bgqjDL4wibk6lKuXvO+J36eoz+OYU+P9QJxHrAte4ZIHbUA/GmJ1FOljBo3cmR64g9EQjWABz2Ie/amgnVKw1CHxJM72zFJscIxqGSZYqQDWHesVVqTXQr1nA== 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=ermkPpHVZ1MCmAlMBQT6Vsyb7fTFNbF2TcqPT0JhB7M=; b=m9Q3McnEVHxKSCeh4eWBZMhA6PkSEUAbi71Ku+QrIw/ydtalDOYxnE8XepBM7EGZDLlK+XWnByrfPZqNG1MjKD9V4R8N2asHpRqg6zwfrXmJIiaMSl+U7yEMm74c0st/knHtmQUq86+EbmMfTv0EZALnGdmjOcP8YH4B3MEBTzqJ+akETBozHj5jnbU+V0gt56iX88v+6Ck+FWopKu17TIOBzJ6CgJMxk4ROQ0xEzw9pG4zwrHs5Iy5eXGsiJKC6SRhh+ElpcXmC0Lvxgy1uFRQdx3YTh+X9ZeYbersXCkRcVUKHaHswSa1KVMWGPS7Pbw7pOOscbK5DCFA3pHtGog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=ermkPpHVZ1MCmAlMBQT6Vsyb7fTFNbF2TcqPT0JhB7M=; b=J82ah2hbtD30LZi3GuWCNG/7zkN4kPVJ8JznMNq/1J94wGae0CTha50igB4ChczrBz0goFWL1ZqxBz/JzK+pLxfsydB4FA9mgSX4aqCzdn11l+eKQp4naZCEH1tdpfqNYN4kOxl5yEPxK+PsQOm+gD1PAC2yv70tDuKuvUA/TvIaMYNFzRyVPvs2ve8xif8jllai20Q+iDTNymILaA1wT6R1UBXbWz2MwaOzxRYeitq5Qp/RTmXwKBFlD5zI9nM0QMz5ntYU9OvCV7EQyPs/Yw+Kp45ZSEMcN/wqytPaVlLrhCRc66bgMBe1lW6oA05VR3yY2a2VJtUhKrpqHXS+ig== Received: from BL1PR13CA0270.namprd13.prod.outlook.com (2603:10b6:208:2ba::35) by CH3PR12MB8548.namprd12.prod.outlook.com (2603:10b6:610:165::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Thu, 14 Dec 2023 03:13:06 +0000 Received: from BL6PEPF0001AB55.namprd02.prod.outlook.com (2603:10b6:208:2ba:cafe::d9) by BL1PR13CA0270.outlook.office365.com (2603:10b6:208:2ba::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7113.8 via Frontend Transport; Thu, 14 Dec 2023 03:13:06 +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 BL6PEPF0001AB55.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.26 via Frontend Transport; Thu, 14 Dec 2023 03:13:06 +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; Wed, 13 Dec 2023 19:12:54 -0800 Received: from nvidia.com (10.126.231.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.986.41; Wed, 13 Dec 2023 19:12:50 -0800 From: Suanming Mou To: , Dariusz Sosnowski , "Viacheslav Ovsiienko" , Matan Azrad CC: , Subject: [PATCH 2/2] net/mlx5: add compare item support Date: Thu, 14 Dec 2023 11:12:27 +0800 Message-ID: <20231214031227.363911-3-suanmingm@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231214031227.363911-1-suanmingm@nvidia.com> References: <20231214031227.363911-1-suanmingm@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB55:EE_|CH3PR12MB8548:EE_ X-MS-Office365-Filtering-Correlation-Id: 1fff9bbd-7b32-445c-ae6b-08dbfc52979e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R6uptSwqn5SIimvQ1f816KU8GDh02qDgpCsE1D6E4FHQatyKS/1qomLxPFORBS+27ewgm7YUJkEDYxi/prFHeiu7ixzkg8XgGqVVKhJ8iqNwEjtVcb5bklfRM85JGrPXaNa8Tg/luxntmeKc7h8WqVVRRo6XkJ3eVQ7z6KbmA1qZ2B1mp975zN6l1m8JgHe/dv8eOtWZlqyAGYeXTf5kSXj1x7WbePu/MmZMGzqwVrPQSEYDgwGpQ1qST9voaisF2KJ8XCtuWz9HTtfQE7bVGctzJ9UEGCsWTqFreQbE2s+h6qSOQLxMR+RHjZUTzFu3W5JurTBVaS/POdWvG5v88G/MuF5g2e04Jf/4cAmEz3bRiioHEKPOH9Lk9Rj0XzVsthCwaZXlV9tyQ2iN+XdSnsBeHEGK5zB40WfYdMHdCaeRmTO4sNr3gNx1SXi35Tcez4SOzIuuR/4E4jBQUGZNz+MgWOt1jGbNK9gS5IXjieT+fjduWw1ELzOzg36cs0NAWnlDPUZHqe6VNC3NFaYAbrAPnJX2rzNmY/EZVWI/kLR/2RqVBIFnxohnockuJsQWOz62KmnXaDE0hJIUJgf2QlFjbQtAGv2RDuPBI6wfd9LFIksQii6k6pGM0kxVWv3zHREJPBCwSJZGs7fNHXlHxRyzTjhwX1su+bs/zhMESN25FcWRkLVPmfXKRxksj1uq6p/NSsGYnhM1C/wW0Rb95mIoem0pYbIcPOILrChb4rVLBQLQyTm98L3oqjjtgdoZ 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)(39860400002)(136003)(346002)(376002)(396003)(230922051799003)(1800799012)(82310400011)(186009)(64100799003)(451199024)(40470700004)(36840700001)(46966006)(8936002)(4326008)(8676002)(6666004)(426003)(336012)(83380400001)(478600001)(40480700001)(2616005)(107886003)(6286002)(47076005)(16526019)(26005)(110136005)(70586007)(70206006)(54906003)(6636002)(316002)(55016003)(5660300002)(7696005)(36860700001)(1076003)(2906002)(40460700003)(356005)(7636003)(82740400003)(41300700001)(86362001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2023 03:13:06.2302 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1fff9bbd-7b32-445c-ae6b-08dbfc52979e 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: BL6PEPF0001AB55.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8548 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 compare item allows adding flow match with comparison result. This commit adds compare item support to the pmd code. Due to HW limitation: - Only HWS supported. - Only 32-bit comparison is supported. - Only single compare flow is supported in the flow table. - Only match with compare result between packet fields is supported. Signed-off-by: Suanming Mou --- doc/guides/nics/features/mlx5.ini | 1 + doc/guides/nics/mlx5.rst | 7 +++ doc/guides/rel_notes/release_24_03.rst | 2 +- drivers/net/mlx5/mlx5_flow.h | 3 ++ drivers/net/mlx5/mlx5_flow_hw.c | 73 ++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/mlx5.ini b/doc/guides/nics/features/mlx5.ini index 0739fe9d63..00e9348fc6 100644 --- a/doc/guides/nics/features/mlx5.ini +++ b/doc/guides/nics/features/mlx5.ini @@ -56,6 +56,7 @@ Usage doc = Y [rte_flow items] aggr_affinity = Y +compare = Y conntrack = Y ecpri = Y esp = Y diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 6b52fb93c5..18b40bc22d 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -778,6 +778,13 @@ Limitations The flow engine of a process cannot move from active to standby mode if preceding active application rules are still present and vice versa. +- Match with compare result item (``RTE_FLOW_ITEM_TYPE_COMPARE``): + + - Only supported in HW steering(``dv_flow_en`` = 2) mode. + - Only single flow is supported to the flow table. + - Only 32-bit comparison is supported. + - Only match with compare result between packet fields is supported. + Statistics ---------- diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst index 71ebd67dbd..5693ea4628 100644 --- a/doc/guides/rel_notes/release_24_03.rst +++ b/doc/guides/rel_notes/release_24_03.rst @@ -63,7 +63,7 @@ New Features * **Updated NVIDIA mlx5 driver.** * Added support for accumulating from src field to dst field. - + * Added support for comparing result between packet fields or value. Removed Items ------------- diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 120609c595..9c9bdc3f6a 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -277,6 +277,9 @@ enum mlx5_feature_name { /* NSH ITEM */ #define MLX5_FLOW_ITEM_NSH (1ull << 53) +/* COMPARE ITEM */ +#define MLX5_FLOW_ITEM_COMPARE (1ull << 54) + /* Outer Masks. */ #define MLX5_FLOW_LAYER_OUTER_L3 \ (MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index c4a90a3690..82d7fa006f 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -426,6 +426,9 @@ flow_hw_matching_item_flags_get(const struct rte_flow_item items[]) case RTE_FLOW_ITEM_TYPE_GTP: last_item = MLX5_FLOW_LAYER_GTP; break; + case RTE_FLOW_ITEM_TYPE_COMPARE: + last_item = MLX5_FLOW_ITEM_COMPARE; + break; default: break; } @@ -4390,6 +4393,8 @@ flow_hw_table_create(struct rte_eth_dev *dev, rte_errno = EINVAL; goto it_error; } + if (item_templates[i]->item_flags & MLX5_FLOW_ITEM_COMPARE) + matcher_attr.mode = MLX5DR_MATCHER_RESOURCE_MODE_HTABLE; ret = __atomic_fetch_add(&item_templates[i]->refcnt, 1, __ATOMIC_RELAXED) + 1; if (ret <= 1) { @@ -6670,6 +6675,66 @@ flow_hw_prepend_item(const struct rte_flow_item *items, return copied_items; } +static inline bool +flow_hw_item_compare_field_supported(enum rte_flow_field_id field) +{ + switch (field) { + case RTE_FLOW_FIELD_TAG: + case RTE_FLOW_FIELD_META: + case RTE_FLOW_FIELD_VALUE: + return true; + default: + break; + } + return false; +} + +static int +flow_hw_validate_item_compare(const struct rte_flow_item *item, + struct rte_flow_error *error) +{ + const struct rte_flow_item_compare *comp_m = item->mask; + const struct rte_flow_item_compare *comp_v = item->spec; + + if (unlikely(!comp_m)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item mask is missing"); + if (comp_m->width != UINT32_MAX) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item only support full mask"); + if (!flow_hw_item_compare_field_supported(comp_m->a.field) || + !flow_hw_item_compare_field_supported(comp_m->b.field)) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item field not support"); + if (comp_m->a.field == RTE_FLOW_FIELD_VALUE && + comp_m->b.field == RTE_FLOW_FIELD_VALUE) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare between value is not valid"); + if (comp_v) { + if (comp_v->operation != comp_m->operation || + comp_v->a.field != comp_m->a.field || + comp_v->b.field != comp_m->b.field) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item spec/mask not matching"); + if ((comp_v->width & comp_m->width) != 32) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, + "compare item only support full mask"); + } + return 0; +} + static int flow_hw_pattern_validate(struct rte_eth_dev *dev, const struct rte_flow_pattern_template_attr *attr, @@ -6680,6 +6745,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, int i, tag_idx; bool items_end = false; uint32_t tag_bitmap = 0; + int ret; if (!attr->ingress && !attr->egress && !attr->transfer) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ATTR, NULL, @@ -6817,6 +6883,13 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, " attribute"); break; } + case RTE_FLOW_ITEM_TYPE_COMPARE: + { + ret = flow_hw_validate_item_compare(&items[i], error); + if (ret) + return ret; + break; + } case RTE_FLOW_ITEM_TYPE_VOID: case RTE_FLOW_ITEM_TYPE_ETH: case RTE_FLOW_ITEM_TYPE_VLAN: