From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 21C63A0548 for ; Sun, 28 Nov 2021 16:00:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E5DE4068A; Sun, 28 Nov 2021 16:00:02 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2073.outbound.protection.outlook.com [40.107.102.73]) by mails.dpdk.org (Postfix) with ESMTP id 195FD4068A for ; Sun, 28 Nov 2021 16:00:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kWCpjnoYq9saLbd2CiIxjDTkvFHfw809dtC8fWmVUgldI1boqbWHuoYdw0NfWZenFy5dKArjaSKSAlmTfHAF5J6V0MxlK06BRNK9hdp6Oh+b4cUR1tm8oWxr5smfOl+Hs54LsT9pZ4TQygvNKA7C5TxZh79L0VJrRD4wrBHdi2S3fpiz6W4Qt22miWlLtp+stowFJWjHcpEXX7GxoOy5mcarO/RYDBqfib01zDajAczdKroxYGIhr4//cw5kHH7tnl3IvgJ4oIWcXxKMtqZJuO1DMrx0zKJY/tH5kDVbyAq13R3M8v5/bqR2mUd8KToq921gAqkt6NbpFacEREMHyQ== 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=A1ttfaWYuoqi5covSZRIKgjno9Z5r8Ud/iqciJErOSs=; b=j1upwxY4aR2Mahlvtg+JdIiBCZFqtIZo50ttG31GJ4U6juKL14l5kJbBdtUT3D1QCDkuZzZ/O5BjAwxo7NiebXmcr+2xmhfWTpNB7CagX6bilN6MWgAt9wP8yyyrXiZfsSEK3ytYc4y3U6sIIXmED4P13F3Gf+JU1znu23d+4aDE/mE3TwDgP7CKpwRChGZJcttl0E2y40T6hdESnBDg6bit1KarqzKblld/mY0cF2/VIqnA+QL2L20HM5Ysvno4Kjv27lg/vjAMCmPty9yOHfouI7RI2RUY6SRyt3LiiXJKVhdapgLZHlGJBXY8ZEOEEBbuIWao0rnDt+N2LGaeBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=A1ttfaWYuoqi5covSZRIKgjno9Z5r8Ud/iqciJErOSs=; b=cr5SIDmgJl04mg8x3k4iN/vrXtEJR4+0ooeLIoOO6cIpl+hfpkX5poaG4AwwlZdOEUohoSgX4ipH9nnZFWXolyn0VHlSK31mUpqOYAJ+Xs8nOTiQwhnPmsIIVH6uJ7/Hd60txeHoaOGQAjUDrgy3oGAz6scuLoozxCcV0QNq2iYIV07R1QFoVnkEO8GN3/KxCbjGYsIe8K2R/JZskS0r+vlWQt4w+971oK7s3fT8KPMdhpC1fhizwM7J+YXid4LYy5ajDc4KMB/pZ+dlnPgXf6IgZS+WcZ3NMQMPh0SCFNSnhp8SfBH8bJ7A/BAymnXq6/Hglb83tbA9GQTnEHPZaA== Received: from BN9PR03CA0526.namprd03.prod.outlook.com (2603:10b6:408:131::21) by MN2PR12MB4173.namprd12.prod.outlook.com (2603:10b6:208:1d8::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Sun, 28 Nov 2021 14:59:59 +0000 Received: from BN8NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:408:131:cafe::e4) by BN9PR03CA0526.outlook.office365.com (2603:10b6:408:131::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20 via Frontend Transport; Sun, 28 Nov 2021 14:59:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT040.mail.protection.outlook.com (10.13.177.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 14:59:59 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 14:59:57 +0000 From: Xueming Li To: Gregory Etelson CC: Luca Boccassi , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: add Ethernet header to GENEVE RSS expansion' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:49 +0800 Message-ID: <20211128145423.3974892-46-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62b8c6bf-6281-4d7e-c034-08d9b27fbf9c X-MS-TrafficTypeDiagnostic: MN2PR12MB4173: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VLj4TLe/19yx3oSW4WHOA9nRDTxyzl6eLz+ZwviVss8GBoupJXjY+A+2P/mp22pENhYPRldcyX6PlHnKFyiYY9G1cVWYKbgEPsq7i48d1dsA+6q9z2ftV6m3eZODj26xzPos1XWgtK7mY5/HYt6HsoGGjuBxTt7CK/pga52E//cuzehhKVZpz4hJmovdQFbQyJzF7TWRy30yuGgeF+iYqb+NSsBYvGVsp+HYgXDgvSwW6q2zNmTv39HVwUe0S3ZNDOCT0556vSSOHx80E0G/1dNuA3nI5RhfVeD9Wucbw0z/o08NHSdtHNzw9jHd9ZYjWm7fzoX6QRLNKmch6HbdASrFwqSofcJIFHKwOEVV6kpJScp1oI24nAe+g7pPB49sbRhSNmyYstn+7t2ovxOdtjZ56+gnyiqmji7dtdKUnRqLtXEtD2ZmY1NKVLbsXYkXvnmuHeUMqv0AnU2xkLGKYdvv1m8qmJWv+DFcSv37uYjZP65ZpRGMwcPKRvBnYu32h68t6yrmJlPtO1JlxSl+Mqf89B3b2HmiR9lfFwuFzFFzHiSqdXzwOrE6NFs+PWKA5+f3p1ZHPmeYsFrucQ1632uwgdWwBDrtmTR0P6Hc0e35Nh5ZxrKWvqVgFdBhkZgQXsF4h/lteOa7yEBcI5ncvj6Eg+yjL09u+rbaMaQN98/UGV9UPaXO5W3WnmzWrYJRJt489uCDnMMTM+cL7eKMp/xRBTQFut6I6w9zTr2dDkN6aMdKrFlkO6zRgSTnuA4EZQtqUdTgP8a6IerV5MBYNgS1GrwjclPXpYrKPlIQ2qxmfvN0TSoOu9aWG7F3IjnikjPJtaGEBWIzCqbqrUdGtg== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(36860700001)(6286002)(55016003)(316002)(36756003)(356005)(2906002)(6666004)(26005)(83380400001)(47076005)(70206006)(6862004)(5660300002)(54906003)(966005)(7636003)(7696005)(2616005)(426003)(336012)(186003)(37006003)(1076003)(4001150100001)(82310400004)(8676002)(8936002)(16526019)(53546011)(86362001)(4326008)(70586007)(508600001)(6636002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 14:59:59.3208 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62b8c6bf-6281-4d7e-c034-08d9b27fbf9c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4173 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/ae9d83d713a8861f4dee8cf86f91ff125b488655 Thanks. Xueming Li --- >From ae9d83d713a8861f4dee8cf86f91ff125b488655 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 14 Nov 2021 17:36:13 +0200 Subject: [PATCH] net/mlx5: add Ethernet header to GENEVE RSS expansion Cc: Xueming Li [ upstream commit 9f151fd8dfb30946a00f6ac273df93db14d1b45d ] RFC-8926 allows inner Ethernet header after GENEVE tunnel. Current GENEVE RSS expansion created IPv4 and IPv6 paths only. The patch adds Ethernet to RSS expansion scheme. Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index b8e11a43f5..21f018dd1d 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -237,6 +237,29 @@ mlx5_flow_expand_rss_item_complete(const struct rte_flow_item *item) else ret = RTE_FLOW_ITEM_TYPE_END; break; + case RTE_FLOW_ITEM_TYPE_GENEVE: + ether_type_m = item->mask ? + ((const struct rte_flow_item_geneve *) + (item->mask))->protocol : + rte_flow_item_geneve_mask.protocol; + ether_type = ((const struct rte_flow_item_geneve *) + (item->spec))->protocol; + ether_type_m = rte_be_to_cpu_16(ether_type_m); + ether_type = rte_be_to_cpu_16(ether_type); + switch (ether_type_m & ether_type) { + case RTE_ETHER_TYPE_TEB: + ret = RTE_FLOW_ITEM_TYPE_ETH; + break; + case RTE_ETHER_TYPE_IPV4: + ret = RTE_FLOW_ITEM_TYPE_IPV4; + break; + case RTE_ETHER_TYPE_IPV6: + ret = RTE_FLOW_ITEM_TYPE_IPV6; + break; + default: + ret = RTE_FLOW_ITEM_TYPE_END; + } + break; default: ret = RTE_FLOW_ITEM_TYPE_VOID; break; @@ -456,7 +479,8 @@ enum mlx5_expansion { MLX5_EXPANSION_IPV6_UDP, MLX5_EXPANSION_IPV6_TCP, MLX5_EXPANSION_IPV6_FRAG_EXT, - MLX5_EXPANSION_GTP + MLX5_EXPANSION_GTP, + MLX5_EXPANSION_GENEVE, }; /** Supported expansion of items. */ @@ -514,6 +538,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN, MLX5_EXPANSION_VXLAN_GPE, MLX5_EXPANSION_MPLS, + MLX5_EXPANSION_GENEVE, MLX5_EXPANSION_GTP), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV4_UDP, @@ -538,6 +563,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN, MLX5_EXPANSION_VXLAN_GPE, MLX5_EXPANSION_MPLS, + MLX5_EXPANSION_GENEVE, MLX5_EXPANSION_GTP), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV6_UDP, @@ -634,7 +660,13 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6), .type = RTE_FLOW_ITEM_TYPE_GTP - } + }, + [MLX5_EXPANSION_GENEVE] = { + .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH, + MLX5_EXPANSION_IPV4, + MLX5_EXPANSION_IPV6), + .type = RTE_FLOW_ITEM_TYPE_GENEVE, + }, }; static struct rte_flow_shared_action * -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:05.662242319 +0800 +++ 0045-net-mlx5-add-Ethernet-header-to-GENEVE-RSS-expansion.patch 2021-11-28 22:41:03.340207285 +0800 @@ -1 +1 @@ -From 9f151fd8dfb30946a00f6ac273df93db14d1b45d Mon Sep 17 00:00:00 2001 +From ae9d83d713a8861f4dee8cf86f91ff125b488655 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9f151fd8dfb30946a00f6ac273df93db14d1b45d ] @@ -12,2 +14,0 @@ -Cc: stable@dpdk.org - @@ -17,2 +18,2 @@ - drivers/net/mlx5/mlx5_flow.c | 34 +++++++++++++++++++++++++++++++++- - 1 file changed, 33 insertions(+), 1 deletion(-) + drivers/net/mlx5/mlx5_flow.c | 36 ++++++++++++++++++++++++++++++++++-- + 1 file changed, 34 insertions(+), 2 deletions(-) @@ -21 +22 @@ -index f657980737..205fe19cdd 100644 +index b8e11a43f5..21f018dd1d 100644 @@ -24 +25 @@ -@@ -258,6 +258,29 @@ mlx5_flow_expand_rss_item_complete(const struct rte_flow_item *item) +@@ -237,6 +237,29 @@ mlx5_flow_expand_rss_item_complete(const struct rte_flow_item *item) @@ -54 +55 @@ -@@ -530,7 +553,8 @@ enum mlx5_expansion { +@@ -456,7 +479,8 @@ enum mlx5_expansion { @@ -64 +65 @@ -@@ -574,6 +598,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { +@@ -514,6 +538,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { @@ -71,2 +72,2 @@ - .rss_types = RTE_ETH_RSS_NONFRAG_IPV4_UDP, -@@ -598,6 +623,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { + .rss_types = ETH_RSS_NONFRAG_IPV4_UDP, +@@ -538,6 +563,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { @@ -79,5 +80,7 @@ - .rss_types = RTE_ETH_RSS_NONFRAG_IPV6_UDP, -@@ -701,6 +727,12 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { - MLX5_EXPANSION_IPV6), - .type = RTE_FLOW_ITEM_TYPE_GTP, - }, + .rss_types = ETH_RSS_NONFRAG_IPV6_UDP, +@@ -634,7 +660,13 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { + .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, + MLX5_EXPANSION_IPV6), + .type = RTE_FLOW_ITEM_TYPE_GTP +- } ++ }, @@ -92 +95 @@ - static struct rte_flow_action_handle * + static struct rte_flow_shared_action *