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, jhubbard@nvidia.com,
        gerald.schaefer@linux.ibm.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH v2 3/8] mm/hugetlb: convert putback_active_hugepage to take in a folio
Date:   Wed, 25 Jan 2023 09:05:32 -0800
Message-Id: <20230125170537.96973-4-sidhartha.kumar@oracle.com>
In-Reply-To: <20230125170537.96973-1-sidhartha.kumar@oracle.com>
References: <20230125170537.96973-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?9sgAYD3gdXxS2CRN9w2rlxC3xGPdd9uuYCRpvYkm6X5on0epumjmGR2Itwph?=
 =?us-ascii?Q?YaBEeHffyb9/lBvqZCDrav/FRxncbMZ6vY1kRuxRDlSfhE8mAMSTWwgD8Ksp?=
 =?us-ascii?Q?MTPXZmizufSmGc7l0X13+hIHj/KwT99MStWFj9F3LEMM9pnz1Tl9x11xQ8oC?=
 =?us-ascii?Q?v7nyeY5y0LhKX69KRWXqcQvk3OXavNwvQesuZxTr1nUrmsravImCOtUu441A?=
 =?us-ascii?Q?jlUcKVgILnIj+NuW+JXrlSz/cBsX3FcJ3aSFC32cHl+yA4ZbyMDgYFK2kSTE?=
 =?us-ascii?Q?IFQUom3n33DW43Yg5iXBsla4lSbKLcu7tn/7obdBV4Uww1P1Wi2WytmvVc1a?=
 =?us-ascii?Q?Dm8OYyqYXoKo0tDmEyFi3e+zqYdiYZocIQBlm4j98Q27nVcUhCze0zio3TTT?=
 =?us-ascii?Q?t08yUNlxkNX9YfU50zbdgVi2gWxafvKdFC2FRlpnMTkkWhNsuaHceFNJV73y?=
 =?us-ascii?Q?Q7BC8gY//VQPV4hD1b4uteOdVtiSMCH1qy8rd7/7ZTF0uRcfMd062vGXWssO?=
 =?us-ascii?Q?JKwIwyMTNBeKWJRqGjT9saEO3mYRWecZR2k6z20MzAdzJpelON0MOpBXJVJM?=
 =?us-ascii?Q?QaMga1l3hZpGtE7yI/UgGxXeHMLyztak5uGR3GA/6QPr5MYehug11ISRYpyB?=
 =?us-ascii?Q?C5imxDTrCpb2U7LdhCnW4LVn51U9NaRj6TPJTseG0WMlQsC8wW2vY+sdRFJc?=
 =?us-ascii?Q?8c33ozynHoFHxLV7/z6nphnJLPC69zt0ZqyhveyLt1o/SQRMdEzCI8EXxqRj?=
 =?us-ascii?Q?FHOlugs1mqKESrBnqAbuXkEiqb4mbX/K0fXvEPZhVkj9sduGoiuXsMb28ZP7?=
 =?us-ascii?Q?h4JC3QoaSXMqAwYSh8f38GctkCOH+1xGgVWqfekSIh/gmb/WVX5wc7i0+gWu?=
 =?us-ascii?Q?tw7aCd9/sl0t/qSYIGBXW4ojQe1slo8k/0bBxlPBeQPqHCsjEqV+/JVbM3H7?=
 =?us-ascii?Q?3EhoeGvaJboBGeldcmAo1gU6Ayy1rzTrBsCzkPu40aMsd7R3bIpFLsi4NorP?=
 =?us-ascii?Q?iehUageLTIgN8OGqy6F31SH+wGTweVY5lZYaQ/tTHl3WrED/fLAKnMSX4Zga?=
 =?us-ascii?Q?HCOc1z5ZLud5XPWrfJAIOaavCAFsSV9eRj++QkhzTtKIvBCW66vRhKeeKJpr?=
 =?us-ascii?Q?QmMbP1RQChKITLI4zH2q2B3eAc+/XOoTgREYN6aHJ0cZyXgifwxVXV/+mQ2t?=
 =?us-ascii?Q?Ar4hPhBHOJ+H5slXVr0vVZrk8KxbvQj7mm5xysldGRc3xfLUcPK2do4PZcgT?=
 =?us-ascii?Q?AX27TqrQ+z66D9rToSuFPazEF1kD+cyEP1ZYauO8JtqhoWjGfclzth5EiqOo?=
 =?us-ascii?Q?UeT0Ef95VJf3m3z0ECQMjbGDim6XdYblqzUUC5eJF7et/kP3Nz6qqgC20skk?=
 =?us-ascii?Q?AQZwCXfndgw8TxCl+HiDCBXlHBNzcpHyq81IKgaoHNrZ/17z0EpMFNp2ZlYv?=
 =?us-ascii?Q?QXa3JKfKhfkTtOkQJzam7a1/EC0GA7A3430xGMV99TUvx4jlf+E0YtJVdh++?=
 =?us-ascii?Q?MgdeFLnjyaZQSq8obLqal8X/9lTwCWgevjRCSMmpWCdX0xlWj4g7YPonYyUl?=
 =?us-ascii?Q?hheL2zw1trOHr7X8YY3N7MaTZHd1h4yQqDgYtR9GNNca6X+lCv61B69fjijf?=
 =?us-ascii?Q?/w=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?n0ryBzR9McwWSWQGZFE+UCgD1AfXhMAvKGvv/yjkbN2BJvV0VxU4D7WdqcFk?=
 =?us-ascii?Q?5TRgqT+5Mu/H/kLumBUDCKdxjNpZQBitOWaOOd1+fjPiQZryRT18zkLZYuEt?=
 =?us-ascii?Q?VXrFOEZ0zOpG4OCncr7wvfglq+GVu4kCw5mFvrd0j8oyUPHuvTLXEEyq8fWg?=
 =?us-ascii?Q?vbs4WdMd3CXdj6usPGM9glooVd4k0xDaqEO+fuKLcrECAwprGcaBaBZLqusi?=
 =?us-ascii?Q?661YxjFSfpdfxq22fNNtfBSN3VlebHMkIXLUTA9YrbbvOMztFzgCCuP9brIl?=
 =?us-ascii?Q?+CPf+mI+6rs2t0emeis1wuIjFX93HVuFNlUZ1OMbeYjH9mZ6VYPW2f4OLjAt?=
 =?us-ascii?Q?rx1qRLq4nYeWjdp7URK7Kor7xsHnQ5OgEbutZeCivx8ifDcRVNRTKOKIwd/c?=
 =?us-ascii?Q?2a5j4tH2fYUIaWKfHgF5BG0pWTAcGfrrIf+RzV1ka0Fp4PxOKbMk2xriaPlH?=
 =?us-ascii?Q?yKwUi24mCT2Ak4jAmFvlVQk8beVIxHtuhMtx2ayWadexx6mJioteTbUX7eEs?=
 =?us-ascii?Q?rwj6BYXPchP6YUUwcMmxRYp8eF8An/zI/47AvnLa5inrdDSjb6c2NZC7YjJf?=
 =?us-ascii?Q?6NgS7AXwtMLFiGNuSlDI2N6SBZOSKRjsRniRQhDb2oz655NPlsjpzVeQe8YX?=
 =?us-ascii?Q?8TW0T5sX4Vt1hTdiUmZqzLvdX3o7GPE3mUIQhg6b9Uha9B1C2c7sojtkx2q3?=
 =?us-ascii?Q?7V904Q4LxfwlMcjaJnehFEi5naPK8C4VLiQ0REhGHcY4iSsbU9WCp4L/c9MJ?=
 =?us-ascii?Q?jjWWuMMdiZQ8D6y/qLFrg9uRIwEd2gHuTdZs3p53oYdSkDOhLVjGW3bI5kaT?=
 =?us-ascii?Q?VMMlaZxiQ/wql2PkHTRpo+g/L83czSVZIxgIkEytIqWGSXRLisgV+Lom3RZ5?=
 =?us-ascii?Q?rzHDbaVs5k3GGZw2j0Bm+PePtVaTms4bQPywK993TDYToRzb7mHqoAF05NHJ?=
 =?us-ascii?Q?90M9njo8XfCcfrmURnxIRjMKbsXSXCljxCo1VR50CXM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f89f6fde-83b6-4c7d-f006-08dafef66b8d
X-MS-Exchange-CrossTenant-AuthSource: DS7PR10MB5117.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2023 17:05:54.7782
 (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: +57xr/a8geWzW5upmnHPiDNri19ynodnV6mqQ+D5FFodrPPB/VBRIStU0wAC6g83cTbTjM31J/oRH6mzk3fCXhY+5R58Ix4fPoUmtc4QhNU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4384
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-25_11,2023-01-25_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 phishscore=0
 suspectscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301250152
X-Proofpoint-GUID: P_ZwQ1rLJe-OcpQjGYuDE_1D7vSIqOLi
X-Proofpoint-ORIG-GUID: P_ZwQ1rLJe-OcpQjGYuDE_1D7vSIqOLi
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Convert putback_active_hugepage() to folio_putback_active_hugetlb(), this
removes one user of the Huge Page macros which take in a page. The callers
in migrate.c are also cleaned up by being able to directly use the src and
dst folio variables.

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
---
The call to folio_putback_active_hugetlb(page_folio(page)); in
putback_movable_pages() is being converted so that a folio can be
passed directly. This patch has been sent by Vishal Moola and is
currently under review.

 include/linux/hugetlb.h | 4 ++--
 mm/hugetlb.c            | 8 ++++----
 mm/migrate.c            | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 06eb59711e4a..1170db8e7831 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -174,7 +174,7 @@ int isolate_hugetlb(struct folio *folio, struct list_head *list);
 int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison);
 int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
 				bool *migratable_cleared);
-void putback_active_hugepage(struct page *page);
+void folio_putback_active_hugetlb(struct folio *folio);
 void move_hugetlb_state(struct folio *old_folio, struct folio *new_folio, int reason);
 void free_huge_page(struct page *page);
 void hugetlb_fix_reserve_counts(struct inode *inode);
@@ -428,7 +428,7 @@ static inline int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
 	return 0;
 }
 
-static inline void putback_active_hugepage(struct page *page)
+static inline void folio_putback_active_hugetlb(struct folio *folio)
 {
 }
 
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index e506a46b7871..ded5fe790c79 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -7300,13 +7300,13 @@ int get_huge_page_for_hwpoison(unsigned long pfn, int flags,
 	return ret;
 }
 
-void putback_active_hugepage(struct page *page)
+void folio_putback_active_hugetlb(struct folio *folio)
 {
 	spin_lock_irq(&hugetlb_lock);
-	SetHPageMigratable(page);
-	list_move_tail(&page->lru, &(page_hstate(page))->hugepage_activelist);
+	folio_set_hugetlb_migratable(folio);
+	list_move_tail(&folio->lru, &(folio_hstate(folio))->hugepage_activelist);
 	spin_unlock_irq(&hugetlb_lock);
-	put_page(page);
+	folio_put(folio);
 }
 
 void move_hugetlb_state(struct folio *old_folio, struct folio *new_folio, int reason)
diff --git a/mm/migrate.c b/mm/migrate.c
index 92d53e0b609a..b971edbf32fc 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -151,7 +151,7 @@ void putback_movable_pages(struct list_head *l)
 
 	list_for_each_entry_safe(page, page2, l, lru) {
 		if (unlikely(PageHuge(page))) {
-			putback_active_hugepage(page);
+			folio_putback_active_hugetlb(page_folio(page));
 			continue;
 		}
 		list_del(&page->lru);
@@ -1374,7 +1374,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
 
 	if (folio_ref_count(src) == 1) {
 		/* page was freed from under us. So we are done. */
-		putback_active_hugepage(hpage);
+		folio_putback_active_hugetlb(src);
 		return MIGRATEPAGE_SUCCESS;
 	}
 
@@ -1459,7 +1459,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
 	folio_unlock(src);
 out:
 	if (rc == MIGRATEPAGE_SUCCESS)
-		putback_active_hugepage(hpage);
+		folio_putback_active_hugetlb(src);
 	else if (rc != -EAGAIN)
 		list_move_tail(&src->lru, ret);
 
@@ -1471,7 +1471,7 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
 	if (put_new_page)
 		put_new_page(new_hpage, private);
 	else
-		putback_active_hugepage(new_hpage);
+		folio_putback_active_hugetlb(dst);
 
 	return rc;
 }
-- 
2.39.1