Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc:     akpm@linux-foundation.org, songmuchun@bytedance.com,
        mike.kravetz@oracle.com, willy@infradead.org,
        naoya.horiguchi@nec.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH] mm/hugetlb: convert get_hwpoison_huge_page() to folios
Date:   Tue, 17 Jan 2023 10:29:17 -0800
Message-Id: <20230117182917.73729-1-sidhartha.kumar@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8+VAxGnwfpeUxiM2LMYWKDGEkrcq5AMjE1AukGOh5FXLRmLP3ga77qI1sfk7?=
 =?us-ascii?Q?laJ1hVbuN40zHY6jpQqWpyG9MKqp19GLAPEcTHoev9Pg/1xVElsCa6IAX26b?=
 =?us-ascii?Q?4gryAitidfoxAIHumkBOg2/t8PqFfi1+i5gAr/Y3VjDSiNwHynLoL5rMWJLk?=
 =?us-ascii?Q?dSsc5hrqMCEJB7mdy/EjBrlBlRuSgY8e4/vSM+syzuWqsaKb+IzRL/+4+m1I?=
 =?us-ascii?Q?ePZI/Ioqhyi25nESNOhk56bTbzLwT1A2Q+P4bMJoj9aIl11DLnV5d6VoFJll?=
 =?us-ascii?Q?FGiq6jtQnk2VIPCWiV06pGR4OeFqNzKFePKVNFMO5eNFH+/TXPzawVqIG+OF?=
 =?us-ascii?Q?HUKKqP2L26yiYA6tYDDl+VzUnIB74uwXtEpC0OCzw1Ers7zVj45D+f3mVJZR?=
 =?us-ascii?Q?SyPrECv/dMmjXPXEOMRdkb3qI0U7LnyERsaCVpVyG1WhhrxVFwIUa/iHo65z?=
 =?us-ascii?Q?L4FLxFO1Lrkl7lT6guwb2QaM6ZEsaRiZKYA/TzpOeF7WCy1H/+k5mHZXjvRo?=
 =?us-ascii?Q?ZPY+2LRQ/jVleAAiBXha1qgnXLspL9fcXlMkXTVDtzsdKD4iuW3zzDKfEyYa?=
 =?us-ascii?Q?7U92dAZYJy5yaKC92GZV84wcgGKtG+1qml9VFDg00/Dj8s/TTpwtTvp2POm1?=
 =?us-ascii?Q?uP6vppz2Znnp2xe+B3yzZLlPKVKyKw5tHkyrCaTx9jnYBAJkvEsFEyV8+3tv?=
 =?us-ascii?Q?P6V+FUGkMKwlOK/TT0x0qWpra2EJKCtFPsEsttWv50iW/tosskf5LCbV9tog?=
 =?us-ascii?Q?SyMLg8MnnlG39Ml4ZX4+afiO/iaXc2WtFpGKR0u/mHt6VRFuOFMvCe2cTQAv?=
 =?us-ascii?Q?n99a8R4hCxym2MzgsUzIGq1Zc+02WpQC60hw7bqcIBWWVd68SrszC7brO+ca?=
 =?us-ascii?Q?qQG3+5VI4vMUe4IjWNi4YI6yju6ZiXE+xACcHAcT7ISZqkI0yQ3NQbsD9fTE?=
 =?us-ascii?Q?HonKaD5ffjO7X5t1vkODZ4V+WrO7raHxo/Q5tmNkVq25nNL2VX01eSClTEmP?=
 =?us-ascii?Q?MhP6TMRiqJfdZzAIYbFZq3w87YD/sjsb8QOy8n43gwxPvd7YhQFq9XS7DOMf?=
 =?us-ascii?Q?2XWpJsz1ENsitA6o6fQ/V4/QUbd5wd3N+fgW5qbiLU4xUGZZ1gZPsl8l8GWK?=
 =?us-ascii?Q?olHIx/0G/OeC4FFqTCJFOfkEX/D2n+7MLy8yRpyfvAiIjpqCVg242u6HyowR?=
 =?us-ascii?Q?YSjS1AEPTU/YaOnwZcCMrcsizJodtbDyQh3e/D9p4XUg7VDUpjipQJH968y5?=
 =?us-ascii?Q?++aDi2p7lSyuBoepGx6PUlFVXibYCgE2GgBJAWYFOFTl+xaR1mjk0XUkrfUv?=
 =?us-ascii?Q?6y0JssYQq5vK81jaodRNBr1FE9pG1BSZtBevTrg5OqK/nRRz6qAiVm80oOmZ?=
 =?us-ascii?Q?ReIgzs/rDjm372Fh/JSsFCpyzhEAybrrcco6fU/PKS4+YpS6OoPTMBmMOvt+?=
 =?us-ascii?Q?U9lUqIghVakzwTmJHH5F7Wi1X/zSEKUVLW8uxDPcG8Qz9qCCOYK8lwuyOz7G?=
 =?us-ascii?Q?qLw4rJnjUoDhdK4irXxpG1jPVGsAhmxcmumxHdDLvkAkxZ/jMZ9XwB7pNNq2?=
 =?us-ascii?Q?XseEkb1G4xP0bC4K63gkrCZyPzsDnHXh3bA/0SSIRYRR8HNw7cuGQJ94KGR/?=
 =?us-ascii?Q?Ig=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JtJ3ZoHGoREZIVT7YU8hQbmefmPr9WPrOCxDLp27Dy9VMVr4CYjVDbtRZHvs?=
 =?us-ascii?Q?R+jCFL1mj2DRWagVLP4LPLuqzh0Ri8ywZ5et6ziMS1yUWtRfW9jNY0R64KeV?=
 =?us-ascii?Q?iFX4RZS4XjfU624pXPUrg8q9yPumXTMZnDdUM/EoLjFuF0slmCwKMI/v3ldJ?=
 =?us-ascii?Q?mXHKHZw27Bqp6okpCKM5CSTVwKv3oRQKQzS2vki3IuK+SOBFHRzx09GzM7Dp?=
 =?us-ascii?Q?5tMKTNiG3AqIubrdqe+8UIRHqzJ2WF1ClOsdKnKVYRSCP4veK0X0pK0Bb0g6?=
 =?us-ascii?Q?jDldHmytVFM6uYjMldSeGiZdTjhBMsR1p9QsZ79O6twgXZdEv8mLNxyCE5f3?=
 =?us-ascii?Q?hqIm61t6gecvaDzCZYZevxItQm9QKbCuH7/3pSUl4LHldRfoF2SqiDjmSaR0?=
 =?us-ascii?Q?hu/8d1SF9w8CMqbTQ/1u+TtEaHQ0UM8ZNrfbXrpNZkAknLqPRN72KaGUeaSG?=
 =?us-ascii?Q?a1cPiqjJchzEmpWAjKR1MssLBZYBDY+B3JiGciAqwU3tLLny4O/Smj381lfK?=
 =?us-ascii?Q?AW7sxh6UISSTaOkQ2Y2AFKmEoIxbJIjG9RVbuzHo4NZeJFnWVdaOTP4RNlKy?=
 =?us-ascii?Q?2cU5RFmQHLjPJOQld0XS9FcsgzxWEqJBR8pn/3s0qr3nCIOn/QJ/h8e/hECd?=
 =?us-ascii?Q?K6jFiebCNIAZd9BsjqRej7DSBa7w+alH3Sa1g3k+p3zx5CacqvP0WAMfs2Z3?=
 =?us-ascii?Q?xglXhMJKlTnNIgksHM8fkmBNLEoCrDZhVVx35WVcsahOpSJpimLBQ2JhBulJ?=
 =?us-ascii?Q?sevOq0t4RK4vYWyOpVAwZOYHOeVAF6zA9TyCm6eUlu/tf9nmqcuomkXoehtV?=
 =?us-ascii?Q?w94ui2C/jXAmgN/U3uOT9KDrRidVMO+aTXiYNE16hyRO2F+QM44JZJm5Mx3d?=
 =?us-ascii?Q?lLA05HE8ZegUVne2HET7RwLHsHZ6K0JCx3f1CgfhYmqcQ2+Z5rnlHu2VdvG5?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7bac1b41-f737-486d-cb1e-08daf8b8c0cd
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5117.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 18:29:22.0929
 (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: x+BHIM08+V3G/mOCaCZ9TWEEaJbZFshJ20skCuTUbkoQKvBM8JUx9jjbBNh8sGTetk5RyGM8QTKz2y+evQUZYU/AR+sp+IcRpE854ZjDNGk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4639
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-17_10,2023-01-17_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0
 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301170147
X-Proofpoint-GUID: 8pqPNnBuN-3T6ifhF-0wjLJ0AFASGF2k
X-Proofpoint-ORIG-GUID: 8pqPNnBuN-3T6ifhF-0wjLJ0AFASGF2k
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Straightforward conversion of get_hwpoison_huge_page() to
get_hwpoison_hugetlb_folio(). Reduces two references to a head page in
memory-failure.c

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 include/linux/hugetlb.h |  2 +-
 mm/hugetlb.c            | 10 +++++-----
 mm/memory-failure.c     | 22 +++++++++++-----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index eed1beed23b6..076bb8c037af 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -171,7 +171,7 @@ bool hugetlb_reserve_pages(struct inode *inode, long from, long to,
 long hugetlb_unreserve_pages(struct inode *inode, long start, long end,
 						long freed);
 int isolate_hugetlb(struct folio *folio, struct list_head *list);
-int get_hwpoison_huge_page(struct page *page, bool *hugetlb, bool unpoison);
+int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison);
 int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
 				bool *migratable_cleared);
 void putback_active_hugepage(struct page *page);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index a5340a807874..7a7422a43538 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -7284,18 +7284,18 @@ int isolate_hugetlb(struct folio *folio, struct list_head *list)
 	return ret;
 }
 
-int get_hwpoison_huge_page(struct page *page, bool *hugetlb, bool unpoison)
+int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison)
 {
 	int ret = 0;
 
 	*hugetlb = false;
 	spin_lock_irq(&hugetlb_lock);
-	if (PageHeadHuge(page)) {
+	if (folio_test_hugetlb(folio)) {
 		*hugetlb = true;
-		if (HPageFreed(page))
+		if (folio_test_hugetlb_freed(folio))
 			ret = 0;
-		else if (HPageMigratable(page) || unpoison)
-			ret = get_page_unless_zero(page);
+		else if (folio_test_hugetlb_migratable(folio) || unpoison)
+			ret = folio_try_get(folio);
 		else
 			ret = -EBUSY;
 	}
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index ee8548a8b049..7b53fe287ea7 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1257,28 +1257,28 @@ static inline bool HWPoisonHandlable(struct page *page, unsigned long flags)
 
 static int __get_hwpoison_page(struct page *page, unsigned long flags)
 {
-	struct page *head = compound_head(page);
+	struct folio *folio = page_folio(page);
 	int ret = 0;
 	bool hugetlb = false;
 
-	ret = get_hwpoison_huge_page(head, &hugetlb, false);
+	ret = get_hwpoison_hugetlb_folio(folio, &hugetlb, false);
 	if (hugetlb)
 		return ret;
 
 	/*
-	 * This check prevents from calling get_page_unless_zero() for any
-	 * unsupported type of page in order to reduce the risk of unexpected
-	 * races caused by taking a page refcount.
+	 * This check prevents from calling folio_try_get() for any
+	 * unsupported type of folio in order to reduce the risk of unexpected
+	 * races caused by taking a folio refcount.
 	 */
-	if (!HWPoisonHandlable(head, flags))
+	if (!HWPoisonHandlable(&folio->page, flags))
 		return -EBUSY;
 
-	if (get_page_unless_zero(head)) {
-		if (head == compound_head(page))
+	if (folio_try_get(folio)) {
+		if (&folio->page == compound_head(page))
 			return 1;
 
 		pr_info("%#lx cannot catch tail\n", page_to_pfn(page));
-		put_page(head);
+		folio_put(folio);
 	}
 
 	return 0;
@@ -1347,11 +1347,11 @@ static int get_any_page(struct page *p, unsigned long flags)
 
 static int __get_unpoison_page(struct page *page)
 {
-	struct page *head = compound_head(page);
+	struct folio *folio = page_folio(page);
 	int ret = 0;
 	bool hugetlb = false;
 
-	ret = get_hwpoison_huge_page(head, &hugetlb, true);
+	ret = get_hwpoison_hugetlb_folio(folio, &hugetlb, true);
 	if (hugetlb)
 		return ret;
 
-- 
2.39.0