From patchwork Thu Jan 16 06:16:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wupeng Ma X-Patchwork-Id: 13941321 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 BA68EC02180 for ; Thu, 16 Jan 2025 06:24:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 41CCD6B0088; Thu, 16 Jan 2025 01:24:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D9C76B0089; Thu, 16 Jan 2025 01:24:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 294BA280001; Thu, 16 Jan 2025 01:24:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 0664D6B0085 for ; Thu, 16 Jan 2025 01:24:37 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 863244426D for ; Thu, 16 Jan 2025 06:24:36 +0000 (UTC) X-FDA: 83012326152.27.8A33940 Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf25.hostedemail.com (Postfix) with ESMTP id EC710A0003 for ; Thu, 16 Jan 2025 06:24:33 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737008674; 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=huODdhIPXh5W+Nl2ITtMWzZ0PVHJE6h4y+zB/y82y8Q=; b=E1c67XD/RFW7AGIVURdrRnDZS65hV4lNLoL4oVPrt6sj4cZ/BNaAXO0642h7LOAnr7t3OK X97Gyzcejg2qJXyPw4H3Y048R2btN5cI9dDTNonIZUde+BgzE1h9zKQvtFfB99lyk11azE renKpF+Y5nrLlBXKItZMAS7CX0k9b94= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1737008674; a=rsa-sha256; cv=none; b=aPaXoE6GOA1d0V9rMsjOEN0G/MmXSLjOQeBfDY+3JIePvdXYcIGvUzN1SVQEOXB435MdhC FvaQ/VApQJbW1jkBY5uhLgtxQJnJLYJ8fP6hecGT+hK9nv+pZXHJEoE5RNFMHKn61aAx0x GtSOTZ8lyTWroaGMJ/rACKl2eDqcX+8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4YYXn726VSz1V4tl; Thu, 16 Jan 2025 14:21:15 +0800 (CST) Received: from kwepemg100017.china.huawei.com (unknown [7.202.181.58]) by mail.maildlp.com (Postfix) with ESMTPS id 39D82140109; Thu, 16 Jan 2025 14:24:27 +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; Thu, 16 Jan 2025 14:24:26 +0800 From: Wupeng Ma To: , , , , , CC: , , Subject: [PATCH v2 1/3] mm: memory-failure: update ttu flag inside unmap_poisoned_folio Date: Thu, 16 Jan 2025 14:16:55 +0800 Message-ID: <20250116061657.227027-2-mawupeng1@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250116061657.227027-1-mawupeng1@huawei.com> References: <20250116061657.227027-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-Stat-Signature: m4oj5cfaguy5rkwxhax8cn7oe8x9ujde X-Rspam-User: X-Rspamd-Queue-Id: EC710A0003 X-Rspamd-Server: rspam03 X-HE-Tag: 1737008673-427346 X-HE-Meta: U2FsdGVkX19kzl3IVEiMWlENlzew3BVk1zzRtssnFwL0mX3ASDXL5/6adqdM4lYW0kXIlRzmce2qpF7DSS1IRl9EVVKzYGa/R2Iygl1TMRCyiHkFrpgGZrL2DkW9D5QDpq5xnmoMozHZxcshI2f5Wijw0sJxqTCAgMm+0NYkOo4eBowYGlks1btaKxUirOvK1vAf1Joqe2fwMEyrYZw6/UbIcLdYoueGXq9xKX3EBckB50UYy759LqHzp+SnSzU6tHXAG4lxtBJQA6s8sPwoaAR+pZnkeNeQoXKXn6dI7zr33KQBhpylJ+uqwnlxPoBxv60BkjRjzWKbRnPJWB77ksPtf5YpTDHEHsoztPAPU2AAWl5mDXYy9Bj6OXCCUQe9BZR07WFuIIx3nYhftYKMmx/CVw4XSdy/HdFy1c5xq1FHN3n4UM+vzegYDcr895y2C9FCCmpXu8zjgpg8XnOOj/q9GJ8lgU6PYx8PwvxNI8PngKlAXVYSjIveKiRnkTXUMkwyWrps4ISGyHA99hJQoqu7aN0Nvq6rAB7iXGOM9FIvrk8FDDtLPVPQHxKr3gFCBMFdFm2pNthFMihDdLrB0T0bsxw6GgPiOYc4gpDYbuCD49tseK9iC0ohD/rKhdy5S9DszKbNo++iPNMEG5naD27xciPLKPo3d1aB9us6BwNVGgqfZdvLurYqyECTRLqKQ7CJvo5Y+8lg8Qss1ofy8sjYZyJfwhIX7tGEIqQZ5aSh68odL/HT/ISHbY3BUFEOC9fZ1I9w6aMx4pdSQk2LNZQfV18HO/ZL9C1vSf/gIb62VmICzLFfojo9844ZTD5TnYIBraWbmhPVmDdfVoaeLuXyf7eCqD/NctxQO4zOKO2EGjlpFbUuhMs+xkqXJnwTDTyS5IsDuutcxPfLgwJg1AcdS6pK5rmXh9MN+ZwsKE9PMM2fqd0/r+BiWXbBNin/oiZwQkcWk1IqxxYYokY Jb8NlK35 7/FJXJL7e/tEO+jH9it9NT2Vh/+nU8mVvQ2z1uNX0Rcus+Gg/xLpvWYBFtWHkDdNGInvA5BjJjpD1/ZacCBSDeWcXw5zw7MQAg7B4ZP3Vyt3yW+hvVVWCiE6+QZLEKnQ9EkMiZzYn6+PwBi6FGotFCZZawvkz9n59p7FAPWFidLlY96QSeIcMPsCCd1t5p52NUIxVXzyF3TYr9ypSifStwXQOtgy+SMY+YfgQWk43JWr/RXfn4yIPJ5nWcuJsYwkDq3VtIZWaC6s8oEO6WfwH/Dy/6A== 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 6da6b1d4a7df ("mm/hwpoison: convert TTU_IGNORE_HWPOISON to TTU_HWPOISON") introduce TTU_HWPOISON to replace TTU_IGNORE_HWPOISON in order to stop send SIGBUS signal when accessing an error page after a memory error on a clean folio. However during page migration, anon folio must be set with TTU_HWPOISON during unmap_*(). For pagecache we need some policy just like the one in hwpoison_user_mappings to set this flag. So move this policy from hwpoison_user_mappings to unmap_poisoned_folio to handle this waring properly. Waring will be produced during unamp poison folio with the following log: ------------[ cut here ]------------ WARNING: CPU: 1 PID: 365 at mm/rmap.c:1847 try_to_unmap_one+0x8fc/0xd3c Modules linked in: CPU: 1 UID: 0 PID: 365 Comm: bash Tainted: G W 6.13.0-rc1-00018-gacdb4bbda7ab #42 Tainted: [W]=WARN Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 pstate: 20400005 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : try_to_unmap_one+0x8fc/0xd3c lr : try_to_unmap_one+0x3dc/0xd3c Call trace: try_to_unmap_one+0x8fc/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 ---[ end trace 0000000000000000 ]--- Fixes: 6da6b1d4a7df ("mm/hwpoison: convert TTU_IGNORE_HWPOISON to TTU_HWPOISON") Signed-off-by: Ma Wupeng Suggested-by: David Hildenbrand --- mm/internal.h | 5 ++-- mm/memory-failure.c | 61 +++++++++++++++++++++++---------------------- mm/memory_hotplug.c | 3 ++- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 9826f7dce607..3caee67c0abd 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1102,7 +1102,7 @@ static inline int find_next_best_node(int node, nodemask_t *used_node_mask) * mm/memory-failure.c */ #ifdef CONFIG_MEMORY_FAILURE -void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu); +int unmap_poisoned_folio(struct folio *folio, unsigned long pfn, bool must_kill); void shake_folio(struct folio *folio); extern int hwpoison_filter(struct page *p); @@ -1125,8 +1125,9 @@ unsigned long page_mapped_in_vma(const struct page *page, struct vm_area_struct *vma); #else -static inline void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) +static inline int unmap_poisoned_folio(struct folio *folio, unsigned long pfn, bool must_kill); { + return -EBUSY; } #endif diff --git a/mm/memory-failure.c b/mm/memory-failure.c index a7b8ccd29b6f..b5212b6e330a 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1556,8 +1556,34 @@ static int get_hwpoison_page(struct page *p, unsigned long flags) return ret; } -void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) +int unmap_poisoned_folio(struct folio *folio, unsigned long pfn, bool must_kill) { + enum ttu_flags ttu = TTU_IGNORE_MLOCK | TTU_SYNC | TTU_HWPOISON; + struct address_space *mapping; + + if (folio_test_swapcache(folio)) { + pr_err("%#lx: keeping poisoned page in swap cache\n", pfn); + ttu &= ~TTU_HWPOISON; + } + + /* + * Propagate the dirty bit from PTEs to struct page first, because we + * need this to decide if we should kill or just drop the page. + * XXX: the dirty test could be racy: set_page_dirty() may not always + * be called inside page lock (it's recommended but not enforced). + */ + mapping = folio_mapping(folio); + if (!must_kill && !folio_test_dirty(folio) && mapping && + mapping_can_writeback(mapping)) { + if (folio_mkclean(folio)) { + folio_set_dirty(folio); + } else { + ttu &= ~TTU_HWPOISON; + pr_info("%#lx: corrupted page was clean: dropped without side effects\n", + pfn); + } + } + if (folio_test_hugetlb(folio) && !folio_test_anon(folio)) { struct address_space *mapping; @@ -1572,7 +1598,7 @@ void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) if (!mapping) { pr_info("%#lx: could not lock mapping for mapped hugetlb folio\n", folio_pfn(folio)); - return; + return -EBUSY; } try_to_unmap(folio, ttu|TTU_RMAP_LOCKED); @@ -1580,6 +1606,8 @@ void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) } else { try_to_unmap(folio, ttu); } + + return folio_mapped(folio) ? -EBUSY : 0; } /* @@ -1589,8 +1617,6 @@ void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) static bool hwpoison_user_mappings(struct folio *folio, struct page *p, unsigned long pfn, int flags) { - enum ttu_flags ttu = TTU_IGNORE_MLOCK | TTU_SYNC | TTU_HWPOISON; - struct address_space *mapping; LIST_HEAD(tokill); bool unmap_success; int forcekill; @@ -1613,29 +1639,6 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p, if (!folio_mapped(folio)) return true; - if (folio_test_swapcache(folio)) { - pr_err("%#lx: keeping poisoned page in swap cache\n", pfn); - ttu &= ~TTU_HWPOISON; - } - - /* - * Propagate the dirty bit from PTEs to struct page first, because we - * need this to decide if we should kill or just drop the page. - * XXX: the dirty test could be racy: set_page_dirty() may not always - * be called inside page lock (it's recommended but not enforced). - */ - mapping = folio_mapping(folio); - if (!(flags & MF_MUST_KILL) && !folio_test_dirty(folio) && mapping && - mapping_can_writeback(mapping)) { - if (folio_mkclean(folio)) { - folio_set_dirty(folio); - } else { - ttu &= ~TTU_HWPOISON; - pr_info("%#lx: corrupted page was clean: dropped without side effects\n", - pfn); - } - } - /* * First collect all the processes that have the page * mapped in dirty form. This has to be done before try_to_unmap, @@ -1643,9 +1646,7 @@ static bool hwpoison_user_mappings(struct folio *folio, struct page *p, */ collect_procs(folio, p, &tokill, flags & MF_ACTION_REQUIRED); - unmap_poisoned_folio(folio, ttu); - - unmap_success = !folio_mapped(folio); + unmap_success = !unmap_poisoned_folio(folio, pfn, flags & MF_MUST_KILL); if (!unmap_success) pr_err("%#lx: failed to unmap page (folio mapcount=%d)\n", pfn, folio_mapcount(folio)); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index c43b4e7fb298..3de661e57e92 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1806,7 +1806,8 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) if (WARN_ON(folio_test_lru(folio))) folio_isolate_lru(folio); if (folio_mapped(folio)) - unmap_poisoned_folio(folio, TTU_IGNORE_MLOCK); + unmap_poisoned_folio(folio, pfn, false); + continue; } From patchwork Thu Jan 16 06:16:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wupeng Ma X-Patchwork-Id: 13941320 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 14D11C02183 for ; Thu, 16 Jan 2025 06:24:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FC9E6B0085; Thu, 16 Jan 2025 01:24:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 926DE280001; Thu, 16 Jan 2025 01:24:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B3A16B008C; Thu, 16 Jan 2025 01:24:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 452F06B008A for ; Thu, 16 Jan 2025 01:24:37 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 01CA3120771 for ; Thu, 16 Jan 2025 06:24:36 +0000 (UTC) X-FDA: 83012326194.01.B6ABA2A Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf26.hostedemail.com (Postfix) with ESMTP id 9E23F14000A for ; Thu, 16 Jan 2025 06:24:33 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1737008675; a=rsa-sha256; cv=none; b=kXEOUUfnKg4qW9CrWmZYLnt+SZXWyIabfRjWlrII+9F/GqIrg3AXwj8Fjpu4lvG2tnOHUg 2JGTWy4Q39OQwTG8PeqmUj/l/js8hTTX1OyolnGYBGoScTo+i9EavsyPhtyr0tYZOJxCts vFbqGoMFERSEr/X1+fWt6kxozIWx25o= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf26.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737008675; 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=yEVpDe5o9C8UDsftW8NkOjgyf85YOhtiDvfaTi+Epls=; b=KZXAEPoINevbHhOTepkE1y0H2BeNRGU+NbGCpySDGOs0gMXx6OYwoS/4mMTbPVZFBi7+IR e211abs+qfkBrHI7ptaZB+qAS7GbQfLDKYDq5Y2XewQXYISCErjfxfYY26k2WzXzHUKhgx 31rlFA8WMeSzziIY6oBvvTYB608Rhek= Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4YYXqp1nZKz1xmrf; Thu, 16 Jan 2025 14:23:34 +0800 (CST) Received: from kwepemg100017.china.huawei.com (unknown [7.202.181.58]) by mail.maildlp.com (Postfix) with ESMTPS id 0630E14034E; Thu, 16 Jan 2025 14:24:28 +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; Thu, 16 Jan 2025 14:24:27 +0800 From: Wupeng Ma To: , , , , , CC: , , Subject: [PATCH v2 2/3] hwpoison, memory_hotplug: lock folio before unmap hwpoisoned folio Date: Thu, 16 Jan 2025 14:16:56 +0800 Message-ID: <20250116061657.227027-3-mawupeng1@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250116061657.227027-1-mawupeng1@huawei.com> References: <20250116061657.227027-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-Rspam-User: X-Rspamd-Queue-Id: 9E23F14000A X-Rspamd-Server: rspam10 X-Stat-Signature: 5odc5hpzmktpxn7noj7ojy61jtm5mo7s X-HE-Tag: 1737008673-490533 X-HE-Meta: U2FsdGVkX19WhUoEsVt8siwG8ii+Wv/N9IYXcLzBY3n3YnAqRSwbYggWpBkHzypNZ0cSSynwLEoAugIpzXMr75aISMeHygHp9Lb5uCAQ5IgyYlVUlU2Pm4BbffPO52F+zsN/ZPDjRPhU+6PZf3gjOl+IcyM/6m+GUytrjYmva/ZogzVG896hs5DoRDfRYmptVTFUMEatzUmiQ7SzWjaA9OfsRZWrzoOX6n/Efk1jyNLkLvlEoa2ZPF+aVgoVoh/2zm7fpBo0LU0T666ZzUUgcH461+mdgoZ5FbzL1PZlpjPHxIeW7p6pSK7d5rasToMss0szXXwvX5Nu0RWfBA/4H5uYFC1Y+A+QQLc62uwV/QfzMOQEvxrbA96wpZPYZUSU6Nq6d6nLgtDERV39Df/x8ki81iACEOdfKIfUmzGg8mfKf5HzgO5mExaQJ39B2s6zI4z8m5MkHTp+vPe1UaDPjqAEANzxOXURZ4Vl1EgUTqZaFlovdsKclb61KGl+wMJq3yFlbiLHS8nyYUcLhS6ufMUI5buEgfHg03QMSyVqGEKOH2c9o6d0tErGB0DnqVj7o0aaaD3jff93zAr+Nn6qTifXYArCgU1CLrHSFofujCeOHU3zz52ftANu+aOpFRhIG5YL2MbRK1yXMMtsCcmKgTIH6XaincaAlnmC2n3L+B1Tr+gSsHvVoVV+cvrhLPd5/QFwQVy6Ps88hFjWfTBpnWAUKo9cIywU2Z/bkxul/8lQyPM35s6OaUKubqtKJ+jsVKsuKUSx/hSMC6dlvx+AJQOCMomx3u2MDeYUQMjt1nSV0QHPEXMO8YhwfIR6HlBpt4za/23xaCtX7KZroBlVGWKMivaNPwEeLdGUG7OMmMbYdjgSaoCKVYzLirviwrqolUmdzL1pm+esnlhukAcRbsuhR/AKODSWddPAb8/uAI+gTQ5qRj8IjmUwIIYq+b9sgoYABLsqUPmwnO7i1g7 9jyflZAR O+2I1rKZdmwusltxkm293WcjvzZeDVfTlda8XZN9yeMsKsAeZAtUOIzy+b5m/clCPs2Mq+caSAk1Cya9O0cC44k6Kz7+ERR6ZvFCgE+xRuzwMwlKzQxO2PwlUHR9wNPvyGTpsQVIE2UWYVhqpB+N7GMT8oMbIRGqVQmOuQhsvHThIIweW2BtPkBpWkciZgS0K6D59yDUwrcjYE5w0a3KzDBV6+GChCckmNhb/B5buTBKnIo8k0Lvw24ub6Yc2PVa6u7KV 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. Waring 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 --- 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 3de661e57e92..2815bd4ea483 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); + } continue; } From patchwork Thu Jan 16 06:16:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wupeng Ma X-Patchwork-Id: 13941322 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 8F42CE77188 for ; Thu, 16 Jan 2025 06:24:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1D266B0089; Thu, 16 Jan 2025 01:24:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BC4926B0092; Thu, 16 Jan 2025 01:24:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99F3C6B008C; Thu, 16 Jan 2025 01:24:37 -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 50FCE6B0092 for ; Thu, 16 Jan 2025 01:24:37 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 063321C7447 for ; Thu, 16 Jan 2025 06:24:37 +0000 (UTC) X-FDA: 83012326194.03.DB4DC6C Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf13.hostedemail.com (Postfix) with ESMTP id A3C1720006 for ; Thu, 16 Jan 2025 06:24:32 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf13.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1737008674; a=rsa-sha256; cv=none; b=o5g7CFN5OtzAsZiOr87zCGvjozkBPVHzfvDOhofkOS367f8o99GqCPfP/jZye1lycit5AC qkRV3vhnultTpP3a5NyOX/MrxSbenrzXKsqXYeWgASho5ThPYmFWl1ljVnQxiEE14nlylS WPha4YPGK73TAPEJjve1m1cg7NKrYCU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf13.hostedemail.com: domain of mawupeng1@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=mawupeng1@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1737008674; 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=rEhJdON/GMmNwJBgscv8EQf63kvckFtv/7gMUDhX93c=; b=2Cr+CU/FKA5tMrE/qIiHHWnXH0hreCXPFkxw+KbKKG//IlUTzO+FVQ7ILiIZHgKh4RbVtJ dNKTcVfI1yLZVdierOeek41hMyDAOqvEh5lhY0M1YZw1Tla5FlvAwFgcYkQZfkp9C+iFf7 p7RJRN278P3wqbRBB1jkPopN25ZmUOs= Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4YYXp52GlWz22lDB; Thu, 16 Jan 2025 14:22:05 +0800 (CST) Received: from kwepemg100017.china.huawei.com (unknown [7.202.181.58]) by mail.maildlp.com (Postfix) with ESMTPS id C7C83140109; Thu, 16 Jan 2025 14:24:28 +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; Thu, 16 Jan 2025 14:24:27 +0800 From: Wupeng Ma To: , , , , , CC: , , Subject: [PATCH v2 3/3] mm: memory-hotplug: check folio ref count first in do_migrate_rang Date: Thu, 16 Jan 2025 14:16:57 +0800 Message-ID: <20250116061657.227027-4-mawupeng1@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250116061657.227027-1-mawupeng1@huawei.com> References: <20250116061657.227027-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: A3C1720006 X-Stat-Signature: 645u4q9fcrhee8ojfesy6qkbkwfnw5rb X-Rspam-User: X-HE-Tag: 1737008672-447814 X-HE-Meta: U2FsdGVkX19AYPMuqEhAMAO7icJ2a4Ma1hvxSkU4MYmXuW5+Utp3bxqou/rIKrUavu5X9loYxWWIIdqMRvOgWJsfdXchVy6LTCgamQYyADfXFK5zN0ZUkDQgkcmmBscsguRrjM8e+CKZPCXbt2I7gk70V3sHqqadZCwf7Ix6w6REpYwpfV8p4TlQ908KWGb0lTVBDvSNWhV/nOwzh8n1hIUM/9wMXRLgT7mqswiZS9Wlm8AAE30R/vccg1K+11PESVn6oNwmyi5iGyw2Slr5XzvePkSuvr1lkXkgiho37lBTMaU/+IfvvsgMKmPvgp5+SzmRceYZL+iCNZPvECil5EkArkUMUxVseqduSJ11/OdkYqCCSWB1MNBbVXX+eCU4qxFQfOQVULzgiAVMqjtrE3THzVt0rzLqL670Yk9OcZKXWDawSZ9gb064Ws9Qmfl8JODUyc0jF6Lk96L0kyhOBMLxPkdxR2enAkYfcJk3NDSg6yY1DdN1id6ZxLV2HoY8IsGq4Y4hsNq21oAYuhLBlHQkeLw22QPEEAubWKZftFWsxbA6Cxpvzvvh46qom0L0ZIK8YffxlxeKCoF2Cs8/78oJdzxHBLlELLByLBhkEmo8fZI150ncumiDbW/hdCGmVh3IBP5UIzoFzb21SzhF9HIdHJrv14teGLNaercbRpVLbt8MSr6pZoZ97Z8dkAmc3T/1yCcRdL0AzyeC06jM1MFR05Q2qS4/G40jfLIFdO37PcWmRD0ekPFKjRBFGEH+PWPb83Xz9BoROBkjUmSIZS/byqe6Ne05hNNr684HMjorZVEBrIP4zk1IxWcgdy/ri5GvmL5fx/gC6RaVQLd8detxyVnasamyliDP/MhV/1XPp79oxbC4fJ/3WDIoezzB360dKfG5BF7+r/pfRncRch2+T3sHskxoWp2VJDKHuhspWWiYigP+U0RGyW8eg+2qaVhY6EVKVSvkEdIDVWL 4Aspbc57 AHEo1l/gqKs6Lbx6RmOOnieQ/aHGUPEyX60L90Wxgvxy2Df0RtSp1NIuPQ1z2RVKO1XV2PG3Vd7A7c9P2KquMtEh0FWyGbLyHggokUia72+skjSAySG4y8Tx22jtE9tulCWr9tu2u0hGAe83/Pkg3LUETTNqr8oHBBhhrjtgWsAeR5Ru69xfa7TSQ5tNTznxwTmHm9OWokjS3wE60lT5N1vUparrIoyRRXhOKIIB86XmCc+SFXjZ/8cf4E/TeKTcZiHVW2sIZXjdMfOI= 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 If a folio has an increased reference count, folio_try_get() will acquire it, perform necessary operations, and then release it. In the case of a poisoned folio without an elevated reference count (which is unlikely for memory-failure), folio_try_get() will simply bypass it. Therefore, relocate the folio_try_get() function, responsible for checking and acquiring this reference count at first. Signed-off-by: Ma Wupeng --- mm/memory_hotplug.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 2815bd4ea483..3fb75ee185c6 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1786,6 +1786,9 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) page = pfn_to_page(pfn); folio = page_folio(page); + if (!folio_try_get(folio)) + continue; + /* * No reference or lock is held on the folio, so it might * be modified concurrently (e.g. split). As such, @@ -1795,12 +1798,6 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) if (folio_test_large(folio)) pfn = folio_pfn(folio) + folio_nr_pages(folio) - 1; - /* - * HWPoison pages have elevated reference counts so the migration would - * fail on them. It also doesn't make any sense to migrate them in the - * first place. Still try to unmap such a page in case it is still mapped - * (keep the unmap as the catch all safety net). - */ if (folio_test_hwpoison(folio) || (folio_test_large(folio) && folio_test_has_hwpoisoned(folio))) { if (WARN_ON(folio_test_lru(folio))) @@ -1811,12 +1808,9 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) folio_unlock(folio); } - continue; + goto put_folio; } - if (!folio_try_get(folio)) - continue; - if (unlikely(page_folio(page) != folio)) goto put_folio;