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 1/8] mm/memory-failure: convert __get_huge_page_for_hwpoison() to folios
Date:   Thu, 12 Jan 2023 14:46:01 -0600
Message-Id: <20230112204608.80136-2-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?5b50hv3DxMIRBWxPjkS3JvgIpHg5eLjCJRNW2vJLfq6SPJRGnGYj+Mb8MTDu?=
 =?us-ascii?Q?yRiz5UdjIYbn/s0uwMcaIVcQPwKc9xRyA5tfMGakv7MQ2QuoZ2EoWS80G3MB?=
 =?us-ascii?Q?8a2n+QXzmYbVI8wqaAyxxOsnBn7tV95gVwjloc64dHAnaNfCfI4vewv1FYOr?=
 =?us-ascii?Q?ykTa1MJ1ltWdYLFwr1nVTD9uIWezAdYoYy3llZQBIuD0+O5JXTzW7kTYtY7v?=
 =?us-ascii?Q?kkIHR3b9mor6GrwzLmw4OXe0jlEiZkFSQTknI1LU5uYUzF9SrS7X6TXufD2S?=
 =?us-ascii?Q?OPnGYmRyhd+2XjsQmS+hDCLoMPGqqpk46HgTzcfubDKzZJWeoCoCFGPvboXX?=
 =?us-ascii?Q?bQa7Vwz0CNEQekclL3g0A5bfh2aCqLklaQfl1muUG6CL9Dc7I1Kr7geo+qhx?=
 =?us-ascii?Q?dynzlimdpR/mgLuJ3vAPo5uxFeCbXi3wZgEF6IqP85EF9Y+X20okGvD1Fdrf?=
 =?us-ascii?Q?KQph+FWP5Rwn/mXUmZRXlI0lVcb536k9iWmL3YN/vtsrCjAhtEP3/Q0s4YPw?=
 =?us-ascii?Q?aBljogQWzd5hvoNYKsEqpQT7Ev+/3d6HU50uz7ALzVoPQdLVCFdvUpIWvOWm?=
 =?us-ascii?Q?utdKqi+YLwEUO1E6E7xPrnZgdn6LH1qBFVMux8pTpD20SoKr11s9UXgw20nM?=
 =?us-ascii?Q?iQh8Cbsac1IA3bNUdwDPr+V9QxKwLuYxyynqYpvncrFtSxq3xwCXxClvNGQZ?=
 =?us-ascii?Q?A0LpwtpNJ5BG06HD2fHO2YP/3908QR6mLPmq7srEl2hDyrRC6W7c+te5eK/c?=
 =?us-ascii?Q?Q2CgX4T/i2tIudTtWsbT/5Cnzq9CKEEahHRGZZyBQyiILYCV7WND0h+g0Xpj?=
 =?us-ascii?Q?rWe9ioS42KiYpkNtAeQ6Rgvm1GWU9cAKYOLHnVppVSCxg4YIBDmsnCrGgRkf?=
 =?us-ascii?Q?Bow9NjU/CNDn8qMMA6ycWdNzEo64tBVSgFiI9lSDos6t+yqph/mtVVscOmwI?=
 =?us-ascii?Q?U/UynF3/mJADWc5L1WJY+pXeUkb8n8ztieRnOSeBeMIgGu2zxhZFQks7ZrnB?=
 =?us-ascii?Q?SZFC2LgSjJAUlehbpBlLNj2mz91S71H1C0h4aRW4+bnpw77wODjhdNqWKJcy?=
 =?us-ascii?Q?EUUYviCGJ8rcIV+QCx9qRkxSAJt4OdeyXU3AUc7Z4B4V0DVdUaQRwpQA2NBw?=
 =?us-ascii?Q?HpYXgr7OR30QXKOJp5Y2VqqcnYOlsezZGe8TdeMfJmhXUXkdZtN9cfR5dgQG?=
 =?us-ascii?Q?m6vMMUKD6/7/rKltgLVNmmwZJ/IVv9VEyKGYSFCv3JIerRUx9rlh3uCBd1K+?=
 =?us-ascii?Q?OIlS3G/wwhhWTWJE3/A6VvWW0doUfcwOiQoucdTQsRkv0xy7BWJa+VX8ts50?=
 =?us-ascii?Q?yMbQgYV8DY/PIjI8CxfJ4nDHzr3YS2uwnkwgSJQnSDA/4U5UEdXV5ZDlcze3?=
 =?us-ascii?Q?budLlkgAMiScFcdxIiggnDUyIu/2vVzcDjtr3G4mpBVXtkh/DUZ5ptGUmAoa?=
 =?us-ascii?Q?YWTR4QBFK/DLtsUCy4wzcvODi8Lnx50RjxDcGDP2HZfwTHggE1w2p4k+MNLm?=
 =?us-ascii?Q?04MuwWqEmf2bnZEzkmrqrsWIZj/ZgIpIqYHabq3V2Psm2ZdI+oZoFup91Qfj?=
 =?us-ascii?Q?933aW+nVLiY3k+MvLGX46QiCnWxp0KfKFYhMRKzLc3X1wDHNoj9vd3yI/QiB?=
 =?us-ascii?Q?2a0zSI5b5vwR2YrbKbx0Wvg=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?kdkf3Ld1XNNzIo2UI/Y/tOMGuGrugs7Qs99aBHaXOuO10y7lLNpSk6vOEVuf?=
 =?us-ascii?Q?oc3Uj+CGv7RrpS1n9jOazJdkt6L3wPc5tmi6BvW0LE7BzuvT1YX5aQM9NiID?=
 =?us-ascii?Q?LPnsZOBoxmhW8VyfIh1aZeiGazWfZXazh6XZ93r133S096UZX6NtZQcJr6NL?=
 =?us-ascii?Q?q6l6OqVarZXPv9kXSJxVPRTUFppuPWuMoWDft38KovZOG7k5KXlJ64D3/CXi?=
 =?us-ascii?Q?sefdOMiFY+Q2viTRupCJ+Vwf0tMfvUo+c6M5zu5gynP9qBUolfZcNZHVzYyb?=
 =?us-ascii?Q?HE53qiPo/i9G0z0ajhHVmRouTMeziGTYlPHBAc9fVatqLm+2bBS15hVMMM8N?=
 =?us-ascii?Q?lAQo465+4zijFo/ADzIa+vX6kYHFqvrSMVCYw2E0a1YghheC6+86TYsI7ViA?=
 =?us-ascii?Q?oFJMFZwZOmaX5MGyT8WY5MT8o0R2ymdF5NJXxaRjbvwsPPqq4UaCVoWg4MnJ?=
 =?us-ascii?Q?bh+nj1nDCjvYOrgQscj3ITw87esdUSoOrWJkRKCvxbGXxYA8h86d1kMKGJ/b?=
 =?us-ascii?Q?NTYNRtKSb5S9KFIH8XVuaVouLZOdK7KOWm5H7fKvdePOk5RzGbUPkxyFcI32?=
 =?us-ascii?Q?pDdOe7mEl8ClRtFSR0ooQKLlUHfsc+gHFqnffZJ3yNtpfgHFV68XOnTC2MM/?=
 =?us-ascii?Q?Gsvao6++HJZcxxxa/ByKsG2hfKi4Ji/2RsFT4xsWZWW5zNF/4dEKmJYb7XAu?=
 =?us-ascii?Q?HmCDu97sjjCcQrfISKtkzt+abNmdMPQ5nlzR5b5S9XyF85nrUXvNW/E/8UlA?=
 =?us-ascii?Q?ho2Pi4+3dXGL8yPSA5CnERa15aAwYUCe4rHYsbCvjYYhfzONLqjlOvS0BfuN?=
 =?us-ascii?Q?6eNuYubZa45j4VkWw4j52UinPFx2+twewMnlrHihkuuSy2N8n/0lB4Wv2GCk?=
 =?us-ascii?Q?c/WaHKb5FX8HtqNvjWfQX/DOnmIIOrXMdvoRe5aWtetyBVxqJ7/hBqHb13N+?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0fa91f0d-7195-46de-53b7-08daf4de0c97
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:16.0163
 (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: 9VIg8pzaEerT2Hp3nZ5zPwGiyFb5zUer03l54ysKg9ZEwcw13/kjHOm4jKFw9PPBayf3i1SjM4EG/AhfC3qe9w+um6dsxsFW7bLv03ySdvI=
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 suspectscore=0 malwarescore=0
 adultscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301120148
X-Proofpoint-GUID: k5s4JmT990fZcuDW8dfB8ipmGYdokatp
X-Proofpoint-ORIG-GUID: k5s4JmT990fZcuDW8dfB8ipmGYdokatp
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 folio throughout the function rather than using a head page. This
also reduces the users of the page version of hugetlb specific page flags.

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

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 9a80d7830b40..ee7e79ec6eaf 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1807,20 +1807,20 @@ int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,
 				 bool *migratable_cleared)
 {
 	struct page *page = pfn_to_page(pfn);
-	struct page *head = compound_head(page);
+	struct folio *folio = page_folio(page);
 	int ret = 2;	/* fallback to normal page handling */
 	bool count_increased = false;
 
-	if (!PageHeadHuge(head))
+	if (!folio_test_hugetlb(folio))
 		goto out;
 
 	if (flags & MF_COUNT_INCREASED) {
 		ret = 1;
 		count_increased = true;
-	} else if (HPageFreed(head)) {
+	} else if (folio_test_hugetlb_freed(folio)) {
 		ret = 0;
-	} else if (HPageMigratable(head)) {
-		ret = get_page_unless_zero(head);
+	} else if (folio_test_hugetlb_migratable(folio)) {
+		ret = folio_try_get(folio);
 		if (ret)
 			count_increased = true;
 	} else {
@@ -1829,24 +1829,24 @@ int __get_huge_page_for_hwpoison(unsigned long pfn, int flags,
 			goto out;
 	}
 
-	if (hugetlb_set_page_hwpoison(head, page)) {
+	if (hugetlb_set_page_hwpoison(&folio->page, page)) {
 		ret = -EHWPOISON;
 		goto out;
 	}
 
 	/*
-	 * Clearing HPageMigratable for hwpoisoned hugepages to prevent them
+	 * Clearing hugetlb_migratable for hwpoisoned hugepages to prevent them
 	 * from being migrated by memory hotremove.
 	 */
-	if (count_increased && HPageMigratable(head)) {
-		ClearHPageMigratable(head);
+	if (count_increased && folio_test_hugetlb_migratable(folio)) {
+		folio_clear_hugetlb_migratable(folio);
 		*migratable_cleared = true;
 	}
 
 	return ret;
 out:
 	if (count_increased)
-		put_page(head);
+		folio_put(folio);
 	return ret;
 }
 
-- 
2.39.0