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 E765BA0093 for ; Thu, 10 Mar 2022 13:12:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E149F4113E; Thu, 10 Mar 2022 13:12:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 8CDC34113E for ; Thu, 10 Mar 2022 13:12:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914333; 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=pGKyMns5nYw2Loc5tCespxcEudftac0tj2nIc1QA9T4=; b=Y5464CeRSK2pOuEvCEDMbIBdzk5AS5iqUGret0t+QaVoqT+T8NOySCU3pcwgcI2DjanYK/ 1DZOpMNdxMvJajj1zN8dbka7f0EZzRhSUEt9ZJy8Nvy/6gGm2coWZG3kEfVtTfM0gbp8Jk knuebhvLZPboH+qJnYt1+KJottYDiVs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-198-ABuV__OaMH2A2xsY_e7ooA-1; Thu, 10 Mar 2022 07:12:08 -0500 X-MC-Unique: ABuV__OaMH2A2xsY_e7ooA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 05345800D55; Thu, 10 Mar 2022 12:12:07 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81E302D1F8; Thu, 10 Mar 2022 12:12:05 +0000 (UTC) From: Kevin Traynor To: Dmitry Kozlyuk Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix modify port action validation' has been queued to stable release 21.11.1 Date: Thu, 10 Mar 2022 12:11:15 +0000 Message-Id: <20220310121127.1324802-9-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/14/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/0036f3941e4f82b8848cc4dc8d9c951f8b38b681 Thanks. Kevin --- >From 0036f3941e4f82b8848cc4dc8d9c951f8b38b681 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 f8bce92e9f..64335b8670 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -427,5 +427,5 @@ enum mlx5_feature_name { #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 -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-10 12:05:31.737846771 +0000 +++ 0016-net-mlx5-fix-modify-port-action-validation.patch 2022-03-10 12:05:31.280630805 +0000 @@ -1 +1 @@ -From ea7cc15ab97a3f73ae4f6c0a9d9c89f5ca0374f3 Mon Sep 17 00:00:00 2001 +From 0036f3941e4f82b8848cc4dc8d9c951f8b38b681 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 f8bce92e9f..64335b8670 100644 @@ -23 +24 @@ -@@ -428,5 +428,5 @@ enum mlx5_feature_name { +@@ -427,5 +427,5 @@ enum mlx5_feature_name {