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 48883C021AA for ; Wed, 19 Feb 2025 02:51:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F38F280118; Tue, 18 Feb 2025 21:51:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A434280117; Tue, 18 Feb 2025 21:51:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76B9D280118; Tue, 18 Feb 2025 21:51:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 59C22280117 for ; Tue, 18 Feb 2025 21:51:09 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6E837120BA5 for ; Wed, 19 Feb 2025 02:51:08 +0000 (UTC) X-FDA: 83135167416.15.D179CF6 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf08.hostedemail.com (Postfix) with ESMTP id 73D90160008 for ; Wed, 19 Feb 2025 02:51:05 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.190 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=1739933466; 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=VXRt6rftbAxs+aNx5svkLPoDptAzrYvOy/yT34/+TMc=; b=OxYPYm7z6Cp9wNBGyMcejPwWAHMuPugEhLMqLQVH8GoavVHKVQoUgxoXkePQTKXX40zeW7 VGL/c8m6S/CJKTA84ZMf0/czWWwcNoDRkitv1S6WxiFRDCxh0RkCmZC1dS7fOidJpJ6qjx s5pt4fblU9YFG/SkaAr1DMUqgHH9bko= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739933466; a=rsa-sha256; cv=none; b=ZKeFIixETQrrN9/RqvDt32J/KzoerOOcjqVpS533EssunQcuwHfOvJ8fFtNm51eMytceJG rkf+hhVK1Gth+Am2m149CM6qrdSb1QIaBwftTYgyB2i1GpJPRnfmJCI48b+JY0fbxTjT0e 4l0FLJx+sOHUvbWAhYF3HmaRfUDoQRY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4YyLRP05y1z22stq; Wed, 19 Feb 2025 10:48:01 +0800 (CST) Received: from kwepemd200019.china.huawei.com (unknown [7.221.188.193]) by mail.maildlp.com (Postfix) with ESMTPS id 0CC981401F0; Wed, 19 Feb 2025 10:51:01 +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; Wed, 19 Feb 2025 10:51:00 +0800 Subject: Re: [PATCH v3 1/3] mm: memory-failure: update ttu flag inside unmap_poisoned_folio To: Wupeng Ma CC: , , , , , , References: <20250217014329.3610326-1-mawupeng1@huawei.com> <20250217014329.3610326-2-mawupeng1@huawei.com> From: Miaohe Lin Message-ID: <55e4ad74-752b-65c6-5ceb-b3a7fd7959a1@huawei.com> Date: Wed, 19 Feb 2025 10:50:59 +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: <20250217014329.3610326-2-mawupeng1@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: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemd200019.china.huawei.com (7.221.188.193) X-Rspam-User: X-Rspamd-Queue-Id: 73D90160008 X-Rspamd-Server: rspam07 X-Stat-Signature: r638udccdht48j377pgyn8yrxkmudcu1 X-HE-Tag: 1739933465-535409 X-HE-Meta: U2FsdGVkX19pDTPS2R1xS6QA/cDb7fJQzP4LScjikSbNOMsfztIwMbbwdVHfnWz/lI9xq3icmhcSIJZtus7AifOo4seHyV8CITsycld14ickxGUsRzMdrbp0fno3mzY5TsJi55DqEBBWtz4/Ux81OvgqsXG61vrkdXzGoI58fuhASqjuR5DsKPfIR920ZoKYIRhPE4gcXo4+ZKYtadcx9f3xp10fPjkE3XkB8rXIKfSni6oSC9rIF+KplTyVnAV/AQZHzs0C7K0+e34/z4U0xICHskJZqm8miPI2BBN7h0MO7NA+qbgN6sgBJiuF+yqCauI8rkG8tdlXmJMkq/VYyoDOkzS+wYjQyULh6NtaKkeQ6IGYNFB8GNlV94ohGbC/L1PUvzIynLn7ttwsuBCcLt/XKqU6UmALFwrgk+qECvWVh7HG+FyU0zyLIsaMHZ5hDozG6tniYmEs2cA9l4DoSHjVReDUtoyOvpF0Q1JQTqN7D2eYX2GY94UXJGkiDWI1sJ479FhGfs8PU4hnQFKW/n+TfVdlK8eJ1YJjV3I49Pt7YuUkgWD4VTjdldzisk0DX+imfbJkz9todSyoctuYglCxxOQArNaveSSLQXlvbBwCP/uKiln7/Tz3D1iasnN20pQViNlU2ok4A4ICUddFkwsCfvdcfGOAZJusfbwUhsaDnAAd3UKHDUTEJlTyC0SpDpOZFbRKM+uvU56XjTQY6tr9MElbxS72dkjPObgzBBArt0MlSlUYs5iZ0h3CHOoN3WBy95HFg4nKomGnBSVf8bfh0NKWJWnLLDwm287xgjnUDtW6GUx5U+3HLRsJHMgvBQ4/aSWcfXogrZTMwInDZJoZkcppTKcx2fvpTnZmDJebaMv0UHkcCRIa9GRaSXKi+M6ABHBKVIJZZkWsEZYQ4Mp6sTTGBgnZLwRAZzTHmrlRA+dr2IBIADCoKtHCIGRDV8ZsPZ+ELQAu61o16jc pe/Ljs/X /RbWj3JPa5NnXpygCyc+oibGV+spqRJRhdL/uQb5JxM1TDiaWovFGpJdDwKSVpa6WYsP4hTY0Z5CYu1jDR92O+RfB0d87kRkPDaQnI2LHhnME3MqEqff0cewaQCuCTw/kbqftgSGSUimd1qy9DQwCDeRFTIQm1DNCvjlDxHb3wRFf8jw34OZPtXsjePfMRQUWdosnbauevTx9wABpt2WEjSK41ZmwQk5v1tWhRG+o7uN3RVVytORsNr050lGyoxj+x0fZB6e+6RvpFaSUOigAhoYEBac4tWQIQG+Tql98QmHlHvQ= 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 2025/2/17 9:43, Wupeng Ma wrote: > 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 warning properly. > > Warning 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") > Suggested-by: David Hildenbrand > Signed-off-by: Ma Wupeng > Acked-by: David Hildenbrand Thanks. LGTM. One nit below. Acked-by: Miaohe Lin > --- > 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..c9186ca8d7c2 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; This mapping can be removed as we have already defined one above. But this is trivial. Thanks. .