From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 290A1A055A
for <public@inbox.dpdk.org>; Thu, 27 Feb 2020 10:35:04 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 1D5DB1BFE9;
Thu, 27 Feb 2020 10:35:04 +0100 (CET)
Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com
[209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 5DCAA1BFE9
for <stable@dpdk.org>; Thu, 27 Feb 2020 10:35:03 +0100 (CET)
Received: by mail-wm1-f67.google.com with SMTP id a5so2687258wmb.0
for <stable@dpdk.org>; Thu, 27 Feb 2020 01:35:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=EyAf4xKh7u/ynHrWW0NZrSseqEmYRZrz+4w1Frwpy4g=;
b=o7M/Lc+rr6px6noagdqJgnLzYZ9AZIgo7an33pR0rHwZIwPtbD2Glur3G05gP2xRZo
gjcwdlh87A0m0R99m5tj0qSsmfaNjCy2P+A9fynOnUuPxwCkcR4lxHHGVn2/Ei6X1BN8
e5rhJOqb2I06RcdGBEzEDe50DVtO+ANJtiGRu99qCJoQHon2typyly3uwnHr+WYneJx5
6WwWYzCQmGFNdBM3MAgVvFLpJd4iGV0IcTG6b06bIHVy6dA+tpruHitFkDGX4Wrp9I2S
RKVy4GRNhI0aKQBDED0bAE+TeKmjTqZyp73iB/yvRxdrP9AqJKVRS1tQbzRiCBm08ans
722g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=EyAf4xKh7u/ynHrWW0NZrSseqEmYRZrz+4w1Frwpy4g=;
b=TzPeBQ8Q/LnzB8PwsS6emSIBfYLQMUY5JXm6sbuPj19OTbTxBQ2QGuTYBHDDXhUXNp
713Dukg+c6X45sikHEqCbxcJEx/lxNA1VrAsWEt66gLlWGWSYcSHqP8+8jq6GJHPu4dl
PJEDfvAR8IU2/D2kTUgFszN8XS6jxsDneLXXLitDrs1P6mywBl/j5qZfgmwaWNQFStVE
xsYiU/s41qDVuodwPTTrzxI9KyfBobqdjh3A4uA8AkZRkaQrLV6uoiZPF9tEutotfMWV
ryk2/5MDMSl/Hp5iRv4RQx5i9iUttP6X9/Ssrt9xJVHDJSCxC2Be9+QseOcYgcvi9sof
/1Wg==
X-Gm-Message-State: APjAAAUE3t4o0rn29H/ljkzOpIDje10XgQi9fXz5JQjahYe3zdpSS3As
rOehkuFX9s3UFUiY0hVC5sI=
X-Google-Smtp-Source: APXvYqzdl2w0OWXNZ906sbgQgo59b+BghKJSSVgp6e/XOLjaSKVYp5ZFrHXQkjEMv0xU7hM6aBZCaA==
X-Received: by 2002:a05:600c:20f:: with SMTP id
15mr4078494wmi.128.1582796103100;
Thu, 27 Feb 2020 01:35:03 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id a7sm6446485wmj.12.2020.02.27.01.35.02
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 27 Feb 2020 01:35:02 -0800 (PST)
From: luca.boccassi@gmail.com
To: Matan Azrad <matan@mellanox.com>
Cc: Viacheslav Ovsiienko <viacheslavo@mellanox.com>,
dpdk stable <stable@dpdk.org>
Date: Thu, 27 Feb 2020 09:33:39 +0000
Message-Id: <20200227093402.17690-19-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com>
References: <20200217174546.25334-54-luca.boccassi@gmail.com>
<20200227093402.17690-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/mlx5: fix L3 VXLAN RSS expansion' has been
queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/20. 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.
Thanks.
Luca Boccassi
---
>From 17d61f47de846dc3901cabfef961afc5e48cb7a6 Mon Sep 17 00:00:00 2001
From: Matan Azrad <matan@mellanox.com>
Date: Wed, 19 Feb 2020 08:29:36 +0000
Subject: [PATCH] net/mlx5: fix L3 VXLAN RSS expansion
[ upstream commit cd04052475995caffc1d59a199260b86f32242cc ]
The RSS expansion feature was introduced to split RSS flows according to
the adjustment between the RSS types and the flow items.
The expansion function gets an item tree for the above adjustment from
the caller which reflects the HW needs.
The standard vxlan header next protocol is always Ethernet while there
are some Mellanox customers who use their own method to allow L3
headers after the vxlan tunnel header.
The expansion tree of mlx5 PMD didn't expect to get L3 headers after the
vxlan header what caused a failure in flow creation when inner RSS is
requested on L3 after vxlan flow.
Add IPV4 and IPV6 as optional headers after vxlan in the RSS expansion
tree to allow L3 tunnel support for vxlan.
Fixes: f4f06e361516 ("net/mlx5: add flow VXLAN item")
Signed-off-by: Matan Azrad <matan@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
drivers/net/mlx5/mlx5_flow.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index b2ab5491ce..a7ddc161c8 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -165,7 +165,9 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
.rss_types = ETH_RSS_NONFRAG_IPV6_TCP,
},
[MLX5_EXPANSION_VXLAN] = {
- .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH),
+ .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH,
+ MLX5_EXPANSION_IPV4,
+ MLX5_EXPANSION_IPV6),
.type = RTE_FLOW_ITEM_TYPE_VXLAN,
},
[MLX5_EXPANSION_VXLAN_GPE] = {
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-27 09:31:56.456237294 +0000
+++ 0019-net-mlx5-fix-L3-VXLAN-RSS-expansion.patch 2020-02-27 09:31:55.739945903 +0000
@@ -1,8 +1,10 @@
-From cd04052475995caffc1d59a199260b86f32242cc Mon Sep 17 00:00:00 2001
+From 17d61f47de846dc3901cabfef961afc5e48cb7a6 Mon Sep 17 00:00:00 2001
From: Matan Azrad <matan@mellanox.com>
Date: Wed, 19 Feb 2020 08:29:36 +0000
Subject: [PATCH] net/mlx5: fix L3 VXLAN RSS expansion
+[ upstream commit cd04052475995caffc1d59a199260b86f32242cc ]
+
The RSS expansion feature was introduced to split RSS flows according to
the adjustment between the RSS types and the flow items.
@@ -21,7 +23,6 @@
tree to allow L3 tunnel support for vxlan.
Fixes: f4f06e361516 ("net/mlx5: add flow VXLAN item")
-Cc: stable@dpdk.org
Signed-off-by: Matan Azrad <matan@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
@@ -30,10 +31,10 @@
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index eb6bd274e5..ce5adede30 100644
+index b2ab5491ce..a7ddc161c8 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -167,7 +167,9 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
+@@ -165,7 +165,9 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = {
.rss_types = ETH_RSS_NONFRAG_IPV6_TCP,
},
[MLX5_EXPANSION_VXLAN] = {