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 AECABA0093 for ; Wed, 9 Mar 2022 17:32:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A986C410E1; Wed, 9 Mar 2022 17:32:41 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 0292D410E6 for ; Wed, 9 Mar 2022 17:32:41 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id t11so3924164wrm.5 for ; Wed, 09 Mar 2022 08:32:41 -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=HHFGFlEB7nqV70cUQCzvIyHB9NcpHVmBt9fB1ppVbdM=; b=jeiM25j3tSkz8XL0SmNFTwai1jRexEdOZ9SnDHbRa0jbV7GYpzSxKtftncchMlQRME kCxQ0jsplaSPDGInLphd22B7yXWGwoaki+zXu0m2WVoLLF5ToGu9W5ZhoKwJoKMHRn9H AFElpDtZ+mZu118rdLiSRELK1iJD7wJoT5F+sU+cXn1pewZEwbF5Q7G2rcem7nq0ZABT h/v6VAVAkm6t6eEGULyWAwW99U2SIQ9EkZoy0e33JknMOsVQXRAXveAF+y5fRNyZr7he /SOYRQv84kL7gKSEILOBzMYRP6HftjwgQ2B0Wf6W9Sc+xVrgW/4MATDbEPy2+M87UczH 0JvQ== 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=HHFGFlEB7nqV70cUQCzvIyHB9NcpHVmBt9fB1ppVbdM=; b=GwQUjE9MBLkbGhpSPWhYgd/d8CQc3kf2VKsBkZb0v0geRbWX8PpeHAKbwv0PC32WHE vgyHaFNFtZSvcdqpZw95mPQpmumhy7je2AuOg9H6VIcsn0Gex1A0Ru09O4J1t6BpdJ7Q 7qtpNgpn2Sa//hbiDihEGaD+yN9mmNisirWnzwCZuUC4CAAyYSfIHJuBY1fmDrzmzmoR MkwdFwk9jq64ney8dJ7VQzRvmvbJGbADiTKbMlng8Zbxn1Dqa66hU+XBYU2bZ5FPvno4 roPjbOBaIKrC0BdVSyYM1M0e1r3vb1JAsYLU2wRlRSNGTTHBB87vZAfY0tRAvrqmKyyK 3W8A== X-Gm-Message-State: AOAM532Rk7Q8I4VINCJBDSOjL4gNPa8jJkTo8BlL7QeE+ZfqVFJb16ua XkAfRw1ImRSE8b0MQHQol/E= X-Google-Smtp-Source: ABdhPJzHx6XJbKoOyPtc+/jSJzJLSCSHQ/LSj2Z9WyF0DN2z4uVeNPPNh2wLCCp3htq38BpUbRABeA== X-Received: by 2002:a5d:6d0f:0:b0:1f0:469d:42bb with SMTP id e15-20020a5d6d0f000000b001f0469d42bbmr331547wrq.257.1646843560741; Wed, 09 Mar 2022 08:32:40 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id m3-20020a5d6a03000000b001f06621641fsm1972197wru.96.2022.03.09.08.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:32:39 -0800 (PST) From: luca.boccassi@gmail.com To: Dmitry Kozlyuk Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix modify port action validation' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:49 +0000 Message-Id: <20220309163053.245754-33-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/331e5474b9faf4e6db16411928574d74342958b9 Thanks. Luca Boccassi --- >From 331e5474b9faf4e6db16411928574d74342958b9 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Wed, 2 Mar 2022 03:34:29 +0200 Subject: [PATCH] net/mlx5: fix modify port action validation [ upstream commit ea7cc15ab97a3f73ae4f6c0a9d9c89f5ca0374f3 ] Certain flow rules containing a modify header action for an L4 port could be erroneously rejected as invalid, because this action was counted as consuming two HW actions, while it only requires one. Fixes: 72a944dba163 ("net/mlx5: fix header modify action validation") Signed-off-by: Dmitry Kozlyuk Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index fb11ae6b40..090cc7c77f 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -363,7 +363,7 @@ enum mlx5_feature_name { #define MLX5_ACT_NUM_MDF_IPV6 4 #define MLX5_ACT_NUM_MDF_MAC 2 #define MLX5_ACT_NUM_MDF_VID 1 -#define MLX5_ACT_NUM_MDF_PORT 2 +#define MLX5_ACT_NUM_MDF_PORT 1 #define MLX5_ACT_NUM_MDF_TTL 1 #define MLX5_ACT_NUM_DEC_TTL MLX5_ACT_NUM_MDF_TTL #define MLX5_ACT_NUM_MDF_TCPSEQ 1 -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.765678510 +0000 +++ 0033-net-mlx5-fix-modify-port-action-validation.patch 2022-03-09 16:30:08.599026318 +0000 @@ -1 +1 @@ -From ea7cc15ab97a3f73ae4f6c0a9d9c89f5ca0374f3 Mon Sep 17 00:00:00 2001 +From 331e5474b9faf4e6db16411928574d74342958b9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ea7cc15ab97a3f73ae4f6c0a9d9c89f5ca0374f3 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 484ce5791e..f56115dd11 100644 +index fb11ae6b40..090cc7c77f 100644 @@ -23 +24 @@ -@@ -427,7 +427,7 @@ enum mlx5_feature_name { +@@ -363,7 +363,7 @@ enum mlx5_feature_name {