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 EA8F3A00C2 for ; Tue, 8 Mar 2022 15:16:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E57334068B; Tue, 8 Mar 2022 15:16:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7CB0F4068B for ; Tue, 8 Mar 2022 15:16:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748965; 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=TGBgBscOS4P7zd90U29CuOfEkOE6ApoeaqWisGZ9xR4=; b=B3cXoK2qLi2aMEO6brKAM1bdANwkIyEooM4HGzMD2GwLR3k+8YMg2u8dowUuEMhDdKLAMV lgOL2Dq8aG98/200WXlqFlK3Gka6LrdNSNGureXQ4i4BXte6VfGqu7yQvSt9JpmYpV6+OR nmJTkeYkfjQ8BU6t1drwtwTl4NQZreU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-346-C9ojNJbIP6yhcRHoXDgBuA-1; Tue, 08 Mar 2022 09:16:01 -0500 X-MC-Unique: C9ojNJbIP6yhcRHoXDgBuA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 962241854E27; Tue, 8 Mar 2022 14:16:00 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71F1284034; Tue, 8 Mar 2022 14:15:59 +0000 (UTC) From: Kevin Traynor To: Gregory Etelson Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix GRE item translation in Verbs' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:39 +0000 Message-Id: <20220308141500.286915-24-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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 03/14/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ac14a09ded84ddabd7bb3194297191646179181c Thanks. Kevin --- >From ac14a09ded84ddabd7bb3194297191646179181c Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Mon, 28 Feb 2022 11:53:01 +0200 Subject: [PATCH] net/mlx5: fix GRE item translation in Verbs [ upstream commit df4986559f24fbf669aeaa33e5e23563f7fc90b3 ] GRE item translation must set inner protocol value. For that reason the item is not translated inplace when PMD translation iterates over flow items, but moved after the loop, when all inner types are discovered. If PMD does not translate GRE flow item inside the translation loop it must save the GRE item for access outside the loop. Fixes: 985b479267aa ("net/mlx5: fix GRE protocol type translation for Verbs") Signed-off-by: Gregory Etelson Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_verbs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c index 90ccb9aaff..66a2711e8b 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -1680,4 +1680,5 @@ flow_verbs_translate(struct rte_eth_dev *dev, struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace(); struct mlx5_flow_rss_desc *rss_desc; + const struct rte_flow_item *tunnel_item = NULL; MLX5_ASSERT(wks); @@ -1819,4 +1820,5 @@ flow_verbs_translate(struct rte_eth_dev *dev, subpriority = MLX5_TUNNEL_PRIO_GET(rss_desc); item_flags |= MLX5_FLOW_LAYER_GRE; + tunnel_item = items; break; case RTE_FLOW_ITEM_TYPE_MPLS: @@ -1833,5 +1835,6 @@ flow_verbs_translate(struct rte_eth_dev *dev, } if (item_flags & MLX5_FLOW_LAYER_GRE) - flow_verbs_translate_item_gre(dev_flow, items, item_flags); + flow_verbs_translate_item_gre(dev_flow, tunnel_item, + item_flags); dev_flow->handle->layers = item_flags; /* Other members of attr will be ignored. */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.028810204 +0000 +++ 0024-net-mlx5-fix-GRE-item-translation-in-Verbs.patch 2022-03-08 13:55:28.465315078 +0000 @@ -1 +1 @@ -From df4986559f24fbf669aeaa33e5e23563f7fc90b3 Mon Sep 17 00:00:00 2001 +From ac14a09ded84ddabd7bb3194297191646179181c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit df4986559f24fbf669aeaa33e5e23563f7fc90b3 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index f08aa7a770..85f0788222 100644 +index 90ccb9aaff..66a2711e8b 100644