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 DA7F946C54 for ; Wed, 30 Jul 2025 17:02:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D28CD402C3; Wed, 30 Jul 2025 17:02:45 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2054.outbound.protection.outlook.com [40.107.220.54]) by mails.dpdk.org (Postfix) with ESMTP id D9FC5402C3 for ; Wed, 30 Jul 2025 17:02:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yKXxInbmu3SwoDngIhOIGTAHnX6p0g5YvjGb7Fq2UspFE+N5zHQeRNsqzIT8exNOT0Ah+027NfF48JoHOdJTu9B8YXi0+q77HTstkOSJqqpn+lG/BpjTZPjTTGA3Ocj+IROz73EMybYPRT5C4HAgtZsRmgWBawnuoB5DQdtHXDbVKJBzpUvyV7u0uAv/PkrMFPrWvUAzMQGgKPP9ScQ7+8ZYyooy9taSstgFK+kDb3WwRjk4NkxzbNqMgzmskXGdWoaiQQheaapKSB9lzqB/SPUFU5caBL9oB3zcoTH9WuUnduiUrY7fj2ghmNDr9zuxOCFhi4ijNZMrrcVBuqvaBw== 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=7Zad3aknk+6Nvlv5aeFVEW/It7FdvIijFhymj1lQckQ=; b=JZ+mU6DEBXqrNu4wq1PI/6yhQSaJEjBlzOwR12d1MqYWvtVtMcx4B25n67Y+umEcK9edKLuVVIGDY31NeJ8j5xzRr6I19BAM3pS2bRiOXU2eIGdOjC9rR4BfgWSpFNJK13ICteXaV7579mfTWzrzwf8qJ+jsGE0pIayCIR8msMiIUqmb9xDiRYosj/vBBmOTNoeUlCs3PuwE5VfwvLbn1uraqoQJMQ8nc0k5C01X7f36dXyoKyoxrzhTIWbGHSNOjGwXRRn5bvhZZNfkV2mgrjPgPLTHLuzMkax7pWZeX8QHGUtGTx/4ojjf5wIzsdOn+FO52NLu3Wmph6bVfL0gTw== 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=7Zad3aknk+6Nvlv5aeFVEW/It7FdvIijFhymj1lQckQ=; b=nzjgJOg2QyPHZGHJwNOEXrwMddWQqo6aBecdilBksxcV65OTfNP/HteTHnd0jF3k/y3rRBfDi6q1X6z7+x0qVeBmvD9b8rw14U2KN+Ib2lwQCU8inubj92Uf3V3qi3dlVD1JAG0w4p+jWdAZhXurCTvTmxZ0V9hV0QHhUKh1VB4Hdn/N65TSQ2BxIqgHfukFBnu8M2iENe5Jv7Q5aNsTH/xSY5O7uHwVJA7BEDefVrEswLJFDI0oL8PAOfbgucIN+ezqAgMB0zr8GkFMBZ0LJjysj+BLwb70ZnRGH+WsrCHkKULAA36/I52dk5QkP3VnFefmD312QRSljO7GMgnXcg== Received: from BN1PR10CA0005.namprd10.prod.outlook.com (2603:10b6:408:e0::10) by BY5PR12MB4164.namprd12.prod.outlook.com (2603:10b6:a03:207::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.13; Wed, 30 Jul 2025 15:02:38 +0000 Received: from BL6PEPF0002256F.namprd02.prod.outlook.com (2603:10b6:408:e0:cafe::49) by BN1PR10CA0005.outlook.office365.com (2603:10b6:408:e0::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.13 via Frontend Transport; Wed, 30 Jul 2025 15:02:38 +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 BL6PEPF0002256F.mail.protection.outlook.com (10.167.249.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 15:02:38 +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.14; Wed, 30 Jul 2025 08:02:12 -0700 Received: from nvidia.com (10.126.230.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.14; Wed, 30 Jul 2025 08:02:09 -0700 From: Xueming Li To: Dariusz Sosnowski CC: Xueming Li , Bing Zhao , "dpdk stable" Subject: patch 'net/mlx5: fix masked indirect age action validation' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 22:56:30 +0800 Message-ID: <20250730145633.245984-22-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730145633.245984-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0002256F:EE_|BY5PR12MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: c241d5cb-f022-4440-63ac-08ddcf7a1ffc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?GAst0FrRw2umsSfzu9ukjQUS8/1EElBi57j0vf4QAKfUicOkpS+4jN45SM/w?= =?us-ascii?Q?0Q242f5iEhXaNqwnabFu7MH1rYQVWxKnuaXT4xssUzj5WG18xk42F3lZyueg?= =?us-ascii?Q?QRFSIqifop9NXNGgvUnedtZwOA9zywtRVENbH/Af/f5yXPJ+3FniX5ash1TL?= =?us-ascii?Q?6vLsLySuvOXrQ5UY7mEEppVHVBmbzNF62Za9LG08x8Ggl1GRSvGJz4mAxg+g?= =?us-ascii?Q?LUzixO54v197jdBLTnS/F8U156ITJc9iEatV5KBDbLCYmYfWdyl23F5vNc7B?= =?us-ascii?Q?vNN0Hidg3Es99QsGJ0zs1GlV6E5IxUyWPp1WbFi9EMreAQS/yBwHjS439IRO?= =?us-ascii?Q?0BJPwoNHSM5mBnjB+A+XayIFJXgIVwZ+BAl51srfCWr0v9JKH68KDcGpdL4/?= =?us-ascii?Q?lQi3tpbRJDL9qReFaLkMsKaDcI2aOI6KXgVVnB6RlrpGQul0i7ZN8PIswC6N?= =?us-ascii?Q?jDlCVPn6eUm8ogN7rTWdTZZcwSFnXEDSjQ83VGXs5BOHqE2KIX4ZmptuJCAv?= =?us-ascii?Q?viQd7bTnKKX1KO70phezNacffOhyjpsgvYFTT9Et9HEpcbWDX5HmsfcTc0Ph?= =?us-ascii?Q?aPLXBZUFfzcdM8de0oWs5geYAZPBkjh6PpSaKCAEf8f2vWRNv5EAGCgg34gM?= =?us-ascii?Q?KGDk8uOyFdDf1Fh12APU1r7/3D8b19nVywNZOnHXlLelOPYKmrGe+V0NAP6T?= =?us-ascii?Q?Kcxk6sbOMd/Jftr0cezAfXvz6op65MlVCuUpKhE/BwGdtFiX1maD5YMfvGik?= =?us-ascii?Q?i7028KoDwyjbtw1E4a2g4puvBdYl9O1GRAjfRymw00XnB+xtD7JKvTLW3jOw?= =?us-ascii?Q?AEnxQ0FwXUu4VnloXxpILnnVNeMraiAEoLEMWbY/OCbdg+2coB5xK1VFPQiy?= =?us-ascii?Q?KODyo5G6VVKqChInR3+pkc2hkgkxXyKjHz0UDFE+brXjPX19ZkAK/XsHyVjA?= =?us-ascii?Q?ESa+dKHU7JaZ6do73HpBGpwNKhOrwsB69ZmA/b9BOZgyw24onAGuM1c0FH3B?= =?us-ascii?Q?CvlcZR+pVNcyLRrpWd0MMaAz862/dc1aY5SbmLZF+cloVS+ahiOxHkWh61+R?= =?us-ascii?Q?FKl1WWYklnz5Eo1Cgo+3Q0GXRQHxMI8RdOU+Pv/nF/0vRa6XfSojO8mP+MaG?= =?us-ascii?Q?h4UgS6GMkUkaMBGnxsH6KXRvqJKNly19h+/wm/6D/9AlymSnKDuruR99cvKK?= =?us-ascii?Q?EY5h/DEYDTVUduB15feTHiEosys9y3mcPmiW6CnfPShl33HsByeLeQuOIC2t?= =?us-ascii?Q?XOmoxrDgRs3BUL9VutrGStPwcJDlpfBUqSk8/RcGy1bStMljFRX04HA1/IAm?= =?us-ascii?Q?9+E/0WSWyBIU7DiMOdQVeKHmDp6zm7SO3Rw7vaN7e5OKwXAUhY2sMtEuyH6L?= =?us-ascii?Q?QUpiNr33BqEtqTOlxZnf4AdKbxqhItohQl4p0VqsBoXw3YCs7KtWdeelqqSq?= =?us-ascii?Q?r1lpPx2CctDog3gt1nq8WUAn198HGwkajt+kE3IdBT/o87cURyfoay25HNw4?= =?us-ascii?Q?J9prZoIv+hQ3tSCF8mSRznivYq773RS9BKfTSryxSmrErbGFsJwdNMp74A?= =?us-ascii?Q?=3D=3D?= 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)(82310400026)(36860700013)(1800799024)(376014)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 15:02:38.4203 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c241d5cb-f022-4440-63ac-08ddcf7a1ffc 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: BL6PEPF0002256F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4164 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.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 08/10/25. 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=4e2077a1a72e8fe2a5d56b06aa15800e45b75b71 Thanks. Xueming Li --- >From 4e2077a1a72e8fe2a5d56b06aa15800e45b75b71 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Tue, 1 Jul 2025 12:32:53 +0200 Subject: [PATCH] net/mlx5: fix masked indirect age action validation Cc: Xueming Li [ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ] Masked indirect age flow action is not supported in actions templates. Up to this patch, this case was checked only through debug assertion. As a side effect, in a build without assertions, this lead to a segfault on the attempt to create a table using actions template with masked indirect age action. To prevent the segfault, this patch adds relevant validation to actions template creation and removes the debug assertion which now becomes redundant. Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS") Cc: stable@dpdk.org Signed-off-by: Dariusz Sosnowski Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow_hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 37011b9950..540828008b 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -1042,10 +1042,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, return -1; } break; - case MLX5_INDIRECT_ACTION_TYPE_AGE: - /* Not supported, prevent by validate function. */ - MLX5_ASSERT(0); - break; case MLX5_INDIRECT_ACTION_TYPE_CT: if (flow_hw_ct_compile(dev, MLX5_HW_INV_QUEUE, idx, &acts->rule_acts[action_dst])) { @@ -5351,6 +5347,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev, *action_flags |= MLX5_FLOW_ACTION_INDIRECT_COUNT; break; case RTE_FLOW_ACTION_TYPE_AGE: + if (action->conf && mask->conf) + return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, + action, + "Fixed indirect age action is not supported"); ret = flow_hw_validate_action_age(dev, action, *action_flags, *fixed_cnt, error); if (ret < 0) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 22:50:04.413037852 +0800 +++ 0021-net-mlx5-fix-masked-indirect-age-action-validation.patch 2025-07-30 22:50:03.076763670 +0800 @@ -1 +1 @@ -From 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 Mon Sep 17 00:00:00 2001 +From 4e2077a1a72e8fe2a5d56b06aa15800e45b75b71 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6ed1ce029d6bd89a47968cd92d99cdf7ece8ac96 ] @@ -26 +29 @@ -index 4ecc2bacfc..6dc16f80d3 100644 +index 37011b9950..540828008b 100644 @@ -29 +32 @@ -@@ -1351,10 +1351,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, +@@ -1042,10 +1042,6 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev, @@ -40 +43 @@ -@@ -6405,6 +6401,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev, +@@ -5351,6 +5347,10 @@ flow_hw_validate_action_indirect(struct rte_eth_dev *dev,