Commit 170a5a7e authored by Jiang Liu's avatar Jiang Liu Committed by Linus Torvalds
Browse files

mm: make __free_pages_bootmem() only available at boot time

In order to simpilify management of totalram_pages and
zone->managed_pages, make __free_pages_bootmem() only available at boot
time.  With this change applied, __free_pages_bootmem() will only be
used by bootmem.c and nobootmem.c at boot time, so mark it as __init.
Other callers of __free_pages_bootmem() have been converted to use
free_reserved_page(), which handles totalram_pages and
zone->managed_pages in a safer way.

This patch also fix a bug in free_pagetable() for x86_64, which should
increase zone->managed_pages instead of zone->present_pages when freeing
reserved pages.

And now we have managed_pages_count_lock to protect totalram_pages and
zone->managed_pages, so remove the redundant ppb_lock lock in
put_page_bootmem().  This greatly simplifies the locking rules.
Signed-off-by: default avatarJiang Liu <>
Cc: Thomas Gleixner <>
Cc: Ingo Molnar <>
Cc: "H. Peter Anvin" <>
Cc: Yinghai Lu <>
Cc: Wen Congyang <>
Cc: Tang Chen <>
Cc: Yasuaki Ishimatsu <>
Cc: Mel Gorman <>
Cc: Minchan Kim <>
Cc: "Michael S. Tsirkin" <>
Cc: <>
Cc: Arnd Bergmann <>
Cc: Catalin Marinas <>
Cc: Chris Metcalf <>
Cc: David Howells <>
Cc: Geert Uytterhoeven <>
Cc: Jeremy Fitzhardinge <>
Cc: Jianguo Wu <>
Cc: Joonsoo Kim <>
Cc: Kamezawa Hiroyuki <>
Cc: Konrad Rzeszutek Wilk <>
Cc: Marek Szyprowski <>
Cc: Michel Lespinasse <>
Cc: Rik van Riel <>
Cc: Rusty Russell <>
Cc: Tejun Heo <>
Cc: Will Deacon <>
Cc: Russell King <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent c3d5f5f0
......@@ -712,36 +712,22 @@ EXPORT_SYMBOL_GPL(arch_add_memory);
static void __meminit free_pagetable(struct page *page, int order)
struct zone *zone;
bool bootmem = false;
unsigned long magic;
unsigned int nr_pages = 1 << order;
/* bootmem page has reserved flag */
if (PageReserved(page)) {
bootmem = true;
magic = (unsigned long)page->;
if (magic == SECTION_INFO || magic == MIX_SECTION_INFO) {
while (nr_pages--)
} else
__free_pages_bootmem(page, order);
while (nr_pages--)
} else
free_pages((unsigned long)page_address(page), order);
* are all allocated by bootmem.
if (bootmem) {
zone = page_zone(page);
zone->present_pages += nr_pages;
totalram_pages += nr_pages;
static void __meminit free_pte_table(pte_t *pte_start, pmd_t *pmd)
......@@ -101,12 +101,9 @@ void get_page_bootmem(unsigned long info, struct page *page,
/* reference to __meminit __free_pages_bootmem is valid
* so use __ref to tell modpost not to generate a warning */
void __ref put_page_bootmem(struct page *page)
void put_page_bootmem(struct page *page)
unsigned long type;
static DEFINE_MUTEX(ppb_lock);
type = (unsigned long) page->;
......@@ -116,17 +113,8 @@ void __ref put_page_bootmem(struct page *page)
set_page_private(page, 0);
* Please refer to comment for __free_pages_bootmem()
* for why we serialize here.
__free_pages_bootmem(page, 0);
......@@ -745,14 +745,7 @@ static void __free_pages_ok(struct page *page, unsigned int order)
* Read access to zone->managed_pages is safe because it's unsigned long,
* but we still need to serialize writers. Currently all callers of
* __free_pages_bootmem() except put_page_bootmem() should only be used
* at boot time. So for shorter boot time, we shift the burden to
* put_page_bootmem() to serialize writers.
void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
void __init __free_pages_bootmem(struct page *page, unsigned int order)
unsigned int nr_pages = 1 << order;
unsigned int loop;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment