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 10DEBC3DA79 for ; Mon, 15 Jan 2024 12:03:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A85A6B0071; Mon, 15 Jan 2024 07:03:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 657D76B0072; Mon, 15 Jan 2024 07:03:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 547416B0075; Mon, 15 Jan 2024 07:03:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 44AF06B0071 for ; Mon, 15 Jan 2024 07:03:07 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D4FA88089C for ; Mon, 15 Jan 2024 12:03:06 +0000 (UTC) X-FDA: 81681409572.16.256D683 Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) by imf11.hostedemail.com (Postfix) with ESMTP id C9E7440026 for ; Mon, 15 Jan 2024 12:03:03 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="XMLr/Gyr"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.181 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705320184; 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=0ku4XsXQqxqtL/FTICwMT++CeuXLKDLkAWaL9IT7UHs=; b=kQlm2bZXtCs0K38y1fsHNontbu6X1Mosl/PufNPXLPUbeiapdF9JMx9d2hIzA+rGEp5s21 q/8V68D3rJMX0z5C5R/KboGIzQ+vg6y02xb/ap2/fY2OQis5wi2bI7iSijukNEcgTfkLVC /sebFMuvIrHkW8SDd0EIS6GIX6Txdco= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="XMLr/Gyr"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf11.hostedemail.com: domain of muchun.song@linux.dev designates 91.218.175.181 as permitted sender) smtp.mailfrom=muchun.song@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705320184; a=rsa-sha256; cv=none; b=fLrLzCqVnSjvcKYNnkibjf+3nsSihQtnaIL1TaLtx2/Y4xqWek/xFwpNN5+X7+hf50AF5L binHx5/53ckW0SEuoR2/kd/DoLCFTA+HOboHfsId7HzvNKo7C3pFQSNJmfiraPTQvSJC3r 9JyJ22R0tab1zCa/kWzNsK3K0wHiUfk= Message-ID: <03168121-080f-41e4-a242-02638f5787f7@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1705320181; 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; bh=0ku4XsXQqxqtL/FTICwMT++CeuXLKDLkAWaL9IT7UHs=; b=XMLr/GyrtPkV7e9kX240aayMjgfu+hZ4RAC0BD3UMdAsnR5UoeV+/t7OfvMpMiN+SEL4tv Eg7DbbHjNSlgyrXhC4xZvg6fqxayKQ63Vqs2yA7tQ9tqkXZrtDdxNXgvldzv3x8V5AwpyA 0322B8O3yB1KcRQOU4KdyKWmvxGlmWY= Date: Mon, 15 Jan 2024 20:02:51 +0800 MIME-Version: 1.0 Subject: Re: [PATCH v2] fs/hugetlbfs/inode.c: mm/memory-failure.c: fix hugetlbfs hwpoison handling To: Sidhartha Kumar , linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, usama.anjum@collabora.com, jiaqiyan@google.com, willy@infradead.org, linmiaohe@huawei.com, naoya.horiguchi@nec.com, shy828301@gmail.com, jthoughton@google.com, jane.chu@oracle.com, stable@vger.kernel.org References: <20240112180840.367006-1-sidhartha.kumar@oracle.com> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Muchun Song In-Reply-To: <20240112180840.367006-1-sidhartha.kumar@oracle.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: C9E7440026 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 6nxycyw56jdw7pjuntxkpmeuz1p73awd X-HE-Tag: 1705320183-643008 X-HE-Meta: U2FsdGVkX19jKfsBLXinyZSfQIePq8dC8zAgIikLkImpfNcdax++nQQ1eHs8YsG3ixnMcXAX5JcIl34Eq+PMLfzNNSkb3lbJ86mAkkH7JDthNR4OnMFypfMGEH5AhY+BepAhsn71RkkKjxX+sQFqowtVMnYFsdeT3bTfioAcpMtOLTWoFi1PWTBEQUyE+vXt2+KxHmK4Ce0DAFy99vPcH4dk1NZWCZFLSBgOc0YOSygu97zWs2QalHAK5C10xOxxiq/ubGlnqWXmyXuVBRTAoz3iRsddljOkzHS3X7Sy3MKM8HOXEBbUavzUZTIWdW3JzzkE5d2P2+U1vGyVZCJBdAeyQUe2E3Y3DF+4eTpRErkOV3w5VskFnnVrdPSY1WtUr7k8Dh/C3lRO/65cJi2flU66pHKLR6stzLxQU/9+WuPapLpQVtlphjqXAc2yqLkb4Yd27ebLPyQagQ1XAD41IRSbIt5UOs2MzXQxG0DUwp+FPiMZ3UWkp1j5h6ZQTM5RaYwMjv+uPAL1K3fy7+iMSXFj+dPlKVLhI36W6d/xRdP6WUjzUBnRxWE0Js8ByODq+mg8HcpIlDsONoVYFnF2ecSn4piu35udu+tlXWuIF1nT4DYgru2Zd9SDLD2eea2fXvWy++/LkygSQIiW+v8LLY6FVdEpjsCEzfU4orZ1Yfhxk6NPGap/6fR34cMd63+AprFkZ+sbwvuTGMYAX5DWMEMoX34p4VOpr62jS66plH0FYVwNxFVSKpGr3DK6SOG3KWDrHiqBIF/1CrYC4igesV5OrFqKCcPMgoDLfC5IPmFTi15UjC+FoJmgMSfNM+vga2mB/EVczxZE9dA6ODqO07FTu+Z5C7Z0BceFABEqMaaMsGiprXYBJnOH6kfM0VnROo+JRpWmsIfXCRrNu6q8OOogr77FIEB9hDfzWDyf3C48sR+5rIVFS4kl4/4MzKbWITw5rv/ZTAGZK2DMGQs lnBJQQ/T uDtEkOWQHSuZX2tEz6fvkw8rwfGaDoptDjrmT7pmyDPRyFsBukcim1RINjkC7jTDz43LPKLOHSBjXJpd9m1cPZx1YZyEIuWwy6QQuyppt2IBlFLV3HKVdmTZaaO+3+zZzhBKEWXmsAxZevO+GmB2uJUsVF3CPy+ejVr2OgC7GaE2TDgbqQxmtkvYrPMO94nv0+GMzL8b/ect190TCWS71+m2txgiTlofWavufHpurekXvGxGjspo1OFCTPAlNZIxg5iL4 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/1/13 02:08, Sidhartha Kumar wrote: > has_extra_refcount() makes the assumption that the page cache adds a ref > count of 1 and subtracts this in the extra_pins case. Commit a08c7193e4f1 > (mm/filemap: remove hugetlb special casing in filemap.c) modifies > __filemap_add_folio() by calling folio_ref_add(folio, nr); for all cases > (including hugtetlb) where nr is the number of pages in the folio. We > should adjust the number of references coming from the page cache by > subtracing the number of pages rather than 1. > > In hugetlbfs_read_iter(), folio_test_has_hwpoisoned() is testing the wrong > flag as, in the hugetlb case, memory-failure code calls > folio_test_set_hwpoison() to indicate poison. folio_test_hwpoison() is the > correct function to test for that flag. > > After these fixes, the hugetlb hwpoison read selftest passes all cases. > > Fixes: a08c7193e4f1 ("mm/filemap: remove hugetlb special casing in filemap.c") > Closes: https://lore.kernel.org/linux-mm/20230713001833.3778937-1-jiaqiyan@google.com/T/#m8e1469119e5b831bbd05d495f96b842e4a1c5519 > Cc: # 6.7+ > Signed-off-by: Sidhartha Kumar > Reported-by: Muhammad Usama Anjum > --- > > v1 -> v2: > move ref_count adjustment to if(extra_pins) block as that represents > ref counts from the page cache per Miaohe Lin. > > fs/hugetlbfs/inode.c | 2 +- > mm/memory-failure.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c > index 36132c9125f9..3a248e4f7e93 100644 > --- a/fs/hugetlbfs/inode.c > +++ b/fs/hugetlbfs/inode.c > @@ -340,7 +340,7 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to) > } else { > folio_unlock(folio); > > - if (!folio_test_has_hwpoisoned(folio)) > + if (!folio_test_hwpoison(folio)) > want = nr; > else { > /* > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index d8c853b35dbb..ef7ae73b65bd 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -976,7 +976,7 @@ static bool has_extra_refcount(struct page_state *ps, struct page *p, > int count = page_count(p) - 1; > > if (extra_pins) > - count -= 1; > + count -= folio_nr_pages(page_folio(p)); IIUC, It seems than this also fix shmem of THP, because has_extra_refcount() is called from me_pagecache_clean(), right? > > if (count > 0) { > pr_err("%#lx: %s still referenced by %d users\n",