From patchwork Tue Dec 13 09:27:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13071849 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 88817C4708E for ; Tue, 13 Dec 2022 09:11:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 704708E0007; Tue, 13 Dec 2022 04:11:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C7498E0003; Tue, 13 Dec 2022 04:11:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2E6FF8E0007; Tue, 13 Dec 2022 04:11:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0B4AE8E0002 for ; Tue, 13 Dec 2022 04:11:26 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D9FF440C60 for ; Tue, 13 Dec 2022 09:11:25 +0000 (UTC) X-FDA: 80236714530.03.830217E Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf08.hostedemail.com (Postfix) with ESMTP id A6CC0160014 for ; Tue, 13 Dec 2022 09:11:23 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 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=1670922684; 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:in-reply-to:references:references; bh=2NjTt0zSqwbWYip1Pe5Mvj8edW/6o+lHqhbbkVuLtQ0=; b=VgVihzB8G7dvLNIyUzvHxQRC5YkttxdXEyr5kfhZaUVT8nETBZW2euAbsM/H4OzUIulsH3 IWGGiMJY3at77Z4ViUQBj57Ky0vPiwFhgXCTD2IWH262INBF9mcHpU70IcNpuaSBGrao4h plI/lwECfRVHTSLevUU3N9sezANs0U0= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf08.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670922684; a=rsa-sha256; cv=none; b=gRD3YiWVMHj0biSm41X0mbN8t6B1P2Vrnr+K2uptf2orkgo+AywzGgc2MZyyg3XB/Juc0v hCtmshrQDioP4TNelphy0+VG2zLIf3YjxtOYYhd64JX+wRap+6p+FK32klkGjwkCTOc6Bb l3j83Nm85vS4PqTwkuvcKEcMrLa5Tv0= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4NWXlL52MTzlVjH; Tue, 13 Dec 2022 17:10:22 +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; Tue, 13 Dec 2022 17:11:19 +0800 From: Kefeng Wang To: Andrew Morton , David Hildenbrand , Oscar Salvador , SeongJae Park CC: , , , , , Kefeng Wang Subject: [PATCH -next 3/8] mm: huge_memory: convert split_huge_pages_all() to use folios Date: Tue, 13 Dec 2022 17:27:30 +0800 Message-ID: <20221213092735.187924-4-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221213092735.187924-1-wangkefeng.wang@huawei.com> References: <20221213092735.187924-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A6CC0160014 X-Stat-Signature: m8kqjfnjj8owt73ua8nw6raeznm8af8s X-Rspam-User: X-HE-Tag: 1670922683-680195 X-HE-Meta: U2FsdGVkX19AI3Ed9gp1PZJwLnhRCsjNKL/tp53cTeUR3Dg/ItXPrYRCQloXvquwBm7+TW24JXEqjdKGVg9upvLxMC/u4XvaSmKjrxFT8H50a/1LU+HLm9zA1TNNB3qBPRcKcaFUwi0593IIeCv6HJgP580S/xJ3T03nMzgU+YxkGfYUXjsCd4jMOJYmhRX3MPyQSQW3CGWo32zkht3wnhE6Wly19daNRTkDt8QFACo8avEmJw6D9PKw3cYCsATt0Y9kU4SKtvoJ7vq8SC6CvH7Gq6K/dRXpSA02jHEwTqi/Hsi8QOHr6qkfRSbcIucssteUuLbc+sh1u3AnNdrtYN7Y8PE6qKVwcLNfWo5t1yVFthijObDbRvkynPQXrChvJcd0pKNjhYyPasEpR/yvZ3jfhhZmPkBs2o6n8lntp9z4SHI8/6Hn/laLPc9Lb5531XwJMf35obfz1GyiXWamndzeMCyVzVZ2DVuItbHPWfxYQqX+F6ch926pOEFvt3uqnkmRkvhFuqmG4MtH+G4M/ulzNe4uvNq0naJ/FLk2ZRYGZdWt19MZOFniI75nD7jiFwj7udHv25C+IHJPzCaCrD2Ufq133RI82nt3fsynJP8cHhwWItrazxWB7EJhSNPI4ETfnGDGDXFxZGsFU1mAUTxLlFctqQVxINeFBCw0JJ3YJjcZ+OSbaTX5rgQbJjtUYruU0q7ki6T2BpyyN+TgspOHpFtorYoYlUbwmTkfYQ3hch2jdfmebjGfTJw58AY5d6TnXClxJZ+IQ8LgZ5iYXuP7N/4G81nqPE1C3c/moFYFfRzoiMGbM0QH337PtaR8sK+CBYFmz06saYTrBnT/uuyg2UgbEfQeyrpVHb+7VKEpKIu+zSRoaqGW6+6Gk+YG/7Htdd9XmOe2PHtmdo0egSHdHcg6ge41YDlYt6ahCWQJDb6QZNxQbtuLV0nnY6SKXnNTPI6Ds8My/4uHD+X wU9X4YCi 3Myaix/iTSC2Wx+o= 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 folio function. Signed-off-by: Kefeng Wang --- mm/huge_memory.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index abe6cfd92ffa..02092dd10aa4 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2933,7 +2933,7 @@ static struct shrinker deferred_split_shrinker = { 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; @@ -2945,25 +2945,27 @@ static void split_huge_pages_all(void) for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++) { int nr_pages; - page = pfn_to_online_page(pfn); - if (!page || !get_page_unless_zero(page)) + folio = pfn_to_online_folio(pfn); + if (!folio || !folio_try_get(folio)) continue; - if (zone != page_zone(page)) + 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(); } }