Skip to contentSkip to conversation

mm: PG_reserved cleanups and documentation

PATCH In review David Hildenbrand 5 participants 19 messages Jan 14, 2019 – Jan 25, 2019

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

v2 cover mm: PG_reserved cleanups and documentation

Nothing major changed since the last version. I would be happy about additional ACKs. If there are no further comments, can this go via the mm-tree in one chunk?

I was recently going over all users of PG_reserved. Short story: it is difficult and sometimes not really clear if setting/checking for PG_reserved is only a relict from the past. Easy to break things. I guess I now have a pretty good idea wh things are like that nowadays and how they evolved.

I had way more cleanups in this series inititally,
but some architectures take PG_reserved as a way to apply a different caching strategy (for MMIO pages). So I decided to only include the most obvious changes (that are less likely to break something). So the big chunk of manual SetPageReserved users are MMIO/DMA related things on device buffers.

Most notably, for device memory we will hopefully soon stop setting PG_reserved. Then the documentation has to be updated.

v1 -> v2:
- Minor speeling errors in "mm: better document PG_reserved" fixed
- Added ACKs

RFC -> v1:
- Add more details to "mm: better document PG_reserved"
- Add "arm64: kdump: No need to mark crashkernel pages manually PG_reserved"
- Add "ia64: perfmon: Don't mark buffer pages as PG_reserved"
- Added ACKs

David Hildenbrand (9):
agp: efficeon: no need to set PG_reserved on GATT tables s390/vdso: don't clear PG_reserved
powerpc/vdso: don't clear PG_reserved
riscv/vdso: don't clear PG_reserved
m68k/mm: use __ClearPageReserved()
arm64: kexec: no need to ClearPageReserved()
arm64: kdump: No need to mark crashkernel pages manually PG_reserved
ia64: perfmon: Don't mark buffer pages as PG_reserved
mm: better document PG_reserved

 arch/arm64/kernel/machine_kexec.c |  3 +-
 arch/arm64/mm/init.c              | 27 --------------
 arch/ia64/kernel/perfmon.c        | 59 +++----------------------------
 arch/m68k/mm/memory.c             |  2 +-
 arch/powerpc/kernel/vdso.c        |  2 --
 arch/riscv/kernel/vdso.c          |  1 -
 arch/s390/kernel/vdso.c           |  2 --
 drivers/char/agp/efficeon-agp.c   |  2 --
 include/linux/page-flags.h        | 33 +++++++++++++++--
 9 files changed, 37 insertions(+), 94 deletions(-)
Signature · 1 line
2.17.2
#1 lore raw

PATCH v2 1/9 agp: efficeon: no need to set PG_reserved on GATT tables

The l1 GATT page table is kept in a special on-chip page with 64 entries. We allocate the l2 page table pages via get_zeroed_page() and enter them into the table. These l2 pages are modified accordingly when inserting/removing memory via efficeon_insert_memory and efficeon_remove_memory.

Apart from that, these pages are not exposed or ioremap'ed. We can stop setting them reserved (propably copied from generic code).

Cc David Airlie <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
---
 drivers/char/agp/efficeon-agp.c | 2 --
 1 file changed, 2 deletions(-)
drivers/char/agp/efficeon-agp.c +0 -2
index 7f88490b5479..c53f0f9ef5b0 100644
@@ -163,7 +163,6 @@ static int efficeon_free_gatt_table(struct agp_bridge_data *bridge)
 		unsigned long page = efficeon_private.l1_table[index];
 		if (page) {
 			efficeon_private.l1_table[index] = 0;
-			ClearPageReserved(virt_to_page((char *)page));
 			free_page(page);
 			freed++;
 		}
@@ -219,7 +218,6 @@ static int efficeon_create_gatt_table(struct agp_bridge_data *bridge)
 			efficeon_free_gatt_table(agp_bridge);
 			return -ENOMEM;
 		}
-		SetPageReserved(virt_to_page((char *)page));
 
 		for (offset = 0; offset < PAGE_SIZE; offset += clflush_chunk)
 			clflush((char *)page+offset);
Signature · 1 line
2.17.2
#2 lore raw

PATCH v2 2/9 s390/vdso: don't clear PG_reserved

In reply to David Hildenbrand

The VDSO is part of the kernel image and therefore the struct pages are marked as reserved during boot.

As we install a special mapping, the actual struct pages will never be exposed to MM via the page tables. We can therefore leave the pages marked as reserved.

Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Kees Cook <[email protected]>
Cc Souptick Joarder <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
---
 arch/s390/kernel/vdso.c | 2 --
 1 file changed, 2 deletions(-)
arch/s390/kernel/vdso.c +0 -2
index 4ff354887db4..e7920a68a12e 100644
@@ -291,7 +291,6 @@ static int __init vdso_init(void)
 	BUG_ON(vdso32_pagelist == NULL);
 	for (i = 0; i < vdso32_pages - 1; i++) {
 		struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE);
-		ClearPageReserved(pg);
 		get_page(pg);
 		vdso32_pagelist[i] = pg;
 	}
@@ -309,7 +308,6 @@ static int __init vdso_init(void)
 	BUG_ON(vdso64_pagelist == NULL);
 	for (i = 0; i < vdso64_pages - 1; i++) {
 		struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE);
-		ClearPageReserved(pg);
 		get_page(pg);
 		vdso64_pagelist[i] = pg;
 	}
Signature · 1 line
2.17.2
#3 lore raw

PATCH v2 3/9 powerpc/vdso: don't clear PG_reserved

In reply to David Hildenbrand

The VDSO is part of the kernel image and therefore the struct pages are marked as reserved during boot.

As we install a special mapping, the actual struct pages will never be exposed to MM via the page tables. We can therefore leave the pages marked as reserved.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Kees Cook <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
---
 arch/powerpc/kernel/vdso.c | 2 --
 1 file changed, 2 deletions(-)
arch/powerpc/kernel/vdso.c +0 -2
index 7725a9714736..a31b6234fcd7 100644
@@ -798,7 +798,6 @@ static int __init vdso_init(void)
 	BUG_ON(vdso32_pagelist == NULL);
 	for (i = 0; i < vdso32_pages; i++) {
 		struct page *pg = virt_to_page(vdso32_kbase + i*PAGE_SIZE);
-		ClearPageReserved(pg);
 		get_page(pg);
 		vdso32_pagelist[i] = pg;
 	}
@@ -812,7 +811,6 @@ static int __init vdso_init(void)
 	BUG_ON(vdso64_pagelist == NULL);
 	for (i = 0; i < vdso64_pages; i++) {
 		struct page *pg = virt_to_page(vdso64_kbase + i*PAGE_SIZE);
-		ClearPageReserved(pg);
 		get_page(pg);
 		vdso64_pagelist[i] = pg;
 	}
Signature · 1 line
2.17.2
#4 lore raw

PATCH v2 4/9 riscv/vdso: don't clear PG_reserved

In reply to David Hildenbrand

The VDSO is part of the kernel image and therefore the struct pages are marked as reserved during boot.

As we install a special mapping, the actual struct pages will never be exposed to MM via the page tables. We can therefore leave the pages marked as reserved.

Cc Palmer Dabbelt <[email protected]>
Cc Albert Ou <[email protected]>
Cc Tobias Klauser <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
---
 arch/riscv/kernel/vdso.c | 1 -
 1 file changed, 1 deletion(-)
arch/riscv/kernel/vdso.c +0 -1
index 582cb153eb24..0cd044122234 100644
@@ -54,7 +54,6 @@ static int __init vdso_init(void)
 		struct page *pg;
 
 		pg = virt_to_page(vdso_start + (i << PAGE_SHIFT));
-		ClearPageReserved(pg);
 		vdso_pagelist[i] = pg;
 	}
 	vdso_pagelist[i] = virt_to_page(vdso_data);
Signature · 1 line
2.17.2
#6 lore raw

PATCH v2 5/9 m68k/mm: use __ClearPageReserved()

In reply to David Hildenbrand

The PG_reserved flag is cleared from memory that is part of the kernel image (and therefore marked as PG_reserved). Avoid using PG_reserved directly.

Cc Geert Uytterhoeven <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
---
 arch/m68k/mm/memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/m68k/mm/memory.c +1 -1
index b86a2e21693b..227c04fe60d2 100644
@@ -51,7 +51,7 @@ void __init init_pointer_table(unsigned long ptable)
 	pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
 
 	/* unreserve the page so it's possible to free that page */
-	PD_PAGE(dp)->flags &= ~(1 << PG_reserved);
+	__ClearPageReserved(PD_PAGE(dp));
 	init_page_count(PD_PAGE(dp));
 
 	return;
Signature · 1 line
2.17.2
maintainer Acked-by on v2 5/9
#7 lore raw

Re: [PATCH v2 5/9] m68k/mm: use __ClearPageReserved()

Quoted 9 lines · David Hildenbrand

The PG_reserved flag is cleared from memory that is part of the kernel image (and therefore marked as PG_reserved). Avoid using PG_reserved directly.

Cc Geert Uytterhoeven <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>

BTW, it's a pity ctags doesn't know where __ClearPageReserved() is defined.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#8 lore raw

PATCH v2 6/9 arm64: kexec: no need to ClearPageReserved()

In reply to David Hildenbrand

This will be done by free_reserved_page().

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Bhupesh Sharma <[email protected]>
Cc James Morse <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Dave Kleikamp <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
---
 arch/arm64/kernel/machine_kexec.c | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/kernel/machine_kexec.c +0 -1
index aa9c94113700..6f0587b5e941 100644
@@ -361,7 +361,6 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
 
 	for (addr = begin; addr < end; addr += PAGE_SIZE) {
 		page = phys_to_page(addr);
-		ClearPageReserved(page);
 		free_reserved_page(page);
 	}
 }
Signature · 1 line
2.17.2
Reviewed-by on v2 6/9
#9 lore raw

Re: [PATCH v2 6/9] arm64: kexec: no need to ClearPageReserved()

Hi David,

Thanks for the patch.

Quoted 32 lines · David Hildenbrand

This will be done by free_reserved_page().

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Bhupesh Sharma <[email protected]>
Cc James Morse <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Dave Kleikamp <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
---
 arch/arm64/kernel/machine_kexec.c | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/kernel/machine_kexec.c +0 -2
index aa9c94113700..6f0587b5e941 100644
@@ -361,7 +361,6 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
 
        for (addr = begin; addr < end; addr += PAGE_SIZE) {
                page = phys_to_page(addr);
-               ClearPageReserved(page);
                free_reserved_page(page);
        }
 }
--
Quoted 2 lines

2.17.2

maintainer Acked-by on v2 6/9
#10 lore raw

Re: [PATCH v2 6/9] arm64: kexec: no need to ClearPageReserved()

In reply to David Hildenbrand
Quoted 14 lines · David Hildenbrand

This will be done by free_reserved_page().

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Bhupesh Sharma <[email protected]>
Cc James Morse <[email protected]>
Cc Marc Zyngier <[email protected]>
Cc Dave Kleikamp <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Matthew Wilcox <[email protected]>
#11 lore raw

PATCH v2 7/9 arm64: kdump: No need to mark crashkernel pages manually PG_reserved

In reply to David Hildenbrand

The crashkernel is reserved via memblock_reserve(). memblock_free_all() will call free_low_memory_core_early(), which will go over all reserved memblocks, marking the pages as PG_reserved.

So manually marking pages as PG_reserved is not necessary, they are already in the desired state (otherwise they would have been handed over to the buddy as free pages and bad things would happen).

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc James Morse <[email protected]>
Cc Bhupesh Sharma <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Dave Kleikamp <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Stefan Agner <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Greg Hackmann <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Kristina Martsenko <[email protected]>
Cc CHANDAN VN <[email protected]>
Cc AKASHI Takahiro <[email protected]>
Cc Logan Gunthorpe <[email protected]>
---
 arch/arm64/kernel/machine_kexec.c |  2 +-
 arch/arm64/mm/init.c              | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
arch/arm64/kernel/machine_kexec.c +1 -1
index 6f0587b5e941..66b5d697d943 100644
@@ -321,7 +321,7 @@ void crash_post_resume(void)
  * but does not hold any data of loaded kernel image.
  *
  * Note that all the pages in crash dump kernel memory have been initially
- * marked as Reserved in kexec_reserve_crashkres_pages().
+ * marked as Reserved as memory was allocated via memblock_reserve().
  *
  * In hibernation, the pages which are Reserved and yet "nosave" are excluded
  * from the hibernation iamge. crash_is_nosave() does thich check for crash
arch/arm64/mm/init.c +0 -27
index 7205a9085b4d..c38976b70069 100644
@@ -118,35 +118,10 @@ static void __init reserve_crashkernel(void)
 	crashk_res.start = crash_base;
 	crashk_res.end = crash_base + crash_size - 1;
 }
-
-static void __init kexec_reserve_crashkres_pages(void)
-{
-#ifdef CONFIG_HIBERNATION
-	phys_addr_t addr;
-	struct page *page;
-
-	if (!crashk_res.end)
-		return;
-
-	/*
-	 * To reduce the size of hibernation image, all the pages are
-	 * marked as Reserved initially.
-	 */
-	for (addr = crashk_res.start; addr < (crashk_res.end + 1);
-			addr += PAGE_SIZE) {
-		page = phys_to_page(addr);
-		SetPageReserved(page);
-	}
-#endif
-}
 #else
 static void __init reserve_crashkernel(void)
 {
 }
-
-static void __init kexec_reserve_crashkres_pages(void)
-{
-}
 #endif /* CONFIG_KEXEC_CORE */
 
 #ifdef CONFIG_CRASH_DUMP
@@ -586,8 +561,6 @@ void __init mem_init(void)
 	/* this will put all unused low memory onto the freelists */
 	memblock_free_all();
 
-	kexec_reserve_crashkres_pages();
-
 	mem_init_print_info(NULL);
 
 	/*
Signature · 1 line
2.17.2
Reviewed-by on v2 7/9
#12 lore raw

Re: [PATCH v2 7/9] arm64: kdump: No need to mark crashkernel pages manually PG_reserved

Hi David,

Quoted 98 lines · David Hildenbrand

The crashkernel is reserved via memblock_reserve(). memblock_free_all() will call free_low_memory_core_early(), which will go over all reserved memblocks, marking the pages as PG_reserved.

So manually marking pages as PG_reserved is not necessary, they are already in the desired state (otherwise they would have been handed over to the buddy as free pages and bad things would happen).

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc James Morse <[email protected]>
Cc Bhupesh Sharma <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Dave Kleikamp <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Stefan Agner <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Greg Hackmann <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Kristina Martsenko <[email protected]>
Cc CHANDAN VN <[email protected]>
Cc AKASHI Takahiro <[email protected]>
Cc Logan Gunthorpe <[email protected]>
---
 arch/arm64/kernel/machine_kexec.c |  2 +-
 arch/arm64/mm/init.c              | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)
arch/arm64/kernel/machine_kexec.c +1 -1
index 6f0587b5e941..66b5d697d943 100644
@@ -321,7 +321,7 @@ void crash_post_resume(void)
  * but does not hold any data of loaded kernel image.
  *
  * Note that all the pages in crash dump kernel memory have been initially
- * marked as Reserved in kexec_reserve_crashkres_pages().
+ * marked as Reserved as memory was allocated via memblock_reserve().
  *
  * In hibernation, the pages which are Reserved and yet "nosave" are excluded
  * from the hibernation iamge. crash_is_nosave() does thich check for crash
arch/arm64/mm/init.c +0 -28
index 7205a9085b4d..c38976b70069 100644
@@ -118,35 +118,10 @@ static void __init reserve_crashkernel(void)
        crashk_res.start = crash_base;
        crashk_res.end = crash_base + crash_size - 1;
 }
-
-static void __init kexec_reserve_crashkres_pages(void)
-{
-#ifdef CONFIG_HIBERNATION
-       phys_addr_t addr;
-       struct page *page;
-
-       if (!crashk_res.end)
-               return;
-
-       /*
-        * To reduce the size of hibernation image, all the pages are
-        * marked as Reserved initially.
-        */
-       for (addr = crashk_res.start; addr < (crashk_res.end + 1);
-                       addr += PAGE_SIZE) {
-               page = phys_to_page(addr);
-               SetPageReserved(page);
-       }
-#endif
-}
 #else
 static void __init reserve_crashkernel(void)
 {
 }
-
-static void __init kexec_reserve_crashkres_pages(void)
-{
-}
 #endif /* CONFIG_KEXEC_CORE */
 
 #ifdef CONFIG_CRASH_DUMP
@@ -586,8 +561,6 @@ void __init mem_init(void)
        /* this will put all unused low memory onto the freelists */
        memblock_free_all();
 
-       kexec_reserve_crashkres_pages();
-
        mem_init_print_info(NULL);
 
        /*
--
Quoted 1 line

2.17.2

LGTM, so:

maintainer Acked-by on v2 7/9
#13 lore raw

Re: [PATCH v2 7/9] arm64: kdump: No need to mark crashkernel pages manually PG_reserved

In reply to David Hildenbrand
Quoted 21 lines · David Hildenbrand

The crashkernel is reserved via memblock_reserve(). memblock_free_all() will call free_low_memory_core_early(), which will go over all reserved memblocks, marking the pages as PG_reserved.

So manually marking pages as PG_reserved is not necessary, they are already in the desired state (otherwise they would have been handed over to the buddy as free pages and bad things would happen).

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc James Morse <[email protected]>
Cc Bhupesh Sharma <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Dave Kleikamp <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Florian Fainelli <[email protected]>
Cc Stefan Agner <[email protected]>
Cc Laura Abbott <[email protected]>
Quoted 8 lines
Cc Greg Hackmann <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Kristina Martsenko <[email protected]>
Cc CHANDAN VN <[email protected]>
Cc AKASHI Takahiro <[email protected]>
Cc Logan Gunthorpe <[email protected]>
#14 lore raw

PATCH v2 8/9 ia64: perfmon: Don't mark buffer pages as PG_reserved

In reply to David Hildenbrand

In the old days, remap_pfn_range() required pages to be marked as PG_reserved, so they would e.g. never get swapped out. This was required for special mappings. Nowadays, this is fully handled via the VMA (VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP inside remap_pfn_range() to be precise). PG_reserved is no longer required but only a relict from the past.

So only architecture specific MM handling might require it (e.g. to detect them as MMIO pages). As there are no architecture specific checks for PageReserved() apart from MCA handling in ia64code, this can go. Use simple vzalloc()/vfree() instead.

Note that before calling vzalloc(), size has already been aligned to PAGE_SIZE, no need to align again.

Cc Tony Luck <[email protected]>
Cc Fenghua Yu <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Andrew Morton <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc David Howells <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Michal Hocko <[email protected]>
---
 arch/ia64/kernel/perfmon.c | 59 +++-----------------------------------
 1 file changed, 4 insertions(+), 55 deletions(-)
arch/ia64/kernel/perfmon.c +4 -55
index 46bff1661836..7a969f4c3534 100644
@@ -583,17 +583,6 @@ pfm_put_task(struct task_struct *task)
 	if (task != current) put_task_struct(task);
 }
 
-static inline void
-pfm_reserve_page(unsigned long a)
-{
-	SetPageReserved(vmalloc_to_page((void *)a));
-}
-static inline void
-pfm_unreserve_page(unsigned long a)
-{
-	ClearPageReserved(vmalloc_to_page((void*)a));
-}
-
 static inline unsigned long
 pfm_protect_ctx_ctxsw(pfm_context_t *x)
 {
@@ -816,44 +805,6 @@ pfm_reset_msgq(pfm_context_t *ctx)
 	DPRINT(("ctx=%p msgq reset\n", ctx));
 }
 
-static void *
-pfm_rvmalloc(unsigned long size)
-{
-	void *mem;
-	unsigned long addr;
-
-	size = PAGE_ALIGN(size);
-	mem  = vzalloc(size);
-	if (mem) {
-		//printk("perfmon: CPU%d pfm_rvmalloc(%ld)=%p\n", smp_processor_id(), size, mem);
-		addr = (unsigned long)mem;
-		while (size > 0) {
-			pfm_reserve_page(addr);
-			addr+=PAGE_SIZE;
-			size-=PAGE_SIZE;
-		}
-	}
-	return mem;
-}
-
-static void
-pfm_rvfree(void *mem, unsigned long size)
-{
-	unsigned long addr;
-
-	if (mem) {
-		DPRINT(("freeing physical buffer @%p size=%lu\n", mem, size));
-		addr = (unsigned long) mem;
-		while ((long) size > 0) {
-			pfm_unreserve_page(addr);
-			addr+=PAGE_SIZE;
-			size-=PAGE_SIZE;
-		}
-		vfree(mem);
-	}
-	return;
-}
-
 static pfm_context_t *
 pfm_context_alloc(int ctx_flags)
 {
@@ -1498,7 +1449,7 @@ pfm_free_smpl_buffer(pfm_context_t *ctx)
 	/*
 	 * free the buffer
 	 */
-	pfm_rvfree(ctx->ctx_smpl_hdr, ctx->ctx_smpl_size);
+	vfree(ctx->ctx_smpl_hdr);
 
 	ctx->ctx_smpl_hdr  = NULL;
 	ctx->ctx_smpl_size = 0UL;
@@ -2137,7 +2088,7 @@ pfm_close(struct inode *inode, struct file *filp)
 	 * All memory free operations (especially for vmalloc'ed memory)
 	 * MUST be done with interrupts ENABLED.
 	 */
-	if (smpl_buf_addr)  pfm_rvfree(smpl_buf_addr, smpl_buf_size);
+	vfree(smpl_buf_addr);
 
 	/*
 	 * return the memory used by the context
@@ -2266,10 +2217,8 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
 
 	/*
 	 * We do the easy to undo allocations first.
- 	 *
-	 * pfm_rvmalloc(), clears the buffer, so there is no leak
 	 */
-	smpl_buf = pfm_rvmalloc(size);
+	smpl_buf = vzalloc(size);
 	if (smpl_buf == NULL) {
 		DPRINT(("Can't allocate sampling buffer\n"));
 		return -ENOMEM;
@@ -2346,7 +2295,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
 error:
 	vm_area_free(vma);
 error_kmem:
-	pfm_rvfree(smpl_buf, size);
+	vfree(smpl_buf);
 
 	return -ENOMEM;
 }
Signature · 1 line
2.17.2
#15 lore raw

PATCH v2 9/9 mm: better document PG_reserved

In reply to David Hildenbrand

The usage of PG_reserved and how PG_reserved pages are to be treated is buried deep down in different parts of the kernel. Let's shine some light onto these details by documenting current users and expected behavior.

Especially, clarify on the "Some of them might not even exist" case. These are physical memory gaps that will never be dumped as they are not marked as IORESOURCE_SYSRAM. PG_reserved does in general not hinder anybody from dumping or swapping. In some cases, these pages will not be stored in the hibernation image.

Cc Andrew Morton <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Pavel Tatashin <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Alexander Duyck <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc Anthony Yznaga <[email protected]>
Cc Miles Chen <[email protected]>
Cc Dan Williams <[email protected]>
Cc Randy Dunlap <[email protected]>
---
 include/linux/page-flags.h | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)
include/linux/page-flags.h +31 -2
index 808b4183e30d..9f8712a4b1a5 100644
@@ -17,8 +17,37 @@
 /*
  * Various page->flags bits:
  *
- * PG_reserved is set for special pages, which can never be swapped out. Some
- * of them might not even exist...
+ * PG_reserved is set for special pages. The "struct page" of such a page
+ * should in general not be touched (e.g. set dirty) except by its owner.
+ * Pages marked as PG_reserved include:
+ * - Pages part of the kernel image (including vDSO) and similar (e.g. BIOS,
+ *   initrd, HW tables)
+ * - Pages reserved or allocated early during boot (before the page allocator
+ *   was initialized). This includes (depending on the architecture) the
+ *   initial vmemmap, initial page tables, crashkernel, elfcorehdr, and much
+ *   much more. Once (if ever) freed, PG_reserved is cleared and they will
+ *   be given to the page allocator.
+ * - Pages falling into physical memory gaps - not IORESOURCE_SYSRAM. Trying
+ *   to read/write these pages might end badly. Don't touch!
+ * - The zero page(s)
+ * - Pages not added to the page allocator when onlining a section because
+ *   they were excluded via the online_page_callback() or because they are
+ *   PG_hwpoison.
+ * - Pages allocated in the context of kexec/kdump (loaded kernel image,
+ *   control pages, vmcoreinfo)
+ * - MMIO/DMA pages. Some architectures don't allow to ioremap pages that are
+ *   not marked PG_reserved (as they might be in use by somebody else who does
+ *   not respect the caching strategy).
+ * - Pages part of an offline section (struct pages of offline sections should
+ *   not be trusted as they will be initialized when first onlined).
+ * - MCA pages on ia64
+ * - Pages holding CPU notes for POWER Firmware Assisted Dump
+ * - Device memory (e.g. PMEM, DAX, HMM)
+ * Some PG_reserved pages will be excluded from the hibernation image.
+ * PG_reserved does in general not hinder anybody from dumping or swapping
+ * and is no longer required for remap_pfn_range(). ioremap might require it.
+ * Consequently, PG_reserved for a page mapped into user space can indicate
+ * the zero page, the vDSO, MMIO pages or device memory.
  *
  * The PG_private bitflag is set on pagecache pages if they contain filesystem
  * specific data (which is normally at page->private). It can be used by
Signature · 1 line
2.17.2
#16 lore raw
In reply to David Hildenbrand
Quoted 9 lines · David Hildenbrand

Nothing major changed since the last version. I would be happy about additional ACKs. If there are no further comments, can this go via the mm-tree in one chunk?

I was recently going over all users of PG_reserved. Short story: it is difficult and sometimes not really clear if setting/checking for PG_reserved is only a relict from the past. Easy to break things. I guess I now have a pretty good idea wh things are like that nowadays and how they evolved.

Any reason you skipped

drivers/gpu/drm/drm_pci.c:drm_pci_alloc()

and

drivers/gpu/drm/drm_scatter.c:drm_legacy_sg_alloc()

which both look completely bogus as-is?

In fact we should probably just try to kill them off as they have very few users left.

#17 lore raw
Quoted 15 lines · Christoph Hellwig
Quoted 9 lines · David Hildenbrand

Nothing major changed since the last version. I would be happy about additional ACKs. If there are no further comments, can this go via the mm-tree in one chunk?

I was recently going over all users of PG_reserved. Short story: it is difficult and sometimes not really clear if setting/checking for PG_reserved is only a relict from the past. Easy to break things. I guess I now have a pretty good idea wh things are like that nowadays and how they evolved.

Any reason you skipped

drivers/gpu/drm/drm_pci.c:drm_pci_alloc()

Quoted 9 lines

and

drivers/gpu/drm/drm_scatter.c:drm_legacy_sg_alloc()

which both look completely bogus as-is?

In fact we should probably just try to kill them off as they have very few users left.

I actually have patches lying around for these, however excluded them for now as I was not 100% sure about the implications ("Easy to break things").

Are you sure nobody in the system (especially somebody who does a PageReserved()) relies on this to identify e.g. MMIO pages? (e.g. ioremap on some archs, KVM code)

(I am by far no DRM expert, but when I hear DMA, I tend to be careful)

Signature · 3 lines
Thanks,

David / dhildenb
#18 lore raw
In reply to David Hildenbrand
Quoted 3 lines · David Hildenbrand

Nothing major changed since the last version. I would be happy about additional ACKs. If there are no further comments, can this go via the mm-tree in one chunk?

For the time being, I will not add further patches to this series (as discussed in response to one question, we have to be careful dropping PG_reserved at some places). Only ACKs were added during review so far.

@Andrew, how to proceed with this?

Signature · 3 lines
Thanks,

David / dhildenb