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 76CEF470E5 for ; Thu, 25 Dec 2025 10:23:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 16A1B40B8F; Thu, 25 Dec 2025 10:23:01 +0100 (CET) Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012020.outbound.protection.outlook.com [40.107.200.20]) by mails.dpdk.org (Postfix) with ESMTP id B928140648 for ; Thu, 25 Dec 2025 10:22:59 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TptUWpVuGd/vKEoLNengJB6WKCHmZGQibJyAF8CpRATTaGjspCa/V12G4cy+EBSLCkKHwsi4g/X9W+/rdZHaDskhF0Ly/n3sX/V12jXpUbDI+3QMtfeevCLU1WcF4KNMC8UPcP8JPtSRDIJAPHjKw2StAJZoLLVfULcqzuIgZV1ulXbGwrs5DSiiF75AtzKzBLU4NCADttv2SAvpLwB8LOWSYL1H76xyXRYe9ryXBAWHqQ0TLpicq/PE0bgbRsG7YzWUu628av8j77SWF9yfv4GXv6kTqEcYLjDIB6221+/lxFd+0v24VpWRTtDoiIvKP73gYT62t5CX1xl16vWdnQ== 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=LuM5H9wI6IOyuWpQK9Au0+8v2Xgsy/BaBmiZcgQgCMQ=; b=XE7unZCUwqRq6jSmFCwj2ldPIMGIs/qjnUFvOqJGvVz1tmL9lmNV364VVsbQ41Pg89B/kk1hse9u8As3+yuxSFHeHwTSrSHY6/3xfBOPKTE580x4mSxaUVnakPi+avaVIBhaRMJgzPKHGCFzE1nyv6VBn1SgkuB8gsS91yXJHrhE677MZN8KLQo85O/mw7r2kRC71nkQNn5tFfXgZetqSrSEBMG+u4gVzzQiiPYq9hCPhPNHQHnMeaC7peL0JEimsZDg9S5lDpWQ0KgKcAhrt+vv5vZOZZEyZdfsWDcTswKmh7zrWjQOxBY2E+1/515LbcpR59pVklgPZFPEW2YIbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.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=LuM5H9wI6IOyuWpQK9Au0+8v2Xgsy/BaBmiZcgQgCMQ=; b=U1O9X+fkd3o9oLwyVBbEnJ9D8ZmqVlpnDDax28A1kwfRdli5zVeUtvIdLL0vWtUdTeWPy3vikXxCgNxgeCPva9faX5vu4lU3EMPw1RoI4O0hYwLFoEi6Dlt+6HnxgGstZUA0zcB8qoINca/qQc+/3EPut0EPNFMgsZUwM0d34dYXcYnTGZxKvhM22hIzWHqdIxToXx/jwziAj5TuDPHoMRJ8uB6fVAs46UKDlD85g20NIKmLfSvnOfdXqep7KymZU/jzP4QFFx1t5KuJFD4KitjzengTqTN6+EDV3lD3lLhPiC3wODmw572CDbHXirCPjV5ZZX5/IpUXANxRFI6PTA== Received: from CH0PR04CA0043.namprd04.prod.outlook.com (2603:10b6:610:77::18) by SA1PR12MB6704.namprd12.prod.outlook.com (2603:10b6:806:254::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:22:55 +0000 Received: from CH2PEPF0000013E.namprd02.prod.outlook.com (2603:10b6:610:77:cafe::af) by CH0PR04CA0043.outlook.office365.com (2603:10b6:610:77::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:22:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CH2PEPF0000013E.mail.protection.outlook.com (10.167.244.70) 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:22:54 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) 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:22:35 -0800 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.2562.20; Thu, 25 Dec 2025 01:22:35 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.129.68.9) 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:22:34 -0800 From: Shani Peretz To: Stephen Hemminger CC: dpdk stable Subject: patch 'net/nfp: fix metering cleanup' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:04 +0200 Message-ID: <20251225091938.345892-43-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: CH2PEPF0000013E:EE_|SA1PR12MB6704:EE_ X-MS-Office365-Filtering-Correlation-Id: ed44da17-e744-43cc-e44b-08de43972f6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3t8JZcIr3BLzkv1nuBIEmuPPKXWYvCcX6CnDprtGUE3AtyHJJcIIZabTFW9l?= =?us-ascii?Q?L6hL7U89OKDeTiLNi6NKXT7z+vJtwUO/edTJPVPbUmxkrpGr5YvPweqI2B2i?= =?us-ascii?Q?FE+3pEWiLwYotyt6HBlFRZ9XLDes+9k7qTwSJ8xs7/hEoOdGLIHrKUr/729P?= =?us-ascii?Q?3SpD1JuzqO4Au1mJ6wsJtL/VGGZyDfyL6Mtwv315hsCU0Vme049CI94V2vSd?= =?us-ascii?Q?s6f1S+yXc81xr35iawEuGDyexNeacct7j8EbD2BqtYye54aeUq9WnhlOGetC?= =?us-ascii?Q?pPv2FJpBH9ovdM0pABQniK8Kml12AZz6jMrjgDOp8KJXQ9QysQWz3Eum0+0n?= =?us-ascii?Q?g+/ex68o+ckXtqmyIu5PJJewmseqsf587WhQzZ6DfGA500GuDAAp/jOjsHCg?= =?us-ascii?Q?cXOfat9wq0BkRag0k1hQgiuMP0PIMKTqFOfEzmEEVbeeBgQgoloeUYzE6ZWv?= =?us-ascii?Q?tw4j628pJ3fQA3wCrb9dTNwsYD5ZnDBRezjgCZo3Oj+ojreTGam7t6Rq0GSO?= =?us-ascii?Q?CKgllLgIjqfbuMevZTWkDhcNQjqOcEbwAvlw4QGp7ZHbmbwY8PzULDAGN3Jn?= =?us-ascii?Q?Z7csgEcQwP/Be4aQW7YcxjdOFOADIbnaYlL+clkF90VtZgu7mA65KgdYoguz?= =?us-ascii?Q?T6AwrI/xEwTJsVvgz0N9vCMqb6DjMZ/EYfdl20l1qyr3KGBL1nGAFAhjuOY5?= =?us-ascii?Q?FDczmgPMfM9qfchYbrK+4AYRMQU4zu8xjcqMMcXw8RHPJZeLUE2QR0kTGX2S?= =?us-ascii?Q?XCulp/6YVv9ZnnIxB33NXBIJ7qe1K0QAEAksw88gQ18IkFRR8ppe+/388oKH?= =?us-ascii?Q?VABbeAQ1pcLh9ks+NO8oqpflaVkxrcJ7hmkmZcuslnq07582SqwayEOVGT9b?= =?us-ascii?Q?je8Bva7MIkD6pnxxNXgIbeshnT+h8pKE9EGhSCmtC+Vh1JSCtfSm4OFsRKy9?= =?us-ascii?Q?TM5MEbfMyio/ZsM9dPbLYCVKz65V3lGZcX7Q1eDAbtVmnCoxGMXVvM3Vm8Qz?= =?us-ascii?Q?yRTxrgBW5Ro8Ye6na8E4ZXgJm1HmM0AoPjyhObFFc9qC6dNcjzyHq17xb4u/?= =?us-ascii?Q?VvMW/rlzIVmIaeZHZYQTMgxsLxJukERN6AX47BE0qa9LPEhAfKivSCmNLKsD?= =?us-ascii?Q?1tWEo3Ok/z3fCpJRqVeM6yuToPCz3S7AGtBdQEs+8ZrKHdgR9cGONZPkOTaf?= =?us-ascii?Q?PXXHUwtja547n2Ml9ZZKHjYfvva8YV8lRMDKHPfPgIn2Z/oSCRib3ac51lIB?= =?us-ascii?Q?MH9PnmGS9bVgtxglQuGwKiBSitY1KWy0NymkFUMozwFBADoGLdjznKk8NEl2?= =?us-ascii?Q?dLslXJgVCpu8PSdHFmFHEh4Hw0Qw2n3qJdB1z9Vm0zCtjC84QVCOYex5cLOV?= =?us-ascii?Q?0NZPdbPnaFq6l4U9LuVR++htzsoyM05KR9PRM57B+HcGNrfDWuJf6XcwKcKK?= =?us-ascii?Q?pYmdhYltjX/tDUCFGpStIdTM/X8v7gaJB6OjR2K8rZ7WuGL3cWhBF6IHNPfK?= =?us-ascii?Q?BcKqGbV13+cZDAfuzsRdqhFPCr6WwS4il36wQX0kAx3Yh0XWD/dnTIMm6atJ?= =?us-ascii?Q?T2Yy0ub/ZaspLpRkW6q88mVtTTcK4k3A6XDt9e8S?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(376014)(1800799024)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:22:54.5746 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed44da17-e744-43cc-e44b-08de43972f6c 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF0000013E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6704 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/588e3f389dcbab61fe63ceeba739286d2a926b1a Thanks. Shani --- >From 588e3f389dcbab61fe63ceeba739286d2a926b1a Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 3 Nov 2025 21:29:15 -0800 Subject: [PATCH] net/nfp: fix metering cleanup [ upstream commit 080b02cd66cb2b0a08c4903b7f51a10f0ba8c37f ] The code to cleanup metering was using the objects after calling rte_free(). Fix by using LISTFOREACH_SAFE Fixes: 2caf84a71cfd ("net/nfp: add meter options") Signed-off-by: Stephen Hemminger --- drivers/net/nfp/nfp_mtr.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_mtr.c b/drivers/net/nfp/nfp_mtr.c index 255977ec22..377b72534e 100644 --- a/drivers/net/nfp/nfp_mtr.c +++ b/drivers/net/nfp/nfp_mtr.c @@ -12,6 +12,13 @@ #include "flower/nfp_flower_representor.h" #include "nfp_logs.h" +#ifndef LIST_FOREACH_SAFE +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ + for ((var) = LIST_FIRST((head)); \ + (var) && ((tvar) = LIST_NEXT((var), field), 1); \ + (var) = (tvar)) +#endif + #define NFP_MAX_POLICY_CNT NFP_MAX_MTR_CNT #define NFP_MAX_PROFILE_CNT NFP_MAX_MTR_CNT @@ -1124,10 +1131,10 @@ nfp_mtr_priv_init(struct nfp_pf_dev *pf_dev) void nfp_mtr_priv_uninit(struct nfp_pf_dev *pf_dev) { - struct nfp_mtr *mtr; + struct nfp_mtr *mtr, *tmp_mtr; struct nfp_mtr_priv *priv; - struct nfp_mtr_policy *mtr_policy; - struct nfp_mtr_profile *mtr_profile; + struct nfp_mtr_policy *mtr_policy, *tmp_policy; + struct nfp_mtr_profile *mtr_profile, *tmp_profile; struct nfp_app_fw_flower *app_fw_flower; app_fw_flower = NFP_PRIV_TO_APP_FW_FLOWER(pf_dev->app_fw_priv); @@ -1135,17 +1142,17 @@ nfp_mtr_priv_uninit(struct nfp_pf_dev *pf_dev) rte_eal_alarm_cancel(nfp_mtr_stats_request, (void *)app_fw_flower); - LIST_FOREACH(mtr, &priv->mtrs, next) { + LIST_FOREACH_SAFE(mtr, &priv->mtrs, next, tmp_mtr) { LIST_REMOVE(mtr, next); rte_free(mtr); } - LIST_FOREACH(mtr_profile, &priv->profiles, next) { + LIST_FOREACH_SAFE(mtr_profile, &priv->profiles, next, tmp_profile) { LIST_REMOVE(mtr_profile, next); rte_free(mtr_profile); } - LIST_FOREACH(mtr_policy, &priv->policies, next) { + LIST_FOREACH_SAFE(mtr_policy, &priv->policies, next, tmp_policy) { LIST_REMOVE(mtr_policy, next); rte_free(mtr_policy); } -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:38.459616445 +0200 +++ 0043-net-nfp-fix-metering-cleanup.patch 2025-12-25 11:16:35.674021000 +0200 @@ -1 +1 @@ -From 080b02cd66cb2b0a08c4903b7f51a10f0ba8c37f Mon Sep 17 00:00:00 2001 +From 588e3f389dcbab61fe63ceeba739286d2a926b1a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 080b02cd66cb2b0a08c4903b7f51a10f0ba8c37f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index d4f2c4f2f0..4833ebd881 100644 +index 255977ec22..377b72534e 100644