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 9A76EA0093 for ; Wed, 9 Mar 2022 17:31:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 955B240687; Wed, 9 Mar 2022 17:31:48 +0100 (CET) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id 1C9F14013F for ; Wed, 9 Mar 2022 17:31:47 +0100 (CET) Received: by mail-wm1-f45.google.com with SMTP id r187-20020a1c2bc4000000b003810e6b192aso1822793wmr.1 for ; Wed, 09 Mar 2022 08:31:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qXI7RsKDJNaape7xKe7tDLwgaPYpyGJKtglgkhwHnmk=; b=Xm5eXwaEKKeUSzYBhAOy60xhWsrFrOSEDI7HMyxIXeoIRzfioysOzJ9jnxx2a3KE/r pcC+vfqLdsLvm+MNbNRTAsd6SNAFozOZV2CQSGia2eiHU+cee7OLHT4JSGFJJ/ZHWL6Y juWn9oE6HtDhYVukGrq1Xbe3Qj6mCeuMY1lSQ5URU13BAxXITD4ZZ4GwltKbfjvG4z9E b7M0mrVVX2Dk2JQSmebswl5amdwkzIiOrdiGHvge0QssANIyRYQ8ZS0qK4J90ZBfuPYe t97YsVxeLo1PlviAqAMZRIvFRRlOqoovqPz0k9EtI/EIvz2IIWj6m9szcX/neIoU+f7x pgQA== 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=qXI7RsKDJNaape7xKe7tDLwgaPYpyGJKtglgkhwHnmk=; b=QDY9uOo3dd5rUTHGqu6DyyAPOUobh9aHX2zq+L9Rh129pZjyDPW7CCriIBNlR7bLWj rr6POIKAjW4J9Vme4GjSrs1KLtjiPeIGzE+ZiFK7ZNSutD7bUZ2EIx4cLY5IfuppICcB vOJtzx8PZu7PvzQ5uA/fC9p3q02QMavVGdh6awULwTD70sCU7xJ+37AYtAWxuZuckF5R jxAuooQn95TuaWNn6TyK98bihMsK5D3DjtnAFwXRJbANtoIBfnBjxx8Mr6EcrcT2Pdni E+KtsMHfTsqV+gBSvNFOsJ4pfFVh4/f0pO38PZ9YWfny1rfr4ViqnTpmZf9BgfqcqOOF aVng== X-Gm-Message-State: AOAM533QKrt9dzCMs8rFyFgErPMLc5lPohjFTgAC+6JnLzjGDJgen1wc YWsZBnLqBcPw/29AJ2+7vU1e8Spn1QE= X-Google-Smtp-Source: ABdhPJyRuDxJRa4MNrdeoH9AA1DqN83lRhFvnDJgust9MxBP3lRF/3Fq+XVKekHJaQJHouaZYcVKjQ== X-Received: by 2002:a05:600c:3203:b0:381:b544:7970 with SMTP id r3-20020a05600c320300b00381b5447970mr154991wmp.144.1646843506737; Wed, 09 Mar 2022 08:31:46 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id f186-20020a1c38c3000000b00382a9b91515sm5373733wma.37.2022.03.09.08.31.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:31:46 -0800 (PST) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix GRE item translation in Verbs' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:32 +0000 Message-Id: <20220309163053.245754-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-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.5 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/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8de9d40b7c9057f2c3bf89e287bc55333baa09f5 Thanks. Luca Boccassi --- >From 8de9d40b7c9057f2c3bf89e287bc55333baa09f5 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 fa7ba129fd..a0c6d23c6a 100644 --- a/drivers/net/mlx5/mlx5_flow_verbs.c +++ b/drivers/net/mlx5/mlx5_flow_verbs.c @@ -1722,6 +1722,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, struct mlx5_priv *priv = dev->data->dev_private; 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); rss_desc = &wks->rss_desc; @@ -1861,6 +1862,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, case RTE_FLOW_ITEM_TYPE_GRE: subpriority = MLX5_TUNNEL_PRIO_GET(rss_desc); item_flags |= MLX5_FLOW_LAYER_GRE; + tunnel_item = items; break; case RTE_FLOW_ITEM_TYPE_MPLS: flow_verbs_translate_item_mpls(dev_flow, items, @@ -1875,7 +1877,8 @@ 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. */ dev_flow->verbs.attr.priority = -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.127587012 +0000 +++ 0016-net-mlx5-fix-GRE-item-translation-in-Verbs.patch 2022-03-09 16:30:08.527024706 +0000 @@ -1 +1 @@ -From df4986559f24fbf669aeaa33e5e23563f7fc90b3 Mon Sep 17 00:00:00 2001 +From 8de9d40b7c9057f2c3bf89e287bc55333baa09f5 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 fa7ba129fd..a0c6d23c6a 100644 @@ -27 +28 @@ -@@ -1679,6 +1679,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, +@@ -1722,6 +1722,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, @@ -35 +36 @@ -@@ -1818,6 +1819,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, +@@ -1861,6 +1862,7 @@ flow_verbs_translate(struct rte_eth_dev *dev, @@ -43 +44 @@ -@@ -1832,7 +1834,8 @@ flow_verbs_translate(struct rte_eth_dev *dev, +@@ -1875,7 +1877,8 @@ flow_verbs_translate(struct rte_eth_dev *dev,