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 2BB55A0093 for ; Wed, 9 Mar 2022 12:03:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 283A2410F3; Wed, 9 Mar 2022 12:03:43 +0100 (CET) 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 AE0F540150 for ; Wed, 9 Mar 2022 12:03:41 +0100 (CET) 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 7B4573F4C2 for ; Wed, 9 Mar 2022 11:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823821; bh=Ebidg72ZNxb2W1HoxL0sCPBGkxVvYRZHM5/6Ozd72+E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RICcQjobz4915LLlUdJBkBDUZoKoJ50Pgc4pGtLXBbRbUFxtg0EsrSFpb/NMuIP9H 0NM/v7YNU5VOq5NxkYArlvKkT7zHzXd02vz/caQd4K1Fy4KpHb19MuKy1jbLxVY0UN MFin2GX5s87pV8fCs5Y2I/ZoAJrdZR1nLN4Y2XZt3PB18m1bExGAZ8WJNLBg9WX668 IJlt7DUX+R0wGqq36FAfGEFPpAMBw93JOmWIjLRJYRKtgTVfIbqDZ3ijLUW+t8jTKQ ybn+ZnJx+OigFSWjeiYoqTIeR0k0oID2EYYzt2GHBulydy4I74gGnxPGIczT9lAvtv XC9sJJEJ/sDEQ== Received: by mail-ej1-f69.google.com with SMTP id qf24-20020a1709077f1800b006ce8c140d3dso1093149ejc.18 for ; Wed, 09 Mar 2022 03:03:41 -0800 (PST) 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=Ebidg72ZNxb2W1HoxL0sCPBGkxVvYRZHM5/6Ozd72+E=; b=Rp8DcOUBYGn7tkQpkK6MjRHep+A/0exayc6ETqRLQgm3BcIbDIP4hU1zasKtU4CdlH 4hmt7VcZ7FDGuraq5w7zSiimo1bR//g2ENynFz8Ivtx8JHgdUIjh1Epp0DJa1iyZJ+RZ /mjhO2650y28u+foekCFZ0UvW+n3rr+GVHAWsVafDJqA4kMbdfnk24NVZGkZEF5myEcM Abla8Im8cvkcFoH+GFkmRX8RrnNe6+08gxrggoF7WmoMEw8BMdoW8ustTL5dd7fG70r4 Tg6/FRsTbhIeq3jvx43D2NzQWHneDXuRIrj23Lw/khOZbpGRneUD116cMZx4oSSK5e5A 5+ng== X-Gm-Message-State: AOAM532oDwODP5pwME9He5HrMjfQM4AUVV5mtm6g8ZjegRMNEg7e5YM8 aDftL5H8zI/Vy2Szqpa6/9dewDan3Ndbnr5pvNReQF1QAMV7VtmxkzXMNX++RFTmht0gaf6y2v0 2J71D4xWx+ei6MsPYkHacIzcg X-Received: by 2002:a05:6402:4316:b0:416:6770:11de with SMTP id m22-20020a056402431600b00416677011demr8433870edc.316.1646823820721; Wed, 09 Mar 2022 03:03:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfCMfn+iudfwKDvqkTaLiWQxyr5F/vRbMS++Mz+eB+qc+VZdMN4LDrgg0v91wREpmv7aWoeA== X-Received: by 2002:a05:6402:4316:b0:416:6770:11de with SMTP id m22-20020a056402431600b00416677011demr8433856edc.316.1646823820514; Wed, 09 Mar 2022 03:03:40 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id kq26-20020a170906abda00b006da87077172sm609472ejb.29.2022.03.09.03.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:03:39 -0800 (PST) From: christian.ehrhardt@canonical.com To: Dmitry Kozlyuk Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix modify port action validation' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:01:16 +0100 Message-Id: <20220309110116.1295395-45-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-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.12 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/21da1f705c5ce6444329ff339af8e153dd4330c8 Thanks. Christian Ehrhardt --- >From 21da1f705c5ce6444329ff339af8e153dd4330c8 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 caf6afd4d8..f9f4149895 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -335,7 +335,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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:45.701423554 +0100 +++ 0045-net-mlx5-fix-modify-port-action-validation.patch 2022-03-09 11:57:43.428938606 +0100 @@ -1 +1 @@ -From ea7cc15ab97a3f73ae4f6c0a9d9c89f5ca0374f3 Mon Sep 17 00:00:00 2001 +From 21da1f705c5ce6444329ff339af8e153dd4330c8 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 caf6afd4d8..f9f4149895 100644 @@ -23 +24 @@ -@@ -427,7 +427,7 @@ enum mlx5_feature_name { +@@ -335,7 +335,7 @@ enum mlx5_feature_name {