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, linmiaohe@huawei.com,
        naoya.horiguchi@nec.com, willy@infradead.org,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH mm-unstable 2/8] mm/memory-failure: convert try_memory_failure_hugetlb() to folios
Date:   Thu, 12 Jan 2023 14:46:02 -0600
Message-Id: <20230112204608.80136-3-sidhartha.kumar@oracle.com>
In-Reply-To: <20230112204608.80136-1-sidhartha.kumar@oracle.com>
References: <20230112204608.80136-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?pbZl9pvNcv1gDF0a8YzTTFH2NxboImcrg4WDzUOwNAi+bR81iuxzFhn9MIml?=
 =?us-ascii?Q?Q7EYTbJejEK37nkBkIL2HhAMkhYnbUxmOx6IFHvH/6Q6Uih8t66PSCPYFLLt?=
 =?us-ascii?Q?6T6dECMpp8AsPsdSx3gnFdyWQMZcGuNA2zDKGRFAD788/iXc/YfcAO+0Fm/A?=
 =?us-ascii?Q?JXNAI+x2b0/vhxojUheTooQmTIAdDurdD+I5p8DY4Ss4j7wpt5EKZ1ne9xi8?=
 =?us-ascii?Q?z0nG0jYCVoPiwrRdkYud0/0xHhC92G1+YQu9ZObbM+Y7zut4zjikmAY1UGPr?=
 =?us-ascii?Q?+TWY2xMYlKWoXK3JfwQ3K9aIZhjteYALDOlqCVRdlbFiMG43Er2T3mo2+upr?=
 =?us-ascii?Q?TZ2VQ4kOX6Sm9piIeg6o6vZaXdr9/wa8Xk/4TJMcHKUBavA0EgPqRauVKZFY?=
 =?us-ascii?Q?rLgy8ehCjGovJqUenzgMQ5sSpk1L1sCvJpkTyoIba+vp37S42B8zdnzpL0ND?=
 =?us-ascii?Q?LadGb2ERpJFFeBDoJczI/qEs16iYSFHsBKachPMFwq0xg6f4Rd7DnLJem+Mr?=
 =?us-ascii?Q?KIo4HkkyBUSS8SPlTfpmv+ygCehBUv9A6jz0sJGtOb++V0qbivHhse84qxn1?=
 =?us-ascii?Q?Xr8oxiQ9H6/y9rGraW5Q9UR48p9iu7wPzCs4asCLkQ8O/PbwIyY2XJdLazlF?=
 =?us-ascii?Q?iOSgYAjsq8HczKo+AO7mfPJmCWvTrC57eSPGSBa0+IPDQMnqpki7NnRZvchl?=
 =?us-ascii?Q?3Mvf/CVgz098prFFU/vXhle7iTTT+mBdlcHsB8yPZ4N8/w2eBeoAvcJg2uqh?=
 =?us-ascii?Q?i3/SrkbBFze41ZRcRqII2TY3Xss3AVxPyYs1ZKsK89y8os7ePQu+KH1JfIv8?=
 =?us-ascii?Q?d3YxvZvQVGt7zTozd0OwO8Nwy54W9hdEKCt6H0Q8XqV09laCl+Wm/5V96ey1?=
 =?us-ascii?Q?WwbqSh9R2fBNZ/wmrqDg4eVk1FVi5etHIhsAyMhHXUBdyD72CIfCcO23QXIR?=
 =?us-ascii?Q?COU063QaMkO9TJNXFt+bI1zwV237rMHGlRKZOVSkjS3LNI43cdfhtgsIu7MY?=
 =?us-ascii?Q?iPY4Cwhx5miu9adzbKEy4FD9PmLOKc8rHAgc1r5QuPLoG2nscoYHbV2s9YDI?=
 =?us-ascii?Q?hO24OqaYu9FCX/AVE5g3L7CTa8D6IH1LA2RMdFakSvMTyhuWKRG1AMOaz3eQ?=
 =?us-ascii?Q?BUFgpuBYQXz+7mMoG8lFFYQCaB9A96YYHHhq5EnYj9RTbYKzwCwiGJSWEwcR?=
 =?us-ascii?Q?yZYzOP+LIBOTC5MpeWJLYNYVxCY8krAuHmuH8iR0guenVZZEU+E1SGJeDd0B?=
 =?us-ascii?Q?Hyu92hcbvrZXbOru6JJGgv/rldFNHYnlF1D9fOuw4iWBrMNNA2/0Mphwv319?=
 =?us-ascii?Q?KScUbYLDpF9AuQZ8vrGZClRVcuBwYdX8zsW3K1q+k0Rq8K3JNMlreRyWeRMz?=
 =?us-ascii?Q?z2RS3A6uG06LSA+RYsnZJGpOJXyMhfLqJdsSJCovJ36ebF0UCsdzOQTcgvzU?=
 =?us-ascii?Q?Azt1qiiv5pbrr4KfzdCYqfxLaAUU9wTrWELVLdBqQjPxHVbA0YLrAOOw20kk?=
 =?us-ascii?Q?08J5BtqaLkNKTEu37EaAR2h+zVXFlCokGn8Z2lDjP7bk3nKA7C4eRjx+n18e?=
 =?us-ascii?Q?XO6VP8E5WxR6ilD4KndRN3rOJsSaP58iOi8FlC4d4GFAClof56Dds9CXL1lw?=
 =?us-ascii?Q?KzWhMno6UBhW50BIllbDZOQ=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?T21ztMhbkN6q3M02mgXVtkgGq1AD+n7cRaKe/jhe+3e1n1rmp7FqhHh2dsm8?=
 =?us-ascii?Q?xJFYYuVAyblSGhPYbqe/IiIic9/cxO5XS5S565U4tZHaIbWJvejgBxlHBf3T?=
 =?us-ascii?Q?VfhlcmjMs8nLFl4fOiJAHhnsMHW3R23o5iCRkWpDSeXz/8Tc/Py0ZhIEhjpY?=
 =?us-ascii?Q?A3sY9eAsu8IufWajL5ENjXioidjLgnrnbRvNzb4e55cyqVLAWdAWxVqaYD1b?=
 =?us-ascii?Q?5Gvkem2Ymrf4el3nU1UJ4FpK39tx4hJqj958fE2WRy0PxZrWwpd8jmu3JExd?=
 =?us-ascii?Q?gRqYF8pjLIepQDZijyQQOWrw0cIUcEOcEu9exF9VzytWorfN+Srh6dSW133p?=
 =?us-ascii?Q?13iykzV2NRtX09rXKMoUafAJ8WkAktovxS/TOOt97utDH0mrDN/x7nYWT8/M?=
 =?us-ascii?Q?WTP6zXsi8PvVt4OUt77V8/WbK9ddaJc0aGIdQUzdC63xpNoNHfBcWNRDGDrU?=
 =?us-ascii?Q?1uLNC89akP0uzr7VhmMYQ0g7u/ShRL9XqfUMrznI0DGWwE7q5u/2b9Fa9MJs?=
 =?us-ascii?Q?El5TfsTZisEgoKBTSm2XFWbEyKMVjNkxgy5QNK+OIcgl0JGjk4emW236/4eC?=
 =?us-ascii?Q?Enc5ExC5gsUWZphjvQbqh51lyCrHL6Z7Cw3r7TXaVbUse/qKN/rjbo/WUouS?=
 =?us-ascii?Q?l5WUjsSSo+XMowtBN5v4dnhbT6qv7baLn0vgGROeJ9Y4W1FL7F1ICWC1QZIF?=
 =?us-ascii?Q?RUf5gcJktB6KJohtYkPUvIzGO+OzONbUGmHenNjuBQqQQNJSUcdy9iKlZMva?=
 =?us-ascii?Q?4Ip8P4LqgD9lvvYW8iJRysSJdGt77eDX+PyB8fE3xVx/u4HBnqE7/vI36I8R?=
 =?us-ascii?Q?tbKniUFrVsjUWMSAOgDrF/0LBDmhWhG+y7jAxdyeLi37Ct/N1YKCYD1RidTM?=
 =?us-ascii?Q?xkWzj/HwZAoGHoD90MeOCmxpqoe1YaOnmdFktHmUifo+pMeVjGeb5kY6Ytt7?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7ddfb8c1-2c13-47e1-8e62-08daf4de0e8e
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5117.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2023 20:46:19.3142
 (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: h7Gg7g0v84Y9+StJMX1xrVPhxlI93qC5kJWjWTTkBBXd7pXP9zLfl4cTdqMzUadjkSldRLQDyWgpICuBY7Dc/AzdcinR0o0ViajzIouDaiY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6804
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-12_12,2023-01-12_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999
 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 suspectscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301120148
X-Proofpoint-GUID: bGjhiaQ2vQNaNY4PQdbSIzzKpyryC1aa
X-Proofpoint-ORIG-GUID: bGjhiaQ2vQNaNY4PQdbSIzzKpyryC1aa
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

Use a struct folio rather than a head page in try_memory_failure_hugetlb.
This converts one user of SetHPageMigratable to the folio equivalent.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/memory-failure.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index ee7e79ec6eaf..ca84b27489d0 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1860,7 +1860,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
 {
 	int res;
 	struct page *p = pfn_to_page(pfn);
-	struct page *head;
+	struct folio *folio;
 	unsigned long page_flags;
 	bool migratable_cleared = false;
 
@@ -1873,8 +1873,8 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
 	} else if (res == -EHWPOISON) {
 		pr_err("%#lx: already hardware poisoned\n", pfn);
 		if (flags & MF_ACTION_REQUIRED) {
-			head = compound_head(p);
-			res = kill_accessing_process(current, page_to_pfn(head), flags);
+			folio = page_folio(p);
+			res = kill_accessing_process(current, folio_pfn(folio), flags);
 		}
 		return res;
 	} else if (res == -EBUSY) {
@@ -1885,16 +1885,16 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
 		return action_result(pfn, MF_MSG_UNKNOWN, MF_IGNORED);
 	}
 
-	head = compound_head(p);
-	lock_page(head);
+	folio = page_folio(p);
+	folio_lock(folio);
 
 	if (hwpoison_filter(p)) {
-		hugetlb_clear_page_hwpoison(head);
+		hugetlb_clear_page_hwpoison(&folio->page);
 		if (migratable_cleared)
-			SetHPageMigratable(head);
-		unlock_page(head);
+			folio_set_hugetlb_migratable(folio);
+		folio_unlock(folio);
 		if (res == 1)
-			put_page(head);
+			folio_put(folio);
 		return -EOPNOTSUPP;
 	}
 
@@ -1903,7 +1903,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
 	 * or demotion can be prevented by PageHWPoison flag.
 	 */
 	if (res == 0) {
-		unlock_page(head);
+		folio_unlock(folio);
 		if (__page_handle_poison(p) >= 0) {
 			page_ref_inc(p);
 			res = MF_RECOVERED;
@@ -1913,10 +1913,10 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb
 		return action_result(pfn, MF_MSG_FREE_HUGE, res);
 	}
 
-	page_flags = head->flags;
+	page_flags = folio->flags;
 
-	if (!hwpoison_user_mappings(p, pfn, flags, head)) {
-		unlock_page(head);
+	if (!hwpoison_user_mappings(p, pfn, flags, &folio->page)) {
+		folio_unlock(folio);
 		return action_result(pfn, MF_MSG_UNMAP_FAILED, MF_IGNORED);
 	}
 
-- 
2.39.0