From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45E47C4332F for ; Thu, 29 Dec 2022 12:09:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 937E38E0002; Thu, 29 Dec 2022 07:09:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C1108E0001; Thu, 29 Dec 2022 07:09:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 761DA8E0002; Thu, 29 Dec 2022 07:09:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 625958E0001 for ; Thu, 29 Dec 2022 07:09:41 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2900FAB373 for ; Thu, 29 Dec 2022 12:09:41 +0000 (UTC) X-FDA: 80295224562.17.600BDB6 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf14.hostedemail.com (Postfix) with ESMTP id 16F83100017 for ; Thu, 29 Dec 2022 12:09:37 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672315779; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=B1a8gHeys/ZFdqQ8Q/MTcgGouU50qVaXrm6uPQjvMJ4=; b=pXH33Y+xzIGk2gtE+BCjMyehIIZ0RbZvQlR1F8aPzMMq/Ki5NndQgGXBrrjWeJ4MtcUxId FuAx73HyWm9+vGzgI21QA5VfpYun9s6Pfcjwn51Gc+G6Fzs++SpJfTUuL7tr0iOwjtlFse VGWkqvBciYf4Xh2cpLISbND/t7Lh/Yc= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672315779; a=rsa-sha256; cv=none; b=KRezKA61I6KC2CGyg/jqRrnAtTJmLQu+hjp8TjoEbWzaMLd8hvK3SIfl6Cg/sl//k2ivge EQ4T7vaM1iR3a5Q7ZbXFGziw775qvAqPgEIvfhQiDPNItAoSTnS7PcLdiAFZAaXBut8BWS U5ZeL4YSYPt0JbQ057HsnTcF1GApsM4= 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: 8bit Content-Type: text/plain 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 X-Rspamd-Queue-Id: 16F83100017 X-Stat-Signature: f4c8tymxqcubteso7a8ijgyt75xx9aeb X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1672315777-264499 X-HE-Meta: U2FsdGVkX18KfpIzvI+Xk0N8x47bbls6tifuHSshDXC/K42PuNPU96MIvEzZFgI9GS9I/xrp8j928vLAAatW3Bbi4bSbO63lv+gO2xqPjOUXrPahxtU778wmWuPgCemFplB6CxQTAwUjqSbqIyTsVg9hFNkvikACS6ChqZCrv6ZFSGAb63wR7udwtBV0cQybbd1ewWjCfeJXAZjs/iI6gkptL/TVxbZsWpN8w0v6dkE83ip2eKtMDxYVUxay81+i8nG371OmM+JnVbcmHbYLSoMvvnjo5H2uYAUkG1nfi5m47I2KBdezkqtoHUntZDT9sjyrhOy4Rinsh5rRsIJO7XJuNA+j6rbN+pwyDTFKIv/Ft8BIxzhBqEoN1np3+vJ+Gul3vh91EXEnncYjrcXuDZrcdOV+Ii17+aa9XaV1cvtwBYpFUhXKVDKMl85SRXCccwhTQPrbvo2N1d7QJEBV7WfgBP/iXYdfuD6Z+KV4AeXoVRKRikdQgeKr0XT04EWjgVaC14NUUfmSz0AJQcuXlPrzEypBEgam+vmx+PXR30gtL9T80CTl89d1lF63tenTptdRZpjeNJP0RwSHfW6ev/8TjbaHBLA0SMCY06xfoBzupZHR9jsxjzlebepyyhmaa73tN04BD8c351UxSoG3r6aF82QLipCSaynxsuAqluaXdKZWoiefB5YmIhopB7VDoEdfWWBA+s0PZ8ALdWjPDasK/pbBebi/0kpbPo14E7OGRotDosvX1bNANWT+1KvzECXnqv5+3zYCPmGTSrrjqlEpoFCmyBKruJ5KRguzu8ymEUr/qP1n9QrRO1jsa4siAkZwiNLQz4T4VRapiJL6SXHAG9HCtkHEKtJaLAKOgoka4A2zOTd88UNqEoEEl1B992SdR4/0aKYxeYknA13fHw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 = 0, split = 0; @@ -2944,24 +2945,32 @@ static void split_huge_pages_all(void) int nr_pages; page = pfn_to_online_page(pfn); - if (!page || !get_page_unless_zero(page)) + if (!page || PageTail(page)) + continue; + folio = page_folio(page); + if (!folio_try_get(folio)) continue; - if (zone != page_zone(page)) + if (unlikely(page_folio(page) != folio)) + goto next; + + if (zone != folio_zone(folio)) goto next; - if (!PageHead(page) || PageHuge(page) || !PageLRU(page)) + if (!folio_test_large(folio) + || folio_test_hugetlb(folio) + || !folio_test_lru(folio)) goto next; total++; - lock_page(page); - nr_pages = thp_nr_pages(page); - if (!split_huge_page(page)) + folio_lock(folio); + nr_pages = folio_nr_pages(folio); + if (!split_folio(folio)) split++; pfn += nr_pages - 1; - unlock_page(page); + folio_unlock(folio); next: - put_page(page); + folio_put(folio); cond_resched(); } } -- 2.35.3