From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
To:     linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc:     akpm@linux-foundation.org, willy@infradead.org, david@redhat.com,
        osalvador@suse.de, Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 2/2] mm/memory_hotplug: remove head page reference in scan_movable_pages()
Date:   Mon, 23 Jan 2023 12:23:47 -0800
Message-Id: <20230123202347.317065-2-sidhartha.kumar@oracle.com>
In-Reply-To: <20230123202347.317065-1-sidhartha.kumar@oracle.com>
References: <20230123202347.317065-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?S1UQ+3J4HDmKhfvhJ5uSXlnaTuwdfaZeu1/1MIgkakigTjx10/nd57d9sj1U?=
 =?us-ascii?Q?htfYgTOsE5bi7x4EHZFRJZwjUjRM+/Vs/E178ocmtDaZ8fCMtk6GZesPlX05?=
 =?us-ascii?Q?AyV3vR0FKJ7PAqTBTy2leGm2PgalNqOk4WMZqVhk8fD3IbQ0fSK24rGk0SSc?=
 =?us-ascii?Q?haI5SoTokGo0hnlXSBLQMO3oiq2wH/0v7r4QzvfxWpLjD1kJxgZtE5Tfo76L?=
 =?us-ascii?Q?EHg+awwOZvxe7twt/uzMv95dr88SYSPkzVqJDddE1ydaF/6r/LiXnqX6z94r?=
 =?us-ascii?Q?zupkIxu3FobziaN9lscjz1R8QcNWKHuG9uVHGave8xiCy7jTdqKDzbcbvJ6z?=
 =?us-ascii?Q?cx0rtN9f50xw9atO56MxTsgQi+si7NvsKTVT775RPWg/6PspFeg8KisVvk9+?=
 =?us-ascii?Q?I/zDPfI/2qOuCb5119cqX1ER6MtFgJFwB+BNkq6bYMTDW3tCrnNJgm5Cduvu?=
 =?us-ascii?Q?c6snxQd+QbRAQKNa4kLmf7fr2vY2ywPRp4LiwFYra3rpCBl1ETPGyrQvNpgK?=
 =?us-ascii?Q?Dd3vihUVFZy2iQ9NHaYJjWxq7J56yGj3qW33ml7GyA2ZEgMW4lERw/2Z9csL?=
 =?us-ascii?Q?JuUIrw1Bbxy/eKwmvlwIRJ6230TG49jr7PpdCie/BF/xaT+2nj83sVXMNI3a?=
 =?us-ascii?Q?qSlA+mDWZ/enedKuNQN7Ek3biY9egIGx79Stu6om7WNBGLUAdyCDBdTDJ+70?=
 =?us-ascii?Q?uX9IGT6zL3TXPp22yl+KYS8/ZSSsX2OCMzCEhsLvu4m7islmQ8+m743PxhXF?=
 =?us-ascii?Q?N8WNSaFKoAjgwhJ3Lk2kmCdALmzS81T4M//pEMcbBT7zBxvVrmmTk4G6/b9c?=
 =?us-ascii?Q?fAQsjlJ6pTGjblqjbWvYwhBInKcFYPcKRqezrsgkHrKwygqGzeDJSqSZKYRw?=
 =?us-ascii?Q?ZYtgssbevMRE+PC/JC9R3UQYGkhR3dI2m3SvscD3umXUjnXNHH79c3ixxOFG?=
 =?us-ascii?Q?K1IHrHB0jZH8DaBNdmv1HPFvqJ9k3znV3b35neA5th/ElxIAQ/Rlq7j8AqUn?=
 =?us-ascii?Q?xCRoesuXHi1np9Jt7+02r1Lsk4nstqVrPNZZi/byNB92U7TaOcAuEQ3aVfYp?=
 =?us-ascii?Q?jiyZotrujBuLSxlT65iBurRaZNQ9u1smx9UsXXumSihFvXaUK9KdhPBo7Y4U?=
 =?us-ascii?Q?51llAF+hrZOmZH7Zol4EPBBoTWUTy3lWi1gMTvuwVNtHB4+H+eHgmjRt9tE4?=
 =?us-ascii?Q?zdhpcYxn0VfzmItsutwzCVDKHeSdMZ2/ft7rlvGUGtDZwUpEqut5Fv5AQcXi?=
 =?us-ascii?Q?Chq6nWtlE+55frXFRmxrR9wcRjJY6vHshNvXvBIznQhTFHeSYGfvoxDnoRzL?=
 =?us-ascii?Q?WhcNYHPds/K5xppVxjzuGTaaQfgEVD1+Zlzv6xySmMV+LkTD4F+mK2aw1TVR?=
 =?us-ascii?Q?eBFZ+iRM74sqP6F1epYXnWGcz/HpUjWeA0ELTKgb8One+q6/7/utTQwdC6Nt?=
 =?us-ascii?Q?Lk0TPPTrFnSY2YwfzAlLu5pnCZMRpYt1nKwJs0+o21902+xH/MViTiRoYcyP?=
 =?us-ascii?Q?BEcFBmDz3ytym3t2YmM2sPTa+8/4G8hJ20wL7NQX9l5Epl8VzBz7SNaA3q6f?=
 =?us-ascii?Q?FU8vSUy5+lwGwDNhON/kS2YVEO6PxLCVJvTzi/Tc5teMlcPZuXhlro4TFMco?=
 =?us-ascii?Q?Tw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?hR5JV0WQv6OLErBIYCT5g8dJVStHzG5D5Dzj26xZqekicnPX9a+hZ1N2jCf8?=
 =?us-ascii?Q?f1RW3aE/d2hLAHRxv1gNjTbGLIpA3MXUj+J6dZsKVxAXWW2jQY0uMj5KBE+B?=
 =?us-ascii?Q?i6+7rukQNa0DMZMW4OIgZj65jikqm4AJhzBpJYk+Haqi74kObs5ZkjX7z3QN?=
 =?us-ascii?Q?M8OuCVnLlqRLjjkpBurlj2nFbEaNj3B0ST8Prkrgl8TnEbwG5XUCcAwO7WIG?=
 =?us-ascii?Q?rmeGVgxEvAgOuj3Kf2CZjh20Ge5VKJXoB+qaFArq+mYCj5C775zr0zPLZNbi?=
 =?us-ascii?Q?m4oFO90T97gwDbyRR3DOzTeDydffu2mgYWRveKMNm8rFnbA7t40qnqi5mLxO?=
 =?us-ascii?Q?E2qIS+m+o/5XlpkvyjCu0rgIqN+pNKt8c+joqyAThGLApYXT4vgHBPmSnyB7?=
 =?us-ascii?Q?E4K4cTwGrrhyvOaPd4j6mSv7LtTg9fHiTwCTtZUHVqF0NlYUOAcfjaVgK4WU?=
 =?us-ascii?Q?OU52g+nyjL4w+3exRGlUlQQa3FEJi2c3EwCkXah381w5p5b6K9swUnVi/2dU?=
 =?us-ascii?Q?I6M3yQci/8P/75lIt8IRpecMtbdyPa4tyWc91GPRuXqR3ZEFMaCPgR8Eie/r?=
 =?us-ascii?Q?eRZ7tPR8APw6T1M1RhjFJ2HHkSIOoIBnO1A+rYluNvKIQt44cWxG/YrD6znH?=
 =?us-ascii?Q?4AuUI7VxRW8lNiyQqGWcQpkrr6Y7Zvd02gWgYF8+0RrR5dC98t+pteqk6k3u?=
 =?us-ascii?Q?MMI/Th+WZzapiDxm/oVEwbllqiSGs4g2yOZaKF8X29euHcs7HkkG2jDm3oCO?=
 =?us-ascii?Q?Jy8JEpdGN5i/ECPlUDfN2y0tt0XzfBpk4Y9cU1waXAFI1DfSv8vFhoyC32hv?=
 =?us-ascii?Q?cr5aX6FybrCQniSMbC9xxZrao8uX++PITzIGvJqAsrA6Db2Toohn0el9T1G4?=
 =?us-ascii?Q?I0FB3GizrM7ZiaXp3rPJSFmNRQrcvZr6zPaFXG4SnyND6/DYpbHbCKk+lfNr?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b3d4d287-e4a3-4d6a-80ab-08dafd7fde4c
X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5106.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2023 20:24:45.9669
 (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: R4giiI72e62MwjFA7PUYsQuft7Qzcb52CUAYbUtRhiPOAFOXMYs6wyGASgRLNdjoKFCuPbJUpVXMI9tHDDdaTBtN8EPmwVdFiri2yC94Urk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6013
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-23_12,2023-01-23_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 spamscore=0
 bulkscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301230195
X-Proofpoint-ORIG-GUID: xMeph6Oma-ZxrFpBPPjhdF6Thl1ZPNFV
X-Proofpoint-GUID: xMeph6Oma-ZxrFpBPPjhdF6Thl1ZPNFV
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Remove one user of the Huge Page macros which take in a page. Also remove
a reference to a head page variable by using a folio instead.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/memory_hotplug.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index ad09189786b1..d5a0672cdf3a 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1579,7 +1579,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))
@@ -1599,9 +1600,9 @@ static int scan_movable_pages(unsigned long start, unsigned long end,
 		if (PageOffline(page) && page_count(page))
 			return -EBUSY;
 
-		if (!PageHuge(page))
+		folio = page_folio(page);
+		if (!folio_test_hugetlb(folio))
 			continue;
-		head = compound_head(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
@@ -1609,9 +1610,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) - (page - head);
+		skip = folio_nr_pages(folio) - (page - &folio->page);
 		pfn += skip - 1;
 	}
 	return -ENOENT;
-- 
2.39.1