From patchwork Mon Feb 17 01:43:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mawupeng X-Patchwork-Id: 13976986 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4798C021A7 for ; Mon, 17 Feb 2025 01:53:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 98AFD280028; Sun, 16 Feb 2025 20:52:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 937AB280024; Sun, 16 Feb 2025 20:52:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 789F6280028; Sun, 16 Feb 2025 20:52:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5589E280024 for ; Sun, 16 Feb 2025 20:52:55 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F0A8E1613E1 for ; Mon, 17 Feb 2025 01:52:54 +0000 (UTC) X-FDA: 83127763068.02.59BC005 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by imf22.hostedemail.com (Postfix) with ESMTP id 7DD68C0007 for ; Mon, 17 Feb 2025 01:52:52 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739757173; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SnggH7JbAzJeBRjlLL4jUjK2wWRFo1Brbc67PdGwXsU=; b=roIoiBmUPpUmM5RGJwhPG8QDN1gtuM1T3ilIKrjHbW5cqbfLB7q/45VeQIFQvy7MuY5fit in7XBGeYwTQEyPqbrjDzDPeZEn2dwdDu5tw+y4SiTkU/QAjx7R5pcAF6K4C5qa1GY40uCI 1K1VX1uom1+r1uKh8tkofHGm235ifUY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.32 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739757173; a=rsa-sha256; cv=none; b=CAfSfpDbgkBJEy2UXbnEw1pIa/YbQwgXEAGZ+ABT0JpPh0bNS5Sp2RHI3/ooTOLWLr2CRC zLd9ioXVJ+GpHF90FzREH7kvyP41QXgPriNoroOeu+GM1eOagsC1virYL0ZBMFmntWAhNj kRdWctK27D8jUQe67UvKsCnx48iCfaA= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Yx5KC63C6z1xxGr; Mon, 17 Feb 2025 09:53:19 +0800 (CST) Received: from kwepemg100017.china.huawei.com (unknown [7.202.181.58]) by mail.maildlp.com (Postfix) with ESMTPS id 7773F1A0188; Mon, 17 Feb 2025 09:52:49 +0800 (CST) Received: from huawei.com (10.175.124.71) by kwepemg100017.china.huawei.com (7.202.181.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 17 Feb 2025 09:52:48 +0800 From: Wupeng Ma To: , , , , , CC: , , Subject: [PATCH v3 3/3] hwpoison, memory_hotplug: lock folio before unmap hwpoisoned folio Date: Mon, 17 Feb 2025 09:43:29 +0800 Message-ID: <20250217014329.3610326-4-mawupeng1@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217014329.3610326-1-mawupeng1@huawei.com> References: <20250217014329.3610326-1-mawupeng1@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.71] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemg100017.china.huawei.com (7.202.181.58) X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7DD68C0007 X-Stat-Signature: uzifokm6e8616bkykoywmy3ge77u9ocj X-Rspam-User: X-HE-Tag: 1739757172-864451 X-HE-Meta: U2FsdGVkX1+PmDnUZtEAvvvJnwFqtCzvaoSE3qwlrrqXOrur9RiwE+Ch1jG5dy0qJiH9mpnPnX81TYAiUMcRoBkTt+Ru3POSCVCvyXT7bmsmeX+9GunZDlWbPsTbmqgQwBHcHXJygWL6MbRsvbINqQUhIA9tuAHQ9rtqxemXzfoLK+sUYZe7zNB20VyLFuFbfgxIZF63hqYfohuA4IS/XcwYjWQP3P/PJtQqcYlpk07ZowErsmFjP+9FGSoAZbNlp/GM4HIGG80JFT4ZHVLf19AUK7ItxCYYIY7Jai+zTFovrjsa+Hmg3hzwFdUCOEkwvvGe/rozTnU4DsrL5josbxICo5cwj6Syz+dCtnp/9/4clBXEMrDpWii2FARybtCfLI3n8MWBDuLiqgiF263x2KqKr6eTpsCe4yZfleWfS599LrZwvlmgfty429kWve2PNalgabXQXROy2EiSpjVg3mzCJ0sycpVo9K9xLpYCO/0Mh+zIsyVAXSmiXAdPZZ8reWPjDzqbJQjVWHuOX7H7NEz6KZAnGiX3CHrkP2BlT/upVjTBB3xMBQlVJM089f9bXMSsjocBDA/lHAd4NMd6VeG51AzpdDxGH4wouybI2QqmTic34aAdTaBdNW1S7rz+VTHNr5JpjCMafwLR4hY47X5zREBEN2i3GT/U4dNPEqXSKQORtyek/7aMTHhir6U6ivnK5EpRjmAaad3xlKKm2gEuuV1Uoej5Z8P3Sf6vU31JRGdbFh7FdWn9ljnlzx4hSUiE9cRfgpaMh9EkkGPy3vUsbuqIWngHu/x6ibT6qpP+eQ9nH5VwqlbgfJMNWAt1uV3BVOWxrMNGz+sIWLTTXl93/THgEk4AA87uJWKydhFX7KNDJHk6XZIqvPXu2y9iYpUYyF/zbATls0M614/h1JU+Hpv2b8IgAN5eBaIyZxrvlqRssF0SKux3CYm1ayh4wDqTEgPusyGJjBlR84D JnoNB+fz pebVQOBx0EFbD/rEtE84TvJ+NSqwm6u+i3uQ7epomuRZTjWw8m1cF1FWg0VxN/TorQzgWlJCIjMjEtLQVN8RfhLAftCjtywSDO3P/4Xe0E8qcpUbvuJx8oGpszqopP48Jr5oypOyIKiQ7pHUwU/b6pU2UwfcKweO76Tyvva5AJS7fwgil5BrNz1Idzhh+5LjorH74gLI92mvzPFlvtpwoGxQtnPXZedVMOKUbkEbxQm0AXFxAwnBHxQZjtZJxUwfnU+s/xXSDa0TcRqOR6ivGdcTIcRmFx/uFUzq3 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Ma Wupeng Commit b15c87263a69 ("hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined) add page poison checks in do_migrate_range in order to make offline hwpoisoned page possible by introducing isolate_lru_page and try_to_unmap for hwpoisoned page. However folio lock must be held before calling try_to_unmap. Add it to fix this problem. Warning will be produced if folio is not locked during unmap: ------------[ cut here ]------------ kernel BUG at ./include/linux/swapops.h:400! Internal error: Oops - BUG: 00000000f2000800 [#1] PREEMPT SMP Modules linked in: CPU: 4 UID: 0 PID: 411 Comm: bash Tainted: G W 6.13.0-rc1-00016-g3c434c7ee82a-dirty #41 Tainted: [W]=WARN Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 pstate: 40400005 (nZcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : try_to_unmap_one+0xb08/0xd3c lr : try_to_unmap_one+0x3dc/0xd3c Call trace: try_to_unmap_one+0xb08/0xd3c (P) try_to_unmap_one+0x3dc/0xd3c (L) rmap_walk_anon+0xdc/0x1f8 rmap_walk+0x3c/0x58 try_to_unmap+0x88/0x90 unmap_poisoned_folio+0x30/0xa8 do_migrate_range+0x4a0/0x568 offline_pages+0x5a4/0x670 memory_block_action+0x17c/0x374 memory_subsys_offline+0x3c/0x78 device_offline+0xa4/0xd0 state_store+0x8c/0xf0 dev_attr_store+0x18/0x2c sysfs_kf_write+0x44/0x54 kernfs_fop_write_iter+0x118/0x1a8 vfs_write+0x3a8/0x4bc ksys_write+0x6c/0xf8 __arm64_sys_write+0x1c/0x28 invoke_syscall+0x44/0x100 el0_svc_common.constprop.0+0x40/0xe0 do_el0_svc+0x1c/0x28 el0_svc+0x30/0xd0 el0t_64_sync_handler+0xc8/0xcc el0t_64_sync+0x198/0x19c Code: f9407be0 b5fff320 d4210000 17ffff97 (d4210000) ---[ end trace 0000000000000000 ]--- Fixes: b15c87263a69 ("hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined") Signed-off-by: Ma Wupeng Acked-by: David Hildenbrand Acked-by: Miaohe Lin --- mm/memory_hotplug.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 3669b3e2d962..c3de35389269 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1805,8 +1805,11 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) (folio_test_large(folio) && folio_test_has_hwpoisoned(folio))) { if (WARN_ON(folio_test_lru(folio))) folio_isolate_lru(folio); - if (folio_mapped(folio)) + if (folio_mapped(folio)) { + folio_lock(folio); unmap_poisoned_folio(folio, pfn, false); + folio_unlock(folio); + } goto put_folio; }