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 3EA75A0A02 for ; Mon, 17 May 2021 18:13:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34EF2410F9; Mon, 17 May 2021 18:13:08 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id A4B4A40041 for ; Mon, 17 May 2021 18:13:06 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifre-0007qc-ED; Mon, 17 May 2021 16:13:06 +0000 From: Christian Ehrhardt To: Xiaoyu Min Cc: Matan Azrad , dpdk stable Date: Mon, 17 May 2021 18:08:12 +0200 Message-Id: <20210517161039.3132619-63-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: support RSS expansion for IPv6 GRE' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/bfbdb7ac71858ac9af7217dd922f52b8f3115f57 Thanks. Christian Ehrhardt --- >From bfbdb7ac71858ac9af7217dd922f52b8f3115f57 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Thu, 18 Mar 2021 11:03:57 +0000 Subject: [PATCH] net/mlx5: support RSS expansion for IPv6 GRE [ upstream commit 048f0d45e3420cc3569f60e2d9b5ee447ae34fd1 ] Currently RSS expansion only support IPv4 as GRE payload or delivery protocol (RFC2784). IPv6 as GRE payload or delivery protocol (RFC7676) is not supported. This patch add RSS expansion for RFC7676 so PMD can expand flow item correctly. Fixes: f4b901a46aec ("net/mlx5: add flow GRE item") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 2311f424e0..7925f24243 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -149,7 +149,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { (MLX5_EXPANSION_OUTER_IPV6_UDP, MLX5_EXPANSION_OUTER_IPV6_TCP, MLX5_EXPANSION_IPV4, - MLX5_EXPANSION_IPV6), + MLX5_EXPANSION_IPV6, + MLX5_EXPANSION_GRE), .type = RTE_FLOW_ITEM_TYPE_IPV6, .rss_types = ETH_RSS_IPV6 | ETH_RSS_FRAG_IPV6 | ETH_RSS_NONFRAG_IPV6_OTHER, @@ -177,7 +178,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { .type = RTE_FLOW_ITEM_TYPE_VXLAN_GPE, }, [MLX5_EXPANSION_GRE] = { - .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4), + .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4 + MLX5_EXPANSION_IPV6), .type = RTE_FLOW_ITEM_TYPE_GRE, }, [MLX5_EXPANSION_MPLS] = { -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:31.997656334 +0200 +++ 0063-net-mlx5-support-RSS-expansion-for-IPv6-GRE.patch 2021-05-17 17:40:29.215809823 +0200 @@ -1 +1 @@ -From 048f0d45e3420cc3569f60e2d9b5ee447ae34fd1 Mon Sep 17 00:00:00 2001 +From bfbdb7ac71858ac9af7217dd922f52b8f3115f57 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 048f0d45e3420cc3569f60e2d9b5ee447ae34fd1 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index d46fc333d1..de4e4a374a 100644 +index 2311f424e0..7925f24243 100644 @@ -26 +27 @@ -@@ -499,7 +499,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { +@@ -149,7 +149,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { @@ -36 +37 @@ -@@ -527,7 +528,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { +@@ -177,7 +178,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { @@ -40,2 +41,2 @@ -- .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4), -+ .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, +- .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4), ++ .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4