Received-SPF: pass (google.com: domain of linux-kernel+bounces-193146-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, vishal.moola@oracle.com, muchun.song@linux.dev,
        david@redhat.com, osalvador@suse.de, willy@infradead.org,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH] mm/hugetlb: mm/memory_hotplug: use a folio in scan_movable_pages()
Date: Tue, 28 May 2024 15:03:21 -0700
Message-ID: <20240528220321.144535-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?KcH+0J8GTPxPIPV8+B5rydcvCwCwsAb45KB1klaB/6FwmPeJhZiJo5whe6Dh?=
 =?us-ascii?Q?wfZ+9M0uIqGt4eh+6QEayaLIG6clDC7nSJ8M1LvJxzDnbm4VyXjHA0Be9R3D?=
 =?us-ascii?Q?Br9BgRtC3FV35zbSjYjouamDBrFIg/7/nj94aqPskf3O8pzzdGDPpxo4uYZ/?=
 =?us-ascii?Q?CJ4ijXgKs/EkbnnAsq3Nb8TZfk3LZF+Z7UqSR11Ztehk4ETYM/4grx1/XpdC?=
 =?us-ascii?Q?/BAX/zUjOJzqL7B9ezDjSnOBzELvtY9DR+98n6a16KGe2jrRFW0Z4Zk2dWtE?=
 =?us-ascii?Q?xhC6Cd/rKNU4dgJZBEpoBzadD1zNnfH926hTWIRHBUvMOqB+7bxTb9MSrgJf?=
 =?us-ascii?Q?PcnVBt+YE1lRbn8w8XoS6ZuHp4UaX6nqWLRsCm6yadeJx+OVGwKIH9125exA?=
 =?us-ascii?Q?Fd5xXVkFPj++07AoXEvAjHGtBVwhCPuIesIvEVXHmZEBMo4gvtLe4r40qgfh?=
 =?us-ascii?Q?d342ZeQOh+ZOkLYZA51F7SfgakymZsXFdlWjzwzH+vPwgk5ndgH9niTsxU3E?=
 =?us-ascii?Q?NeP45d1MHOeafDrRJY+xRV+0OS2JN2eDgg5XdJ+qqXKWifcR7uLGuXTBbqdT?=
 =?us-ascii?Q?jseSRAD4EJkcGmMgbD5tkoSDOFMCXm/fCKKUIPyIujaUd5WjAgqxL4aqf5xY?=
 =?us-ascii?Q?q1jvVxrSJOROBUfJZH7iDJ/VqGk2XUV76inxNaXSIJxRi601BUh+7M6L7/tf?=
 =?us-ascii?Q?GBkSoa5S5dWrr+bDYhtgpHMF2rGGz/59JddnLN8F+ZgH5LNM+HDZUkpcJWsh?=
 =?us-ascii?Q?Mcl0lL0p1b9gPgCJvvcrAkCVsusPVY12YWys7fhqOtyoSnDp5kSJISkHxLuJ?=
 =?us-ascii?Q?ZMqjIbWYwV1Yn1gVyhjssj5yY80ZOyubB/MVhb9vZpy9Lu95QlLT1FZr13nJ?=
 =?us-ascii?Q?+MKmSWKL2Hf6LGWM9EEb0aCshFJiBB3N/sAyD54TA7WSsyRa1cQOaxp1ciDG?=
 =?us-ascii?Q?yHwIg1pBOznYfofE4AxK+Yswxl9FB+JkqonzcWMT1B+akBccc/X9CY7hZ1iY?=
 =?us-ascii?Q?qgOKsIn2ODtzGhN4jn1qtZ8s6M8FARTAEhEP5G+u0rYNgctPvWJ0l4wH/q4s?=
 =?us-ascii?Q?4Fhb7S3TkY7GrQCiD7gI7idcFoOyXM32najRYuf4bZ9JSBFTZ8WSSvuZy61I?=
 =?us-ascii?Q?5oTKi+flS//t1FJoGdGzIgDGeKsY39xhnZeiqJeKuJ7S0IKLXmM8dvcqc5l4?=
 =?us-ascii?Q?4sCvlmBMJijRw+nZM+gH8pUN5OyhE+SA+teVT7KXKtqsLaR7v69Guw3Q6sCt?=
 =?us-ascii?Q?rp6TGSWeZjFcurmDAZioaLjAuHxXd50RxPDmkRJqpDCsF3T24p6D5cWB/u01?=
 =?us-ascii?Q?2WpImLzs21kq3E6zm5p/7qKoUrvZa5T/TnL49KNJlvvfeXdg1K5LjVi9fc1x?=
 =?us-ascii?Q?5ODFZYau4frOQlBU6aJCmfl5HjvOtAd+pMqX3/xOJNgCSysBTPdk78iXAnbC?=
 =?us-ascii?Q?CcnYHQk9US0SaTBD/vDYXSXyJIe11GWC0fOIMs/0nI0WEwLwPuOqB39daWz6?=
 =?us-ascii?Q?wv+d5xrk/A+ztNlbz9/vIR/NTnihFrDTjHwFbjGFQOX4fTCTpl7ckgTt3bPz?=
 =?us-ascii?Q?oAiNbydLUHTLNKeClrMVSpBu1XgA56HI5xlSUX/ScwHXHm7EpGtdrHNauvkm?=
 =?us-ascii?Q?MEI7a0KaGNVAbz9fuj89BN8=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	Pk13FeVkZU9aXHG6I2sxr1EFkzcvCPXVncye4Y5OJxd/d0pvrUViuw2UzEXJkjO/1B8pcZYmYMBMRn0cK84F+zHQd708wE9c58/p2tnIvu4/sfnYP3Oc2/USqt8byQrX4hr5I8mJifcC8skJXLxSBNL8np16xt4n+A7c+Pi07Urk57sJf8sF/00pqi8aaeRFNVIJmMU97cM1/oNbic3cuVKHG0XlGus3fWZ0KF1vCVpsiuS7SJgL17uVUfiU445mPgUZh0yb57cBA+E2ZUgPfs3ckgzt64X1/u4d6ze+w9POvilFRJBhooxbI65AOQNA1xsOcMtNY1Zkdw7mqG5PIx4soFTboEy4T55nDLGuiXVzX10ow6Wf7GO8eUoIVtxCSx+Wu2I8IVRbh0glTvbM8+pgOXnNWP0zqLFMc5/GrgZ+dXB3B2XZO/3sTOdm0qhzKqzpEv6EdgOPML9M0ZdAiJ9FMH26qvDuc0hvjq9spj+hqg4uN1QJ8T5q8UjmMeRCrJD0aOe4tncqcQZwuOxFCyYGHyFBRx76D279P22l6Q0ZAXHfCoftVljod7k5L1P7ohaO7Nq9RFI+NCLiGHqKkUbaoyzcCbS3njXcFI2dL3I=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dcac5adb-14f4-45d8-66f3-08dc7f62012c
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 22:03:28.4906
 (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: +glOkavfj4R1It8rtTCCptOKvNt/fPRm0iHW/KBQNUVHkwj+QGuNjbidEwkMQhqn4kjLmPlm2BRH9m9XdipMvBbr0Wdbi3BiACHVzp11JS0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6508
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.650,FMLib:17.12.28.16
 definitions=2024-05-28_14,2024-05-28_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 mlxscore=0
 mlxlogscore=999 phishscore=0 spamscore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2405280164
X-Proofpoint-GUID: E81Nk0iIyi89IwbtpdVjo63RbboL_uU7
X-Proofpoint-ORIG-GUID: E81Nk0iIyi89IwbtpdVjo63RbboL_uU7

By using a folio in scan_movable_pages(), we convert the last user of the
page-based hugetlb meta-data macro functions to the folio version.
After this conversion, we can safely remove the page-based definitions
from include/linux/hugetlb.h.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 include/linux/hugetlb.h | 6 +-----
 mm/memory_hotplug.c     | 9 +++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 15a58f69782c..279aca379b95 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -616,9 +616,7 @@ static __always_inline						\
 bool folio_test_hugetlb_##flname(struct folio *folio)		\
 	{	void *private = &folio->private;		\
 		return test_bit(HPG_##flname, private);		\
-	}							\
-static inline int HPage##uname(struct page *page)		\
-	{ return test_bit(HPG_##flname, &(page->private)); }
+	}
 
 #define SETHPAGEFLAG(uname, flname)				\
 static __always_inline						\
@@ -637,8 +635,6 @@ void folio_clear_hugetlb_##flname(struct folio *folio)		\
 #define TESTHPAGEFLAG(uname, flname)				\
 static inline bool						\
 folio_test_hugetlb_##flname(struct folio *folio)		\
-	{ return 0; }						\
-static inline int HPage##uname(struct page *page)		\
 	{ return 0; }
 
 #define SETHPAGEFLAG(uname, flname)				\
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 431b1f6753c0..3573f39fbaa6 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1731,7 +1731,8 @@ static int scan_movable_pages(unsigned long start, unsigned long end,
 	unsigned long pfn;
 
 	for (pfn = start; pfn < end; pfn++) {
-		struct page *page, *head;
+		struct page *page;
+		struct folio *folio;
 		unsigned long skip;
 
 		if (!pfn_valid(pfn))
@@ -1753,7 +1754,7 @@ static int scan_movable_pages(unsigned long start, unsigned long end,
 
 		if (!PageHuge(page))
 			continue;
-		head = compound_head(page);
+		folio = page_folio(page);
 		/*
 		 * This test is racy as we hold no reference or lock.  The
 		 * hugetlb page could have been free'ed and head is no longer
@@ -1761,9 +1762,9 @@ static int scan_movable_pages(unsigned long start, unsigned long end,
 		 * cases false positives and negatives are possible.  Calling
 		 * code must deal with these scenarios.
 		 */
-		if (HPageMigratable(head))
+		if (folio_test_hugetlb_migratable(folio))
 			goto found;
-		skip = compound_nr(head) - (pfn - page_to_pfn(head));
+		skip = folio_nr_pages(folio) - folio_page_idx(folio, page);
 		pfn += skip - 1;
 	}
 	return -ENOENT;
-- 
2.45.1