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 15700A0540 for ; Thu, 7 Jul 2022 09:55:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 120EB406B4; Thu, 7 Jul 2022 09:55:37 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 09D3B415D7 for ; Thu, 7 Jul 2022 09:55:35 +0200 (CEST) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id CC7333F04C for ; Thu, 7 Jul 2022 07:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180534; bh=dZXLI1Eou0qGx6/CwCLa5T4CbE2Skm/3O9z105Wdhks=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ViivJ30egttPMExCYutjmLF8XhnEFjxemcz1qR5Z81CAV70SlZ7TQGI1Zro1a6/nR /18V2JpnOKk0r2mpvG95GQG+iNMA8hmEJ7Qs0+Oq1t0vWz0Lt2tpxWdNFDzI6mmXo6 eFXVDsbfLQ6Vde8o59v4nxIAlYjRPraphESj+EUMRPfCapICBgvR/doeq/g7lTn6VJ jvIfsXjpEetgy10r4z5IOYR9FUja9s8CKn8oY6gE1jzZBgue5U3+d3A8xnrpCCvC0J jhxVbsHIrYwlBBiKpCgQtxevZ+1ZPpbvms8BMmoEXmA0Zz3QKjuJ7AkbgIF/AMmI2Q jGM/v3hhQo0eg== Received: by mail-ej1-f69.google.com with SMTP id qb28-20020a1709077e9c00b0072af6ccc1aeso1288141ejc.6 for ; Thu, 07 Jul 2022 00:55:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dZXLI1Eou0qGx6/CwCLa5T4CbE2Skm/3O9z105Wdhks=; b=o/LqVESHJGBeC8AAUVr6lQ4N7/0mVcr7u1uZ9TJxBPG2+5kOkYGOkQ6n0XMDj2tYQS wcd9hYBi9HNtKlc+8jTVEnDrtvuyfBMrmpxW9D/ZKDqlQ19FmN9S2mjUQfKp52LwHgH9 2KuQep2HdRmOQdlEKRL1nVS/KGCNliy1dlVlxVqQzT82nFVSEyq8mQ2wt0XDs05m5AiL 0PgKdqqxeXn8A+v/S5Q0u+j51EbyPE1AEiDMNyTthF5DFQ4FmGSHaQSMVIh1zHU559hj rO97MrxjWTEeRSfravquz7clTt63gUnfyi3N+TDr/Itk4dPsBtGm+wvp4QDNn4cH1zZe a8bQ== X-Gm-Message-State: AJIora97vYpht1atOUMUSnhOoX8DFWHvyXBjKDPMF9qe4Cd9bkQlCumC KA6ZLtj0CSqSNDUcT0zBGuUI6fgC6wl2QhEIdAtWCtLgKmOa/yUBr2n15rnM1ZuLweQZcBih8j0 MWc3AoflY0lNzz9ybM1MpIs/Y X-Received: by 2002:a17:906:7007:b0:6ff:8028:42e with SMTP id n7-20020a170906700700b006ff8028042emr44004787ejj.278.1657180534125; Thu, 07 Jul 2022 00:55:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ujbKyijBtRW7b4IGu1QjT8CgxpkXlqkm/ApPcX+J5tmXdtgegWEuXIHzrg91wNUPHYn7s4Ng== X-Received: by 2002:a17:906:7007:b0:6ff:8028:42e with SMTP id n7-20020a170906700700b006ff8028042emr44004768ejj.278.1657180533899; Thu, 07 Jul 2022 00:55:33 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id cq9-20020a056402220900b0043a6df72c11sm7857527edb.63.2022.07.07.00.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:55:33 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Dariusz Sosnowski Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix GTP handling in header modify action' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:53:59 +0200 Message-Id: <20220707075522.194223-4-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/fa44459ab3bc5a94279ef1ff232d622cd9ad9573 Thanks. Christian Ehrhardt --- >From fa44459ab3bc5a94279ef1ff232d622cd9ad9573 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Wed, 13 Apr 2022 11:18:31 +0000 Subject: [PATCH] net/mlx5: fix GTP handling in header modify action [ upstream commit 26f22fa64e9fd66fbdba560c177ea5c9baacba5c ] GTP items were ignored during conversion of modify header actions. This caused modify TTL action to generate a wrong modify header command when tunnel and inner headers used different IP versions. This patch adds GTP item handling to modify header action conversion. Fixes: 04233f36c712 ("net/mlx5: fix layer type in header modify action") Signed-off-by: Dariusz Sosnowski Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index f7e3d92045..e4808abd64 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -135,6 +135,7 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr, case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: case RTE_FLOW_ITEM_TYPE_GENEVE: case RTE_FLOW_ITEM_TYPE_MPLS: + case RTE_FLOW_ITEM_TYPE_GTP: if (tunnel_decap) attr->attr = 0; break; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:11.374306588 +0200 +++ 0004-net-mlx5-fix-GTP-handling-in-header-modify-action.patch 2022-07-07 09:54:10.785823505 +0200 @@ -1 +1 @@ -From 26f22fa64e9fd66fbdba560c177ea5c9baacba5c Mon Sep 17 00:00:00 2001 +From fa44459ab3bc5a94279ef1ff232d622cd9ad9573 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 26f22fa64e9fd66fbdba560c177ea5c9baacba5c ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 1e9bd63635..da2ddd58cd 100644 +index f7e3d92045..e4808abd64 100644 @@ -25 +26 @@ -@@ -162,6 +162,7 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr, +@@ -135,6 +135,7 @@ flow_dv_attr_init(const struct rte_flow_item *item, union flow_dv_attr *attr,