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,
        almasrymina@google.com, linmiaohe@huawei.com, hughd@google.com,
        tsahu@linux.ibm.com, jhubbard@nvidia.com, david@redhat.com,
        Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH mm-unstable v5 08/10] mm/hugetlb: convert free_gigantic_page() to folios
Date:   Tue, 29 Nov 2022 14:50:37 -0800
Message-Id: <20221129225039.82257-9-sidhartha.kumar@oracle.com>
In-Reply-To: <20221129225039.82257-1-sidhartha.kumar@oracle.com>
References: <20221129225039.82257-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?bwR681NMFRJ4/akGQMeZ//uWJAXAGxSGfZGHGv8zU8vHTIX/llrYhciG79OH?=
 =?us-ascii?Q?LTJsUnR011JUsV/TYGdpVS0FeAreAKhSz3elmsB/b1MwR7UJg0+7bsA2dIPv?=
 =?us-ascii?Q?RDTxjIiDa7ZMhYdhDsSQhElkmPH61TZeMyohMUWje9KHbqDQuKzRi3V9deBx?=
 =?us-ascii?Q?PghYrrdvAz73SDt2nleiw/6EuOjEZIMD75UcWXriqNHT9tURrt6e2kGGKT/x?=
 =?us-ascii?Q?yU6orC47awKbCwFzA11FWB1AQPvm+NJyOsJ+pZdTWqZdI5RhU/gCKxZV6Kph?=
 =?us-ascii?Q?vlkRxy76KfXPxYff1utU/pP2AlqQtMIY81xXVM3MPBebgZgDcSoq8tw0aAjH?=
 =?us-ascii?Q?7/Q6AitFf/6hM3ASyBqVE/xxnc6saKD4xt4fo/s6mRyrlJM++0X0o5raLQkI?=
 =?us-ascii?Q?o8v9XERn3hLNlw/KFaP/y3aGT9w7EwHrN2ju/+8aaXCDlelmg3worwFCA84E?=
 =?us-ascii?Q?TCYcKC6MtRTJ5O1aqV9u5OjsHsuQmUZHH/Ld/aBz+fpMyXctmjKU/UGH1H9z?=
 =?us-ascii?Q?/qm5NU3Gyy9r3RBcaid6qxdlaMZiLpwS9odG3RzNHqrn++IL5gQ58r1LC59x?=
 =?us-ascii?Q?70tb22oXoYf+WYzc7/STW73Zf7i+DkrfQb8vrcGUX5Vc5kz+D/hiGOpSEQBY?=
 =?us-ascii?Q?KTWPvNX+io8SrjHhQmpdneOW0gtC5BRMAIgmcnBmYB6hBTeLdxFXVQx+pXqi?=
 =?us-ascii?Q?9V0tmARbcohxXyuN2HghtntLZpNZgk3TxOGQlS5kF4BgkTx7+goKsmoe8XvE?=
 =?us-ascii?Q?gBzF0ulnMPWFgtpQKwT9HpD3opefZp0FM7t4mzJfeGkCFQLrswcvJLpNnn1V?=
 =?us-ascii?Q?hppfz48buITyZ319yoM7vzUMO5mk6BkDNZ6JNDQf89x/+cKMhLl+iwRZ7X3z?=
 =?us-ascii?Q?6Vo4bKnNi1NduGwtP1bn66qW/zfsw4ANd/p7yt0M9NmbOdMRdRh8Abf7fG4G?=
 =?us-ascii?Q?a//cVPt18olyp0aSP8UnsTr1H7d5e+YTP3SApRwnQKRmq8BmjDYPRInNj8Nb?=
 =?us-ascii?Q?EADiPw8QBVQjotQiHg49WOQVZNvJrYOnq6iRIl+hUIirsJtZv82o+AKgEG8n?=
 =?us-ascii?Q?hUfjBFwhgQi2G82EQBrgbMeLwPlE2r5xvoAd8Okwv/8P65gf8140widz1jLe?=
 =?us-ascii?Q?D1icIrZYbtqRwESKwIFEAwURJeixOgXxLFlBBu/5+f5KoV1oD/LxSJHPFNt9?=
 =?us-ascii?Q?+DpfKc+sSsth+hlJ4UymK28d654sVlw+sFElWUZOcEKSzSPGUfmGEpd38fkX?=
 =?us-ascii?Q?m8OBYHQSwYMFRfF0uiZs1SewCLZEXFyGlHnodBxF5nyL+JkI41QDxqevzE0b?=
 =?us-ascii?Q?1lW4rMagEGUJpBg/5II98caaLSll6Eulsn9FTPpw0oej1TS54VUsMc/lzGy3?=
 =?us-ascii?Q?0sB9CSKVsX0X4uAEjfNU6SKlO45aXsiiI5FP2nWNvgDV2Oow2c2Bcp3DpDDS?=
 =?us-ascii?Q?EIiOZ3ojKUu7Xv0VYUTVo+sMpuuuThHjCCRbOnCYohVwSA2/bAZ52O5ZHRvl?=
 =?us-ascii?Q?/u3yrntpoaz2Many7kVk/iEHTEPNNJ9Sj3ByGp0nSHGOZjKZ1GG6L88cE5yp?=
 =?us-ascii?Q?TNMjQvwl2Odt8cBmI6gnvLKQrCofffxSuQIyiJj/R0dFp5b9WdFtNnqWbJ2l?=
 =?us-ascii?Q?OQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?ZY69ynzMqolXsszWV0KgH15dUkDP5ahmvkQ1oDrvT/HpADt2gmGkAmJNSqvk?=
 =?us-ascii?Q?PeKN0cAlIm4K05ydg788ieP3rHuqD5Z0lqR8RxaMUaGdzA3eITllR/oEMOFd?=
 =?us-ascii?Q?cWkQfRMuMQIsr/+FmGxqntatToVf+7GKNHUAuwBSvmy3lb2SNccSqAxvFc3+?=
 =?us-ascii?Q?of+SpkP1cfPlvbhfMaM1Ov6bANuThJTGuGRNeH3lsxXtILmPw0NpFV6GIMB9?=
 =?us-ascii?Q?r5E+Lf84BsgYiRR8IaeG7LP+FsvsxBSgKYxoZ9s04ygtRieIxjrNl0vv6Roi?=
 =?us-ascii?Q?SHDCHig4c7690bgjs2kRxjT2lCEU3J7xBrZw5Un6VDdc5xK4deeCz/BoNpOO?=
 =?us-ascii?Q?d/JqUE5mNdbAo3yAX6q5/4ck1nuLZpR8vIuVjYCxgeY0DEhKfCMN3OGIv6UW?=
 =?us-ascii?Q?K3Csvjo3ErLUY6feyb49qyaCL2c70xgS6As8xSJfcx1r2q3MUtUX58YnpvwL?=
 =?us-ascii?Q?jGCIMt2RIF82GqfTbKFaqDalHXTb0hJQlZSg+N2zsycpjaAchg/FJtNUzM2X?=
 =?us-ascii?Q?NMhFiCQzGFNKMSqti9G4X0HISEGDlvaNKNWTMG5c79YIe+PQRCJX5etV8H8M?=
 =?us-ascii?Q?BjnkOG4LPCqaNX/j6291++CNv6SYosvxDbkNRmxr1yDWAcAGA8CVDUFGNqE0?=
 =?us-ascii?Q?4i2u8SN0mqCd036eNk3QiEo9+J6E6iZiA6jLCAIO/NqrLOopEdXhrFaiBjiR?=
 =?us-ascii?Q?QKDADvFZITGFVOJXFjuSqiRipq2OjdxsroOllG0ob/Xr2vYUoN29p5RsGVvK?=
 =?us-ascii?Q?ZJBiu/jHweQYqckRsvBS1YxbiyxpkUGUdumCVLb/s04L5tTdV1qQaw4M6VM6?=
 =?us-ascii?Q?1XCvE8ns3s6niaFkmKOUrwUVTeKxGVWHlWLljEmb4msc6t8cIMeeV5lsxoOd?=
 =?us-ascii?Q?T+hNN7JY2lXoqylLKbzUC3fa4bM8jlKg2jtvu53RFZ9dXD7HI/ttQ4Zh6prx?=
 =?us-ascii?Q?YlYXPjqAH8+LPt9TiV6JMM+4ivX6CsZBrCFH3nMgjFIEufxDf4GNs7uv2G29?=
 =?us-ascii?Q?cFGmezruVfMJ/Wg2Je5ZVbYsX7EUD+5u4oWGjemkg1GL5jUq51Nfl+gU/DBv?=
 =?us-ascii?Q?uP1vRpqm947fsV0pxexi6jw/yRDECvG7eM5BgYIP23XITDgk9JM=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 02b3d9ad-0e28-4aad-49f1-08dad25c2bbc
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2022 22:50:54.4417
 (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: HhXLrsLiKFd0IuWiYi3NTDIAct07rfrBhSEENQw9paVwimf/wKSCMITkdZO8BEObWJt2zkSPGVj1+ruNfKt/YORBFTC9b7lPl/iVDEnEDXk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5586
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-11-29_13,2022-11-29_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0
 mlxlogscore=999 mlxscore=0 adultscore=0 bulkscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2211290137
X-Proofpoint-GUID: LyypGqLyMKerSw-r-tHOcNGzAUezfYBZ
X-Proofpoint-ORIG-GUID: LyypGqLyMKerSw-r-tHOcNGzAUezfYBZ
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

Convert callers of free_gigantic_page() to use folios, function is then
renamed to free_gigantic_folio().

Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
 mm/hugetlb.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index c889593d5053..5e580ab834c3 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1361,18 +1361,20 @@ static void destroy_compound_gigantic_folio(struct folio *folio,
 	__destroy_compound_gigantic_folio(folio, order, false);
 }
 
-static void free_gigantic_page(struct page *page, unsigned int order)
+static void free_gigantic_folio(struct folio *folio, unsigned int order)
 {
 	/*
 	 * If the page isn't allocated using the cma allocator,
 	 * cma_release() returns false.
 	 */
 #ifdef CONFIG_CMA
-	if (cma_release(hugetlb_cma[page_to_nid(page)], page, 1 << order))
+	int nid = folio_nid(folio);
+
+	if (cma_release(hugetlb_cma[nid], &folio->page, 1 << order))
 		return;
 #endif
 
-	free_contig_range(page_to_pfn(page), 1 << order);
+	free_contig_range(folio_pfn(folio), 1 << order);
 }
 
 #ifdef CONFIG_CONTIG_ALLOC
@@ -1426,7 +1428,8 @@ static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask,
 {
 	return NULL;
 }
-static inline void free_gigantic_page(struct page *page, unsigned int order) { }
+static inline void free_gigantic_folio(struct folio *folio,
+						unsigned int order) { }
 static inline void destroy_compound_gigantic_folio(struct folio *folio,
 						unsigned int order) { }
 #endif
@@ -1565,7 +1568,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
 	 * If we don't know which subpages are hwpoisoned, we can't free
 	 * the hugepage, so it's leaked intentionally.
 	 */
-	if (HPageRawHwpUnreliable(page))
+	if (folio_test_hugetlb_raw_hwp_unreliable(folio))
 		return;
 
 	if (hugetlb_vmemmap_restore(h, page)) {
@@ -1575,7 +1578,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
 		 * page and put the page back on the hugetlb free list and treat
 		 * as a surplus page.
 		 */
-		add_hugetlb_folio(h, page_folio(page), true);
+		add_hugetlb_folio(h, folio, true);
 		spin_unlock_irq(&hugetlb_lock);
 		return;
 	}
@@ -1588,7 +1591,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
 		hugetlb_clear_page_hwpoison(&folio->page);
 
 	for (i = 0; i < pages_per_huge_page(h); i++) {
-		subpage = nth_page(page, i);
+		subpage = folio_page(folio, i);
 		subpage->flags &= ~(1 << PG_locked | 1 << PG_error |
 				1 << PG_referenced | 1 << PG_dirty |
 				1 << PG_active | 1 << PG_private |
@@ -1597,12 +1600,12 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
 
 	/*
 	 * Non-gigantic pages demoted from CMA allocated gigantic pages
-	 * need to be given back to CMA in free_gigantic_page.
+	 * need to be given back to CMA in free_gigantic_folio.
 	 */
 	if (hstate_is_gigantic(h) ||
 	    hugetlb_cma_folio(folio, huge_page_order(h))) {
 		destroy_compound_gigantic_folio(folio, huge_page_order(h));
-		free_gigantic_page(page, huge_page_order(h));
+		free_gigantic_folio(folio, huge_page_order(h));
 	} else {
 		__free_pages(page, huge_page_order(h));
 	}
@@ -2025,6 +2028,7 @@ static struct page *alloc_fresh_huge_page(struct hstate *h,
 		nodemask_t *node_alloc_noretry)
 {
 	struct page *page;
+	struct folio *folio;
 	bool retry = false;
 
 retry:
@@ -2035,14 +2039,14 @@ static struct page *alloc_fresh_huge_page(struct hstate *h,
 				nid, nmask, node_alloc_noretry);
 	if (!page)
 		return NULL;
-
+	folio = page_folio(page);
 	if (hstate_is_gigantic(h)) {
 		if (!prep_compound_gigantic_page(page, huge_page_order(h))) {
 			/*
 			 * Rare failure to convert pages to compound page.
 			 * Free pages and try again - ONCE!
 			 */
-			free_gigantic_page(page, huge_page_order(h));
+			free_gigantic_folio(folio, huge_page_order(h));
 			if (!retry) {
 				retry = true;
 				goto retry;
@@ -3050,6 +3054,7 @@ static void __init gather_bootmem_prealloc(void)
 
 	list_for_each_entry(m, &huge_boot_pages, list) {
 		struct page *page = virt_to_page(m);
+		struct folio *folio = page_folio(page);
 		struct hstate *h = m->hstate;
 
 		VM_BUG_ON(!hstate_is_gigantic(h));
@@ -3060,7 +3065,7 @@ static void __init gather_bootmem_prealloc(void)
 			free_huge_page(page); /* add to the hugepage allocator */
 		} else {
 			/* VERY unlikely inflated ref count on a tail page */
-			free_gigantic_page(page, huge_page_order(h));
+			free_gigantic_folio(folio, huge_page_order(h));
 		}
 
 		/*
-- 
2.38.1