From nobody Tue Sep 16 19:50:00 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 396F7C3DA7D for ; Thu, 29 Dec 2022 12:09:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232834AbiL2MJl (ORCPT ); Thu, 29 Dec 2022 07:09:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229685AbiL2MJi (ORCPT ); Thu, 29 Dec 2022 07:09:38 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39F885FFA for ; Thu, 29 Dec 2022 04:09:37 -0800 (PST) Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NjRxC1SFtz16LvT; Thu, 29 Dec 2022 20:08:15 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Thu, 29 Dec 2022 20:09:32 +0800 From: Kefeng Wang To: Andrew Morton , CC: , , Kefeng Wang Subject: [PATCH] mm: huge_memory: convert split_huge_pages_all() to use a folio Date: Thu, 29 Dec 2022 20:25:03 +0800 Message-ID: <20221229122503.149083-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Straightforwardly convert split_huge_pages_all() to use a folio. Signed-off-by: Kefeng Wang --- mm/huge_memory.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 266c4b557946..c8cbe7f62eaa 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2932,6 +2932,7 @@ static void split_huge_pages_all(void) { struct zone *zone; struct page *page; + struct folio *folio; unsigned long pfn, max_zone_pfn; unsigned long total =3D 0, split =3D 0; =20 @@ -2944,24 +2945,32 @@ static void split_huge_pages_all(void) int nr_pages; =20 page =3D pfn_to_online_page(pfn); - if (!page || !get_page_unless_zero(page)) + if (!page || PageTail(page)) + continue; + folio =3D page_folio(page); + if (!folio_try_get(folio)) continue; =20 - if (zone !=3D page_zone(page)) + if (unlikely(page_folio(page) !=3D folio)) + goto next; + + if (zone !=3D folio_zone(folio)) goto next; =20 - if (!PageHead(page) || PageHuge(page) || !PageLRU(page)) + if (!folio_test_large(folio) + || folio_test_hugetlb(folio) + || !folio_test_lru(folio)) goto next; =20 total++; - lock_page(page); - nr_pages =3D thp_nr_pages(page); - if (!split_huge_page(page)) + folio_lock(folio); + nr_pages =3D folio_nr_pages(folio); + if (!split_folio(folio)) split++; pfn +=3D nr_pages - 1; - unlock_page(page); + folio_unlock(folio); next: - put_page(page); + folio_put(folio); cond_resched(); } } --=20 2.35.3