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 7AC1C46A63 for ; Thu, 26 Jun 2025 14:09:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 74293400D6; Thu, 26 Jun 2025 14:09:20 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2088.outbound.protection.outlook.com [40.107.244.88]) by mails.dpdk.org (Postfix) with ESMTP id B6B7E402A6 for ; Thu, 26 Jun 2025 14:09:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZFV/3u/R2zEc/+gheNWxBV6kmZ7Y6C/UiIexU9X1XJpAQY4G1QjClICAhvxDcBoCkFmdMSgYnHD2H+kSMZi9VJm4AOPa5Esj5GdM/m3KvUHFGI/qMRs4HjmWnW9M0spPVWV/nu6kpv5pUQISfjCf4JCDo08M+FbuaJodzntIeLtOAyvt1VV1NpsaxSopDdl9NivdHmUgniqE5oqQcJw51Gzh6OFCBCwr4snV/vZRaAV6hqL7SiUZxs3+guSiomqbQd2zExO1IMByZbidSXG/9qqgpmZfxu1JKomBcvAeuc2cJAvUt4zop2cbs7YV9PfjofbBMNlLfGGAtz5y/1RNfA== 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=hvKe1Wku28JTMOFNSB+eCjrF1UIAARpaLnrJ/Hj7Kuo=; b=iqeQIv/UO4hNd1/NVHfwNm5sbJBMig/wba+hyiKCa4y3d0n9c6oIHHVBDHH69EJ7qTZNbqPUcWuf8pbu4YfVQrcznWQg4KwvvV3TE96kV5T4hB8qLwuu+u8Qn0R5cgXI6LPxrtr3yNbERaECdQkRl7v4FFC2JKpJEWVcQnL8DmOebxlgJt+lPS7U7YBHtx4Jt0Zh2yiuvFUcqc0jNh/7AympcM11ogB+YmA1/xiufv1MUjXfvMqUXXAou5pLEPoUUqnoSeGTO5kie3n/dfAX/afD4E3y1hek3bb5nhzfTUkZfkRVoodi3cCpgEEFDrotjpbJAOUb/wutEiC+EMyA7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=h-partners.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=hvKe1Wku28JTMOFNSB+eCjrF1UIAARpaLnrJ/Hj7Kuo=; b=QtAeimG/xQY9H7KzA6dcQM2rW/ctI5A2lDqc7IQ2qwRrAiMEUPYsj1JFxBscjEdqZheRgs8e+2TtDloOgwERYS9FrQpKGcRW7JNoYqBh1BJDKh12gVq0kWkluxwiMdqSHRkvRtHPc8UdhTgJNd1OthoSRDhudcmsFQ+/LBZitQlNpxkE3rYXVAH1pR437wYW9Nnj1/GAfh9DaAo8iXGDQ+eRc16MzrYWVlBTaEesG1yyJDt+ouKAIm4Hk60ODsc0+yZJ5bt6vuR5W4sXa7eGlGpdKAGUCvNVUJC1zBPVaLkUs1EBBFrI8dtGwm/35lPvQ2kyngvmpQRx537w3clltQ== Received: from CH5PR04CA0011.namprd04.prod.outlook.com (2603:10b6:610:1f4::27) by MW6PR12MB8734.namprd12.prod.outlook.com (2603:10b6:303:249::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.22; Thu, 26 Jun 2025 12:09:15 +0000 Received: from DS2PEPF00003447.namprd04.prod.outlook.com (2603:10b6:610:1f4:cafe::ee) by CH5PR04CA0011.outlook.office365.com (2603:10b6:610:1f4::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Thu, 26 Jun 2025 12:09:14 +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 DS2PEPF00003447.mail.protection.outlook.com (10.167.17.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:09:13 +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.1544.4; Thu, 26 Jun 2025 05:08:48 -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; Thu, 26 Jun 2025 05:08:45 -0700 From: Xueming Li To: Rui Ferreira CC: Xueming Li , Bruce Richardson , Thomas Monjalon , "dpdk stable" Subject: patch 'eal/freebsd: unregister alarm callback before free' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:01:36 +0800 Message-ID: <20250626120145.27369-77-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-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: 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: DS2PEPF00003447:EE_|MW6PR12MB8734:EE_ X-MS-Office365-Filtering-Correlation-Id: 57a6b2dc-5428-4bdf-ad73-08ddb4aa43d3 X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UQq/5DQ8wrNw+pIDF3RJLr0nV+sq+zXcXct1EPtPZDQKv00dY8NmxnLKhrS5?= =?us-ascii?Q?V72KpTdJlATaiN9h/YTs0bwg8/3jI3GfCF1FFPBcj4SP9ojWViPXhIBm+6SS?= =?us-ascii?Q?lQrm4plcFKcs/gscDaB0Sb/U+Dcrfq+uwRFULqZh0z7QhUfZccDrj3Y6bCi2?= =?us-ascii?Q?a0kPDFwME5Fdk5UNhxpwLs7KvZ7AufaoM44Cx5otvGK1aHqaH8KhlNoQKjMV?= =?us-ascii?Q?Ap2Xag3ncmNDVxKLuh4As4P/p9SA/iFs4izCKSfqfH6cTi2MTzYf/31RXe46?= =?us-ascii?Q?Moot8MpwPHzll1ftr4YmFLSNAvzh/xS5dcAF7thCn8FVZklwEhxzIUKWZwJH?= =?us-ascii?Q?/91/5a3VWgEzStQQa/mClBIc0BV+7DEEW1ZdwAjQQ3ouq40CowaDBHhY29O3?= =?us-ascii?Q?BD1O0DuBdrxCQ6m+1FKkBGZ/0hz+DolJVH26uMm4/iynDV8mkPU/j9wVL8VW?= =?us-ascii?Q?FqjBxpC1PU7OryaEv41YJr8ojIxXlQ/RtBc4IgVHL6n3mcL4uCV/yUwjiAw/?= =?us-ascii?Q?rzzrvzN0HgxEzw2/78Hod+dVm8viSpHmtRANLSqjXVjFFpRnUXY/MCayejlL?= =?us-ascii?Q?XLcMR5hcrU+0YbBx891erGGA+hnc2E42NLbw1smL07+/12PcTc1zaST9brED?= =?us-ascii?Q?0Ho8qvdQOpy85UXN4qwJzf7eq7sBxVTw9hTZRyCA0WjnSbyEeMJiPiDLj5+L?= =?us-ascii?Q?ACTalMVcLmfhXAhmcSe8LW/PERMgTkBtK4XJ9GWqTuRuG6oKIe4vVto1Htnd?= =?us-ascii?Q?cBnGrS0wWy70rJxStQKZX0qW98WzvGbqAn/byJca++UIQfJHZ+3fyktkQBnS?= =?us-ascii?Q?Ljm+yqjciedRuoelxPRBu3rg6Atuohs2PgaqBIbO6n4s1sP1yvGNBdYdWgMr?= =?us-ascii?Q?KcIoFPx5bw1GwJ8DNnUYMVkbDPcKAmUC+MFqsYlqbP11iE+0Cwu06bN3Nk6U?= =?us-ascii?Q?sBUtPQI8RCmTpwbpeOiKqyInGxIy42S3ZACePsnv0oqJmosE7x81OOcF//6P?= =?us-ascii?Q?3a4laZh2bMAZfbyXv05SW9NlyIwqxEQ93UeDKvgjZyW4Yef18OKuDbT960cI?= =?us-ascii?Q?tyeHbcUPt8S0lBnjc/zqrn4kI7QOcdmoMF76SpF5MXy/ffViciPv9TruT3n+?= =?us-ascii?Q?koT0/kENtFPVOgKAtl1SmlpJq7v7vfOXU1KhZ6Yhy/tu5h5K41PP/8P7B+oH?= =?us-ascii?Q?EL4F93KlDU1GLbXSF+W/gROCS3NJu/DiLn/dJMB8BUX4gOqUytdodZNjZno6?= =?us-ascii?Q?gH18q0A9B4MxG/rHQ06Z1gVJtz/O5+vuV5mgYTFi1kIupVMuVdxCZ6gDPWyC?= =?us-ascii?Q?OKNsXwIjNwPgNQoD+pK7cIb9JcIkSa9Zlr0ehJuJ4zSh07cnGbXZMOsepwsP?= =?us-ascii?Q?JWjH1tCjJrv2uf5oV4S0N+C3ldcHWUfG/q7ho9A9bNk4ykq8JTLPm7DtApsV?= =?us-ascii?Q?iPSUeb1UvM3M2vRBOqY2YOYeIaPtjKukj7UFdwAOnUe19REFHtc2Ru72bktC?= =?us-ascii?Q?5wqGth7wQWhbQXy74NdVHJ2jrTka5gs1np5MEjBZ7ALje8wf/hyNpKtPXQ?= =?us-ascii?Q?=3D=3D?= 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)(1800799024)(376014)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:09:13.0377 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 57a6b2dc-5428-4bdf-ad73-08ddb4aa43d3 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: DS2PEPF00003447.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8734 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 06/28/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=fd527a32b73d9ad30e41ae138f0bfd60084bca2b Thanks. Xueming Li --- >From fd527a32b73d9ad30e41ae138f0bfd60084bca2b Mon Sep 17 00:00:00 2001 From: Rui Ferreira Date: Fri, 30 May 2025 09:18:44 +0100 Subject: [PATCH] eal/freebsd: unregister alarm callback before free Cc: Xueming Li [ upstream commit cf1937a96dcf63f6e00e3181654a845edb1fd682 ] Unregister callback on cleanup to avoid use after free from the interrupt thread (eal_intr_thread_main). To be more defensive, set ptr to NULL if we can unregister. rte_intr_callback_unregister_sync may (optionally) use traces so the alarm cleanup must happen before eal_trace_fini to avoid accessing freed memory. Bugzilla ID: 1683 Fixes: 90b13ab8d4f7 ("alarm: remove direct access to interrupt handle") Signed-off-by: Rui Ferreira Acked-by: Bruce Richardson Signed-off-by: Thomas Monjalon --- lib/eal/freebsd/eal.c | 2 +- lib/eal/freebsd/eal_alarm.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 568e06e9ed..eb62bfdcd3 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -927,9 +927,9 @@ rte_eal_cleanup(void) rte_service_finalize(); rte_mp_channel_cleanup(); eal_bus_cleanup(); + rte_eal_alarm_cleanup(); rte_trace_save(); eal_trace_fini(); - rte_eal_alarm_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); eal_cleanup_config(internal_conf); diff --git a/lib/eal/freebsd/eal_alarm.c b/lib/eal/freebsd/eal_alarm.c index e5b0909a45..965f729157 100644 --- a/lib/eal/freebsd/eal_alarm.c +++ b/lib/eal/freebsd/eal_alarm.c @@ -49,7 +49,13 @@ static void eal_alarm_callback(void *arg); void rte_eal_alarm_cleanup(void) { - rte_intr_instance_free(intr_handle); + /* unregister callback using intr_handle in interrupt thread */ + int ret = rte_intr_callback_unregister_sync(intr_handle, + eal_alarm_callback, (void *)-1); + if (ret >= 0) { + rte_intr_instance_free(intr_handle); + intr_handle = NULL; + } } int -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:20.596366410 +0800 +++ 0076-eal-freebsd-unregister-alarm-callback-before-free.patch 2025-06-26 19:59:17.502418039 +0800 @@ -1 +1 @@ -From cf1937a96dcf63f6e00e3181654a845edb1fd682 Mon Sep 17 00:00:00 2001 +From fd527a32b73d9ad30e41ae138f0bfd60084bca2b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cf1937a96dcf63f6e00e3181654a845edb1fd682 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index d6fffa2170..45adfad668 100644 +index 568e06e9ed..eb62bfdcd3 100644 @@ -31 +33 @@ -@@ -906,9 +906,9 @@ rte_eal_cleanup(void) +@@ -927,9 +927,9 @@ rte_eal_cleanup(void) @@ -43 +45 @@ -index 28f285fdef..c03e281e67 100644 +index e5b0909a45..965f729157 100644 @@ -46 +48 @@ -@@ -50,7 +50,13 @@ static void eal_alarm_callback(void *arg); +@@ -49,7 +49,13 @@ static void eal_alarm_callback(void *arg);