From patchwork Sun Feb 5 13:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Xu X-Patchwork-Id: 123055 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 C7B1E41BDB; Sun, 5 Feb 2023 14:42:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B2BE040ED6; Sun, 5 Feb 2023 14:42:50 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) by mails.dpdk.org (Postfix) with ESMTP id DCDBC40A7D for ; Sun, 5 Feb 2023 14:42:48 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dI1QJ2rxrJWm16GdjSikwnIAgYU9D5AkzL82n1CMJu8efi0ttiw3tckg2amsD2FCQgwlwPqY7UN2o2G8/A35vovDM/rrU92GQWu+ofVt7Lr+ifaDNVGoszjvL+2ZeChnXxUwFolbbJyWFvEEhHiFpPgXjtfB5eng8EYOy5dZi9qBlHsnylMnRDO177C5bqM1Lrdeb/N7GvwpPZwGZAytbEy4RVAjXzqJ4Nab8RACmFiq3EJe8HVxOYwcmcE7atudx9ldgx15JaX17Dgf3lVtSnH+04GKp1nsEVM4AvgKd/9OFHE5wlS4tEv2bDvhNh+DMyB/9+3uI6/MzUgIFTPyBg== 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=QybdI0xKsDJJZg9Mrzr6Hyc7r6O0FAAC3g3XV+kmNmU=; b=ZuB7CuT0B/iLj8wsdFlwZKj4/YApS/rg+Ql0/cIPBNdtdgBsRElvDuS0yGXan7x/i5FWvpjkkvRVRc6J9UK7qSAkJtcfEwM8B/GB6U5DwkQfWi1c/MmuObg6BUoxlMgtqPLu8328HQeypn0cXQVQrJ8R13PJ7N9mJmnK5gHdN2oZu8Qmu9hK1yjPu7Wizu78E25wMGRGlDEP7mVV+Cz1wJqbfJcTbOlrFSfUZtQfyHIZqnPYHK02qx7I6blstAQ4hnyroBIYJolws0twJzaeuiiUxnAieyETykc3g4mpOey+CWqxmKxvfvy8NM1S1lnxR+fDuFOKkHXDFEp29tVQEg== 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=QybdI0xKsDJJZg9Mrzr6Hyc7r6O0FAAC3g3XV+kmNmU=; b=ubx2SoK1JmH79DrLlT/pIxAVZyCbR7GWbf2kBSKBZfTKJMfYe2wDJ3KMv3NHcTf51ecIRD0G79bM9I9L9cLPR2l/ABwV+CSxAWrxSoYhoTVG/qaybIQs4WwRfMWcOTAT1IElL4rNLgafi0vnmvgCNetqE1Ra7TbPhObK8zlGJDIsO9PO5w7DlVGazFPYAgMwU2dfn9zKle7NaCpuRsC2fpLfQgelpdKez8N3LL/xSEJP1Q76rtyh7hxH3l8icQXfhhnnzy4lXGPbdxspE+c5kGnCQrO+lyFT2/at6bM01DoQoamB4Evb0QXs4gU360eC4WxK/mJFkOfW+MWEqFUhIg== Received: from MW4P221CA0007.NAMP221.PROD.OUTLOOK.COM (2603:10b6:303:8b::12) by PH7PR12MB7210.namprd12.prod.outlook.com (2603:10b6:510:205::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.32; Sun, 5 Feb 2023 13:42:45 +0000 Received: from CO1PEPF00001A63.namprd05.prod.outlook.com (2603:10b6:303:8b:cafe::f4) by MW4P221CA0007.outlook.office365.com (2603:10b6:303:8b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34 via Frontend Transport; Sun, 5 Feb 2023 13:42:45 +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 CO1PEPF00001A63.mail.protection.outlook.com (10.167.241.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.20 via Frontend Transport; Sun, 5 Feb 2023 13:42:44 +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; Sun, 5 Feb 2023 05:42:32 -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; Sun, 5 Feb 2023 05:42:29 -0800 From: Leo Xu To: CC: Ori Kam , Thomas Monjalon , "Aman Singh" , Yuying Zhang , Ferruh Yigit , Andrew Rybchenko , Olivier Matz Subject: [PATCH v3 1/3] ethdev: add ICMPv6 ID and sequence Date: Sun, 5 Feb 2023 15:41:52 +0200 Message-ID: <20230205134154.408984-2-yongquanx@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230205134154.408984-1-yongquanx@nvidia.com> References: <20221220074403.1015411-1-yongquanx@nvidia.com> <20230205134154.408984-1-yongquanx@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A63:EE_|PH7PR12MB7210:EE_ X-MS-Office365-Filtering-Correlation-Id: b8d4e598-72e4-4171-0b80-08db077edc63 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: DBaqGMks1Iv6X497mfo7TOmK4J6F3rNuwq8c4qXXWvkv2UvVAuXdpgxuFLPQvgD7uhP3GcD9hHQ+H/TVIRRQGTvg8e1ok5E4z7xBJPnECMF8V8Voem51H3NlI/oyplDKvKMnxUcO4HBTJQupA6UcV1oZ3a5eyS3Tp3xkkc3SeAUiTN8Jqxu0ndACD3a9LSkeCH4i6z/82Cc0lHU0/RTXrCZj6GVIk5vvl0MRabDfXhASMuFmHyw3v9xgbmG5DGWJunkeNTv21tasx9WSDUJtN9q35ZLv4VimP0MXPTmN7KW32xk7Gm2P4q3ruRhX7+lyYBS3QrGDCP6+HulojuecFAAfXhnCXAOV4bAGP61CHoAcWYosiY7V8YXmR/WXaQbYYNB5uutxXF7C1B2fBU01mGXI+d1OMFFjWnfRcAh70C4hZkgisBxpjgDDfbkuE+o4BEnEn2UlRE26mftPYs/7UUWgXQJf/wi9fBkRcbMLWrTdzsUMZSqTAy0gT9YUiN+cNKes35rv3ExdMMWNO5H6c93Ea7zL+kKKJsSaAIcUWsf+K4fAMRw5s+IZdq3ieBeufFGBK3EHjBWUkKrRxbDQO0Xi+PNQBJAXWMBpX4p/msf6dTn33xbYv4HxCRhzPMFjuGm7sV+6+nMeQg9FGea5UKJfq0f9TVMcm68eGvMWd1Cp/qy1+skMUFT3vNtsueJXYsYZnTuvV/b7o7jR22idtg== 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:(13230025)(4636009)(136003)(376002)(396003)(39860400002)(346002)(451199018)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(2906002)(6666004)(478600001)(54906003)(7696005)(7636003)(86362001)(36756003)(82310400005)(40460700003)(82740400003)(356005)(2616005)(26005)(336012)(47076005)(426003)(316002)(6916009)(5660300002)(4326008)(8676002)(70586007)(70206006)(83380400001)(41300700001)(186003)(8936002)(6286002)(16526019)(1076003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2023 13:42:44.6247 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b8d4e598-72e4-4171-0b80-08db077edc63 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: CO1PEPF00001A63.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7210 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 structures for ICMP packet definitions. struct rte_icmp_base_hdr; # For basic header of all ICMP/ICMPv6 header struct rte_icmp_echo_hdr; # For ICMP/ICMPv6 echo header The existing struct rte_icmp_hdr should not be used in new code. It should be set to be deprecated in future. The reason for that is, icmp_ident/icmp_seq_nb are not common fields of ICMP/ICMPv6 packets. 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 Acked-by: Ori Kam --- .mailmap | 1 + app/test-pmd/cmdline_flow.c | 70 +++++++++++++++++++++ doc/guides/nics/features/default.ini | 2 + doc/guides/prog_guide/rte_flow.rst | 14 +++++ doc/guides/rel_notes/release_23_03.rst | 5 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 10 +++ lib/ethdev/rte_flow.c | 2 + lib/ethdev/rte_flow.h | 24 +++++++ lib/net/rte_icmp.h | 22 +++++++ 9 files changed, 150 insertions(+) diff --git a/.mailmap b/.mailmap index 75884b6fe2..310853bd5e 100644 --- a/.mailmap +++ b/.mailmap @@ -728,6 +728,7 @@ Lei Gong Lei Ji Lei Yao Leonid Myravjev +Leo Xu Leszek Zygo Levend Sayar Lev Faerman diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 88108498e0..97ab742abd 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, + hdr.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, + hdr.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, + hdr.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, + hdr.sequence)), + }, [ITEM_ICMP6_ND_NS] = { .name = "icmp6_nd_ns", .help = "match ICMPv6 neighbor discovery solicitation", diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index 510cc6679d..976a020985 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -105,6 +105,8 @@ gtp_psc = higig2 = icmp = icmp6 = +icmp6_echo_request = +icmp6_echo_reply = icmp6_nd_na = icmp6_nd_ns = icmp6_nd_opt = diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 3e6242803d..b910ea51bd 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. + +- ``hdr``: ICMP6 echo header definition (``rte_icmp.h``). + +Item: ``ICMP6_ECHO_REPLY`` +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Matches an ICMPv6 echo reply. + +- ``hdr``: ICMP6 echo header definition (``rte_icmp.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 c15f6fbb9f..3f5c7af3b6 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -69,6 +69,11 @@ New Features ``rte_event_dev_config::nb_single_link_event_port_queues`` parameter required for eth_rx, eth_tx, crypto and timer eventdev adapters. +* **Added rte_flow support for matching ICMPv6 ID and sequence fields.** + + * Added flow items to match ICMPv6 echo request and reply packets. + Matching patterns can include ICMP identifier and sequence numbers. + 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..adcd4a61be 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -123,6 +123,8 @@ 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..3ce6f188a3 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -624,6 +624,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 +1317,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_icmp_echo_hdr hdr; +}; + /** * RTE_FLOW_ITEM_TYPE_ICMP6_ND_NS * diff --git a/lib/net/rte_icmp.h b/lib/net/rte_icmp.h index 4429e8e29f..7aaf0fd096 100644 --- a/lib/net/rte_icmp.h +++ b/lib/net/rte_icmp.h @@ -37,6 +37,28 @@ struct rte_icmp_hdr { #define RTE_IP_ICMP_ECHO_REPLY 0 #define RTE_IP_ICMP_ECHO_REQUEST 8 +/** + * ICMP base header + */ +struct rte_icmp_base_hdr { + uint8_t type; + uint8_t code; + rte_be16_t checksum; +} __rte_packed; + +/** + * ICMP echo header + */ +struct rte_icmp_echo_hdr { + struct rte_icmp_base_hdr base; + 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 From patchwork Sun Feb 5 13:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Xu X-Patchwork-Id: 123056 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 026EE41BDB; Sun, 5 Feb 2023 14:42:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5A3242686; Sun, 5 Feb 2023 14:42:55 +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 128B240A7D for ; Sun, 5 Feb 2023 14:42:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g1Is1vTfCSXzOaUP24t/MJt/XmMrEYY7P6eyVC/jwctrYsnmIam0CrlMcuXUFfYcbgZ/3Gs6bczCw9zeuezaXMVtOQVcqxN5FCFIl2U3CebhtlqEkPqj1ZQh2GwpxQ5ebGRNJzyUdvRDEJj7KffVs5yrkWtRQ37K/8BNoD7Ribi42MuOjsxlJ4TOHi4twp9OlYyfSFf+dkMAJfDZIJwTThfg68SKb317bey0TK+JITrNs7nsCYg7Um2PIYE9+gmOQu3zkfB/D3emcGbYXFJNr6zMeo5fCecKyHBpUcGziwnczevNvmeGKmkQxZj63y6Ah/yrsytO0fwxA+VfebMK9g== 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=Tf+dKMxkP5M4zIXCTbvfggEvxFgXaHbF7v9/AC941oM=; b=JJWydirrT0JcHjb/ITGeHDPnLWxTopqtXbbTRxRAl03uHIKDT4pCFJuGODE3on4j7BmcbE6Es59eIXgxmr3QJdp7jefsXhdheLL0HCKLpWb8sfsQC8UbXGRcHvmdVWglZ3s9thjD1Z6WQuL3D3PNOeVrE4afWvaTRiKRCyWgxAQJgHorQqrigV6/A5uW/Id0hGTAMEyMw4T+uCbUiIrvvzFTDERQIPiJHpJtOrevuznD7YryMbD0M/icvWLKtYHkYa2JegKv9IpJuDLfxOb0Vb6B6uK81uYHU88AaWOIeW73c7hKrEFO+Ye78+3TdVQ7A+O2cTm9IhxbQQXv4LvxvA== 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=Tf+dKMxkP5M4zIXCTbvfggEvxFgXaHbF7v9/AC941oM=; b=taRMgeRP8mFy2O3MPkbhiG7KZ0yU0tCdDQnxEeeUmT0+iTfzyVFI6jqEZA/yZx0ymAGalTBEds1qA8mV/QcX05J8RO+5TxNkMSBVrSysISc8AyiICiYJkUvucWUJhXU71fL6KeqlAYWz8FXaEanzNkeTC3o7qBFKbWRdLVDHuOEHu2YFQaenUScSoBWsOJKFdcRO+10AHRAjAfVuNY5n2+yA7+JItdeWSo9WI7bucMSzwKEcXl38YUDGqWBauUEznQrgHlvdxxp7xsyEFymlrR5Kto7dAtLfpjLHQ07P2UKGS5YX6k4F+lC6z0zs4to0E6J2CFuA8MNjKghICpHMxw== Received: from MW4PR04CA0033.namprd04.prod.outlook.com (2603:10b6:303:6a::8) by SN7PR12MB7251.namprd12.prod.outlook.com (2603:10b6:806:2ab::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.32; Sun, 5 Feb 2023 13:42:52 +0000 Received: from CO1PEPF00001A60.namprd05.prod.outlook.com (2603:10b6:303:6a:cafe::cd) by MW4PR04CA0033.outlook.office365.com (2603:10b6:303:6a::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34 via Frontend Transport; Sun, 5 Feb 2023 13:42:52 +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 CO1PEPF00001A60.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.6064.21 via Frontend Transport; Sun, 5 Feb 2023 13:42:51 +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; Sun, 5 Feb 2023 05:42: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; Sun, 5 Feb 2023 05:42:34 -0800 From: Leo Xu To: CC: Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH v3 2/3] net/mlx5: add ICMPv6 ID and sequence match support Date: Sun, 5 Feb 2023 15:41:53 +0200 Message-ID: <20230205134154.408984-3-yongquanx@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230205134154.408984-1-yongquanx@nvidia.com> References: <20221220074403.1015411-1-yongquanx@nvidia.com> <20230205134154.408984-1-yongquanx@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A60:EE_|SN7PR12MB7251:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e27d1ef-c016-402c-da8e-08db077ee096 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d82+xN2Tqbyr8Q1ztkBmkffIs4SbctYYFVXND9KsinYa8rThQuF1VnI/pEiSqNWildc7Li9ZbKZWDPjiIbWWroe6Czgv30dR/pQRiLayo6ZF3QLMPigE8gfoT4oN9J6IKrOx/b9E3HB4bHhYgLpJPCXrK3r3yFJQmgpJFhtemlIpyjZHxP3V2w9htPTZwVPr4GEWmf3vvLvDsUyFa4LZxhaYCoO+75oeZeaWgmfFmtIZdCVZMgyAk47e4mpWoTuw+32cJ49iR3yhpJncGAHEX0VZNUMNEEDFTK6eWSinLRNKRtqyw0g46a+xbWgc8qTdseAzs/+ncqFQexyUzfHKYeg+R6tcqiGzSHW5TdNdzLOmdHZBVb/+LTVlsfpV+MvBshzgKdW62lJwzr+HUKvZR9iBORD1zzd/62re3oah2NidwXePYblFCnFlyHMsX06d2l9Oezgdz6Ac9BYdRqLZMyG+k5ikNi+ecC0yIyODNMNlPSDgcCSKm6K4kO8SqHwtHv810N6Y7eVLQpxhnAhRBF+PcYm7wbra4DPGKzLBbE/ORpAb2WP04jVvypGEbcfavoxbDS5R2eJxFl6qEXLOuIEZFU1Bos7ydO5SJA1u4LCT4XAuk/xPX8Uv+n8ZxptVGZ/MDVZvUXwaM47nlVO8bL0C4+Ba+tcO0oFEb4k1RiLPNy4hHdun6T4hDX9uuVF+W/5hYBnI9Utd0WAiLjcJYw== 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:(13230025)(4636009)(136003)(376002)(39860400002)(396003)(346002)(451199018)(36840700001)(40470700004)(46966006)(82310400005)(40460700003)(316002)(107886003)(55016003)(40480700001)(6666004)(1076003)(2616005)(478600001)(26005)(16526019)(6286002)(4326008)(8676002)(6916009)(70206006)(7696005)(186003)(54906003)(356005)(86362001)(7636003)(36756003)(82740400003)(70586007)(47076005)(336012)(426003)(83380400001)(36860700001)(5660300002)(41300700001)(8936002)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2023 13:42:51.6594 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e27d1ef-c016-402c-da8e-08db077ee096 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: CO1PEPF00001A60.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7251 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 Acked-by: Viacheslav Ovsiienko --- doc/guides/nics/features/mlx5.ini | 2 + doc/guides/nics/mlx5.rst | 4 +- doc/guides/rel_notes/release_23_03.rst | 4 ++ 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 + 7 files changed, 151 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/mlx5.ini b/doc/guides/nics/features/mlx5.ini index 62fd330e2b..eb016f34da 100644 --- a/doc/guides/nics/features/mlx5.ini +++ b/doc/guides/nics/features/mlx5.ini @@ -69,6 +69,8 @@ gtp = Y gtp_psc = Y icmp = Y icmp6 = Y +icmp6_echo_request = Y +icmp6_echo_reply = Y integrity = Y ipv4 = Y ipv6 = Y diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index f137f156f9..9c6f1cca19 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -405,8 +405,8 @@ 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 - mutually exclusive features which cannot be supported together +- 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`). - LRO: diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index 3f5c7af3b6..cac69e3173 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -74,6 +74,10 @@ New Features * Added flow items to match ICMPv6 echo request and reply packets. Matching patterns can include ICMP identifier and sequence numbers. +* **Updated Mellanox mlx5 driver.** + + * 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 f5e2831480..b38062c70e 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 = { + .hdr.base.type = 0xff, + .hdr.base.code = 0xff, + .hdr.identifier = RTE_BE16(0xffff), + .hdr.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 e376dcae93..86311b0b08 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..2ac9587761 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->hdr.identifier) << 16) | + rte_be_to_cpu_16(icmp6_m->hdr.sequence); + if (icmp6_header_data_m) { + icmp6_header_data_v = + (rte_be_to_cpu_16(icmp6_v->hdr.identifier) << 16) | + rte_be_to_cpu_16(icmp6_v->hdr.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 Sun Feb 5 13:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Xu X-Patchwork-Id: 123057 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 88F3841BDB; Sun, 5 Feb 2023 14:43:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CED042B8C; Sun, 5 Feb 2023 14:42:59 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2066.outbound.protection.outlook.com [40.107.223.66]) by mails.dpdk.org (Postfix) with ESMTP id 2542542D0B for ; Sun, 5 Feb 2023 14:42:58 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EKNv+k3yVPnEjJX6UwkzzE3arPCRZLonZsPi8CPtzxFw6kaCuBiXpzUzHamG36jcm+O6qaDb3WHgJaZjFMSaAzF9QffBZNsxtJMMew6eAaNlaJogPCgL87/w8F/QI8BH/B4XfDnckcma31wr4C38/J0IeYJGt1+Yx/+2D8KwGazDV1VRxEd0my+A5ysxv3idbwUMEPGsV169faNiDGkCp/xY368MasnA9ikVSdLET5vxK/Q7FfynR6lbVtwv9k0F8iI6qXyZSPhlcePf1/8qxlchujSdRlHBMYznquhg84twAJzX8gOAMm7+5xTztaI9I3Dr8zvVyDcm9WDiljggOA== 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=dvluOnw1KG10KVmpk2gzRyl1dKa4DuJ0xWKZ7ro1eWQ=; b=d2uxaYYDvEu0L05WCVYJhkUb8Lbs4/jPzPgu6ETDdFzaQvmf87NfCGBelDvY6P1jktAahOk++qNXxXjr9Pbcy28WyGDWhPEZWp9PGPWa7+0nsDhtHtQyA6PTUrV1mv/wq5SxsyMM9if2gubNRoR9Mco58Bs9LyxkESx/Y9xIoCeCdLBvT7DwKrWcovxne98qS6kv3SmRf71bHpAfJk4H667j/m+7hVLjYf9skHF4oo7Pi2YEplUZ4sTdhZpl6pcIcgRZ+OllCf3ytjGl3gk0LnW0OX0tl+seWWXdd6WRiSxGERvdtbd8PmpfPLoCtS8qCEwM23q78R8bUvcpI6a+iQ== 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=dvluOnw1KG10KVmpk2gzRyl1dKa4DuJ0xWKZ7ro1eWQ=; b=ET3Pmte/kvcrjxTNWMclztZNTN/oooJO/Wi8AKGutFdxwUgWVI/gSWDPGdewDq+6z0KCqGO96+NrfNEPdqEkPXah7PYM3+6eSYFeZvmm7AEm+fhZ4vPosWcL+LLcICetfmKc6J2cFX/fI7moLtoPsreZCPJFZEgMlGZ83wMGJkkL42zHWVn57RH3NNUDA6SAu7GH3hVQs3nbDlCVVqs9n0d6tgltgvaAayP0Yr3aHWNUYqXBW9OLexV3AFfkYLGDlhK9PJzPyZxHYL2fPoLIKMxL4xRW+hN2LhjhHoneaH8Mn+m9NPJnRd3+OjEKLzS2XYb+SjFRuPAsFdVAjSHhiw== Received: from MW4PR04CA0050.namprd04.prod.outlook.com (2603:10b6:303:6a::25) by SN7PR12MB7953.namprd12.prod.outlook.com (2603:10b6:806:345::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.32; Sun, 5 Feb 2023 13:42:56 +0000 Received: from CO1PEPF00001A60.namprd05.prod.outlook.com (2603:10b6:303:6a:cafe::f6) by MW4PR04CA0050.outlook.office365.com (2603:10b6:303:6a::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.32 via Frontend Transport; Sun, 5 Feb 2023 13:42:56 +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 CO1PEPF00001A60.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.6064.21 via Frontend Transport; Sun, 5 Feb 2023 13:42:56 +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; Sun, 5 Feb 2023 05:42: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; Sun, 5 Feb 2023 05:42:37 -0800 From: Leo Xu To: CC: Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH v3 3/3] net/mlx5/hws: add ICMPv6 ID and sequence match support Date: Sun, 5 Feb 2023 15:41:54 +0200 Message-ID: <20230205134154.408984-4-yongquanx@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230205134154.408984-1-yongquanx@nvidia.com> References: <20221220074403.1015411-1-yongquanx@nvidia.com> <20230205134154.408984-1-yongquanx@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF00001A60:EE_|SN7PR12MB7953:EE_ X-MS-Office365-Filtering-Correlation-Id: 32e4ab7c-4002-490b-4820-08db077ee369 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T6ixwEcuFL8D95ihy12PinSHaPGjgzxuwjTrBKcrwCAwuB1osrEjEgFBAF7lsCcf2wZcRyfIMUf9GJhcLScPL3ON4ZyAdqzQHEsR7tJC4ZSYPUwM4iEeZWj/L5maX6i9MGh9ZamWuhJSCeqO64nYWFtparrI1qPTqFIlVRVrriccjQJS8EwBAKYJoBx1cuDrhcwSVEzRFY2rQ9UsMnWO915cELeaGgTSQzxb0slJRm3BXz24SJsqWjGCJcx1LSwdhe1EdLdoYKcSeoqDD8BNSWmOfv9v9OP7mLzCAyKuz5QqJTim+UoaFvSBtjgONLbcbwd1qS//2rCFIG6SPXuzCwB1rapi1CwEy9PW4cy7dtlVymrBKZcC0yHv5FDEQkVwKuaUvRvj8DMeLmhHWvjHLd4tTDwCBMmGYonxrF+rILRTxozPAIc3fmI5GfEkkWzHFwBzNpRhFlC29Zzwi5Rp6VgDD/tfS3p74LVQKQi5CmBToAZMXp8kBZorPyc9Kz1vSRs1SrJ1C1Nna1GYrydcrL2/GaSUlaWl643+Cnhvs4EyOd3Wkltrrbeb5IYZRFrdkK6je8PsnBwo7BDiJ8w1gi3BWg0d2YAU0gUD7MebNjD5SNmM29JAszKd6pA8cl95FmmX1vsB3/XccJLQaWiXGARqKeM6Ct3ynuJ7ycNA/g3auE0p0jVHcn8KtlFw3mHOpxwh1Cl1iIjSxT2zJtFFtw== 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:(13230025)(4636009)(136003)(376002)(396003)(346002)(39860400002)(451199018)(40470700004)(36840700001)(46966006)(82310400005)(40460700003)(1076003)(55016003)(40480700001)(6666004)(107886003)(478600001)(2616005)(26005)(186003)(16526019)(6286002)(4326008)(8676002)(70586007)(70206006)(6916009)(7696005)(316002)(7636003)(54906003)(82740400003)(36756003)(86362001)(356005)(47076005)(426003)(83380400001)(336012)(36860700001)(5660300002)(41300700001)(8936002)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2023 13:42:56.4096 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32e4ab7c-4002-490b-4820-08db077ee369 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: CO1PEPF00001A60.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7953 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 Signed-off-by: Leo Xu Acked-by: Alex Vesker Acked-by: Viacheslav Ovsiienko --- 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..d56e85631d 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->hdr.identifier) << __mlx5_dw_bit_off(header_icmp, ident)) | + (rte_be_to_cpu_16(v->hdr.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->hdr.identifier || m->hdr.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;