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; }