From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 36D8AA0561 for ; Thu, 27 Feb 2020 18:39:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 20D891BFAB; Thu, 27 Feb 2020 18:39:19 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id EC50C1BFA9 for ; Thu, 27 Feb 2020 18:39:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582825157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l3kAbDtZjcj5WGeMAM09zS++1nS6tr2EKQ2r9dMhfkY=; b=b8k6KRTn0SsQlpc4DJJfQPmwgU60jUbl2bwvyxzfusmCHIkb9APfFpUhykuvtSoUd+TNQE YY0yHuWVZ7RBywPz3E2DFFtz0K+ysrM/1Cde5JxcHa3wdn9IwfOJBygV0fDijuMa411FI8 pWXw20Qnqub4D/snMk3T8raqjuo9U00= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-380-PqhbBwP3OxqasGB8JUi8og-1; Thu, 27 Feb 2020 12:39:09 -0500 X-MC-Unique: PqhbBwP3OxqasGB8JUi8og-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0AABD8017CC; Thu, 27 Feb 2020 17:39:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE8F68C07F; Thu, 27 Feb 2020 17:39:04 +0000 (UTC) From: Kevin Traynor To: Matan Azrad Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 27 Feb 2020 17:38:01 +0000 Message-Id: <20200227173807.28004-10-ktraynor@redhat.com> In-Reply-To: <20200227173807.28004-1-ktraynor@redhat.com> References: <20200227173807.28004-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/mlx5: fix L3 VXLAN RSS expansion' has been queued to LTS release 18.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/02/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 rebasi= ng (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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a9151f2984adcc680e= 842cc41e34885d3dc8cbee Thanks. Kevin. --- >From a9151f2984adcc680e842cc41e34885d3dc8cbee Mon Sep 17 00:00:00 2001 From: Matan Azrad 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 Acked-by: Viacheslav Ovsiienko --- 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 28a29d0ebd..7f518fcd26 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -164,5 +164,7 @@ static const struct rte_flow_expand_node mlx5_support_e= xpansion[] =3D { =09}, =09[MLX5_EXPANSION_VXLAN] =3D { -=09=09.next =3D RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH), +=09=09.next =3D RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH, +=09=09=09=09=09=09 MLX5_EXPANSION_IPV4, +=09=09=09=09=09=09 MLX5_EXPANSION_IPV6), =09=09.type =3D RTE_FLOW_ITEM_TYPE_VXLAN, =09}, --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-27 17:26:24.255550829 +0000 +++ 0010-net-mlx5-fix-L3-VXLAN-RSS-expansion.patch=092020-02-27 17:26:23.65= 0831098 +0000 @@ -1 +1 @@ -From cd04052475995caffc1d59a199260b86f32242cc Mon Sep 17 00:00:00 2001 +From a9151f2984adcc680e842cc41e34885d3dc8cbee Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cd04052475995caffc1d59a199260b86f32242cc ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index eb6bd274e5..ce5adede30 100644 +index 28a29d0ebd..7f518fcd26 100644 @@ -36 +37 @@ -@@ -168,5 +168,7 @@ static const struct rte_flow_expand_node mlx5_support_= expansion[] =3D { +@@ -164,5 +164,7 @@ static const struct rte_flow_expand_node mlx5_support_= expansion[] =3D {