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 629A7A054A for ; Tue, 25 Oct 2022 17:09:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FC6042C51; Tue, 25 Oct 2022 17:09:39 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0A9AA42C3C for ; Tue, 25 Oct 2022 17:09:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710577; 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=t5IjSuHDhMCOUrx4AeFLiZPp4AMUsGUhGVKQYr1Btms=; b=KY5kybUgCEefvCFuOzvV2VmcCAUV2FcqQMbCi2p1V3VOom8TeKH3g1T5FlAo7qVcOEJSXc aQ19iFC3rJ1iJgpnKsaYAPORnrwfojPeQbPfk9qjEA8NOnBOw6MYkDKWUUBTBAeXqkj/1p Vuv/hp7SVudCVW3o1VeTW3Fru3I/8sM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-73-1ggcJWquMPmxS3knA2sGog-1; Tue, 25 Oct 2022 11:09:36 -0400 X-MC-Unique: 1ggcJWquMPmxS3knA2sGog-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE4641C0BC68; Tue, 25 Oct 2022 15:09:35 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1059047505E; Tue, 25 Oct 2022 15:09:34 +0000 (UTC) From: Kevin Traynor To: Jiawei Wang Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix modify action with tunnel decapsulation' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:05 +0100 Message-Id: <20221025150734.142189-70-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.3 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/01/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/9412d614c2759a971c72056a94451f7ce55ffcf6 Thanks. Kevin --- >From 9412d614c2759a971c72056a94451f7ce55ffcf6 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Thu, 1 Sep 2022 05:11:56 +0300 Subject: [PATCH] net/mlx5: fix modify action with tunnel decapsulation [ upstream commit 9f71a297da6b9d4be18e624107b8e0017e890154 ] The driver splits the flow with sample action into two sub-flows, sub prefix flow and sub suffix flow. In the case of tunnel flow including a decap action, the driver should translate the inner as outer for actions coming after the decap action. In the case of flow splitting, the packet layers, used to detect the attributes, are inherited from the prefix flow to the suffix flow but the driver wrongly didn't handle the decap adjustment and the inner layers didn't shift to the outer. This patch adjusts the inherited layers in case of decap. Fixes: 6e77151286b2 ("net/mlx5: fix match information in meter") Signed-off-by: Jiawei Wang Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 70031d3dc9..2a976d843b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -122,4 +122,11 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr, */ if (layers) { + if (tunnel_decap) { + /* + * If decap action before modify, it means the driver + * should take the inner as outer for the modify actions. + */ + layers = ((layers >> 6) & MLX5_FLOW_LAYER_OUTER); + } if (layers & MLX5_FLOW_LAYER_OUTER_L3_IPV4) attr->ipv4 = 1; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.131091988 +0100 +++ 0070-net-mlx5-fix-modify-action-with-tunnel-decapsulation.patch 2022-10-25 14:18:58.493798385 +0100 @@ -1 +1 @@ -From 9f71a297da6b9d4be18e624107b8e0017e890154 Mon Sep 17 00:00:00 2001 +From 9412d614c2759a971c72056a94451f7ce55ffcf6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9f71a297da6b9d4be18e624107b8e0017e890154 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 52f1361a14..535b620ed4 100644 +index 70031d3dc9..2a976d843b 100644