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 444CFC3DA79 for ; Mon, 15 Jan 2024 15:08:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5AE526B0075; Mon, 15 Jan 2024 10:08:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 55ECA6B0078; Mon, 15 Jan 2024 10:08:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4265E6B007D; Mon, 15 Jan 2024 10:08:30 -0500 (EST) 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 316986B0075 for ; Mon, 15 Jan 2024 10:08:30 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id EFC2B4090C for ; Mon, 15 Jan 2024 15:08:29 +0000 (UTC) X-FDA: 81681876738.23.71C5EC4 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 82E1914001E for ; Mon, 15 Jan 2024 15:08:26 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=aNuSjlCh; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705331307; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=h1zJVN/StgdtGJ+KvowsDPSUZpuVAQLtb4Gk0WK6sxU=; b=esMS3FAzUizWgPY3DHIq2uAbsQu+K6fKb1Ou/SOO4G2hphoukiTJ2Db5vAuc+S8lcgFWfo iAlaxd8sA5kl/1PFOt1TrD0kYVIh4sQO2u5gMeEuqVNR8wZYRWg0vXHFuTqxyT7MMJfRBm qdUCwFiGkO69I3uM4BnrBe5c0x/Y2GQ= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=aNuSjlCh; dmarc=none; spf=none (imf23.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705331307; a=rsa-sha256; cv=none; b=do+57Z4/VFUanZYY++q6H6+oAnpQswW5cjC4617cENjDgegOFOV1cnt7yLFj0S4ZhvIkwI u5GJzJrJGeekV0z3C1VHSU6rFk0wBWxW1EsvzW8tFcXAtE9Ah8xaNy4N9Nvg/jxlwUD0GU IXBCd9GEip4I9qxW8XYEqu6MUU8qr3I= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=h1zJVN/StgdtGJ+KvowsDPSUZpuVAQLtb4Gk0WK6sxU=; b=aNuSjlChQOa5cvpTN5zXyWQTQs P71JqXtroWZ63bfc4xkj1dF/AqNZArT6Ohf9opFouJrwod6mEL/QCECd9A9YiOByYWqgANJ51MIxB NgXvJ/qbRyEMsKUE9ANEEQ7t2ColgxlZ4X0DEfa49MW/SxKD7E+r070K/jdaiWDyfeuKfrwawA2kP iZjdPET9Nz5F9Qy5Z7jiU2Zh2n46cyC8T8UlIRO0F1ZU5nsjzRaXDfz6j4hEKg3CYr31HCVmHlAyE 0Ws04qhwYB6ZOVBBRVziJCG/yrQWDb+ULrqYDN3TbwGGi0G3UdAfNyBxsA1i3pPGVZMlR7Co49WoH 7LK+S/Tw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1rPOZO-00A0HG-59; Mon, 15 Jan 2024 15:08:10 +0000 Date: Mon, 15 Jan 2024 15:08:10 +0000 From: Matthew Wilcox To: Muchun Song Cc: Sidhartha Kumar , linux-kernel@vger.kernel.org, linux-mm@kvack.org, akpm@linux-foundation.org, usama.anjum@collabora.com, jiaqiyan@google.com, linmiaohe@huawei.com, naoya.horiguchi@nec.com, shy828301@gmail.com, jthoughton@google.com, jane.chu@oracle.com, stable@vger.kernel.org Subject: Re: [PATCH v2] fs/hugetlbfs/inode.c: mm/memory-failure.c: fix hugetlbfs hwpoison handling Message-ID: References: <20240112180840.367006-1-sidhartha.kumar@oracle.com> <03168121-080f-41e4-a242-02638f5787f7@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <03168121-080f-41e4-a242-02638f5787f7@linux.dev> X-Rspamd-Queue-Id: 82E1914001E X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: bg9k4uuxugffecgbj9y7wb9ca8tios7b X-HE-Tag: 1705331306-301600 X-HE-Meta: U2FsdGVkX19+y55GaSuO0C7beZhaC0t66RShlsDu6jisho+gG/42ItYLh4EXMisKzX7YPs31tFx4p56o4mwpnfdiKVZYnHgNzWa9UNxYt1lmQ9KiWYblQM5NVsDnG+f617tdAJjeMdVnaDLZONZeqpKPtkE6DcPv76hdJrjXpd+skVg730udTq1o05z1l7CMN9kZ3HmIQ1Vi/XAVpoFX1kgaGh/lSMZx0aD8hTFSwQeY+/QNBtlHQ+v0cVKitcxYd52ETOmVPqPsRubSkTDe4R63mKHNC0BoPgrGySf9RhQO116t3PESFULedm6/oYvaJ5NgTaTTvlv869KB8Ov+IUzqY7T5RFcHXQXZiy0n0v1ty/QSo9wyva4y5H6kGBnC6vAM/wNrp8VPbOILK+bNd8EDXYr/Ve7f/qs6RTQY2nwOQZWdE8obtsR2V53oiCDx/pbWprU840saAQvbatSbKj9FVdtS5YRWBf5MmGJuTvQBbScWZQFNQdTVm2xlA0i6TuFfNnIvN9njiSgmYg4lPeNshv16Rmc7WBIwNMKVQ+eq/k0AO5FtpPR55QV1+n/pmUtQgz6NYwTeqwAN8+4e068ocrthj+abHzMHX46TVJPHPnHAfHg2M1ItxmAOswL3dgc0YND0AtJ8NCdnNar/wXUasXszSaE/8myqxFu9ji7CLXVbjuiwwujYxLkroAhQt8t6P4RTFGA1x9TGCnjm5Wi7aRI03H/9nbW3FjbFyEvzV9Ofkao2hpAGS7gLekhEEpKvvDMvxLMTGqsT/QMUZN+lFf/gI49GQyfABkkugX1w3HTK4G2kuaQxfs/NrM0E2WN7AHdUZWM3R+I1ilSxdlBBJXCXLAtliAacXG3ng6l9cVVLDlSBUFPTxZ6dm6U9tfI+hgG7VzQL4TMvMGFA8NFw9NF95ZfGY6vn2or/6jRQdpM8e0HKX61Aas90r3Q/V1oUToV94H5Kunkeu17 53Qfk8JN A9GyUnFlqL0oyU8zRdKAJPJ/mZP6r/KDNRYnSzKIO+tV2o3+Z7F5YJ4bvMwg3Sf3s/puKp1X+mJfafaAibSoHuIo/hFwZ9O89V6g2hmZXdoaymyCwiNNGlikEylMap/CyBEtfIzeY3F6e4rUH1EVQDbelHpRp47hMjsFvGH2xUDPYgWEoZTzBvlvRXxeX3IJl34JjNpz1Ff7o7vbIeiXUeeDtpWi8gtMto2/yZV7SzhikXtaX5ZwwQt28DqHSjPiKykAuziY2SHwC2CDoFt1X5dGG/3MjISzSCvOGrx7etVsldA8= 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 Mon, Jan 15, 2024 at 08:02:51PM +0800, Muchun Song wrote: > 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? Usually we split THPs before we get to this point, but we always poison an entire hugetlb page. This should probably change, but it's not high on my list of things to do.