From mboxrd@z Thu Jan 1 00:00:00 1970 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 EEBAFC7EE32 for ; Fri, 27 Jun 2025 13:02:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 624576B00AF; Fri, 27 Jun 2025 09:02:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5ACE86B00B0; Fri, 27 Jun 2025 09:02:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44E9C6B00B1; Fri, 27 Jun 2025 09:02:05 -0400 (EDT) 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 2CBD66B00AF for ; Fri, 27 Jun 2025 09:02:05 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E1FF7C0141 for ; Fri, 27 Jun 2025 13:02:04 +0000 (UTC) X-FDA: 83601193368.05.983AB61 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf07.hostedemail.com (Postfix) with ESMTP id 53A6D40025 for ; Fri, 27 Jun 2025 13:02:01 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=tujinjiang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751029323; a=rsa-sha256; cv=none; b=ROQq5nUyyz3YThq6Y/hqGUzP/vYpd3VeBBHqzwT83i5vfzkGqBxznxmczHxlM4jZ/DEggM uH1f5L1+YifM076o6ylfOwfmDxxuy1sB0l7JNFTfdvPt5Lmaz65TWVaUDl4nkUMoSFOcwH eFRKwMCcLY8hPktEFeD9pVFOD12SnwY= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of tujinjiang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=tujinjiang@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=1751029323; 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=pX6rUIIfs0zx4Yiw/RAA9QobhPL5F8PgLx7Cir3QR2k=; b=iOjC/KGR+IIo8XYRufgcG2obBPpPuyEGhxhseD8Gl4BbBMv8CXrPGBXp71SIVpFhcH/ffg EGkQsj/H4VirFtj2h422T4GYA5oXc+Tz62sMwkSdv3C933JBKsSiz6Z+blNDRfkA4IxTZH 8b7rEK6YqwdhV0zujqzqp/b2g2TBwLI= Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4bTFzM11kYztSfF; Fri, 27 Jun 2025 21:00:47 +0800 (CST) Received: from kwepemo200002.china.huawei.com (unknown [7.202.195.209]) by mail.maildlp.com (Postfix) with ESMTPS id D061E180B57; Fri, 27 Jun 2025 21:01:55 +0800 (CST) Received: from huawei.com (10.175.124.71) by kwepemo200002.china.huawei.com (7.202.195.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 27 Jun 2025 21:01:55 +0800 From: Jinjiang Tu To: , , , , CC: , , Subject: [PATCH v2 2/2] mm/memory_hotplug: fix hwpoisoned large folio handling in do_migrate_range Date: Fri, 27 Jun 2025 20:57:47 +0800 Message-ID: <20250627125747.3094074-3-tujinjiang@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250627125747.3094074-1-tujinjiang@huawei.com> References: <20250627125747.3094074-1-tujinjiang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.124.71] X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To kwepemo200002.china.huawei.com (7.202.195.209) X-Rspam-User: X-Stat-Signature: 4ostdjcu4xnh3m4whn69ij1nwbetyy5z X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 53A6D40025 X-HE-Tag: 1751029321-245868 X-HE-Meta: U2FsdGVkX1+NbzfEeMy8AD4j2oCbESzD9yYC7m3A7besqrcztq53ccbUcTKPPgfkA/etYzrSH6+wuOyIs7ZBuoClatN6szIi3Clt9Wuk5wSoDolDY6hjEThuVwYvOyBpbBYGT5F6Wxi6OGTeZftrfEXtoxXR8Bz2a9mt1CQJCO2CsZC7mqsrFBd7KLsjScGNehzBYGxl7H1AZI9Kb5UeHYO/vSkxtjWgCePkN2etk6DUJQUhgXEuiLw3ynRdVxPC78ICmQmBE9dfnQ42JX0cAl3MvnE4MIe4Sr6DfY2yIejJ2gx2rz9tOrTgdA+7IiiAI16rGcIzB0T40lYRnDAlRZiq9XNh4zQ4831zHDwp+1fFypv/w48Bn510tZNCsKLAAvksXsV6WhV5bov39kmQtLZvFuH7aOKxbbHx+PkKNU8cN2AkkwQNxYL58Fbsg5FrUIS6adThecD9pc0xrJeIIURW+PZKJVlusT5Z6mR7V0wR6hq0ytUwDCE15e4by03cRTavT4USUp3zch2+sddAeqye2CQR7uqAc6dq+cmz/eMx6DZFJWjJI+qC7+roPMlmQNF3P1Ovh7+pdzWJeg0ZniRtZvz1NjBW5yGF7OjYrq4xoua1iQsllh3THeUfQIYDNA1La4vkIWIJ7fANSj52dlrsRcBpi2IFimrbIVDNtMLxx2wt2TFUs91DD+zdfjk5h7V198d2xF6GbPjc6vD2vDRQoi08yPo4/RI9A2zmVMkQVZEHDKZf4s2imCZs9v/6aMlxi17ypgP6I4chJjMOieb2Fk6pEji+3UGkl6gZQSRkFiUGkvhTC0LEIvL+T1GXQfQLkx8h9Djh6eS5OtAa27JJJJ5RYpLGO2AOTpZzcYklFHv/c8tvJkJFMAkVo+g3MDzjE5C/E6ivVAxFwF9qBZA4FaYtpNEuqNoDgMbkC+PLXcMrM6R40MJP/060bR3IyvIDyPSCwK33INNwMuW q8he3ZJ8 XIFaFpbD4ilpU/2fcBoQ8K64G5+YCSHIIT22eQld0LkHE0xbWKOrGO91ekXtcsmW22FozY/keX0jr2EJCNhVBED+59GC4FibjHfidQ3Vkbz8udbii2ETda2i4ElYi0wyDOrwXkrDEf0ULMeh8bpxbIxoXT1DV5DnBqDv7i1+MAq9muPOGkZDPoFzwB84nAX0AOxewLhW6/Nq8f3PY3IWXXpgke9OXPG6vFfVYTYo7OtNq9o3x9R6SBRSIyPmtrE6Rs5im+jFHS+ESACCX94HiZDezKw== 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: In do_migrate_range(), the hwpoisoned folio may be large folio, which can't be handled by unmap_poisoned_folio(). I can reproduce this issue in qemu after adding delay in memory_failure() BUG: kernel NULL pointer dereference, address: 0000000000000000 Workqueue: kacpi_hotplug acpi_hotplug_work_fn RIP: 0010:try_to_unmap_one+0x16a/0xfc0 rmap_walk_anon+0xda/0x1f0 try_to_unmap+0x78/0x80 ? __pfx_try_to_unmap_one+0x10/0x10 ? __pfx_folio_not_mapped+0x10/0x10 ? __pfx_folio_lock_anon_vma_read+0x10/0x10 unmap_poisoned_folio+0x60/0x140 do_migrate_range+0x4d1/0x600 ? slab_memory_callback+0x6a/0x190 ? notifier_call_chain+0x56/0xb0 offline_pages+0x3e6/0x460 memory_subsys_offline+0x130/0x1f0 device_offline+0xba/0x110 acpi_bus_offline+0xb7/0x130 acpi_scan_hot_remove+0x77/0x290 acpi_device_hotplug+0x1e0/0x240 acpi_hotplug_work_fn+0x1a/0x30 process_one_work+0x186/0x340 In this case, just make offline_pages() fail. Besides, do_migrate_range() may be called between memory_failure set hwposion flag and ioslate the folio from lru, so remove WARN_ON(). In other places, unmap_poisoned_folio() is called when the folio is isolated, obey it in do_migrate_range() too. Fixes: b15c87263a69 ("hwpoison, memory_hotplug: allow hwpoisoned pages to be offlined") Signed-off-by: Jinjiang Tu --- mm/memory_hotplug.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b1caedbade5b..5fab212e3a2c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1795,7 +1795,7 @@ static int scan_movable_pages(unsigned long start, unsigned long end, return 0; } -static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) +static int do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) { struct folio *folio; unsigned long pfn; @@ -1819,8 +1819,10 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) pfn = folio_pfn(folio) + folio_nr_pages(folio) - 1; if (folio_contain_hwpoisoned_page(folio)) { - if (WARN_ON(folio_test_lru(folio))) - folio_isolate_lru(folio); + if (folio_test_large(folio) && !folio_test_hugetlb(folio)) + goto err_out; + if (folio_test_lru(folio) && !folio_isolate_lru(folio)) + goto err_out; if (folio_mapped(folio)) { folio_lock(folio); unmap_poisoned_folio(folio, pfn, false); @@ -1877,6 +1879,11 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) putback_movable_pages(&source); } } + return 0; +err_out: + folio_put(folio); + putback_movable_pages(&source); + return -EBUSY; } static int __init cmdline_parse_movable_node(char *p) @@ -2041,11 +2048,9 @@ int offline_pages(unsigned long start_pfn, unsigned long nr_pages, ret = scan_movable_pages(pfn, end_pfn, &pfn); if (!ret) { - /* - * TODO: fatal migration failures should bail - * out - */ - do_migrate_range(pfn, end_pfn); + ret = do_migrate_range(pfn, end_pfn); + if (ret) + break; } } while (!ret); -- 2.43.0