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 021CCC77B7C for ; Thu, 3 Jul 2025 07:53:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 849936B010E; Thu, 3 Jul 2025 03:53:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CBD26B0124; Thu, 3 Jul 2025 03:53:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66DC36B0125; Thu, 3 Jul 2025 03:53:40 -0400 (EDT) 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 4E0EB6B010E for ; Thu, 3 Jul 2025 03:53:40 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BCE4180718 for ; Thu, 3 Jul 2025 07:53:39 +0000 (UTC) X-FDA: 83622188958.18.DBA99B2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id C749820003 for ; Thu, 3 Jul 2025 07:53:35 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JvfEPApb; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751529217; 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:dkim-signature; bh=bGfnLYnw5XhLfziDVjgfpfJFAm/1oIBaav+jGS4FJMc=; b=TPI5uPCY5MXcKl3O3hF1GTxk7MKuglbZ++VvLWvVSb9DGaD1k4Go/6eMpH2uXQdo4+pbNv ih4Q9N/PS3Ab2UiMzwT6PBdc79cFO04f2m1V4vQCSLhUL10dqkF6gC0mb+kXL3AILdoYwn XHMJ0G11t7ED2D8uNpS8TH3tL4IUJfg= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JvfEPApb; spf=pass (imf03.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751529217; a=rsa-sha256; cv=none; b=EKQpi4uaoRHZv5Li7TDkPDuPExHB/8JaA1E0Hw/TeFs1mhvkIRmFEC8xMbCZyW0pgTknMg JoWZKegzQIDsvOPj8elzYFvR6HqX+vcwSdp8szyx1n9HjNcUG1j/yKdhuSS/ZYJTNJRbAE LmuwGqCXbY/tzPkdD94NMulW6paz46o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751529215; h=from:from: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:autocrypt:autocrypt; bh=bGfnLYnw5XhLfziDVjgfpfJFAm/1oIBaav+jGS4FJMc=; b=JvfEPApbNwkn9T4es8vanoXiffSNahcjKdU0BItF4AuK8O1b2zPD2kFWsmzze7hTbxAC+h c5FcSeZRyyvKAwXZjKBl/KqbgrZxTDdTNZTVowXAqUFsLbNCHx4hXHWfuu571smJSs0N8e pLMK8g5zvxefR9MmkO5VkecncAXYf1I= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-300-OtTVgFv0PGW1GrJnbLHQsQ-1; Thu, 03 Jul 2025 03:53:34 -0400 X-MC-Unique: OtTVgFv0PGW1GrJnbLHQsQ-1 X-Mimecast-MFC-AGG-ID: OtTVgFv0PGW1GrJnbLHQsQ_1751529213 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-ae371f9e3f5so72882266b.1 for ; Thu, 03 Jul 2025 00:53:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751529213; x=1752134013; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=bGfnLYnw5XhLfziDVjgfpfJFAm/1oIBaav+jGS4FJMc=; b=UnLKToL0PRNv2WJsexXwa90hKMC+2twKFLjNQL4vxAPBHdq1rclNAoFTVw9gAnJxjT WLQ+X+IVf4gTRTSvPjFK4H3Hgh6PvWG5fO92ZjeDNSx4QyNYqo5NNxFEQyaenKvPc65Z CZ+fNLLRXTgaLHwiCVL44ZoNqlPWuXIgZyU5W76oWqeaF/Xzzv+kP13Fbwhfaw0UvVod +UUmh3CrXs4fKaf2M+pzVEU6qwNLmWgMa/JUaCdkma8mi0LO0GqafhXZPt5fvi1n3MrE R9sRd57tlKQtmbfy97urgwqKdXUcQVG4QREtoCJtLVaJdju98i2gV5mDkA5XZwSIc6T9 lLOw== X-Gm-Message-State: AOJu0YzYyrYzS43T3jAf4Kn2CN/t6mJECfwxtUJYL3s+qTOiJfQwlm33 lrzt9GIz8Q/bZDZETmjyVhDSVbuqoI7+Z3CPMP0eRh+SUBIlvPFwVqhKUsWp02AzL/XSYanrVBq cRv/i2VYJkzQ5Gv1RVRCNqv/Uyt6cxCXTsIzqloV/a4WvVk+liGkR X-Gm-Gg: ASbGncvznLGnLZdGvG9s6Ud2lHKRdmxcrDIfZxG5Z7inSd7EKCTApnSX7eMQU+/Wh/3 FSjQTNlRfJ5ch8NB13H9xGC0mFoQZkkSCBZOXh1/2B9sFBKJEzDhmZ4y2xdKyDAZlyI7qi/IZLS iYxIc2CpyzX5qX3KDSA3sYEyZd21TcXXQjTiYVE4dtukSi+/dFwxBDV4sGGVuIx7fwYdNsoW2G8 EYx4nhip57GkbWFhzMOdLOil5g6TsHgaqT0DarqUjFWCur2Req8OY89bpB+bUpnMPzui3psai6/ xd5fe/cqTwaZEvP6QwN1Cdp6DxiVsp7kNx5uz1oKxgmS X-Received: by 2002:a17:906:6a27:b0:ad8:e448:6c64 with SMTP id a640c23a62f3a-ae3dd5f805cmr157353566b.24.1751529212771; Thu, 03 Jul 2025 00:53:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmfnnNH5QHMBZzk2th4Dwcfp5R4EwkaSt9r72Uw1IlQFzRkJUpdnk5+FRgS95BRp2iMC+BbA== X-Received: by 2002:a17:906:6a27:b0:ad8:e448:6c64 with SMTP id a640c23a62f3a-ae3dd5f805cmr157351966b.24.1751529212346; Thu, 03 Jul 2025 00:53:32 -0700 (PDT) Received: from [10.32.64.156] (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae3b1d2c46csm441512266b.110.2025.07.03.00.53.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Jul 2025 00:53:31 -0700 (PDT) Message-ID: Date: Thu, 3 Jul 2025 09:53:31 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 2/2] mm/memory_hotplug: fix hwpoisoned large folio handling in do_migrate_range To: Jinjiang Tu , akpm@linux-foundation.org, linmiaohe@huawei.com, osalvador@suse.de, mhocko@kernel.org Cc: linux-mm@kvack.org, wangkefeng.wang@huawei.com References: <20250627125747.3094074-1-tujinjiang@huawei.com> <20250627125747.3094074-3-tujinjiang@huawei.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250627125747.3094074-3-tujinjiang@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Bm34wLS4Z3SN6pRvKSVKsja01FjuqRKbidjC3oM72nE_1751529213 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C749820003 X-Stat-Signature: fytgehg9tac3xiybuews4ye3by9e7aes X-Rspam-User: X-HE-Tag: 1751529215-527769 X-HE-Meta: U2FsdGVkX1+htnLNz2c+YHpEmP4Vi7cwORqv9Axizf9FaX30efPvhfYrH2+T6yjb9kcy0c73oDo4mSRAs68lke3gcCnr5J4zy9LnTQvcMgGJvVSvHDqHAlvZkfpzX9nyBDklbTc0lYf/Kl8akvBp4ozI0XdmVnvMExHZXWQ1efa2N1KiVcmuVlZmODX2hjrcRLQkWQTkVfetvbHyg21nKZBnkxqwpZUDFuUcTv8t4dxTWalbp/1xEzVAmyO7z5/60zgn9w7Ke8viYLxYX+brAEfByeqD0JmcGjsNL0rVFkZ4pWMJNpL3hDqOcj+K9/XqvuHF+LH6Yu1VkwNzTCyieEy5tcVuSKcRZ4zWh0mvIV3E1zKawk3hjziNpcPmJ4kILk+i8OfF58Oen18hDSLkOPN4ZykeoqhqjNa18qnyvGS83utHKiXIu0z61daRCNUOcWOYABo9xtN3fair3MlYjgxdYNT22JENuSG/DLPxbBSyOQrdfqvyMJLzMfyNmndX0hx8HmgNMu9LsGxoDCAHhy3SAQpvhZV53FYTcfLjAoMFBNFxRO40Knh4FqKNEYeYQsMdh544vIeJYLyceePucvMCKOn5kpxBiOyxEPt3m14g82EVlDYI1LV5vci87PuEwib1sSYDz69CL81vr5p8FJJ+DA5vnRrt+ocjqEJuk/bymxWzUFxjgIYYCVvrz1dREybuLzmZh3C/uL/GgzQS8zV44nAuTTD86CdSb9ZCdeWqaT9rzK2FVTP4tMgUiiIX5R7hE6wfVz6qmGjWfJ2Ik7aMgFu9DmIRjk/GzhzOkPYjbpvOAySXuK0Ssba9bjTt9P8mJEekJU2pl4VhWpcbXhIcd0J7r96Qf1E8bQYmbEUc6x4WXzJuVW8RnKSImWqWp9KbC0L12YFS/Aroc1SJdyAgf7zavqMcjfj1Qyex5k4Ey5q7Z1ijMz4DQs9uOEnQMnSEgmvhgo2n3hR8I0t HBQPp5q1 ThQMGg2SAViBcEUBFjeTvWNZeDxXdkxTu+eQkpCGcxtUW8nUOMLGhHUb4r9XAci0M1qKcTMesAEEVHjdDDHlzPtDle7u0E2KTFLK6/9bNZcE2gdhc7KanzQSEY2zx+vpNp89dYDvlmWUVB3gdy3OovI8ZTRl+nUUSgwsQZPVw3oaBhpUOY5EswSMg+gmkbkQgcrTu9KxOGNBbiuXQauUkh1/blFhn1hmgydxWYNHgkdBRp5zpyHlKysX5sQfgVfrT7mcJaQG4tqtuzQ/SYjk+WEHS+zHGCEzacMLIDTYILSTZcHoGrKcRYsCSTS25xQp2FsnHZGIPz+120RlKmSrTAAn1opk/JD4ApcLckIf+Oejvuhz5RXZwIrM1DiPxajwgDalP/AzJfqOawczkW79PNBuKzhxxUPI3u9RldIGmKckxyDzTWQ5IHi3S8/i4CHDFau0AwKZeBqsQIM8tihv9uG+yUO9J3emhtqwHIjytBupPeFFNonDOGNlc4xcMbacGlEvtDnIj4Iq74M470/u8xvUc8w== 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: On 27.06.25 14:57, Jinjiang Tu wrote: > 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); > I think this could simply be ... ret = scan_movable_pages(pfn, end_pfn, &pfn); if (!ret) ret = do_migrate_range(pfn, end_pfn); } while (!ret); because the while (!ret) will take care of the "break". -- Cheers, David / dhildenb