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,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2] mm/hugetlb: get rid of page_hstate()
Date:   Wed, 19 Jul 2023 11:41:45 -0700
Message-ID: <20230719184145.301911-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?QseRY9kFJSNBlP8yXNOKxj6OHKSmHWpqMlGHghv9OIUaCF9Y1kxplFsju5HW?=
 =?us-ascii?Q?IvCUlszNmL5luiiWTLu5uW7sd3jJ4jAosUi/iFw4VlwKbJbwAaGsghKoo84l?=
 =?us-ascii?Q?g/fi7M6xRLWIP3ukRpPONfoNlZzWFesQQJoUjAmr5A1JFpQROfsLUFpgdbb2?=
 =?us-ascii?Q?t6sahUTmJLgCo1czJFL88sStg2lcehKFYGrbk0NwAL/95V9XHYSxWDvP5nJL?=
 =?us-ascii?Q?4QiDMZEsOTNmLcSDzh2MBRxI1j3siYJ67kmNmG6iItffxNOWns5tS6oqbBqc?=
 =?us-ascii?Q?Z36uMWO3A2humH9fazJeE16I8RRuLJX56AiM8ydrGLiLtHSIr57quARA7nKm?=
 =?us-ascii?Q?JVxwoF93Ix+zIfQuo7mnSBqh8vLlOb1XdNAbE6RGk0yfOPabGzApiN4yy0rc?=
 =?us-ascii?Q?fftsOkfc6W5oAc8hRPFH40I3cgaE/z2xUq9opx+ziB0Ek6z9qYP8pIHiyIAL?=
 =?us-ascii?Q?zw1Cgo0BaTJw8mgtK9qnSoHJGDqffrXwK03xHYnaBy1MXz/44kxCHjGfgbV/?=
 =?us-ascii?Q?aYxU7iAJUO9O9vEerTSmdzq+1EIvAtWWBTfjeB7Ro5bvRosRwKc+j6Y6yKks?=
 =?us-ascii?Q?LUd1RekEYjL1GszGg6lj5oOSEgY7ACPsgnMKLBve+W+pOpaAbF7wH8Tsuogn?=
 =?us-ascii?Q?s2AHq7R/oLlGV+XnZMORpvvX38cf4qUWI2xZfx+9+7aZ3OpMlQi6dEvhpDb5?=
 =?us-ascii?Q?N75ib3xXPyqpYR7x3zYUWX96MEo2K1db96Mu+fwrBAjKnSJ6nD2D0aE7WLtI?=
 =?us-ascii?Q?O/ob71ixhCU5FB2iWFCiTW4sQU1+cGV95+7/bB6/RD+AOe8M6lW3hfO5ZsJk?=
 =?us-ascii?Q?o/WoSq3BfKzSTfeC0yPoPZvprYzTajJD+haWbkGzW0BD1QZWeyHyDcyr+GK0?=
 =?us-ascii?Q?MRuJD5kSsax4pSZV5K2cPMy4lWRe/Cn04xaIjXtoRW7vUlDoTJUJYoLdv/eN?=
 =?us-ascii?Q?s1p65rvttvZkYq+4aApGTdNviFmOWna0JjeY2cf/0YosxUf0kdll8VyKullA?=
 =?us-ascii?Q?7GIdAVVKDgyGJW6n1gg8vKVwY1NzUVxqJZNei64SU8N954ykARyAmRwBM1ci?=
 =?us-ascii?Q?pNQYJb4yqwjkrxsTxSp22SbLgzegcm7XaeNXBlk6ijkKKZbAq26N0zmhRAfM?=
 =?us-ascii?Q?OGfuTDdt5NjzuXAn5XTzFM1ysH6yEYFMPWcIJUgdM54tM7mdWw+FLmphYK+O?=
 =?us-ascii?Q?faxB+BhkGfyK4EwvS7DMxUsl+AH53ouQgpxNvj+PCIBBka/X4gdSkFeH3SgM?=
 =?us-ascii?Q?NHJKdmGSTUFeT03oRFzcNLyxX2pDRmLE1U4cq1MFcjSWZzNOcn6P1D88+Jd9?=
 =?us-ascii?Q?NO4O3kwWdhKNF0A5KdNVoTbPJCgZdPejNPyAbwgIg83XhGPB3/X+j0cbgIL0?=
 =?us-ascii?Q?vsuA68O7oJhdz5TxZlxoEtwI2UD1z+ot6t5nYAPYXKDlXuxQpazhhyVnaTi3?=
 =?us-ascii?Q?7Sp0ukKp1KQEMdP5rCkdJXVbgg03J4uHUxi0GTetSGz0bpqYYvVTzWGw2v2M?=
 =?us-ascii?Q?i2ZY6bnMTedaUuj8IxGHYoCrC/Of6bamj4nrQgeztdwb9WoO/X3eExTFpj9N?=
 =?us-ascii?Q?YH9G+34KtzbtY5cynUxTNSAmXXXcO/tIjN4f69d6UhJDFcW/XWZO9PW6q4bH?=
 =?us-ascii?Q?4gcMmVzPGvHThazS6nycazY=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5EHLKpR3uGIUV/VnlggLLMEFW2M2GkAqXD35puPq/4PpjxdFwvY2H5wRcURcTa3DzCvrWMD06KfHFz3UammCk7bY71dtRWjfdFoXBXWzYLwjEQH287aSeDF8li405nlTQXpRSnQoib4I3NZu87vovuEPGudMof8JIj7NX5GnLNnBlaNASZPOKmS6cPi1ZkVYrO+jOHksc6s4FtUi1tb6brz00OYJF7z133Kp54m2I4FiS6PwSD+8liyRpMdLlmJUFthelOZsrSKZU0WHRyW6x2Jh3nfIt1E8hyaddWKqP37BcGQiLE22wGtL4YbcDNj+h6yTmafVCFBXnBp9U9MHzIvnaI8YWGApwet6NeZJyeCqRLCDTWZ9o32H14+5+0TtuHpCVw6mM9D8hlVfUnxqms9xVk4tEREL8bHatbWnpsnSKeO8X9DIoRKiH1Sz8cl1ghLPemmxXSs/RZu766o1oEr0G+e0pf7MhPhgrU0Zjq1yjen648V8sKP/Z74k5qXhjmsisyS7nejM70U5A6uB9h4KLo08Ug2rJX2HITN/X1KwVSlSQYuMrnwIdu2XzYoGsROjRZfcXy1aq0zw1TbcCyIkA9srbV6OvLKmvD+t8+vVUDhlqz/omL3AJOWHnLDzVvJEJ/fYCmudNRis1Wschnpww/glVeMiRtaAaa0AIhH7rTIvVcKD3rtvpb1av6mYuPwk2gc5gsfQfCOZ6GbDSJcNYBT9iPrE41dP9WOUHEWCrsunLwPzKD1oFmNhhhtDfZUHEIJWRZgI2aQYt2FJQ/7YSRfP06bUUQVwslfw5BAxXh5hTjljM+7P6WCCL9ZCYP83jSETFqs0IhDxyBHwdDM7PSh0itnso97zaL7dsBcl/EFQ9unGwMeO2bYTEt2+Ml+6s+Cd1E4KFbmjAmto9lutqWufLPO/1MbEXEWYVP8=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c4a22b2d-c2b3-4dce-4c4f-08db8887d138
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2023 18:41:51.6935
 (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: rH3FtSTKfvTO0Bt9grmcnkuyeymdXH2Yvs0EXsQ6fsmb6zih+tQ7CukojlUfwuS0UJVh2JfkZJxrTnfGX3kxpJWi6UwCe0Pb2gdmoMlLJSI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB7536
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-07-19_13,2023-07-19_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 malwarescore=0
 spamscore=0 phishscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000
 definitions=main-2307190169
X-Proofpoint-GUID: 7FzzVbTnMOQUiR65dN2ngepHNyIrMb7o
X-Proofpoint-ORIG-GUID: 7FzzVbTnMOQUiR65dN2ngepHNyIrMb7o
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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

Converts the last page_hstate() user to use folio_hstate() so
page_hstate() can be safely removed.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
v1->v2:
	-change (page - &folio->page) to folio_page_idx(folio, page)
	 per Matthew Wilcox

 include/linux/hugetlb.h | 10 ----------
 mm/hugetlb.c            |  6 +++---
 mm/page_isolation.c     |  8 ++++----
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 9f4bac3df59e4..0a393bc02f25b 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -841,11 +841,6 @@ static inline struct hstate *folio_hstate(struct folio *folio)
 	return size_to_hstate(folio_size(folio));
 }
 
-static inline struct hstate *page_hstate(struct page *page)
-{
-	return folio_hstate(page_folio(page));
-}
-
 static inline unsigned hstate_index_to_shift(unsigned index)
 {
 	return hstates[index].order + PAGE_SHIFT;
@@ -1062,11 +1057,6 @@ static inline struct hstate *folio_hstate(struct folio *folio)
 	return NULL;
 }
 
-static inline struct hstate *page_hstate(struct page *page)
-{
-	return NULL;
-}
-
 static inline struct hstate *size_to_hstate(unsigned long size)
 {
 	return NULL;
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index e0028cbb86c09..154cc5b315727 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1812,10 +1812,10 @@ static void free_hpage_workfn(struct work_struct *work)
 		node = node->next;
 		page->mapping = NULL;
 		/*
-		 * The VM_BUG_ON_PAGE(!PageHuge(page), page) in page_hstate()
-		 * is going to trigger because a previous call to
+		 * The VM_BUG_ON_FOLIO(!folio_test_hugetlb(folio), folio) in
+		 * folio_hstate() is going to trigger because a previous call to
 		 * remove_hugetlb_folio() will call folio_set_compound_dtor
-		 * (folio, NULL_COMPOUND_DTOR), so do not use page_hstate()
+		 * (folio, NULL_COMPOUND_DTOR), so do not use folio_hstate()
 		 * directly.
 		 */
 		h = size_to_hstate(page_size(page));
diff --git a/mm/page_isolation.c b/mm/page_isolation.c
index 6599cc965e216..bcf99ba747a05 100644
--- a/mm/page_isolation.c
+++ b/mm/page_isolation.c
@@ -79,17 +79,17 @@ static struct page *has_unmovable_pages(unsigned long start_pfn, unsigned long e
 		 * handle each tail page individually in migration.
 		 */
 		if (PageHuge(page) || PageTransCompound(page)) {
-			struct page *head = compound_head(page);
+			struct folio *folio = page_folio(page);
 			unsigned int skip_pages;
 
 			if (PageHuge(page)) {
-				if (!hugepage_migration_supported(page_hstate(head)))
+				if (!hugepage_migration_supported(folio_hstate(folio)))
 					return page;
-			} else if (!PageLRU(head) && !__PageMovable(head)) {
+			} else if (!folio_test_lru(folio) && !__folio_test_movable(folio)) {
 				return page;
 			}
 
-			skip_pages = compound_nr(head) - (page - head);
+			skip_pages = folio_nr_pages(folio) - folio_page_idx(folio, page);
 			pfn += skip_pages - 1;
 			continue;
 		}
-- 
2.41.0