From patchwork Tue Dec 20 07:44:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Xu X-Patchwork-Id: 121060 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 E0D0DA0545; Tue, 20 Dec 2022 08:44:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D7B9D410DE; Tue, 20 Dec 2022 08:44:54 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2065.outbound.protection.outlook.com [40.107.93.65]) by mails.dpdk.org (Postfix) with ESMTP id BC1CB40395 for ; Tue, 20 Dec 2022 08:44:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RWwxMdvDeBYTFoTgjJKV33dYHDKVRmKKsrPoEJr89Lu5BJ5www/k29EKqtlZKNyDjnIXNzLrfiwCj/RkhhMmEQ/EPLx+LltmqkpSrvL46Vytk7cC//eoN9ulZFd3EZXWD3jrtKXZyN9jPt0LKypQX2wgvg+JRhyaxI8rE1sxxZxtCm2jyyr8s+rPcSSIY6Zxt5H1F9o+xG7JfHvjGAh4/LVPyC2gfiQW6iBiP/uBtA18s5IvXDwcsbaHcMK9Vr8xFrXa9lViTOrqbkBkWssGDOWJj5BAiBSX3QngaMwwV3TsahYBQ3BXmsN7gd+oHVtcY/8zN0F8hgu4c1umU55dVA== 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=nWSS3hc1JiPHow5weOtcSSZwhI40ubA4pW2IyqRBfj4=; b=dZO8mAIkJJh+HyPQ67cvQ0Vi6MJ1L5fdTX34OaVp1gFqgrk8SC1wo21iokN5DAEISv5kKdOv7K3XUBXbu/XLy5VLTjzLVis/M17kMVS+463gBYhWeQknN+DJ99gwMxi4pdOc8Xeqt8G/R596WJCNyx7rNxUN/CpLT7CkX26iQXaLWgePq5GUf2mcz5EeaGB/bSv1zw7mL0jsmLr5sF3LQUB0to86Y8M7wbriz7yCiMVoQvQo0T7qiG+hscxZJWHHI44uGqiiEzQljfarDpEuXOA1ELAd8k+zZ/LV/nI2AK6cgcIRbuFlmwIHwuqTko1+Hv/Noip0/2ivNWwnQ15+Fw== 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 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=nWSS3hc1JiPHow5weOtcSSZwhI40ubA4pW2IyqRBfj4=; b=lv9r/Sv+VNnGdNDsKeGyKZ75/GLcLVhkZOAVG/bsIEH35fhv83A8QDazBEn6eQ3xUFk2rh/PuIO3elWwQXsHfzwJO7UTC7BnwYiE4FR+sp0IzNsmpgoahZMFjKVnHlZv8VrIJfBKYWdQH3K8bf5PW6pINijZSdKdWXm/YhW3hX7sqW+3P4TmYgOEVCgzkfylGzH+/uVWh1BvWz1QsvLANWLU15UCbzU9c6lkfWrh2EQYa+HVD+YXgfH4bpviwytwhO7nftpmfl8Ekekw3BcbLWrCu0yKqvOWkpW5qYs/uLuW9Kh/GvzQRTGqtOVzaK1fuFmHJIRG8WCJE1C/ozgtHQ== Received: from MW4PR03CA0261.namprd03.prod.outlook.com (2603:10b6:303:b4::26) by DM4PR12MB5344.namprd12.prod.outlook.com (2603:10b6:5:39a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 07:44:50 +0000 Received: from CO1NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::28) by MW4PR03CA0261.outlook.office365.com (2603:10b6:303:b4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 07:44:50 +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 CO1NAM11FT034.mail.protection.outlook.com (10.13.174.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 07:44:50 +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.36; Mon, 19 Dec 2022 23:44:36 -0800 Received: from nvidia.com (10.126.230.37) 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.36; Mon, 19 Dec 2022 23:44:33 -0800 From: Leo Xu To: CC: Bing Zhao , Ori Kam , Aman Singh , Yuying Zhang , "Thomas Monjalon" , Ferruh Yigit , "Andrew Rybchenko" , Olivier Matz Subject: [PATCH v2 1/3] ethdev: add ICMPv6 ID and sequence Date: Tue, 20 Dec 2022 09:44:01 +0200 Message-ID: <20221220074403.1015411-2-yongquanx@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221220074403.1015411-1-yongquanx@nvidia.com> References: <20221212085923.2314350-1-yongquanx@nvidia.com> <20221220074403.1015411-1-yongquanx@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT034:EE_|DM4PR12MB5344:EE_ X-MS-Office365-Filtering-Correlation-Id: 624ce78f-e441-4e1a-7a2b-08dae25e133a 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: 0VwNMGMTsxI59zVU5AI58T4JjD4yOCsOQMGXCQigm6E3GzQzN90r/Idx8Tpu0a7Yl2axXdiqvVJxcTNNQir13NhSp7OLx+82VUQbCLxiJbH3olVUeZ7fKavO9+Ls42/pRLI4Zmk6RfjADq0L8IypSQYYKYV5JWl/ahXkl7oJSW4ILHUvR6qA5teMwbhTSP6ohBMZjCe7Nca8crXVSF032RnHfNp6CG+i9nY/UL0zhqCqLs1w3rLun7fqwXCEIgr18K6YDdNlvLUpNbcgMAmsIpHhWx5iGUoKmvbhGqUtUs9FgQhpV4vlIXOHJdqBILtpOq0yToDE7sH0oHIIgCEJa0zKEuxzeaN4puY1jKbwGW/FmMwoXnLwAx5/+NbnjBUtAjhb6Nk91ZzYr5a3+apx6Jj5Gu60u/exrcyfmb0plL77cLK3JkI11jGdJAbFzvUoZngSC4W9OWO3kvo1jEq+xoZcRn1XDETL8jgtUQnKbaCajLDOwubpX3Tww8J4fBolIGyi56eXXGdDCaweyiRHweCFeu7B8r9czxIEcsN9Ed4v9Zm4keDW9rMngb1722h1HTHbx6x42dnP0bSMP8yjrHGjUZWBa/uBZQdQopgxBgwlQnyqmmKtd2QvL/TDKTigsFnrp7ZDZiQD848rUu50QLwiAQwBi38kXegXTjO8YiZEviRQUc6spylhM38T8w/nR+iesoTERWGMfZSqRIx59A== 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:(13230022)(4636009)(39860400002)(136003)(346002)(396003)(376002)(451199015)(40470700004)(46966006)(36840700001)(6666004)(478600001)(7696005)(86362001)(186003)(40480700001)(2616005)(6286002)(16526019)(70206006)(6916009)(316002)(55016003)(26005)(70586007)(54906003)(2906002)(336012)(36756003)(83380400001)(8676002)(41300700001)(82310400005)(4326008)(1076003)(356005)(7636003)(82740400003)(36860700001)(40460700003)(47076005)(8936002)(426003)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 07:44:50.2499 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 624ce78f-e441-4e1a-7a2b-08dae25e133a 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: CO1NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5344 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 This patch adds API support for ICMPv6 ID and sequence. 1: Add two new pattern item types for ICMPv6 echo request and reply: RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY 2: Add new header file rte_icmp6.h for ICMPv6 packet definitions. 3: Enhance testpmd flow pattern to support ICMPv6 identifier and sequence. Example of ICMPv6 echo pattern in testpmd command: pattern eth / ipv6 / icmp6_echo_request / end pattern eth / ipv6 / icmp6_echo_reply / end pattern eth / ipv6 / icmp6_echo_request ident is 20 seq is 30 / end Signed-off-by: Leo Xu Signed-off-by: Bing Zhao Acked-by: Ori Kam --- app/test-pmd/cmdline_flow.c | 70 +++++++++++++++++++++ doc/guides/prog_guide/rte_flow.rst | 14 +++++ doc/guides/rel_notes/release_23_03.rst | 4 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 10 +++ lib/ethdev/rte_flow.c | 4 ++ lib/ethdev/rte_flow.h | 25 ++++++++ lib/net/meson.build | 1 + lib/net/rte_icmp6.h | 48 ++++++++++++++ 8 files changed, 176 insertions(+) create mode 100644 lib/net/rte_icmp6.h diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 88108498e0..7dc1528899 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -360,6 +360,12 @@ enum index { ITEM_ICMP6, ITEM_ICMP6_TYPE, ITEM_ICMP6_CODE, + ITEM_ICMP6_ECHO_REQUEST, + ITEM_ICMP6_ECHO_REQUEST_ID, + ITEM_ICMP6_ECHO_REQUEST_SEQ, + ITEM_ICMP6_ECHO_REPLY, + ITEM_ICMP6_ECHO_REPLY_ID, + ITEM_ICMP6_ECHO_REPLY_SEQ, ITEM_ICMP6_ND_NS, ITEM_ICMP6_ND_NS_TARGET_ADDR, ITEM_ICMP6_ND_NA, @@ -1327,6 +1333,8 @@ static const enum index next_item[] = { ITEM_IPV6_EXT, ITEM_IPV6_FRAG_EXT, ITEM_ICMP6, + ITEM_ICMP6_ECHO_REQUEST, + ITEM_ICMP6_ECHO_REPLY, ITEM_ICMP6_ND_NS, ITEM_ICMP6_ND_NA, ITEM_ICMP6_ND_OPT, @@ -1575,6 +1583,20 @@ static const enum index item_icmp6[] = { ZERO, }; +static const enum index item_icmp6_echo_request[] = { + ITEM_ICMP6_ECHO_REQUEST_ID, + ITEM_ICMP6_ECHO_REQUEST_SEQ, + ITEM_NEXT, + ZERO, +}; + +static const enum index item_icmp6_echo_reply[] = { + ITEM_ICMP6_ECHO_REPLY_ID, + ITEM_ICMP6_ECHO_REPLY_SEQ, + ITEM_NEXT, + ZERO, +}; + static const enum index item_icmp6_nd_ns[] = { ITEM_ICMP6_ND_NS_TARGET_ADDR, ITEM_NEXT, @@ -4323,6 +4345,54 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6, code)), }, + [ITEM_ICMP6_ECHO_REQUEST] = { + .name = "icmp6_echo_request", + .help = "match ICMPv6 echo request", + .priv = PRIV_ITEM(ICMP6_ECHO_REQUEST, + sizeof(struct rte_flow_item_icmp6_echo)), + .next = NEXT(item_icmp6_echo_request), + .call = parse_vc, + }, + [ITEM_ICMP6_ECHO_REQUEST_ID] = { + .name = "ident", + .help = "ICMPv6 echo request identifier", + .next = NEXT(item_icmp6_echo_request, NEXT_ENTRY(COMMON_UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6_echo, + echo.identifier)), + }, + [ITEM_ICMP6_ECHO_REQUEST_SEQ] = { + .name = "seq", + .help = "ICMPv6 echo request sequence", + .next = NEXT(item_icmp6_echo_request, NEXT_ENTRY(COMMON_UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6_echo, + echo.sequence)), + }, + [ITEM_ICMP6_ECHO_REPLY] = { + .name = "icmp6_echo_reply", + .help = "match ICMPv6 echo reply", + .priv = PRIV_ITEM(ICMP6_ECHO_REPLY, + sizeof(struct rte_flow_item_icmp6_echo)), + .next = NEXT(item_icmp6_echo_reply), + .call = parse_vc, + }, + [ITEM_ICMP6_ECHO_REPLY_ID] = { + .name = "ident", + .help = "ICMPv6 echo reply identifier", + .next = NEXT(item_icmp6_echo_reply, NEXT_ENTRY(COMMON_UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6_echo, + echo.identifier)), + }, + [ITEM_ICMP6_ECHO_REPLY_SEQ] = { + .name = "seq", + .help = "ICMPv6 echo reply sequence", + .next = NEXT(item_icmp6_echo_reply, NEXT_ENTRY(COMMON_UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6_echo, + echo.sequence)), + }, [ITEM_ICMP6_ND_NS] = { .name = "icmp6_nd_ns", .help = "match ICMPv6 neighbor discovery solicitation", diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 3e6242803d..59932e82a6 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1165,6 +1165,20 @@ Matches any ICMPv6 header. - ``checksum``: ICMPv6 checksum. - Default ``mask`` matches ``type`` and ``code``. +Item: ``ICMP6_ECHO_REQUEST`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Matches an ICMPv6 echo request. + +- ``echo``: ICMP6 echo definition (``rte_icmp6.h``). + +Item: ``ICMP6_ECHO_REPLY`` +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Matches an ICMPv6 echo reply. + +- ``echo``: ICMP6 echo definition (``rte_icmp6.h``). + Item: ``ICMP6_ND_NS`` ^^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index b8c5b68d6c..5af9c43dd9 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -55,6 +55,10 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Added rte_flow support for matching ICMPv6 ID and sequence fields.** + + Added ``icmp6_echo`` item in rte_flow to support ID and sequence + matching in ICMPv6 echo request/reply packets. Removed Items ------------- diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 0037506a79..f497bba26d 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3622,6 +3622,16 @@ This section lists supported pattern items and their attributes, if any. - ``type {unsigned}``: ICMPv6 type. - ``code {unsigned}``: ICMPv6 code. +- ``icmp6_echo_request``: match ICMPv6 echo request. + + - ``ident {unsigned}``: ICMPv6 echo request identifier. + - ``seq {unsigned}``: ICMPv6 echo request sequence number. + +- ``icmp6_echo_reply``: match ICMPv6 echo reply. + + - ``ident {unsigned}``: ICMPv6 echo reply identifier. + - ``seq {unsigned}``: ICMPv6 echo reply sequence number. + - ``icmp6_nd_ns``: match ICMPv6 neighbor discovery solicitation. - ``target_addr {ipv6 address}``: target address. diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 7d0c24366c..39cd4f9817 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -123,6 +123,10 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(IPV6_EXT, sizeof(struct rte_flow_item_ipv6_ext)), MK_FLOW_ITEM(IPV6_FRAG_EXT, sizeof(struct rte_flow_item_ipv6_frag_ext)), MK_FLOW_ITEM(ICMP6, sizeof(struct rte_flow_item_icmp6)), + MK_FLOW_ITEM(ICMP6_ECHO_REQUEST, + sizeof(struct rte_flow_item_icmp6_echo)), + MK_FLOW_ITEM(ICMP6_ECHO_REPLY, + sizeof(struct rte_flow_item_icmp6_echo)), MK_FLOW_ITEM(ICMP6_ND_NS, sizeof(struct rte_flow_item_icmp6_nd_ns)), MK_FLOW_ITEM(ICMP6_ND_NA, sizeof(struct rte_flow_item_icmp6_nd_na)), MK_FLOW_ITEM(ICMP6_ND_OPT, sizeof(struct rte_flow_item_icmp6_nd_opt)), diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index b60987db4b..72695aca8a 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -624,6 +625,20 @@ enum rte_flow_item_type { * See struct rte_flow_item_meter_color. */ RTE_FLOW_ITEM_TYPE_METER_COLOR, + + /** + * Matches an ICMPv6 echo request. + * + * See struct rte_flow_item_icmp6_echo. + */ + RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST, + + /** + * Matches an ICMPv6 echo reply. + * + * See struct rte_flow_item_icmp6_echo. + */ + RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY, }; /** @@ -1303,6 +1318,16 @@ static const struct rte_flow_item_icmp6 rte_flow_item_icmp6_mask = { }; #endif +/** + * RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST + * RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY + * + * Matches an ICMPv6 echo request or reply. + */ +struct rte_flow_item_icmp6_echo { + struct rte_icmp6_echo echo; +}; + /** * RTE_FLOW_ITEM_TYPE_ICMP6_ND_NS * diff --git a/lib/net/meson.build b/lib/net/meson.build index 379d161ee0..ce3ca67bdc 100644 --- a/lib/net/meson.build +++ b/lib/net/meson.build @@ -22,6 +22,7 @@ headers = files( 'rte_geneve.h', 'rte_l2tpv2.h', 'rte_ppp.h', + 'rte_icmp6.h', ) sources = files( diff --git a/lib/net/rte_icmp6.h b/lib/net/rte_icmp6.h new file mode 100644 index 0000000000..bf6956d7c9 --- /dev/null +++ b/lib/net/rte_icmp6.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2022 NVIDIA Corporation & Affiliates + */ + +#ifndef _RTE_ICMP6_H_ +#define _RTE_ICMP6_H_ + +/** + * @file + * + * ICMP6-related defines + */ + +#include + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * ICMP6 header + */ +struct rte_icmp6_hdr { + uint8_t type; + uint8_t code; + rte_be16_t checksum; +} __rte_packed; + +/** + * ICMP6 echo + */ +struct rte_icmp6_echo { + struct rte_icmp6_hdr hdr; + rte_be16_t identifier; + rte_be16_t sequence; +} __rte_packed; + +/* ICMP6 packet types */ +#define RTE_ICMP6_ECHO_REQUEST 128 +#define RTE_ICMP6_ECHO_REPLY 129 + +#ifdef __cplusplus +} +#endif + +#endif /* RTE_ICMP6_H_ */ From patchwork Tue Dec 20 07:44:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Xu X-Patchwork-Id: 121061 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 68DECA0545; Tue, 20 Dec 2022 08:45:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C226D42D10; Tue, 20 Dec 2022 08:44:56 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2071.outbound.protection.outlook.com [40.107.243.71]) by mails.dpdk.org (Postfix) with ESMTP id 97D2F40395 for ; Tue, 20 Dec 2022 08:44:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fgt88IV0CB4txih+R793alR2AXyac7TUYhg+0N8QHf9YqEDMVCJN1zHZcQrbxWtRpKrjhX9xH6KfjgI7c9yrtuy9FhgB0NFGwEQR4DaYixKfZpb1iyDsnXdYoPkcBLubvaN6/9JeZNP4cVqWUFhnesJ74Og8f9UQWBVPsCw9d809Odi61dskZaoWdq0mRzCxqgN2a1NtWtxxTUIOxwwFGKES1JsreRDBjTilTwMABnAKvB9BmtQ1n9Z+8AtxKUNDX3UgMuhXpdP9M+dEDLDiSFWXvb9CzmcZW6zmzZ6Fzf+rchRCMpxG9oGcf6vRdGLIXWr9IuQgRpzEzSMtZQXItA== 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=BVbDg0Q6NG2MM//qNbUklAsEGY625j04Ar0H80P006U=; b=P41uQ7N4v1xulElIRtYjQh/wAnjl/fTGFOKfV/2iuRRt7biyTbtHV/WdtE5bghJu/tQWfLX3+5wLVHzRHruOM8KnKuNkInXmxoh61q6PYp8wqYVMZV9bGLEWQk5t0k1vorkmKjkmiy9f++q75p/inWyl0GksOz+NC6wfLN9pZPbuQspMcpeMphYsDDAzOf887/hEfBrxrloBc6QGUxOibUuaOiumDcFpvvYl3uM6DRwd3/pI1pAi2/jM5mrajEVgt0g0Uzi3VjQFSm2orRJpy0V/QBfPG7ceJJ3e/K6cIGXDB6lED97bBOWKvn85AS+OGfMbCk4gZ15FYMIEOmjk6w== 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 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=BVbDg0Q6NG2MM//qNbUklAsEGY625j04Ar0H80P006U=; b=t95lmo7+DHpMaKX83u08NnVl12ab5ZVToTZ3GZ0egX4AffPOWuvA6KJmxXheJm4YK4u4JRaBcE98s4szTvN3Z2w6FaFEViAbDwyi3TYHK7AOwz6HrsYHGyzFgCIKGP4AI0f+j/ahBcn7W0TZ8kVFMpO9jmcbiXC99/X5iKi/3xgiX95h2Tkv3N4FGjdXrxPQFcw5093GdwbfcojuSpwZQ8HpIeuyLp8lpXofQ02QPPXpu1rVuaLeHqaqp/QBPKRz/QgiejLQtrsjzcdhIVit7qQ9wthhYPTjjHdwh1lM5ANJi6VpaUbDmpxwMNG0Bus0GMPGEn3rXKBlNpZSntC6TQ== Received: from MW4PR03CA0264.namprd03.prod.outlook.com (2603:10b6:303:b4::29) by SJ1PR12MB6194.namprd12.prod.outlook.com (2603:10b6:a03:458::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 07:44:52 +0000 Received: from CO1NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::f2) by MW4PR03CA0264.outlook.office365.com (2603:10b6:303:b4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.20 via Frontend Transport; Tue, 20 Dec 2022 07:44:52 +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 CO1NAM11FT034.mail.protection.outlook.com (10.13.174.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 07:44:52 +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.36; Mon, 19 Dec 2022 23:44:37 -0800 Received: from nvidia.com (10.126.230.37) 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.36; Mon, 19 Dec 2022 23:44:36 -0800 From: Leo Xu To: CC: Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH v2 2/3] net/mlx5: add ICMPv6 ID and sequence match support Date: Tue, 20 Dec 2022 09:44:02 +0200 Message-ID: <20221220074403.1015411-3-yongquanx@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221220074403.1015411-1-yongquanx@nvidia.com> References: <20221212085923.2314350-1-yongquanx@nvidia.com> <20221220074403.1015411-1-yongquanx@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT034:EE_|SJ1PR12MB6194:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a97fa31-a88a-4199-89c8-08dae25e14b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OyAeK623i/ukpwzvO+sLaJ7ZTHXS5b2zkkQR/ZkcvRBmXgH6NvXbTR+d7GlzJ8xXkE9sViGittZwkRq2hjHLbVcQm8LuzZUiAPK431yc/GbvdUBKe4fEWepZzyh67VARc/2zt5LzSsxCsTD3pJq19SZr0z/aXnr7hRZmgsfj14O9de7o9kMMG5GDjOOvAR9FooUDW2ymxDcrEX2x+DpzVLp4cfva7oiySXxBOJpRwbpzSenKJexEptYHo28i1e/9efD+5sEF+U1Xo/HaaOunY9QqR/KD8an1a/3wITKNmZolHF0bkBepx+PFBGZKgAdsmOOeWwMpQpoWmwo1wEc+W7FlcULuiiPtf7kOX26EvHpSHO7MHj4vpajlY/iyqUQWoKiVqhLei+0oshLGmNE9T7EI+ob6l6APntQgzrIhniq611BZGpn1/rLPu9pdfq/t0+MkrGg6D0N7ajdc9YNdSQfZgmSxYBwliB1OqoxvWa0w6V9W78FT82Hmq4BsV7Cs/eZNn7zFDrfv3mp/bjj68zRJPxWywZs43n6dVDV6Rw8uyXK6ZtyUXc6phdfgWLB4rv2MTTq8YeSWD8VN/Cb4L2yZnfy0RKjof44FV9qpC0N66J1hC6KsiGiZnOLb/kOIP1EQpBQJ603MAWmcBmNuvm0vIsrALxi71HI9a4qyk0R8gF8O1uhLWGXH/U9R6ngFrlrnM0TLLCFRou583rw+0Q== 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:(13230022)(4636009)(396003)(39860400002)(346002)(376002)(136003)(451199015)(46966006)(36840700001)(40470700004)(41300700001)(8676002)(5660300002)(70206006)(4326008)(8936002)(70586007)(6916009)(82310400005)(316002)(2906002)(54906003)(336012)(40460700003)(36756003)(86362001)(40480700001)(55016003)(82740400003)(16526019)(478600001)(1076003)(26005)(7696005)(107886003)(6286002)(186003)(7636003)(6666004)(356005)(36860700001)(2616005)(47076005)(426003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 07:44:52.7653 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a97fa31-a88a-4199-89c8-08dae25e14b5 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: CO1NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6194 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 This patch adds ICMPv6 ID and sequence match support. Since type and code of ICMPv6 echo is already specified by ITEM type: RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY mlx5 pmd will set appropriate type and code automatically: Echo request: type(128), code(0) Echo reply: type(129), code(0) type and code provided by application will be ignored. Signed-off-by: Leo Xu --- doc/guides/nics/mlx5.rst | 2 +- doc/guides/rel_notes/release_23_03.rst | 6 ++ drivers/net/mlx5/mlx5_flow.c | 61 +++++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 4 ++ drivers/net/mlx5/mlx5_flow_dv.c | 76 ++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_flow_hw.c | 2 + 6 files changed, 150 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 51f51259e3..78693d19b0 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -405,7 +405,7 @@ Limitations - The input buffer, providing the removal size, is not validated. - The buffer size must match the length of the headers to be removed. -- ICMP(code/type/identifier/sequence number) / ICMP6(code/type) matching, IP-in-IP and MPLS flow matching are all +- ICMP(code/type/identifier/sequence number) / ICMP6(code/type/identifier/sequence number) matching, IP-in-IP and MPLS flow matching are all mutually exclusive features which cannot be supported together (see :ref:`mlx5_firmware_config`). diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index 5af9c43dd9..011c2489f7 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -60,6 +60,12 @@ New Features Added ``icmp6_echo`` item in rte_flow to support ID and sequence matching in ICMPv6 echo request/reply packets. +* **Updated Mellanox mlx5 driver.** + + Updated the Mellanox mlx5 driver with new features and improvements, including: + + * Added support for matching on ICMPv6 ID and sequence fields. + Removed Items ------------- diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index a0cf677fb0..8eea78251e 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2352,6 +2352,67 @@ mlx5_flow_validate_item_icmp6(const struct rte_flow_item *item, return 0; } +/** + * Validate ICMP6 echo request/reply item. + * + * @param[in] item + * Item specification. + * @param[in] item_flags + * Bit-fields that holds the items detected until now. + * @param[in] ext_vlan_sup + * Whether extended VLAN features are supported or not. + * @param[out] error + * Pointer to error structure. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +int +mlx5_flow_validate_item_icmp6_echo(const struct rte_flow_item *item, + uint64_t item_flags, + uint8_t target_protocol, + struct rte_flow_error *error) +{ + const struct rte_flow_item_icmp6_echo *mask = item->mask; + const struct rte_flow_item_icmp6_echo nic_mask = { + .echo.hdr.type = 0xff, + .echo.hdr.code = 0xff, + .echo.identifier = RTE_BE16(0xffff), + .echo.sequence = RTE_BE16(0xffff), + }; + const int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL); + const uint64_t l3m = tunnel ? MLX5_FLOW_LAYER_INNER_L3_IPV6 : + MLX5_FLOW_LAYER_OUTER_L3_IPV6; + const uint64_t l4m = tunnel ? MLX5_FLOW_LAYER_INNER_L4 : + MLX5_FLOW_LAYER_OUTER_L4; + int ret; + + if (target_protocol != 0xFF && target_protocol != IPPROTO_ICMPV6) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "protocol filtering not compatible" + " with ICMP6 layer"); + if (!(item_flags & l3m)) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "IPv6 is mandatory to filter on" + " ICMP6"); + if (item_flags & l4m) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "multiple L4 layers not supported"); + if (!mask) + mask = &nic_mask; + ret = mlx5_flow_item_acceptable + (item, (const uint8_t *)mask, + (const uint8_t *)&nic_mask, + sizeof(struct rte_flow_item_icmp6_echo), + MLX5_ITEM_RANGE_NOT_ACCEPTED, error); + if (ret < 0) + return ret; + return 0; +} + /** * Validate ICMP item. * diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 1f57ecd6e1..9243f58b4c 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -2322,6 +2322,10 @@ int mlx5_flow_validate_item_icmp6(const struct rte_flow_item *item, uint64_t item_flags, uint8_t target_protocol, struct rte_flow_error *error); +int mlx5_flow_validate_item_icmp6_echo(const struct rte_flow_item *item, + uint64_t item_flags, + uint8_t target_protocol, + struct rte_flow_error *error); int mlx5_flow_validate_item_nvgre(const struct rte_flow_item *item, uint64_t item_flags, uint8_t target_protocol, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7ca909999b..62381c6346 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7370,6 +7370,17 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, item_ipv6_proto = IPPROTO_ICMPV6; last_item = MLX5_FLOW_LAYER_ICMP6; break; + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST: + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY: + ret = mlx5_flow_validate_item_icmp6_echo(items, + item_flags, + next_protocol, + error); + if (ret < 0) + return ret; + item_ipv6_proto = IPPROTO_ICMPV6; + last_item = MLX5_FLOW_LAYER_ICMP6; + break; case RTE_FLOW_ITEM_TYPE_TAG: ret = flow_dv_validate_item_tag(dev, items, attr, error); @@ -10269,6 +10280,65 @@ flow_dv_translate_item_icmp6(void *key, const struct rte_flow_item *item, icmp6_v->code & icmp6_m->code); } +/** + * Add ICMP6 echo request/reply item to the value. + * + * @param[in, out] key + * Flow matcher value. + * @param[in] item + * Flow pattern to translate. + * @param[in] inner + * Item is inner pattern. + * @param[in] key_type + * Set flow matcher mask or value. + */ +static void +flow_dv_translate_item_icmp6_echo(void *key, const struct rte_flow_item *item, + int inner, uint32_t key_type) +{ + const struct rte_flow_item_icmp6_echo *icmp6_m; + const struct rte_flow_item_icmp6_echo *icmp6_v; + uint32_t icmp6_header_data_m = 0; + uint32_t icmp6_header_data_v = 0; + void *headers_v; + void *misc3_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_3); + uint8_t icmp6_type = 0; + struct rte_flow_item_icmp6_echo zero_mask; + + memset(&zero_mask, 0, sizeof(zero_mask)); + headers_v = inner ? MLX5_ADDR_OF(fte_match_param, key, inner_headers) : + MLX5_ADDR_OF(fte_match_param, key, outer_headers); + if (key_type & MLX5_SET_MATCHER_M) + MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, 0xFF); + else + MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, + IPPROTO_ICMPV6); + MLX5_ITEM_UPDATE(item, key_type, icmp6_v, icmp6_m, &zero_mask); + /* Set fixed type and code for icmpv6 echo request or reply */ + icmp6_type = (item->type == RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST ? + RTE_ICMP6_ECHO_REQUEST : RTE_ICMP6_ECHO_REPLY); + if (key_type & MLX5_SET_MATCHER_M) { + MLX5_SET(fte_match_set_misc3, misc3_v, icmpv6_type, 0xFF); + MLX5_SET(fte_match_set_misc3, misc3_v, icmpv6_code, 0xFF); + } else { + MLX5_SET(fte_match_set_misc3, misc3_v, icmpv6_type, icmp6_type); + MLX5_SET(fte_match_set_misc3, misc3_v, icmpv6_code, 0); + } + if (icmp6_v == NULL) + return; + /* Set icmp6 header data (identifier & sequence) accordingly */ + icmp6_header_data_m = + (rte_be_to_cpu_16(icmp6_m->echo.identifier) << 16) | + rte_be_to_cpu_16(icmp6_m->echo.sequence); + if (icmp6_header_data_m) { + icmp6_header_data_v = + (rte_be_to_cpu_16(icmp6_v->echo.identifier) << 16) | + rte_be_to_cpu_16(icmp6_v->echo.sequence); + MLX5_SET(fte_match_set_misc3, misc3_v, icmpv6_header_data, + icmp6_header_data_v & icmp6_header_data_m); + } +} + /** * Add ICMP item to the value. * @@ -13381,6 +13451,12 @@ flow_dv_translate_items(struct rte_eth_dev *dev, wks->priority = MLX5_PRIORITY_MAP_L4; last_item = MLX5_FLOW_LAYER_ICMP6; break; + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST: + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY: + flow_dv_translate_item_icmp6_echo(key, items, tunnel, key_type); + wks->priority = MLX5_PRIORITY_MAP_L4; + last_item = MLX5_FLOW_LAYER_ICMP6; + break; case RTE_FLOW_ITEM_TYPE_TAG: flow_dv_translate_item_tag(dev, key, items, key_type); last_item = MLX5_FLOW_ITEM_TAG; diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 20c71ff7f0..dbf935ca26 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4731,6 +4731,8 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev, case RTE_FLOW_ITEM_TYPE_GRE_OPTION: case RTE_FLOW_ITEM_TYPE_ICMP: case RTE_FLOW_ITEM_TYPE_ICMP6: + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST: + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY: case RTE_FLOW_ITEM_TYPE_CONNTRACK: break; case RTE_FLOW_ITEM_TYPE_INTEGRITY: From patchwork Tue Dec 20 07:44:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Xu X-Patchwork-Id: 121062 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 254A7A0545; Tue, 20 Dec 2022 08:45:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BAD4542D17; Tue, 20 Dec 2022 08:44:57 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2074.outbound.protection.outlook.com [40.107.94.74]) by mails.dpdk.org (Postfix) with ESMTP id 31FA540395 for ; Tue, 20 Dec 2022 08:44:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NJNXYI7Bg3SOMFTn/TPSWICWy41XF183qIIq07RlT5/1oqZc+NEavVM0m1UmTJGwc/Q3SyQ2Xazj4UJczB/hjHIvVRdRagO0sitYw670RbNSiibF9UP7hbGD5vOBBp2s3PuhGoMxpXtD4wJrf6qRKuwrLlxBJNC+WmLs341lm1jeEuIwNzpo3ySkzcyFnrYyOOCLNbdpp3WCUg1XueW7vLV0Yo/XDxb7KndsqJARuoVpvNxVXaEB1zl8aSIs3bwUarAPXJUFTe86iI+yoeU++S+4T64ib95o56SQtIdAEEmEuH/i1SGbXIAB+Re2D49NT4+KQR4OIsQUSfKnUY2Feg== 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=9vIa99VJZDtKC+wO6ZkI08HK7vcs2t9/HdsHkhmRQvk=; b=WdmuiN8FNOAuDc8O33n83UL8G2F/2p1wfb0Uzwf2+blEwj+DjtH+06IQOYp6x8rzJGWz51gGeuTMj5IpNgdjlM6oZfAyNlhBOMQxVf9iH62V0OO6mU/CoV6jWp9lDv5Yq5RSNogJWoqHm/59N8gDjaysjZ5tj+A+0fNPIm23JnjMfZ7W1ykI0u7WmkYL5Ry8JyOepY+iqjcnI6SDyGy5eiNbWBEdw3UjkMLOrGrQBRQjQImsSTTh/mpeWsLxb5t0kcsERSZ1iPzk4r5/3Ul1v/YzX/7IR8aRs/aMcwn9MgVMCJLN/RuZgAnpZWuUKK2rMiIaoKkL16JbyUt+4kituw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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 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=9vIa99VJZDtKC+wO6ZkI08HK7vcs2t9/HdsHkhmRQvk=; b=bOTiiCsmfJJG7wDzf93HCBYYpYYDNYk3HAaTxKAGtc9xuzvXm4DIOQQ0riYHbc/ZRfLcnMM2mzyiM6nRUz1o12w588U6e6eyI3hvzujUM9gZUmJTN+uhp2gtuigERy/H01h6ROVj6BDhFYlRG2xvS6jrC6wDfys1bqJ0BeKBRCo8/7tApWJhgiClI0XXuGqKO1EbgWNgunDlLLZZsvw++YYavSz2Zt24LrcSeVX8rXY1UzE1I4Bfe//QCdZrlM5H2Oy2zQvsmzX3YhbjCOUe0kutd2jWW0Pmxi72MBHGdnA54ONu0693UGOyUT/dJGNdV8ys91wdOJxNgDirm6qirw== Received: from BN9PR03CA0709.namprd03.prod.outlook.com (2603:10b6:408:ef::24) by DM4PR12MB6326.namprd12.prod.outlook.com (2603:10b6:8:a3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 07:44:53 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ef:cafe::24) by BN9PR03CA0709.outlook.office365.com (2603:10b6:408:ef::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 07:44:53 +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 BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 07:44:52 +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.36; Mon, 19 Dec 2022 23:44:39 -0800 Received: from nvidia.com (10.126.230.37) 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.36; Mon, 19 Dec 2022 23:44:38 -0800 From: Leo Xu To: CC: Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH v2 3/3] net/mlx5/hws: add ICMPv6 ID and sequence match support Date: Tue, 20 Dec 2022 09:44:03 +0200 Message-ID: <20221220074403.1015411-4-yongquanx@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20221220074403.1015411-1-yongquanx@nvidia.com> References: <20221212085923.2314350-1-yongquanx@nvidia.com> <20221220074403.1015411-1-yongquanx@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT032:EE_|DM4PR12MB6326:EE_ X-MS-Office365-Filtering-Correlation-Id: d8be27aa-519b-499d-7c4b-08dae25e14d4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OfTpmOo9KPTEbLgPKBdduGtcfYqsHyizHsqUENEnNNtNk3JWT3BrCi4AuUekQtnpUbhyImnnkJXJln3yUz5yWlrObHM7FyCmBhNpk7UkSGDRR5bj3MGrcKOcIb34tRAjvp9bQ7ZZz/Kor7s/mi6LBb84yCA0s62QdeF4mFwZO0ppO2GRH/fP1iemoJz9TvQt1et2LYMu2eGEIglUg88fO7qQnVKI/ZNP7lmPhNGAvPcAZ+EPuWJ7pb2MraE3bpLPqRd6U8IhjviFwbptehFEESUEvbdqxrn+57h8TS/O0v+UOWv8o72VG/mf5hyxRJriyn9cwL7zRxiTF7RwT3MkN0WxsodAyHyLj3ZATjrV/iWWlX3a2y0PngYzc64uOudS3lyBbaYYFZ+EUNs10L0XPeZ80JgLkhlR8jHh3ob03ECV8O3QItjSygbCqhwy9PsmnQXK31CABX9wVZ2m0c49ATfZpm27ofs5iegwb3shEzeCUdD87ocWiJIqYXUMdfYRg4qiYjI6Vhi0dZzoM2/cBr3g1ommlCWcEIiM+E5YpbbU/52FxYwiS1CHU3oiCLGuQFMqNmCwCMYOB5NhBcRR+VTo061wa1CstK+518SnXLAVneG/CIk0Q9x3dwme4zhuHATYh4mHVU3/s8aAGFhxy7faiFgX/LEBQMfHBvmADBhadRRLHAQT/mQ1txMN4BC1OxYcWm96RRD7HQ3GbLf0HQ== 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:(13230022)(4636009)(39860400002)(136003)(396003)(346002)(376002)(451199015)(40470700004)(46966006)(36840700001)(478600001)(6666004)(107886003)(7696005)(86362001)(186003)(40480700001)(316002)(2616005)(6286002)(16526019)(70206006)(6916009)(55016003)(26005)(54906003)(70586007)(2906002)(336012)(36756003)(83380400001)(41300700001)(82310400005)(4326008)(1076003)(8676002)(356005)(7636003)(82740400003)(40460700003)(36860700001)(47076005)(8936002)(426003)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 07:44:52.8588 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d8be27aa-519b-499d-7c4b-08dae25e14d4 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: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6326 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 This patch adds ICMPv6 ID and sequence match support for HWS. Since type and code of ICMPv6 echo is already specified by ITEM type: RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY mlx5 pmd will set appropriate type and code automatically: Echo request: type(128), code(0) Echo reply: type(129), code(0) type and code provided by application will be ignored This patch also fixes these issues in ICMP definer. 1. Parsing inner ICMP item gets and overwrites the outer IP_PROTOCOL function, which will remove the outer L4 match incorrectly. Fix this by getting correct inner function. 2. Member order of mlx5_ifc_header_icmp_bits doesn't follow ICMP format. Reorder them to make it more consistent. Signed-off-by: Leo Xu --- drivers/net/mlx5/hws/mlx5dr_definer.c | 88 +++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c index 6b98eb8c96..8fbc40ff15 100644 --- a/drivers/net/mlx5/hws/mlx5dr_definer.c +++ b/drivers/net/mlx5/hws/mlx5dr_definer.c @@ -368,6 +368,47 @@ mlx5dr_definer_icmp6_dw1_set(struct mlx5dr_definer_fc *fc, DR_SET(tag, icmp_dw1, fc->byte_off, fc->bit_off, fc->bit_mask); } +static void +mlx5dr_definer_icmp6_echo_dw1_mask_set(struct mlx5dr_definer_fc *fc, + __rte_unused const void *item_spec, + uint8_t *tag) +{ + const struct rte_flow_item_icmp6 spec = {0xFF, 0xFF, 0x0}; + mlx5dr_definer_icmp6_dw1_set(fc, &spec, tag); +} + +static void +mlx5dr_definer_icmp6_echo_request_dw1_set(struct mlx5dr_definer_fc *fc, + __rte_unused const void *item_spec, + uint8_t *tag) +{ + const struct rte_flow_item_icmp6 spec = {RTE_ICMP6_ECHO_REQUEST, 0, 0}; + mlx5dr_definer_icmp6_dw1_set(fc, &spec, tag); +} + +static void +mlx5dr_definer_icmp6_echo_reply_dw1_set(struct mlx5dr_definer_fc *fc, + __rte_unused const void *item_spec, + uint8_t *tag) +{ + const struct rte_flow_item_icmp6 spec = {RTE_ICMP6_ECHO_REPLY, 0, 0}; + mlx5dr_definer_icmp6_dw1_set(fc, &spec, tag); +} + +static void +mlx5dr_definer_icmp6_echo_dw2_set(struct mlx5dr_definer_fc *fc, + const void *item_spec, + uint8_t *tag) +{ + const struct rte_flow_item_icmp6_echo *v = item_spec; + rte_be32_t dw2; + + dw2 = (rte_be_to_cpu_16(v->echo.identifier) << __mlx5_dw_bit_off(header_icmp, ident)) | + (rte_be_to_cpu_16(v->echo.sequence) << __mlx5_dw_bit_off(header_icmp, seq_nb)); + + DR_SET(tag, dw2, fc->byte_off, fc->bit_off, fc->bit_mask); +} + static void mlx5dr_definer_ipv6_flow_label_set(struct mlx5dr_definer_fc *fc, const void *item_spec, @@ -1441,6 +1482,48 @@ mlx5dr_definer_conv_item_icmp6(struct mlx5dr_definer_conv_data *cd, return 0; } +static int +mlx5dr_definer_conv_item_icmp6_echo(struct mlx5dr_definer_conv_data *cd, + struct rte_flow_item *item, + int item_idx) +{ + const struct rte_flow_item_icmp6_echo *m = item->mask; + struct mlx5dr_definer_fc *fc; + bool inner = cd->tunnel; + + if (!cd->relaxed) { + /* Overwrite match on L4 type ICMP6 */ + fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_icmp_protocol_set; + fc->tag_mask_set = &mlx5dr_definer_ones_set; + DR_CALC_SET(fc, eth_l2, l4_type, inner); + + /* Set fixed type and code for icmp6 echo request/reply */ + fc = &cd->fc[MLX5DR_DEFINER_FNAME_ICMP_DW1]; + fc->item_idx = item_idx; + fc->tag_mask_set = &mlx5dr_definer_icmp6_echo_dw1_mask_set; + if (item->type == RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST) + fc->tag_set = &mlx5dr_definer_icmp6_echo_request_dw1_set; + else /* RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY */ + fc->tag_set = &mlx5dr_definer_icmp6_echo_reply_dw1_set; + DR_CALC_SET_HDR(fc, tcp_icmp, icmp_dw1); + } + + if (!m) + return 0; + + /* Set identifier & sequence into icmp_dw2 */ + if (m->echo.identifier || m->echo.sequence) { + fc = &cd->fc[MLX5DR_DEFINER_FNAME_ICMP_DW2]; + fc->item_idx = item_idx; + fc->tag_set = &mlx5dr_definer_icmp6_echo_dw2_set; + DR_CALC_SET_HDR(fc, tcp_icmp, icmp_dw2); + } + + return 0; +} + static int mlx5dr_definer_conv_item_meter_color(struct mlx5dr_definer_conv_data *cd, struct rte_flow_item *item, @@ -1577,6 +1660,11 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx, ret = mlx5dr_definer_conv_item_icmp6(&cd, items, i); item_flags |= MLX5_FLOW_LAYER_ICMP6; break; + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REQUEST: + case RTE_FLOW_ITEM_TYPE_ICMP6_ECHO_REPLY: + ret = mlx5dr_definer_conv_item_icmp6_echo(&cd, items, i); + item_flags |= MLX5_FLOW_LAYER_ICMP6; + break; case RTE_FLOW_ITEM_TYPE_METER_COLOR: ret = mlx5dr_definer_conv_item_meter_color(&cd, items, i); item_flags |= MLX5_FLOW_ITEM_METER_COLOR;