Received-SPF: pass (google.com: domain of linux-kernel+bounces-24003-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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] fix hugetlbfs hwpoison handling
Date: Thu, 11 Jan 2024 11:16:55 -0800
Message-ID: <20240111191655.295530-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?+IXPlCVewnUpa6wEL3gD7k6fuhoW5ba95562zcl4VxIrqV83qseVoZwXfi2+?=
 =?us-ascii?Q?Ssz+NlWDLd4s+t5jbt+zBEwJmZJb5S2egwhaeaa+b7A1lhojvMgt5Tze7hch?=
 =?us-ascii?Q?DTM2dJOAweGKsaAl4tdnmxzZzG6E1CraEfAGADRAv39Oiq8901/nWJ9c1AIO?=
 =?us-ascii?Q?S+FIhHgYcA882tn1BpxCHGL7UVFHsuKsfXdfF5hyNmLFGoXqsArVDt2f4+jz?=
 =?us-ascii?Q?NMnGIPE/HHpKP0it07YcP1KEEHPOMO07X4oVo5uaBDxvWHhEvmN2xL79hCOX?=
 =?us-ascii?Q?iamzkj3ecO36gT7yP6hRSw7mh4mYjLAYsTVFHBrkTLH0w+McEnv1fXZDj6WP?=
 =?us-ascii?Q?+vpvXaWu9cD7ZRFVjg+goJsKy2/8iWMviRY0Ieau0uvXwTUovcV3knD63iQP?=
 =?us-ascii?Q?OQFrUj6eZaV7NJfXkyodPaovVBf0xg5c1eJzbnqIKbu4GTxNcImO9i6x5ElA?=
 =?us-ascii?Q?Q+3uwYLNDfHQulOiReedVvU6GZ6tVqk17c4EfaTMcsND9eQVhfNkya396Pcn?=
 =?us-ascii?Q?89zoeeqXDe5CehbuL2zQtfHq87+yLsGJwqtHQq1uwgWdF4r3b30C6W1FUTyu?=
 =?us-ascii?Q?SUzztC4QjKj7LmONFen5E8vON7Z8py1kxOWV/M249ZwXRfccUg0xzAyKayAf?=
 =?us-ascii?Q?K3TuC/5KbkcLU20crcr9/oW5ybx02Jhqa/8b2BS/V/Wqn5BA2adGtW/jIp40?=
 =?us-ascii?Q?xpu+3Ei52BrcGys38Ftf7FBsuaCRs0AYxKMoFIbiP/f2LwqCsJmOFeQClQ14?=
 =?us-ascii?Q?hc5w7wqbYJkNDE7Ql0dNogJqN9sXn7JBieha7pztmLI0CTCwiadCqcBrFUB0?=
 =?us-ascii?Q?EjkrPVKQZOtJGzz5LhkcCkK8Uu/uRtNlnQNXBVwrRjlr6sK81+3yEKmfGWQy?=
 =?us-ascii?Q?eE8XKCTcgERtoyDnfhtQ6dK0rBN+/7h3Aap2HEOoekx1KyNUkq8Jim7jILGi?=
 =?us-ascii?Q?owsvBWv4KLGf0EeJrKgs8407psHXyGyIToC+zTWogYxnHNxeI/WjNXhrBCz/?=
 =?us-ascii?Q?htyWcDcBIbIPXFFITnhQpfCIVOhXJC1VCg1P3PXtBFQFUnjFftRaP9UA/T81?=
 =?us-ascii?Q?Ibv6BPp/pMTmh3jkuz0oaOsOu/+fLSMGPglTS1ZZUdL4t636s1cHvhstQflr?=
 =?us-ascii?Q?BG+R4nzXotBitQvWCMGqtukx4y7tJiTao6XsXK2r6ZRqa8jeqXbptzfTW544?=
 =?us-ascii?Q?Ww73Mv3iDmcIsfEwzsevze1jxbAWevsWnwWvved4Ei8EcMSnmwadNOLvEORM?=
 =?us-ascii?Q?SvSxm/gOWFK+awBgY8HIMZHsdj4h52/9KgQISnwvowskighRMmkTMIxyZ2HA?=
 =?us-ascii?Q?hZ1rVGoYiObSEur9DBYcsTfeUoCJ3h+NxUR0M6zXh1+fGrFT/czLSoAI49nj?=
 =?us-ascii?Q?2uY+PNKE7iIwZNQyOg6H0WcSx2J5EPkgOKqVG9uqDh9uC3fEyDb4bKvliC4v?=
 =?us-ascii?Q?/l+A70FLIw3AVzvcXqhOlrXwP4emRkQJ9ddXg0MxBHqjQJL+F0n1oLwE+sUO?=
 =?us-ascii?Q?UyqK/2LbAH7BZGLjuOTDqiSpr74Vgw2BZp3pBcdCuB6IB3f5zDJ4FbybwsPE?=
 =?us-ascii?Q?0X5fxTbqKBmFxNA1gFc5ANrME4PpqMQL6BA2z8SlXerp9cBe3caU/oIvCzbK?=
 =?us-ascii?Q?0jfHHtOOQE/HjH9jZrPzlFo=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	FueayVvyLcs3MrfxW6OsxIgQILW1t35qSxKyJA2mOpUZhI999sIssuhrX6oAKKGp7p/tqFstMEkU83Z3vNsYsAGeu8OQDvnaZz+i8cf6xZbp3o/MrySA66vXxA06WGoPLIrDt9+rFADX3U5qhMVK26Dae35Pgvjb5TAD+rNrgs9qlyuzJAOdcOwQnOmS0dq2rxF8EK/t4FzyWO5JTM0P5XFRxA7MbFy0+N0jJNi4JvTbz/R0kjKPD6BOrLvcz/VClnrfjvT75CZxvKn3Q/p42zx7A7O3nMaI6hf+jBNH/oi7JKgBOG7P4vbBFIJOvcMnAh4XeZ9Bogp7AVtZCEzxnZsmdOJfexMrXzHcoarLOiTvSZB45ncoqsw9HlwYTIYqA/IfZswVlp2w2lpTPaWjroq+RDXUDUxmaipNH4fHmQRPRqP6PnWFL/3kdD/5NDARHsAFM9S71hwM/+UCo178edZ+ietdjrLtc5PE+RpuSgiZNRYtW32ovYITja4VKVdGLybdISF6PmAEMNkrfEzgyIVptVIh4OylxTuxh9Ihxz71R/sWjfNu1DdD/aev15Ge2GySV4dZa/vpLKeYEhiHvT8gjhBrl42Pkxt9ecQy1Xg=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aa9e5565-3bee-4642-ddc1-08dc12da031d
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2024 19:17:54.5767
 (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: npAPbt4LlcxYhTxMM3XJmrZDylRzi1wz92xHdO8iRkZfr1c8irpD38easQfgSqjiWGVPq3dUPeU6dAXrTXhfBtEKlwlrQqhR38j5nDlnMeA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5076
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-11_11,2024-01-11_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 adultscore=0
 phishscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401110151
X-Proofpoint-GUID: KB6mb_EAjapkjNzdx06z8o26PF3bXqkg
X-Proofpoint-ORIG-GUID: KB6mb_EAjapkjNzdx06z8o26PF3bXqkg

has_extra_refcount() makes the assumption that a ref count of 1 means
the page is not referenced by other users. 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 check if the page is not referenced by other users by checking
the page count against 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>
Tested-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---
 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..87f6bf7d8bc1 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -973,7 +973,7 @@ struct page_state {
 static bool has_extra_refcount(struct page_state *ps, struct page *p,
 			       bool extra_pins)
 {
-	int count = page_count(p) - 1;
+	int count = page_count(p) - folio_nr_pages(page_folio(p));
 
 	if (extra_pins)
 		count -= 1;
-- 
2.31.1