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 5ABB3CA101D for ; Sat, 31 Aug 2024 08:16:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 439488D0016; Sat, 31 Aug 2024 04:16:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 40F678D0013; Sat, 31 Aug 2024 04:16:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2D9238D0016; Sat, 31 Aug 2024 04:16:47 -0400 (EDT) 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 0E9FD8D0013 for ; Sat, 31 Aug 2024 04:16:47 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 58B4B1A0A6B for ; Sat, 31 Aug 2024 08:16:46 +0000 (UTC) X-FDA: 82511834412.04.02E2218 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf27.hostedemail.com (Postfix) with ESMTP id 086D04000D for ; Sat, 31 Aug 2024 08:16:41 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725092129; a=rsa-sha256; cv=none; b=hIN5NKOB084JDYIIEoxGwbYkogC2z+opIzOOz+4KHhW+moW7iDSdRUN5bjDBmk8JWfPmTR P2yaOndLjOIMEzIWc6gdnQmHBa1vewAhgczqrVKrDsnTGkK6JiCkeaKQlwLKY0NEi5pNFo 6EhPhrNkTTirkhsBpLyQohpvOugDSgU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf27.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725092129; 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=Sffcl+khLM50GSFm/PpbIYo/A5g/k9ptdTFns4KKJ9g=; b=fDdXgsST9CK3OAbYrE4r8heeJvxhiCPiROsP/zsVuZ5EiuTFslc+Tsk+FHlFIvqqU0AWT+ GEpSAh/rGaJC4DeSyxhSjPUJ2vPRu1QGOa6Hno/3pBsQPvD1Z73pulirJHqvjxPclKFLvm Ibx72ac8iX4MQ/edUMfPs0WKa3jZjdg= Received: from mail.maildlp.com (unknown [172.19.88.234]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Wwnsd4y9nz1j7lK; Sat, 31 Aug 2024 16:16:21 +0800 (CST) Received: from kwepemd200019.china.huawei.com (unknown [7.221.188.193]) by mail.maildlp.com (Postfix) with ESMTPS id 8AE801402CC; Sat, 31 Aug 2024 16:16:36 +0800 (CST) Received: from [10.173.127.72] (10.173.127.72) by kwepemd200019.china.huawei.com (7.221.188.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Sat, 31 Aug 2024 16:16:35 +0800 Subject: Re: [PATCH v3 2/5] mm: memory-failure: add unmap_poisoned_folio() To: Kefeng Wang , Andrew Morton CC: David Hildenbrand , Oscar Salvador , Naoya Horiguchi , , , Jonathan Cameron References: <20240827114728.3212578-1-wangkefeng.wang@huawei.com> <20240827114728.3212578-3-wangkefeng.wang@huawei.com> From: Miaohe Lin Message-ID: <1f80c7e3-c30d-1ac1-6a36-d1a5f5907f7c@huawei.com> Date: Sat, 31 Aug 2024 16:16:34 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20240827114728.3212578-3-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.173.127.72] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemd200019.china.huawei.com (7.221.188.193) X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 086D04000D X-Stat-Signature: zc6feb3889wumoicfqofexx5x1moozrd X-Rspam-User: X-HE-Tag: 1725092201-40522 X-HE-Meta: U2FsdGVkX18Y1emANxMMXwQK9o7cmExCVShCXBQ9Cq37DsMwPhdzL7Bvg7QSJk33YQr9KEJdU1LkqWWaGdLzIjtn35iouyXeUf32LBBgrOPwOxJBIO/W4aYjnA4smAj3MhYe8A3ioOMiI83UTZUc/81PDCkb9b9Ad3sAMjIFCZC9DoeevcYb7z6d63Pspu/Dyex2Hh/zwwULBA2hwWZ+PKWZxtnKERC6NVoc8VrKaUWaVmDmk4j1FK8TVTmGpXy8Ty3Ge6NPQXEM7XDXw2XyLroojBI3ZnV2SNbaVBI8pWPlImUEV93ag425ZqQJ9+oP/UTvkXichtvLqqRLVmmBuWkvFfgIDgMilyyYMNvv23/X+5hqzFU8gdqketthbyPrP8IALXe7xJxxGmoUILtjW6VhcAUE0wQkjOuUVdu0otd1hPlUDMjfcSPOOfWEl91KWSig9gh+TTMIAEiARQAi7thoj91O+xoDdDpmBs0MBO3ufWdETjRxXEo8RRoeT9/E5RD0DmdMHRN+LW8r6vd1RGOrb1RW4ebPUIm4r/FT0imrbTgicJXB4RcBeKCLuT8C5rkvYyYKP5PE/N4bYr9H3jR0qahPlggSMf0Haj+6zaocbehw9NeyGcRCqLSXSmjQ6yU9PEaeYzkzoIkfPVfA0HNEjnhKyAd8hYjqk1RV/82wuZuvSJuhOxsl+Bm4LMjYVAUBn8HhWKJos0SOEFANNBQw0v5cfJsBBDpIBkirj5IPipWFBDajF1c8a23FuaqBnuuFMnKvQHJCyppCap8r7Z6WdRCWxxPtrs59B3pAI0KzXCHW44R3JFLHQbvZJF6X2K1VZ9FBn+pMyf+AiZx0ySU+WkZP37BmmLou4aRXia/mK1eVA2/Vl7TzB8XregcbRTL0iw5IlXKBejaGskDGKN1qHBhzl90J5b89/Yky6/3/p+yGM6FuKmSCMlbtAQmj5gYt6cw6R2rIZXILd89 JCIAAw/7 oau0aOPfRSI9h1wKIXh6/Au3ygxbQdaVnWZPSWpxiGevBu40yAxbPQMln2Au32BTA3wCr49uWcYc7SygrKWjc13ukHPr2C4iBZjFOwOWhynXhenX1IwpyKkBBKBp7kXVIVTc+2Fu3sueC+jmhA0wpAo58QlYX5ZiFb/3DK1sU3QkWjS6Xz4YAVUAmbfZiUXT1/yF0v89uC9QTMjA3d1N+efS8z7DnZG90Ap8oMUn2u2wkxNFIzsalQFCujyv6+EA7H841gfXV+2kpMi8Lp85OSyiBStyNer0ieuYMMUAfAZy91mE= 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 2024/8/27 19:47, Kefeng Wang wrote: > Add unmap_poisoned_folio() helper which will be reused by > do_migrate_range() from memory hotplug soon. > > Acked-by: David Hildenbrand > Signed-off-by: Kefeng Wang LGTM. One nit below. > --- > mm/internal.h | 8 ++++++++ > mm/memory-failure.c | 43 ++++++++++++++++++++++++++----------------- > 2 files changed, 34 insertions(+), 17 deletions(-) > > diff --git a/mm/internal.h b/mm/internal.h > index 5e6f2abcea28..b00ea4595d18 100644 > --- a/mm/internal.h > +++ b/mm/internal.h > @@ -1048,6 +1048,8 @@ 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); > void shake_folio(struct folio *folio); > extern int hwpoison_filter(struct page *p); > > @@ -1068,6 +1070,12 @@ void add_to_kill_ksm(struct task_struct *tsk, struct page *p, > unsigned long ksm_addr); > unsigned long page_mapped_in_vma(struct page *page, struct vm_area_struct *vma); > > +#else > +static inline void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) > +{ > +} > +#endif > + > extern unsigned long __must_check vm_mmap_pgoff(struct file *, unsigned long, > unsigned long, unsigned long, > unsigned long, unsigned long); > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 353254537b54..67b6b259a75d 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -1554,6 +1554,31 @@ static int get_hwpoison_page(struct page *p, unsigned long flags) > return ret; > } > > +void unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu) > +{ > + if (folio_test_hugetlb(folio) && !folio_test_anon(folio)) { > + struct address_space *mapping; It might be better to have a empty line here. > + /* > + * For hugetlb folios in shared mappings, try_to_unmap > + * could potentially call huge_pmd_unshare. Because of > + * this, take semaphore in write mode here and set > + * TTU_RMAP_LOCKED to indicate we have taken the lock > + * at this higher level. > + */ > + mapping = hugetlb_folio_mapping_lock_write(folio); > + if (!mapping) { > + pr_info("%#lx: could not lock mapping for mapped hugetlb folio\n", > + folio_pfn(folio)); > + return; > + } > + Acked-by: Miaohe Lin Thanks. .