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 E451341D8D for ; Mon, 27 Feb 2023 08:10:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DEF8F410D3; Mon, 27 Feb 2023 08:10:15 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2044.outbound.protection.outlook.com [40.107.220.44]) by mails.dpdk.org (Postfix) with ESMTP id E3F6640A84 for ; Mon, 27 Feb 2023 08:10:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VgOK6pCODS6fxq4NhtxkAk5KV2bZJCpl4uu/pwr3qUj51UTQJDi+XHZybmZ2RagUNCIcSi5b7zHn3oL9JeEPSYIZM1EaiWWXa6cVeYeg4yn4zWLF3VEREO8uJpvO/ydswly4h7kefKCKk/hTFuxl8M+djgaTGKJjZraogxQZ56XV580FVdzuD4Br/HSfDc2noYSzyINuYTL02FhaOh5kh5G3FpcXiy+m2lDYvgLv7X9JRYe6/fsvR3ut04BRBaclUV0zfbonHiAtcb4l1zY6TkpxEB+73SbR3cpoD+NN5TCQvT0rCKju3O2n5/vcNaa2L8qyXn7nuaREw1mfmly1yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Waav6lwRYC6fe84JjU8HRN4f94rGJyghnB25uNaEoOE=; b=P2l9QEb85AjTVkaQq7wfVsDwkCIdBbFaUKdS11jdzSUalgiw89pIhN4VPYu3QkMVerV7iZ6NUkPktICuYxUFmYt7bCd+vjRgkVNP0NgkFEk1IMg+HM0n79DSy+ZpYGK3ZR8G1MgIwtNyXS9skDMo41ftVByYlXhgLm/9g4Zwf7Zrw9Hj2YW5ojd3fhBUAGS/BNNVb5qlUbA/ks2tq5CpY7z4c5fgA4vG7QadtwmxjcOgM/rTlggWa4X3gc15U3rwGuC37uIOMRye920XybjErJPj8C+uVDS6KZLQ8VFYlE5hXN/WMZMFHv6bZO3wGTkKt99rahsE4HJ5DDiIVMpTbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=bytedance.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 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=Waav6lwRYC6fe84JjU8HRN4f94rGJyghnB25uNaEoOE=; b=JGxHsY2JzHWDULT+M+0n+OJijsWoU7Q85FK3WizETrLOusECWnKtfMtEtdUppCFy7FZBhn4VnzeoMpdMYI96wMw9WCT4cb13+oPQEoOOUp4YHSDYhfnU3hGML1tGSrGyYNrceLQckGnTeGNiwibi5w/YJev13k6X+PxjlEpRLRAhY9Gsh7MofNWNJmAdk5uQNuRlR3FFxBzkkoGVQ+T0nRcwgOPvYl0TXHjCTF2BdIR65QL70VoAFFBensO+NWXVgEONX1thHk7d45OV2bYVy4uNsbnWMo2ouZm9jEzoiJFTluEDw+C9rFNUv4cSjOyVTMBtO9BLGDpQh01Ksus7fA== Received: from DM6PR14CA0049.namprd14.prod.outlook.com (2603:10b6:5:18f::26) by SA1PR12MB7128.namprd12.prod.outlook.com (2603:10b6:806:29c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.27; Mon, 27 Feb 2023 07:10:11 +0000 Received: from DM6NAM11FT082.eop-nam11.prod.protection.outlook.com (2603:10b6:5:18f:cafe::88) by DM6PR14CA0049.outlook.office365.com (2603:10b6:5:18f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29 via Frontend Transport; Mon, 27 Feb 2023 07:10:11 +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 DM6NAM11FT082.mail.protection.outlook.com (10.13.173.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:10:11 +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.986.36; Sun, 26 Feb 2023 23:10:02 -0800 Received: from nvidia.com (10.126.230.37) 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.986.37; Sun, 26 Feb 2023 23:10:00 -0800 From: Xueming Li To: Fengnan Chang CC: dpdk stable Subject: patch 'eal: cleanup alarm and hotplug before memory detach' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:51 +0800 Message-ID: <20230227070107.15664-83-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT082:EE_|SA1PR12MB7128:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f2080d9-9436-47be-f801-08db1891aa8c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Cl2y6PZHuvfwZKalbrMLELMlIffZv7bHPzd4veBNrbOms2ru5G0lNE6g1RAhQEMAhgVoOWMJj+Mc4R5p/o47EAdD95h6hellvudg3K0QjUxMJnFx0SikSMSvbzw0gnz/qoy9Yils4yQARzA0VQlrWDWSg50KqGDf8m3inQSeRLuBhUT8ZwO4a7yLNUKM3gt4BZ0yvTqXGytEYfOo60eEgCwefkaLLvkmgwhtHw3KSGcYYLKex3inTsqle4ZWZrKNIVu8mnQz0LUV9P48W4PpRgWsvTeoKoqJw3NhbuPxuSgwnRYeg28vWV7o23bDoMMP0bANVr1V9ccUjlfSSYguQrBBaWv8CuZ1cWZXKZS9pl7huVEP8p6ErUSpLEPAdSk5g6LBoBTpDATjVYu2XZOPedROCcQqH2G3oVJof37WSZqutvUb5DrUT6EIkLZlSAb8G6DDAlpUmKALfV/HFaMSTfcubfCHP1rnBArFqF772mkpFBnJz90v9HdXhJuf/Hp0nCbOX1q7p+6ILbc1PMf0kKSc3Dr5W4Pkzxan4icILjB3VZCvbVgHgAkKz7ZoJr2P1rLeq2N3fAtiqy1cD4nZuqFxuWdmWt10dts4jeLZqWrtVq6FfMTGbby5CSgYVd04FGJuKRUtwaMgXm7rpN4wgi6UoKljKShfsozKzRkwRx/4l87vhWlK6+xfVZwZcwBbawvGLjT1ynfzKsBe+Je/8+lAUYWceez+r1yV3ks+FgjkKgCopSSA8/RsdzSUyfRlaj4rwZ7yqVF03oTbaZ5qA2cCt12XaSUAhKAy/UozIAst6GCFi6ym7lX0XMwM3u1v 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:(13230025)(4636009)(376002)(136003)(396003)(346002)(39860400002)(451199018)(36840700001)(46966006)(40470700004)(36756003)(5660300002)(40460700003)(83380400001)(82310400005)(336012)(47076005)(426003)(7696005)(6666004)(478600001)(2616005)(966005)(53546011)(1076003)(16526019)(6286002)(186003)(26005)(70206006)(6916009)(4326008)(8676002)(356005)(40480700001)(55016003)(70586007)(8936002)(41300700001)(86362001)(36860700001)(34020700004)(7636003)(316002)(82740400003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:10:11.2184 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f2080d9-9436-47be-f801-08db1891aa8c 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: DM6NAM11FT082.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7128 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=0772cc1d89c8e74cd4ee09650676d1a23467039e Thanks. Xueming Li --- >From 0772cc1d89c8e74cd4ee09650676d1a23467039e Mon Sep 17 00:00:00 2001 From: Fengnan Chang Date: Wed, 21 Dec 2022 11:41:52 +0800 Subject: [PATCH] eal: cleanup alarm and hotplug before memory detach Cc: Xueming Li [ upstream commit cc75968228576250159918ec1531eecc606bc423 ] Alarm and multiprocess hotplug still need access hugepage memory, if alarm event processed after memory detach, it may cause SEGV. So cleanup alarm and multiprocess hotplug before memory detach. Fixes: 90b13ab8d4f7 ("alarm: remove direct access to interrupt handle") Fixes: a0cc7be20dd1 ("mem: cleanup multiprocess resources") Signed-off-by: Fengnan Chang --- .mailmap | 1 + lib/eal/freebsd/eal.c | 2 +- lib/eal/linux/eal.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index e68cc9a6b4..736f62c206 100644 --- a/.mailmap +++ b/.mailmap @@ -372,6 +372,7 @@ Farah Smith Fei Chen Feifei Wang Fei Qin +Fengnan Chang Fengtian Guo Ferdinand Thiessen Ferruh Yigit diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 607684c1a3..390e4257ff 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -896,9 +896,9 @@ rte_eal_cleanup(void) eal_bus_cleanup(); rte_trace_save(); eal_trace_fini(); + rte_eal_alarm_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); - rte_eal_alarm_cleanup(); eal_cleanup_config(internal_conf); return 0; } diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 8c118d0d9f..c76f026023 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -1372,11 +1372,11 @@ rte_eal_cleanup(void) eal_bus_cleanup(); rte_trace_save(); eal_trace_fini(); + eal_mp_dev_hotplug_cleanup(); + rte_eal_alarm_cleanup(); /* after this point, any DPDK pointers will become dangling */ rte_eal_memory_detach(); - eal_mp_dev_hotplug_cleanup(); rte_eal_malloc_heap_cleanup(); - rte_eal_alarm_cleanup(); eal_cleanup_config(internal_conf); rte_eal_log_cleanup(); return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.588132300 +0800 +++ 0084-eal-cleanup-alarm-and-hotplug-before-memory-detach.patch 2023-02-27 14:08:40.809237000 +0800 @@ -1 +1 @@ -From cc75968228576250159918ec1531eecc606bc423 Mon Sep 17 00:00:00 2001 +From 0772cc1d89c8e74cd4ee09650676d1a23467039e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cc75968228576250159918ec1531eecc606bc423 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 5015494210..9501257c17 100644 +index e68cc9a6b4..736f62c206 100644 @@ -34 +36 @@ -index 930340128d..7db4239c51 100644 +index 607684c1a3..390e4257ff 100644 @@ -49 +51 @@ -index d4c3507d16..fabafbc39b 100644 +index 8c118d0d9f..c76f026023 100644 @@ -52 +54 @@ -@@ -1374,11 +1374,11 @@ rte_eal_cleanup(void) +@@ -1372,11 +1372,11 @@ rte_eal_cleanup(void)