From: Mike Rapoport <rppt@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@redhat.com>,
Matthew Wilcox <willy@infradead.org>,
Mel Gorman <mgorman@suse.de>, Michal Hocko <mhocko@kernel.org>,
Mike Rapoport <rppt@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Vlastimil Babka <vbabka@suse.cz>,
linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
linux-mm@kvack.org
Subject: [PATCH 02/15] mm/cma: move init_cma_reserved_pages() to cma.c and make it static
Date: Sun, 19 Mar 2023 23:59:55 +0200 [thread overview]
Message-ID: <20230319220008.2138576-3-rppt@kernel.org> (raw)
In-Reply-To: <20230319220008.2138576-1-rppt@kernel.org>
From: "Mike Rapoport (IBM)" <rppt@kernel.org>
init_cma_reserved_pages() only used in cma.c, no point of having it in
page_alloc.c.
Move init_cma_reserved_pages() to cma.c and make it static.
Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
include/linux/gfp.h | 5 -----
mm/cma.c | 21 +++++++++++++++++++++
mm/page_alloc.c | 21 ---------------------
3 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 65a78773dcca..7c554e4bd49f 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -361,9 +361,4 @@ extern struct page *alloc_contig_pages(unsigned long nr_pages, gfp_t gfp_mask,
#endif
void free_contig_range(unsigned long pfn, unsigned long nr_pages);
-#ifdef CONFIG_CMA
-/* CMA stuff */
-extern void init_cma_reserved_pageblock(struct page *page);
-#endif
-
#endif /* __LINUX_GFP_H */
diff --git a/mm/cma.c b/mm/cma.c
index a7263aa02c92..ce08fb9825b4 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -31,8 +31,10 @@
#include <linux/highmem.h>
#include <linux/io.h>
#include <linux/kmemleak.h>
+#include <linux/page-isolation.h>
#include <trace/events/cma.h>
+#include "internal.h"
#include "cma.h"
struct cma cma_areas[MAX_CMA_AREAS];
@@ -93,6 +95,25 @@ static void cma_clear_bitmap(struct cma *cma, unsigned long pfn,
spin_unlock_irqrestore(&cma->lock, flags);
}
+/* Free whole pageblock and set its migration type to MIGRATE_CMA. */
+static void init_cma_reserved_pageblock(struct page *page)
+{
+ unsigned i = pageblock_nr_pages;
+ struct page *p = page;
+
+ do {
+ __ClearPageReserved(p);
+ set_page_count(p, 0);
+ } while (++p, --i);
+
+ set_pageblock_migratetype(page, MIGRATE_CMA);
+ set_page_refcounted(page);
+ __free_pages(page, pageblock_order);
+
+ adjust_managed_page_count(page, pageblock_nr_pages);
+ page_zone(page)->cma_pages += pageblock_nr_pages;
+}
+
static void __init cma_activate_area(struct cma *cma)
{
unsigned long base_pfn = cma->base_pfn, pfn;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 87d760236dba..22e3da842e3f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2280,27 +2280,6 @@ void __init page_alloc_init_late(void)
set_zone_contiguous(zone);
}
-#ifdef CONFIG_CMA
-/* Free whole pageblock and set its migration type to MIGRATE_CMA. */
-void __init init_cma_reserved_pageblock(struct page *page)
-{
- unsigned i = pageblock_nr_pages;
- struct page *p = page;
-
- do {
- __ClearPageReserved(p);
- set_page_count(p, 0);
- } while (++p, --i);
-
- set_pageblock_migratetype(page, MIGRATE_CMA);
- set_page_refcounted(page);
- __free_pages(page, pageblock_order);
-
- adjust_managed_page_count(page, pageblock_nr_pages);
- page_zone(page)->cma_pages += pageblock_nr_pages;
-}
-#endif
-
/*
* The order of subdivision here is critical for the IO subsystem.
* Please do not alter this order without good reasons and regression
--
2.35.1
next prev parent reply other threads:[~2023-03-19 22:00 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 21:59 [PATCH 00/15] mm: move core MM initialization to mm/mm_init.c Mike Rapoport
2023-03-19 21:59 ` [PATCH 01/15] mips: fix comment about pgtable_init() Mike Rapoport
2023-03-20 10:28 ` David Hildenbrand
2023-03-19 21:59 ` Mike Rapoport [this message]
2023-03-20 10:30 ` [PATCH 02/15] mm/cma: move init_cma_reserved_pages() to cma.c and make it static David Hildenbrand
2023-03-20 11:11 ` Mike Rapoport
2023-03-20 11:14 ` David Hildenbrand
2023-03-20 19:12 ` Doug Berger
2023-03-19 21:59 ` [PATCH 03/15] mm/page_alloc: add helper for checking if check_pages_enabled Mike Rapoport
2023-03-20 10:31 ` David Hildenbrand
2023-03-19 21:59 ` [PATCH 04/15] mm: move most of core MM initialization to mm/mm_init.c Mike Rapoport
2023-03-20 10:32 ` David Hildenbrand
2023-03-19 21:59 ` [PATCH 05/15] mm: handle hashdist initialization in mm/mm_init.c Mike Rapoport
2023-03-20 10:34 ` David Hildenbrand
2023-03-19 21:59 ` [PATCH 06/15] mm/page_alloc: rename page_alloc_init() to page_alloc_init_cpuhp() Mike Rapoport
2023-03-20 10:34 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 07/15] init: fold build_all_zonelists() and page_alloc_init_cpuhp() to mm_init() Mike Rapoport
2023-03-20 10:35 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 08/15] init,mm: move mm_init() to mm/mm_init.c and rename it to mm_core_init() Mike Rapoport
2023-03-20 10:36 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 09/15] mm: move pgtable_init() to mm/mm_init.c and make it static Mike Rapoport
2023-03-20 10:37 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 10/15] mm: move init_mem_debugging_and_hardening() to mm/mm_init.c Mike Rapoport
2023-03-20 10:39 ` David Hildenbrand
2023-03-20 11:17 ` Mike Rapoport
2023-03-20 11:18 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 11/15] init,mm: fold late call to page_ext_init() to page_alloc_init_late() Mike Rapoport
2023-03-20 10:39 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 12/15] mm: move mem_init_print_info() to mm_init.c Mike Rapoport
2023-03-20 10:40 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 13/15] mm: move kmem_cache_init() declaration to mm/slab.h Mike Rapoport
2023-03-20 10:40 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 14/15] mm: move vmalloc_init() declaration to mm/internal.h Mike Rapoport
2023-03-20 10:41 ` David Hildenbrand
2023-03-19 22:00 ` [PATCH 15/15] MAINTAINERS: extend memblock entry to include MM initialization Mike Rapoport
2023-03-20 10:41 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230319220008.2138576-3-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).