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 CA30D45E41 for ; Sat, 7 Dec 2024 09:03:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD21240E5E; Sat, 7 Dec 2024 09:03:03 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2060.outbound.protection.outlook.com [40.107.220.60]) by mails.dpdk.org (Postfix) with ESMTP id 49B3D40E50 for ; Sat, 7 Dec 2024 09:03:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nc0mwOZhnRmcscugt/zQBZxTcnqeNBJ+AhniYtv4J2ZrTONitHBbVZGg1qlo0mRvUy9M+MUVwPsB1c89B9YBvy9DFYnYblIbpD6KLqP0totgZG1PYyomCzGcfAHeP5psfWDSHl58qbyNx9uLLZx9G3+l4gEFSOmTBMCpt3qW5XI/rVprrfYkfo4gdrWFGr0nJAWiwoDTGCgCbTJ49O9ySF+yfcKdE617AaKawkLrHfP6joCiYYdL72L5BwPyZvOW9CR86blJRYIS2EkpTyWXeboVtHqR91mvA7wDSRfJ7PIEUQIwKp99zNuKR6NxGHEGafKMxlRKY8eLbR2hkdya0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=M3KDFMycvrgZPrqLOQubzCULCMnKZhhLma/qUJNqC+k=; b=EqBu//YEgbhFvKjrzHZfW/oSX5tAK2J0TNOrMw5VCT+pCh/uLjHRvo+r5lYqGeiu8RTaiC+fDyV4+JOY36RV41RJdh4jVoT6LOX2pieUj6sW71iv7+3S1siuC9+sNgvoIEHLlLHkVFbtVgHbXT0wpblCpCwBuBT0xqLqCcv7L4rFnSeX5k0Z3iD9+f5NWTIZATNB2RMWHhq5+h4OdIGgF5vMs2M5dZgRsboG1OQ4AHi/85WZUU1/gr2EaP4PdPTRyiy+C5j+Ad09h8cWOOgUTPOOYUg6huXC6yTsQaDOIy8NOuqsrHBbAGpow5G7J352BMK6QNiMXYNfwa1UWC5ZXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=M3KDFMycvrgZPrqLOQubzCULCMnKZhhLma/qUJNqC+k=; b=NnVOFRDgyHA+K2ttT7qWKniVuTp3jjIwrbj4SFNkz1/pXfn6isNl2r9OHyuNELQ3a1yfOscnFQJEEUt9/4Lou/xX9CRKGVvuhg931MkFf0NsC/JWPeGE7CENdJs0ZfD80a2DPNRgPKdRQ1FIZ90O5aQlMG3sjdrfVKQjmPGSX22JUwMuvLEaGRA2evYjMrcWRg9V0IBRqE+EaKWZyYS8zPOJBZaYmrqO/xz0LwkP17UIHGQ/nI9H3QsiPpAgQ9kO9wDr5F06LG0d6O4mHZfAh0N0H9fYFzDZbKNt2FLcbTyfyDyUzQDc8RmI29TAPItvmkOtoqvB1uoV4CX7R098MQ== Received: from BYAPR11CA0037.namprd11.prod.outlook.com (2603:10b6:a03:80::14) by CYYPR12MB8989.namprd12.prod.outlook.com (2603:10b6:930:c2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.25; Sat, 7 Dec 2024 08:02:56 +0000 Received: from SJ1PEPF00001CE3.namprd05.prod.outlook.com (2603:10b6:a03:80:cafe::5b) by BYAPR11CA0037.outlook.office365.com (2603:10b6:a03:80::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.11 via Frontend Transport; Sat, 7 Dec 2024 08:02:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SJ1PEPF00001CE3.mail.protection.outlook.com (10.167.242.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:02:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:02:43 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:02:41 -0800 From: Xueming Li To: Gregory Etelson CC: Xueming Li , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix non-template flow action validation' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:35 +0800 Message-ID: <20241207080055.488538-18-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE3:EE_|CYYPR12MB8989:EE_ X-MS-Office365-Filtering-Correlation-Id: f4352039-eb48-4180-bf63-08dd16958f44 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ul9zrjBTOcvgWA8n9GwVl42fhZkfdRvKK8dWzowg3KEr6p7t1Ujfa8ZoZbcR?= =?us-ascii?Q?mef633D7MCp5vXN92UU8EPVh41Rbcn2ZfWOL+RCeoGwln3qKNySYEbXWxe3/?= =?us-ascii?Q?svGXwXuCr6D/XgYxzvflE4HdPVJQ4gxKJrERc3+q6BnQaZTyLvQZF68d7AYN?= =?us-ascii?Q?TBCV7DfEdEMkxQoEr96SnthtYbJlyIgBB5JV5UDG6A1+yJ9YnH4+X2YTVl9w?= =?us-ascii?Q?ps8QcxDmWAYn2w84+qDU9i7HQMC/mxW9o1TZBZ+LsB0vq4tl9clMN97ffniV?= =?us-ascii?Q?q9AlhTr3atVqlB/IWTYl9mXveBH3buV7ygHLqQP+ahIm1ONaekBCX9Zbzzv5?= =?us-ascii?Q?5qaWUp2T1TjfD7DeSg+kKaIShhOGJtrQ1T4NfxgWder1QJRg9VRrWzlKybC+?= =?us-ascii?Q?7fGaIh4H5WxxH5sFA6boHBeJxCLUmWZccj71bjb8Wa1jwv+OelmZMpceKv8k?= =?us-ascii?Q?XKEGgcVwLDwMmyV2BbNwf+pEfdzS101jb3KvFvhGKB7z9L+LKWZXVGC62uUb?= =?us-ascii?Q?EOgvtZsCTi73OeD25fuU/tMpG/HM7CbNUpw9BSl/P3hSFJ8tD6hFmd/2kVGm?= =?us-ascii?Q?HYLGisiJaL6lLzLZ2Q2d1UXK2YCvYOszeHkmcL8Xhr4idTgvJ+9Rw6GM6FZD?= =?us-ascii?Q?G3EELYL3ZfnBPYjzz4sEYijHycZ5ylIMlKdqj0aDBNfywP1eJJEc8EoPvT6q?= =?us-ascii?Q?Itre1UlHZf9dqdPI/Hf5lcLKMGvKUG5+nN3y8lQQhPXP4AmuefG4P4xOZyC2?= =?us-ascii?Q?Exe7Uwlc+PlERRC/DU9twt1ALbBuQJFOx4xpOV++D/UNpv5h5aSYAGF9QWc6?= =?us-ascii?Q?Zz0kuTPnATiZSZmYP1BYzqb4/U+FRBKQchsabls8ryGHCkfr/sF8miMj2dmN?= =?us-ascii?Q?9Mf7VattP3oe3b1RBjTJnzgk9swAm2XsrjEiD8kn+yR2sUeo82SAbkJhdo/s?= =?us-ascii?Q?pK9fpitsmqONSREqJQf9YDFYrYSKADhEYRjGV6g5cYCY83TZiSzsm9iaCgZ2?= =?us-ascii?Q?1vyvBLJ8z2T47RbcJAC+aPXLrxphJPftFBmoz5bYoqNXeus5FvsGq+wJQJEZ?= =?us-ascii?Q?MFnVj58ThLoN0bKopKrvBP5oKQb8cR5Gd0jDhrojKUAh7P3wB+zklCVG1OUE?= =?us-ascii?Q?0IOtxOOoGE8muxHelJ0sdT8a4kTCQHOQtwfVqSdRL0ESH4rsoIuMXxxf9r0Z?= =?us-ascii?Q?hq59emWuniAaqDMMjQMjSpS8MKh5/SP9N11TgHo2d3nvVNlkEQ4ZJuAdTJqV?= =?us-ascii?Q?zHsobKHasm7Cd9QQlPoeSnpKteBrIGeimpNgbHbqxKP7IBpzADV/xlxXKrRm?= =?us-ascii?Q?37HUg06hIaDpIo3u8qSfLLab5IY+1TK1CAnigo86SQJc7xqhbyblSINQUEFZ?= =?us-ascii?Q?cyFhZdecs9GhCgA9eVEWWMoKxHuJ2l8RocZR2Rl3xqBMTz0yufVlVQ/NIJI2?= =?us-ascii?Q?fo7/XkubgurRQf5OFvmgDSZzUPo/YxqF?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:02:56.5438 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4352039-eb48-4180-bf63-08dd16958f44 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ1PEPF00001CE3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8989 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 23.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=f782c65a9f7bc4797770b9688bb9ddcac21cf3bf Thanks. Xueming Li --- >From f782c65a9f7bc4797770b9688bb9ddcac21cf3bf Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 27 Oct 2024 16:36:59 +0200 Subject: [PATCH] net/mlx5: fix non-template flow action validation Cc: Xueming Li [ upstream commit ee76b173b2e93ab4a0c9b4153191965259dae972 ] Remove HWS actions template validation for non-template API setup. The non-template API does not have action masks, and action templates are created internally by the PMD. The existing validation was incorrectly checking action parameters in non-existent masks. This change ensures that the HWS actions template validation is only performed for the template API, where action masks are available and the validation is meaningful. Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index ca2611942e..5c611b03b9 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -6526,8 +6526,7 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, uint32_t expand_mf_num = 0; uint16_t src_off[MLX5_HW_MAX_ACTS] = {0, }; - if (mlx5_flow_hw_actions_validate(dev, attr, actions, masks, - &action_flags, error)) + if (mlx5_flow_hw_actions_validate(dev, attr, actions, masks, &action_flags, error)) return NULL; for (i = 0; ra[i].type != RTE_FLOW_ACTION_TYPE_END; ++i) { switch (ra[i].type) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:44.719138519 +0800 +++ 0017-net-mlx5-fix-non-template-flow-action-validation.patch 2024-12-06 23:26:43.883044829 +0800 @@ -1 +1 @@ -From ee76b173b2e93ab4a0c9b4153191965259dae972 Mon Sep 17 00:00:00 2001 +From f782c65a9f7bc4797770b9688bb9ddcac21cf3bf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ee76b173b2e93ab4a0c9b4153191965259dae972 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -21,2 +23,2 @@ - drivers/net/mlx5/mlx5_flow_hw.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + drivers/net/mlx5/mlx5_flow_hw.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) @@ -25 +27 @@ -index 6081ebc7e2..94c9ecd165 100644 +index ca2611942e..5c611b03b9 100644 @@ -28,3 +30,3 @@ -@@ -7873,8 +7873,8 @@ __flow_hw_actions_template_create(struct rte_eth_dev *dev, - uint32_t tmpl_flags = 0; - int ret; +@@ -6526,8 +6526,7 @@ flow_hw_actions_template_create(struct rte_eth_dev *dev, + uint32_t expand_mf_num = 0; + uint16_t src_off[MLX5_HW_MAX_ACTS] = {0, }; @@ -34,2 +36 @@ -+ if (!nt_mode && mlx5_flow_hw_actions_validate(dev, attr, actions, masks, -+ &action_flags, error)) ++ if (mlx5_flow_hw_actions_validate(dev, attr, actions, masks, &action_flags, error))