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 286F8470E5 for ; Thu, 25 Dec 2025 10:25:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 21CC6402B7; Thu, 25 Dec 2025 10:25:36 +0100 (CET) Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011015.outbound.protection.outlook.com [52.101.62.15]) by mails.dpdk.org (Postfix) with ESMTP id DCE33402BE for ; Thu, 25 Dec 2025 10:25:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xue0MxvKCK/HNoMFITAIi2cDySyzXiIuwp9rRVNtxNXNQpq5b7LRAezhpPKGOQsYxzTi6pU91Idw/4mRTvc4d4aHvlFDYomMGJLYCZG7Ob8NKFbaNVJbFQ2PxXTvIDNyLl41/gfzrGyw0qsWL/WwcwmdErfbsTzhphQmf51WugE/OFjHtCBKNtUz+S6g0IfIMMoPOE+7wC2zY+lRcox3iUJ1XolpquRZEN2TqSBPSuoYIXpseZWRvH99Bj61/onw2raoUHSSyNKjhNfPwmr3K411s4kI1wA5OW4FG9yVy+9QeofXXZc0txMRcoCXBGb/S2SSC818w2jzlN80v/PW3Q== 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=3DmUOcPXtWtEA/M3FFW57K3WHSWGGiGj7gifIiuHMbU=; b=UqeQNb5tGgv+6EeqK0uaOYm021xnswjnSGTtcp2ZHgQ/Lf7jmLaiHjy2JOK5J5gtGIDQl/H6vFx0+Pcbd9JD4CltnKimUAUuz7qWkce5Cb5MERjBv8Z2fLnV2AweEcv4rkK5dOQFh9mrX4BB8jUxmD4CYygiHn/lwK8HxmT2DHoRjonHO6S/v51bFC1ZpinXxqX3XUYVD7rH3rpzUtoNfE3L6LJbEZVUv5EJcgxHpCp+zXddDGpkwLP/7tBbXl5ot4GLxq3aFtC0P0Txhrt0Q+i7S71XvOZ4M+td1koTnx+UTUyckqIwap6SSl89PliPLaoZ9Ri2Gr9ZMAqlCW/m8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com 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=3DmUOcPXtWtEA/M3FFW57K3WHSWGGiGj7gifIiuHMbU=; b=J3diBaO8OoMk+O6M2c8Wsq+UPeHBHQ7pVx4StnkcSuZSS6ip61ZSrGBXqTRDuCZ7QCEwq8/jXgflRgTbyn++8UZVWUd7OnU6lDyw4ZxryCALU6HqIapW3N6MaD3WIl8jp+p/8dkDwzeC+yB5a2R/zyD9TzEPwRl25EHWq123zPzwjWvcpVyMs0PG2W4tqDRI1TNfFMj/YQ8BeXg6OCcbSkyOjJ9Er75BFvimr99aQBG5Q+Tq7bEeSw4GI9mavtpswfjhuOIhmrzwXOGEWa6Ayq24LGhpiEMX4/ZERu5AjAeIaVr8eIBVEdNmYtNDAufZ7zi7JrVRbwf8qpn4zHvMOg== Received: from SA0PR11CA0013.namprd11.prod.outlook.com (2603:10b6:806:d3::18) by CH8PR12MB9839.namprd12.prod.outlook.com (2603:10b6:610:274::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.12; Thu, 25 Dec 2025 09:25:32 +0000 Received: from SN1PEPF0002636E.namprd02.prod.outlook.com (2603:10b6:806:d3:cafe::18) by SA0PR11CA0013.outlook.office365.com (2603:10b6:806:d3::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.10 via Frontend Transport; Thu, 25 Dec 2025 09:25:19 +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 SN1PEPF0002636E.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:25:32 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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.2562.20; Thu, 25 Dec 2025 01:25:19 -0800 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:25:19 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:25:18 -0800 From: Shani Peretz To: Satha Rao CC: dpdk stable Subject: patch 'common/cnxk: fix null SQ access' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:43 +0200 Message-ID: <20251225091938.345892-82-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636E:EE_|CH8PR12MB9839:EE_ X-MS-Office365-Filtering-Correlation-Id: bef51487-8214-4535-24ed-08de43978d55 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DF7xA4FlFgIKw0shnKKPxcUICYzO0TZjAww0STLX19D4VuH7sRW5caumaSOm?= =?us-ascii?Q?GW81IvluyXWoa0ExJmXrayKCS78OJ+AfaYfTJ0xC9Rxnq5dX6PNphB3RrwJ2?= =?us-ascii?Q?qPZAquDDKCd67j7Fe0RZOu8uGxE3n9vfEGjv58rXz+AaFHrjpYkY4dlNeCWF?= =?us-ascii?Q?IT7WKoHuX75+TeCkiiVLNLJNlAnch5EkOHtku05OFUL4UGLql4fMhH2dSm/+?= =?us-ascii?Q?ySwPvLtQ9ETkJGzCTPKP5E/ytV9T3m33Ou5uENFW4osSdOmGdpTKquhnGcDX?= =?us-ascii?Q?ZyVohsKa2xuHsjpSHI38A2MINMxQJVys/0cK1uY+wHCM0IOhgtLe8e4u/hWW?= =?us-ascii?Q?VJO6wdaGwoNox0wyHAGKqyvFtmDI6V9QTevr1xYQVI4fQSPT1PDPEp2NIJ3f?= =?us-ascii?Q?NhyGOBgEypefQEc5PXhStVtythr3KK+zzUb0MJKYK/z4Ii54UbidFtO5d5KZ?= =?us-ascii?Q?Gm02ZXIAb6keEX7yahJfgvnV6o6mHI3GbjdkFlBRXWpHm9RdrE8+/HhZHmNo?= =?us-ascii?Q?RW323LoKK+INcYkROVqyEmGK+YrhGO+CtJ2gdxTmLi/eTUDabnhQufm4z1N3?= =?us-ascii?Q?TcUelDADOWDqfid30Eg+QA8/YAbop6zPnKSpnngQUU29xMBHA1nsrAxsiNMU?= =?us-ascii?Q?qKYhn5WcDW4Ntyd+ESt6eiz9xvf90Vxk65S5KzjdBsgA2ZDJUnBQhCYCIRbt?= =?us-ascii?Q?YuOz6lTsC82u2GWPOZCyEVJnjUoBi2aAfBGbcTKqU1z7uRc/biZb+di9XJ2U?= =?us-ascii?Q?wV8Zb3GINbE9ZltQ552fS+CxGzqYvgROWzUxqQrz0/oNwtFDTSj7v0mF6Shk?= =?us-ascii?Q?RmRgx9DO4rIjqwXPzKA64hLqqXyMPCQD2GlGAFaM71lEUk47PceQKbFgt0/D?= =?us-ascii?Q?vTgyjkiefZkrO2QrV0nvC7VcPunsyMxcUo+5Xv0E+4f7bLaEaO09yR3ZMFYL?= =?us-ascii?Q?NKTM4+SP7cH9mj9bNZpnK3sr9yg1wBD3gsAnGuzBe4/A2vlBImGoF+ljcI/X?= =?us-ascii?Q?0KI4tMeToT6KUNGFeKKSiIb7XILo5k7esAnuuzRHkLNt9S1yCXJbNu4FVdUE?= =?us-ascii?Q?vA2yvd1p4oDcoR3aKv3qtWrbGBowBu5lje6/KNew/A/oILTZGyo39XKx7Dbs?= =?us-ascii?Q?RWONfDM5lC7x0dLLvBLtX1n0a+f6eC0i/uYF04TX09LzhctSUBBY4usnT3or?= =?us-ascii?Q?uHoILf3Is0B4PtCfPSvGWaD3jFi4mk2mDuHkQKlYM+Ho6QQxunDs2Z8XAZs/?= =?us-ascii?Q?SqpE2soNgxoSUXpvo1QA5gbRRZP7dpdK+CFfUiXIbCHzSTgeyf10abZOimf0?= =?us-ascii?Q?IkF+dZGikgvBj86IkSXDLlyZOQ1AQNUp/3sCuX+/aIvokbnf1gmreuiINFR4?= =?us-ascii?Q?R0PvLSJqIs8oyIQo1HphlbY7QfcTE8+4fHuyI4VY+9Uw6NIPJEAWRJcUF2w+?= =?us-ascii?Q?Nlu1xjX+yceKOn/zd8CVXP83/i6BZGhsWXaj7CNr3EpC3GZrT67JuAg3bI/w?= =?us-ascii?Q?9EqKx3axss2zxzyBwItaf3wTKWw/SmPBYpOYU7r+01rXMkUoUXtjvH12TYeJ?= =?us-ascii?Q?rbgMMSM6zIsk0Oc7YC8=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)(1800799024)(376014)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:25:32.2107 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bef51487-8214-4535-24ed-08de43978d55 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: SN1PEPF0002636E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH8PR12MB9839 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.6 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/30/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://github.com/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/bcb8184dd878ef68086d56b4781d803fb901bbf5 Thanks. Shani --- >From bcb8184dd878ef68086d56b4781d803fb901bbf5 Mon Sep 17 00:00:00 2001 From: Satha Rao Date: Thu, 13 Nov 2025 10:08:01 +0530 Subject: [PATCH] common/cnxk: fix null SQ access [ upstream commit 52ff61c2ca114691d74546f5ce16e8a7ebd164ae ] Condition to check SQ is non NULL before access. Also pktio locks are simplified while doing threshold_profile config. Fixes: 90a903ffa6eb ("common/cnxk: split NIX TM hierarchy enable API") Signed-off-by: Satha Rao --- drivers/common/cnxk/roc_nix_tm_ops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/common/cnxk/roc_nix_tm_ops.c b/drivers/common/cnxk/roc_nix_tm_ops.c index c1b91ad92f..79e1054c36 100644 --- a/drivers/common/cnxk/roc_nix_tm_ops.c +++ b/drivers/common/cnxk/roc_nix_tm_ops.c @@ -606,6 +606,13 @@ roc_nix_tm_hierarchy_xmit_enable(struct roc_nix *roc_nix, enum roc_nix_tm_tree t sq_id = node->id; sq = nix->sqs[sq_id]; + if (!sq) { + plt_err("nb_rxq %d nb_txq %d sq_id %d lvl %d", nix->nb_rx_queues, + nix->nb_tx_queues, sq_id, node->lvl); + roc_nix_tm_dump(roc_nix, NULL); + roc_nix_dump(roc_nix, NULL); + return NIX_ERR_TM_INVALID_NODE; + } rc = roc_nix_tm_sq_aura_fc(sq, true); if (rc) { plt_err("TM sw xon failed on SQ %u, rc=%d", node->id, -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:40.409892038 +0200 +++ 0082-common-cnxk-fix-null-SQ-access.patch 2025-12-25 11:16:36.168818000 +0200 @@ -1 +1 @@ -From 52ff61c2ca114691d74546f5ce16e8a7ebd164ae Mon Sep 17 00:00:00 2001 +From bcb8184dd878ef68086d56b4781d803fb901bbf5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 52ff61c2ca114691d74546f5ce16e8a7ebd164ae ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 09d014a276..230e9b72f6 100644 +index c1b91ad92f..79e1054c36 100644 @@ -21 +22 @@ -@@ -624,6 +624,13 @@ roc_nix_tm_hierarchy_xmit_enable(struct roc_nix *roc_nix, enum roc_nix_tm_tree t +@@ -606,6 +606,13 @@ roc_nix_tm_hierarchy_xmit_enable(struct roc_nix *roc_nix, enum roc_nix_tm_tree t @@ -32 +33 @@ - rc = roc_nix_sq_ena_dis(sq, true); + rc = roc_nix_tm_sq_aura_fc(sq, true);