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 389DBC6FD19 for ; Mon, 13 Mar 2023 12:29:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 80EB76B0071; Mon, 13 Mar 2023 08:29:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7BE5A6B0072; Mon, 13 Mar 2023 08:29:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 685E56B0074; Mon, 13 Mar 2023 08:29:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5C38C6B0071 for ; Mon, 13 Mar 2023 08:29:30 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 24D65140AB4 for ; Mon, 13 Mar 2023 12:29:30 +0000 (UTC) X-FDA: 80563805700.03.B5294EA Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by imf03.hostedemail.com (Postfix) with ESMTP id 3272B20004 for ; Mon, 13 Mar 2023 12:29:27 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ilW4Issw; spf=pass (imf03.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678710568; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=h4VVQpoDamLm4iSGgyTcxUJbskifYCP8YkUsAdfGEbg=; b=CHYMzL4gNLnq9Ttq9o+fcAnd39UBYwTKyGRp0jdYrAK66gVraSrzsp1RMGNvFFAT8Mgah3 +5WL5+BFXt/MeDSA4gmIXuDuSdEzcv8J/C9vpxsAXEUbMFKhjJOs0vfuStkyf5Oq8w0zGh ZWY+Rg89hJ2f6WqfseY+mQRFGkcmqFM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=ilW4Issw; spf=pass (imf03.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678710568; a=rsa-sha256; cv=none; b=WeSUlJYuPQuUOFJgNyYVtT9n+WWsMcFqojOndeQvU2OyDBjmU5uGX+Rhi7K2cwD2FtzLo6 qchuQwuCMyQTCzAqkY3omAKzZZL5QOGNAWB77/7AI57VxGeRPB/YbpD/deRBZIsheub5h2 PDP/XeXbBTYt97yR24UfJQtdtTpUBOA= Received: by mail-wm1-f53.google.com with SMTP id fm20-20020a05600c0c1400b003ead37e6588so10799248wmb.5 for ; Mon, 13 Mar 2023 05:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678710566; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=h4VVQpoDamLm4iSGgyTcxUJbskifYCP8YkUsAdfGEbg=; b=ilW4Issw6poGCbNjTVwFmlU0lWsgBygyLFZDLIyAyzoED7YxH86wCNwJyFwB/D6xUU i43HaZVbGctnUi7RkD3A+4ljGakIHdDb/lJavivGXLYBKSjvhHTpgvqe5yV74BIYhh3O DwiEgpvhf3nuo5LNAzMzgCNXtKey5v8xYZ7EKExLGhzaK78bhsck0/p/U2GHElcMM7fi vQSnAUhXntO+8kUsUlRZKjHaYdM3fvHpX3DgdLfZp94I9x/c5lXOe1wFduWc74TdVOJm 4lP56ZLBt+uh1R6XgySYJ/T9QCE9qSFUn8JUa7/0LJefGPEyluBfp7SPdKEvEXGUMaVF sOHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678710566; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=h4VVQpoDamLm4iSGgyTcxUJbskifYCP8YkUsAdfGEbg=; b=kN8THeY73EWjUeBNtZ5IQ9kFA4nBq0/TDbQ27PyMcr0vmNGKTYeaDgeh+ZtoQlLsaq L3iabu/h9Y4zfxqdYf7EraWuEda8O4CdL5ZNjuljp56jVeqPROX7KrPww4an07bjeyts 4ssFi5tpm3KNJoiFiMOQeAZrOfCgHuXvOLuIVR+rrVIO7KX/oBBJjLVCKQiCM0rAIrYk A3TfrhdoFUD7rAXEyN3FE0cF2qLnfk7waVjBAZo/vzFjiv6OMnVf6GRwIK827JXvcHtf 6q0eau9AnQ1STEl80KRIj9co9aB596djE2aTG027zNXHM8l2v3PXWy0VupYe5Wv94RNS JDaQ== X-Gm-Message-State: AO0yUKXUMBu+VNtMQ27zxBTknWIDGIuLLFe8rePd5ILMukyKKBAYEcJu fOxCc0kwNIkp8q1I1nWTMC00UvEhjS4= X-Google-Smtp-Source: AK7set/gaQp/O/t0O7Ep564CIWvNM8VYVfB7hjofaZjtq9xS+1OFwnb37Wvi1GwJby9ax+AWtLf3bQ== X-Received: by 2002:a05:600c:3107:b0:3dc:55d9:ec8 with SMTP id g7-20020a05600c310700b003dc55d90ec8mr9958755wmo.41.1678710566134; Mon, 13 Mar 2023 05:29:26 -0700 (PDT) Received: from lucifer.home (host86-146-209-214.range86-146.btcentralplus.com. [86.146.209.214]) by smtp.googlemail.com with ESMTPSA id p9-20020a05600c23c900b003ed23e9e03bsm3512317wmb.46.2023.03.13.05.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 05:29:25 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Arnd Bergmann , David Hildenbrand , Nick Piggin , Peter Zijlstra , Vlastimil Babka , Mel Gorman , Uladzislau Rezki , Christoph Hellwig , Lorenzo Stoakes Subject: [PATCH] mm: prefer xxx_page() alloc/free functions for order-0 pages Date: Mon, 13 Mar 2023 12:27:14 +0000 Message-Id: <50c48ca4789f1da2a65795f2346f5ae3eff7d665.1678710232.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3272B20004 X-Stat-Signature: 8ih3cm7aonwaequ9t7uwdc8dze3eynpq X-HE-Tag: 1678710567-4813 X-HE-Meta: U2FsdGVkX1+ZkAlhLqUCe8mHUjojfvLS51mISf+2XQABo7qESDE9UyeMp9ksgopChTJU7hIhoVx9pCL+vIwn5wCAV/kBiZp8JP1sbkH24wPyO3DkbDqwwL6c6bC11cJw+wlJ4sAt4EAecKEmtpMtsaHPVIfWSF3h7W0Er9hoVq0Xe52IpGFxc+S1jcdA8xRm8IrBdjCBmtSe2cOzQASFk+TmFabBAEFaIRfIAKDrFxdcEZ/j2v9sZrEv3SrdXamERzH1voOxb3zPdACSA3H0QCcJruXPeYrkZdTE5+QnpAC3VRKgm2jzL9pRu2bX3J3IBF5mraYsleKbsTmSqp/bHISprEfRbB+5bRnvXmNB3Xjxs5/SgwtasZq2JIoAuz2Amg6qF71e5FPoBWLYXM/rapi+jtYhyoq7kjrEpEHe1MhoGudTTrofU1oizdSQCA/D6GHvLAvnGS/JKqVQ0rG/UGhxyZGeVjfR89QyZLKFE2bSsLl77dsqh0E44P6znxqqz7k0869wr4sNJE6rurNAEGtlBXVok/wGMASlKFWldHXiATEW4eUFt/k/0TP0Rk+fQ3d+Zc7X/0tnB9CJG8IbomLZFFyUDypdx48ihb3xMVQWwngmtAmv1kzN2VwR+4XIF7iZvYtyS1qE/mEtxShwR+lG9FirqQyX+D514gPuc5V1xrUz4Zk2QHwEqSza5gcddFJ4NceuTnO9aT8vd5hieEN5ZJD5hTvwVXrI+pd+SpiaAX0OrCteZkcI1VpYs7AfcyMBJCVEv3DdnuoywwCIA5P9iMa7SorydRCYZfszvDS2CIkgvEKajvCWvhhqcr5LpwqmOdKVr4zBjka4vAEY24AI0mOVugmOL+xe1+TEtqeZsNnBRIjCLOFZSz+iZluPmAv9hohSCK8PPie+R+52Fv1fsR8abYgq8eQ0BZtBC2dj5xkAkSbrW7OWPtycz1N99YI6kpgtn7X0hzx4usO DfpHvVsi y6s8L+KOlOprIhcrzdUCYy+SNkVS3nWx1ioT7/DiSgOCyLcR5OnDPHYmiF0xN9h0i5cCDmfVwYk94HU77rDLae6tQVsQzy1K2DTtwItLd94UEo2EXy6GRMQvv4McwDBDeetJQMQV0pH2/cY0CXHzEUHq8TyL+rsftoCUOs8F42DfZEtPeKEvtal0PIyzdymW+t9pJCtYHI01byYfm4NybAamBVsMvETe4o9xHfaM2tOJYVkHM4vl4fgOn3VgPpq06z/4JAKwRMzH4LNgtJ7yyj2a9DfJE0GRP68kRvkvEVxiTqJ2kTL948piLhdX6H1WNBIlph3j4HGUGi2jSK2czKvTk/9Kd745XVXfH/bzZzlOlfCyQGq5ep+jEmHkvpbw00xUI93K+F9tkbjh+x6goct3ch4YqyX1t9O3+MneTbuB8ct4df+wl6Zwyf6r+Hj8fBjSZww0hG0VS+/DhmAd4MVUUCX+7aCXM1mP985h3ve9MpNh9hxR1BlypsTHkJOyWbTFH 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: Update instances of alloc_pages(..., 0), __get_free_pages(..., 0) and __free_pages(..., 0) to use alloc_page(), __get_free_page() and __free_page() respectively in core code. Signed-off-by: Lorenzo Stoakes --- include/asm-generic/pgalloc.h | 4 ++-- mm/debug_vm_pgtable.c | 4 ++-- mm/hugetlb_vmemmap.c | 2 +- mm/mmu_gather.c | 2 +- mm/page_alloc.c | 2 +- mm/vmalloc.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h index 977bea16cf1b..a7cf825befae 100644 --- a/include/asm-generic/pgalloc.h +++ b/include/asm-generic/pgalloc.h @@ -123,11 +123,11 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) if (mm == &init_mm) gfp = GFP_PGTABLE_KERNEL; - page = alloc_pages(gfp, 0); + page = alloc_page(gfp); if (!page) return NULL; if (!pgtable_pmd_page_ctor(page)) { - __free_pages(page, 0); + __free_page(page); return NULL; } return (pmd_t *)page_address(page); diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c index 7887cc2b75bf..4362021b1ce7 100644 --- a/mm/debug_vm_pgtable.c +++ b/mm/debug_vm_pgtable.c @@ -1048,7 +1048,7 @@ static void __init destroy_args(struct pgtable_debug_args *args) if (args->pte_pfn != ULONG_MAX) { page = pfn_to_page(args->pte_pfn); - __free_pages(page, 0); + __free_page(page); args->pte_pfn = ULONG_MAX; } @@ -1290,7 +1290,7 @@ static int __init init_args(struct pgtable_debug_args *args) } } - page = alloc_pages(GFP_KERNEL, 0); + page = alloc_page(GFP_KERNEL); if (page) args->pte_pfn = page_to_pfn(page); diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index a15cc56cf70a..1198064f80eb 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -400,7 +400,7 @@ static int alloc_vmemmap_page_list(unsigned long start, unsigned long end, return 0; out: list_for_each_entry_safe(page, next, list, lru) - __free_pages(page, 0); + __free_page(page); return -ENOMEM; } diff --git a/mm/mmu_gather.c b/mm/mmu_gather.c index 2b93cf6ac9ae..ea9683e12936 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c @@ -32,7 +32,7 @@ static bool tlb_next_batch(struct mmu_gather *tlb) if (tlb->batch_count == MAX_GATHER_BATCH_COUNT) return false; - batch = (void *)__get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0); + batch = (void *)__get_free_page(GFP_NOWAIT | __GFP_NOWARN); if (!batch) return false; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 680a4d76460e..256e8d3c8742 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5538,7 +5538,7 @@ EXPORT_SYMBOL(__get_free_pages); unsigned long get_zeroed_page(gfp_t gfp_mask) { - return __get_free_pages(gfp_mask | __GFP_ZERO, 0); + return __get_free_page(gfp_mask | __GFP_ZERO); } EXPORT_SYMBOL(get_zeroed_page); diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 5e60e9792cbf..978194dc2bb8 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -2739,7 +2739,7 @@ void vfree(const void *addr) * High-order allocs for huge vmallocs are split, so * can be freed as an array of order-0 allocations */ - __free_pages(page, 0); + __free_page(page); cond_resched(); } atomic_long_sub(vm->nr_pages, &nr_vmalloc_pages); -- 2.39.2