Received-SPF: pass (google.com: domain of linux-kernel+bounces-24956-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, usama.anjum@collabora.com,
        muchun.song@linux.dev, jiaqiyan@google.com, willy@infradead.org,
        linmiaohe@huawei.com, naoya.horiguchi@nec.com, shy828301@gmail.com,
        jthoughton@google.com, jane.chu@oracle.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>, stable@vger.kernel.org
Subject: [PATCH v2] fs/hugetlbfs/inode.c: mm/memory-failure.c: fix hugetlbfs hwpoison handling
Date: Fri, 12 Jan 2024 10:08:40 -0800
Message-ID: <20240112180840.367006-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?6uXE0/xhVic2PZedu7GjCFmJpkSvIV8GC9ktctrkFcJsQGkYblUTfIlVIuwf?=
 =?us-ascii?Q?7c5MUkDV42zhwaCl1MQs7OLK1DHd1Df8KaqUd3o5ZEhtk+IqipQAdG7ZAjhv?=
 =?us-ascii?Q?/uCN86+QMuvisbKX+tmb8MkUJDNeF7kF5JBpZxB7KoXsYEaClNYY2jXfKw/U?=
 =?us-ascii?Q?CB4Df+IYBvZxwn1xkgNlis+470rZxUcNTl5SCzZfdpq23IiecZOubqfq7+W7?=
 =?us-ascii?Q?PZU2PJzjxF60s1elmi4jwA2jmbtY9qw5dWxf8gEb2W2A4SFXC+sAu3FmXTVv?=
 =?us-ascii?Q?c3PpJxhc5/hUeW5IStEIRNM1sgw9YjYQVVQdKNXCE7LufJ5jGIKsc5hpZpA/?=
 =?us-ascii?Q?RjwTDQuOdWKQZu2kVarMFUNeERppaRwVWe8EnQg0baTTjPJY62UhGIT4U4jt?=
 =?us-ascii?Q?T3vUatXcXUpfmpfgX+FAhXy8+zjj7OABUNU5bb+IRDup8vOq8m1xCJiBM82/?=
 =?us-ascii?Q?NftPAujlLerGzBPWAT/0VsKEOxqhOMDJO5gBU5aMfnT1gOpp/hJLsI5s5aZe?=
 =?us-ascii?Q?WMRbzG3fIM1tRTRHnoBZ37ZpA0PymV30BiISUj/zTTQmQeuKE7D5OcXpcTML?=
 =?us-ascii?Q?yYi3UUBPAK9cBvVvT8JOchuKUQ1m/qSTKREVsXzNRIQo/2wOssCbrh4W82Mt?=
 =?us-ascii?Q?ZRWlrKkkiFyutt8zzpd7zujw6G6vkdRHSgvBDgQELGKEPfi0uot7ix2jpE3s?=
 =?us-ascii?Q?vggqpIcQiUSXk4Pbc7EbxfMNhkP3BbYCGt2qm/tLa4i/BcdpP4X1KS8Nh8OQ?=
 =?us-ascii?Q?THTVqWusiU0qXwkXV0VodS9k6sy1HAQSJwHTYTtH+Fw25dh2ozpOTyAyFeNh?=
 =?us-ascii?Q?eN8GeRMQ+hXw3Arxhljp95Yo1+kwlNznH5UMnd/Td31Jxc22gxOmorAnpWu5?=
 =?us-ascii?Q?yxfJXrICRterWo3zRMfjoOB7Q3rD9JxnyofMiUghwgNgZmTSdKFdAyjXV8FJ?=
 =?us-ascii?Q?M+3nhpkgpIkQ5U6uOhRmshehtEUyhIX13PeMnsvRRY/ps1yvwj/o5h52gSx0?=
 =?us-ascii?Q?u7zx69ZFR8YXcSQSi9MMU1GpYZaSfus+EUP6v8mRH2SvO7vLoP1Cm84Snpi+?=
 =?us-ascii?Q?4vPznN02kbWgT8rORfJqIfo3/om+e4QJWYUR8P3Pqql311bug4AdTPhdQ5DD?=
 =?us-ascii?Q?vcdItsuTRnKzGEOfyjYB0hQfqkaP2WJmNMU+k//FIqTEUAnNT4/xsuXNYGHr?=
 =?us-ascii?Q?qfGEvj/ldV5jHcu3fUminDYv19TfX13vr4lWPEJhRrW4uGAEY/ASIvstFhGX?=
 =?us-ascii?Q?7GE1UHMhatoy65RGldiScIf3vVuw5kGeL8nrfQjTTpTrK85EHIWFMFLGCJub?=
 =?us-ascii?Q?fJd1zKjLfLh9oNF4UVF103VjlqT+zUIIevsVNrd68RhB7lMzdNZLlTD/fuCA?=
 =?us-ascii?Q?qj9t0UazUBQdSAD4uhQt1qkURTkzRxkPtArRVXhPrbfV0z9mAWecL2pKzd+/?=
 =?us-ascii?Q?qo2adO9dlyBn2G00ptRAbt1sBxAYh9GOTDnK4iWwukMMn72KSDEDg09j37U3?=
 =?us-ascii?Q?8o62WSpEuAbkxs07G4ynEFHc7vquoVn/QSGO26tqCASrhOrfbi/ZMYmpzzNv?=
 =?us-ascii?Q?m33hhu4WO3YU5KaLhmsn1xa2XrGw29DBMTKeUipLKPYplSNZPvvcInI/8pow?=
 =?us-ascii?Q?hAhczOP0ZxyMHduW93ZHKjg=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	jEW2ctMbgIbZ7vLv9r8bKi1VBfkWgsufe3dkcaUTSvRJSf3r+9OzFS3j2uFe/gLndKkc8Nc3M30dFw5BTHRR2XmeU795h/I35TcuN/n1u4Xid29XTZGDYlHprDbR/9GpQMwb5xFgFN1OyW6dpj+PxrSJW72r+XSnkb4A/SoLl5ujQn3NfIX1yRgDsqTIXQ0MdQotyHRIMdzDu2/T6rAufyDQW9x16q+z8FY+N6HiZgAv6rCKMK/IcDnkFIapRTlmmjTpWklvbjQ6cfo4rFH6J9PSs0GzYPcqV9RecQy18RlxdFSSv9b5mgpZKMUrX7eG8TPB0aTjjLnzn98wWm8+ial3YhrNgHxZe5yGdpEKZ05Vl5+QAg4g16utMnmonOyQD2jKQMRq8Pwajpbi6mgL7zmdhKAbvetnUkxvR4wCwb4MQn3aU+1Yj4QRQIkOvEcZVSUkQZ3ivtEYxv8jauRBMVmCLSdyUdkMhJgPvdnVPtPz8Yhfo1OgnyLLDM2SNhtRbbk6emyyRXINZEl+p9dCKiyoL6es4xJEGiibnS/OLPF7JlTowLW36nnLkviB7C1XZnnSXrBcHYtMdg2qPxUNxzYB85IAyBS8xcQ8emJh3ws=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e6efeed2-a8e0-4400-5193-08dc13998803
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 18:08:51.3927
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XwAhfaHv2rpn1h+2xlhTeLAFl8puOVpe8eZjMPQ2p3CsnnmcTS/a9Hyxe9NoK3AcE1GRqM3Q0dZ2Y2/Zj2mc/bZl9jQc8wmiqckIZ/QTsUM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4129
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-12_09,2024-01-12_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 bulkscore=0
 mlxlogscore=999 adultscore=0 spamscore=0 phishscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401120142
X-Proofpoint-GUID: YYuoMMNDTCClZ_nT8JI-bM73H8CD-B1F
X-Proofpoint-ORIG-GUID: YYuoMMNDTCClZ_nT8JI-bM73H8CD-B1F

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: <stable@vger.kernel.org> # 6.7+
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reported-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---

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));
 
 	if (count > 0) {
 		pr_err("%#lx: %s still referenced by %d users\n",
-- 
2.31.1