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 E778CA00C2 for ; Thu, 3 Nov 2022 10:30:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E4172427EC; Thu, 3 Nov 2022 10:30:46 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 8685540693 for ; Thu, 3 Nov 2022 10:30:46 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id o4so1720515wrq.6 for ; Thu, 03 Nov 2022 02:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qnG8uAU9Dz1LgdoVtyc4JdzFzlg5Ga8crp3eILlDS1M=; b=S3ho/G2Dys5/LGD2E1VRABn0Y2F8BZz9FHqP+0pKwjp7e6ELKzPHXCPWIQh0iMBHLg RJH3vCXpLPMz4YHIhNMnxdeIaRlTd5yAfVcVVZJvHi/W+7r1aHv2H1jNcC031b6BC/L8 FhO1TlvrLFB4dti/zE4cDZR7N4COoZWXMKndhduqff/9eAD9LJL7pf58EBgKJPSh7hi7 OHmzvP6MKdqffvIMNbSfyTRkcFgKfT46Oeudpinwvajhfstl107JudBWFbwsrjQyfnyI iB/MveDHF6cgV7UrVSt1KQ3gx7+hlG8F8AUIKggXgAeeGYoRquhxHh/rEfSc+C0zW+p/ /9pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qnG8uAU9Dz1LgdoVtyc4JdzFzlg5Ga8crp3eILlDS1M=; b=zNuKlTOSZuwEDvHIZbhuZLaW4vqPBafzvN7kEoY/m9DSnI/HAtzfF9rARlmIRIFgzi txb4pcCs7GjHfrEGj+Of0rJgMfE+xBYp+Tdn7FQCQDPxZd3rOzwHGtTh69PSTEaRQony IDqaKG9c188cqKlbmBVhQwYwNPSYITZuRoFznD8TBDM6ygRE+fveDApTmKfV8XbiYFQs vrxuYFLjLqfLXqP5UnO4BVqDESgSHLWFRc0qkRr5Mmz4caD8Qh4zxcMf1NiZbY0ZPBG+ vJozGqe9vT9gx45PVOn+ANPWaC7fBcckjvJfRBZrVfe2p+E4L/klfOfw9CmsWC80iL1n cjHg== X-Gm-Message-State: ACrzQf3tqfkbEnSgaZCbcmDz4bgTuMGz7iuTNg+sN8umPf+E+hKPf2ro W25jKZhN+4tUfrjZxMGsDDKdxv4FoIpIDo3r X-Google-Smtp-Source: AMsMyM4HTK9RBMIPE0dWlVCz8EsoA0VPGbz1X3HeeXj3MBakQfLTx5vWYnMKhs8H7Mp35+F7M/zjvg== X-Received: by 2002:adf:ef82:0:b0:234:ef87:dc8d with SMTP id d2-20020adfef82000000b00234ef87dc8dmr18456136wro.297.1667467846159; Thu, 03 Nov 2022 02:30:46 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id bu14-20020a056000078e00b0022cdb687bf9sm582086wrb.0.2022.11.03.02.30.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:30:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawei Wang Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix modify action with tunnel decapsulation' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:06 +0000 Message-Id: <20221103092758.1099402-48-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.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 11/05/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/eff9ad52b3c9669c682d288c9d18399f86fdbf17 Thanks. Luca Boccassi --- >From eff9ad52b3c9669c682d288c9d18399f86fdbf17 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 c1505b69e6..500ffaf013 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -112,6 +112,13 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr, * have the user defined items as the flow is split. */ 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; else if (layers & MLX5_FLOW_LAYER_OUTER_L3_IPV6) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:28.331185806 +0000 +++ 0048-net-mlx5-fix-modify-action-with-tunnel-decapsulation.patch 2022-11-03 09:27:25.449423912 +0000 @@ -1 +1 @@ -From 9f71a297da6b9d4be18e624107b8e0017e890154 Mon Sep 17 00:00:00 2001 +From eff9ad52b3c9669c682d288c9d18399f86fdbf17 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 c1505b69e6..500ffaf013 100644 @@ -31 +32 @@ -@@ -121,6 +121,13 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr, +@@ -112,6 +112,13 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr,