forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mm: enhance free_reserved_area() to support poisoning memory with zero

Browse source 
Address more review comments from last round of code review.
1) Enhance free_reserved_area() to support poisoning freed memory with
   pattern '0'. This could be used to get rid of poison_init_mem()
   on ARM64.
2) A previous patch has disabled memory poison for initmem on s390
   by mistake, so restore to the original behavior.
3) Remove redundant PAGE_ALIGN() when calling free_reserved_area().

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: <sworddragon2@aol.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Michel Lespinasse <walken@google.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiang Liu 2013-07-03 15:02:51 -07:00 • committed by Linus Torvalds
commit dbe67df4ba
26 changed files with 49 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/alpha/kernel/sys_nautilus.c
View file

@ -239,7 +239,7 @@ nautilus_init_pci(void)
memtop = pci_mem; memtop = pci_mem;
if (memtop > alpha_mv.min_mem_address) { if (memtop > alpha_mv.min_mem_address) {
free_reserved_area(__va(alpha_mv.min_mem_address), free_reserved_area(__va(alpha_mv.min_mem_address),
__va(memtop), 0, NULL); __va(memtop), -1, NULL);
printk("nautilus_init_pci: %ldk freed\n", printk("nautilus_init_pci: %ldk freed\n",
(memtop - alpha_mv.min_mem_address) >> 10); (memtop - alpha_mv.min_mem_address) >> 10);
} }

4
arch/alpha/mm/init.c
View file

@ -319,13 +319,13 @@ mem_init(void)
void void
free_initmem(void) free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void void
free_initrd_mem(unsigned long start, unsigned long end) free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

4
arch/arc/mm/init.c
View file

@ -146,13 +146,13 @@ void __init mem_init(void)
*/ */
void __init_refok free_initmem(void) void __init_refok free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

8
arch/arm/mm/init.c
View file

@ -601,7 +601,7 @@ void __init mem_init(void)
#ifdef CONFIG_SA1111 #ifdef CONFIG_SA1111
/* now that our DMA memory is actually so designated, we can free it */ /* now that our DMA memory is actually so designated, we can free it */
free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL); free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, -1, NULL);
#endif #endif
free_highpages(); free_highpages();
@ -729,12 +729,12 @@ void free_initmem(void)
extern char __tcm_start, __tcm_end; extern char __tcm_start, __tcm_end;
poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start); poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
free_reserved_area(&__tcm_start, &__tcm_end, 0, "TCM link"); free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
#endif #endif
poison_init_mem(__init_begin, __init_end - __init_begin); poison_init_mem(__init_begin, __init_end - __init_begin);
if (!machine_is_integrator() && !machine_is_cintegrator()) if (!machine_is_integrator() && !machine_is_cintegrator())
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
@ -745,7 +745,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (!keep_initrd) { if (!keep_initrd) {
poison_init_mem((void *)start, PAGE_ALIGN(end) - start); poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
} }

4
arch/arm64/mm/init.c
View file

@ -387,7 +387,7 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
poison_init_mem(__init_begin, __init_end - __init_begin); poison_init_mem(__init_begin, __init_end - __init_begin);
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
@ -398,7 +398,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (!keep_initrd) { if (!keep_initrd) {
poison_init_mem((void *)start, PAGE_ALIGN(end) - start); poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
} }

4
arch/avr32/mm/init.c
View file

@ -148,12 +148,12 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

4
arch/blackfin/mm/init.c
View file

@ -133,7 +133,7 @@ void __init mem_init(void)
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
#ifndef CONFIG_MPU #ifndef CONFIG_MPU
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
#endif #endif
} }
#endif #endif
@ -141,7 +141,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
void __init_refok free_initmem(void) void __init_refok free_initmem(void)
{ {
#if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU #if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU
free_initmem_default(0); free_initmem_default(-1);
if (memory_start == (unsigned long)(&__init_end)) if (memory_start == (unsigned long)(&__init_end))
memory_start = (unsigned long)(&__init_begin); memory_start = (unsigned long)(&__init_begin);
#endif #endif

4
arch/c6x/mm/init.c
View file

@ -78,11 +78,11 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif
void __init free_initmem(void) void __init free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }

2
arch/cris/mm/init.c
View file

@ -65,5 +65,5 @@ mem_init(void)
void void
free_initmem(void) free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }

4
arch/frv/mm/init.c
View file

@ -162,7 +162,7 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
#if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL) #if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
free_initmem_default(0); free_initmem_default(-1);
#endif #endif
} /* end free_initmem() */ } /* end free_initmem() */
@ -173,6 +173,6 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} /* end free_initrd_mem() */ } /* end free_initrd_mem() */
#endif #endif

4
arch/h8300/mm/init.c
View file

@ -161,7 +161,7 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif
@ -169,7 +169,7 @@ void
free_initmem(void) free_initmem(void)
{ {
#ifdef CONFIG_RAMKERNEL #ifdef CONFIG_RAMKERNEL
free_initmem_default(0); free_initmem_default(-1);
#endif #endif
} }

2
arch/ia64/mm/init.c
View file

@ -155,7 +155,7 @@ void
free_initmem (void) free_initmem (void)
{ {
free_reserved_area(ia64_imva(__init_begin), ia64_imva(__init_end), free_reserved_area(ia64_imva(__init_begin), ia64_imva(__init_end),
0, "unused kernel"); -1, "unused kernel");
} }
void __init void __init

4
arch/m32r/mm/init.c
View file

@ -181,7 +181,7 @@ void __init mem_init(void)
*======================================================================*/ *======================================================================*/
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
@ -191,6 +191,6 @@ void free_initmem(void)
*======================================================================*/ *======================================================================*/
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

4
arch/m68k/mm/init.c
View file

@ -110,7 +110,7 @@ void __init paging_init(void)
void free_initmem(void) void free_initmem(void)
{ {
#ifndef CONFIG_MMU_SUN3 #ifndef CONFIG_MMU_SUN3
free_initmem_default(0); free_initmem_default(-1);
#endif /* CONFIG_MMU_SUN3 */ #endif /* CONFIG_MMU_SUN3 */
} }
@ -202,6 +202,6 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

4
arch/microblaze/mm/init.c
View file

@ -235,13 +235,13 @@ void __init setup_memory(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }
void __init mem_init(void) void __init mem_init(void)

4
arch/openrisc/mm/init.c
View file

@ -261,11 +261,11 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }

4
arch/parisc/mm/init.c
View file

@ -532,7 +532,7 @@ void free_initmem(void)
* pages are no-longer executable */ * pages are no-longer executable */
flush_icache_range(init_begin, init_end); flush_icache_range(init_begin, init_end);
num_physpages += free_initmem_default(0); num_physpages += free_initmem_default(-1);
/* set up a new led state on systems shipped LED State panel */ /* set up a new led state on systems shipped LED State panel */
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE); pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE);
@ -1101,7 +1101,7 @@ void flush_tlb_all(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
num_physpages += free_reserved_area((void *)start, (void *)end, 0, num_physpages += free_reserved_area((void *)start, (void *)end, -1,
"initrd"); "initrd");
} }
#endif #endif

9
arch/powerpc/kernel/kvm.c
View file

@ -750,13 +750,8 @@ EXPORT_SYMBOL_GPL(kvm_hypercall);
static __init void kvm_free_tmp(void) static __init void kvm_free_tmp(void)
{ {
unsigned long start, end; free_reserved_area(&kvm_tmp[kvm_tmp_index],
&kvm_tmp[ARRAY_SIZE(kvm_tmp)], -1, NULL);
start = (ulong)&kvm_tmp[kvm_tmp_index + (PAGE_SIZE - 1)] & PAGE_MASK;
end = (ulong)&kvm_tmp[ARRAY_SIZE(kvm_tmp)] & PAGE_MASK;
/* Free the tmp space we don't need */
free_reserved_area((void *)start, (void *)end, 0, NULL);
} }
static int __init kvm_guest_init(void) static int __init kvm_guest_init(void)

2
arch/powerpc/mm/mem.c
View file

@ -407,7 +407,7 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

2
arch/s390/mm/init.c
View file

@ -166,7 +166,7 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(POISON_FREE_INITMEM);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD

4
arch/sh/mm/init.c
View file

@ -499,13 +499,13 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

2
arch/um/kernel/mem.c
View file

@ -244,7 +244,7 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif

4
arch/unicore32/mm/init.c
View file

@ -476,7 +476,7 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
@ -486,7 +486,7 @@ static int keep_initrd;
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (!keep_initrd) if (!keep_initrd)
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
static int __init keepinitrd_setup(char *__unused) static int __init keepinitrd_setup(char *__unused)

4
arch/xtensa/mm/init.c
View file

@ -214,11 +214,11 @@ extern int initrd_is_mapped;
void free_initrd_mem(unsigned long start, unsigned long end) void free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (initrd_is_mapped) if (initrd_is_mapped)
free_reserved_area((void *)start, (void *)end, 0, "initrd"); free_reserved_area((void *)start, (void *)end, -1, "initrd");
} }
#endif #endif
void free_initmem(void) void free_initmem(void)
{ {
free_initmem_default(0); free_initmem_default(-1);
} }

7
include/linux/mm.h
View file

@ -1308,7 +1308,7 @@ extern void free_initmem(void);
/* /*
* Free reserved pages within range [PAGE_ALIGN(start), end & PAGE_MASK) * Free reserved pages within range [PAGE_ALIGN(start), end & PAGE_MASK)
* into the buddy system. The freed pages will be poisoned with pattern * into the buddy system. The freed pages will be poisoned with pattern
* "poison" if it's non-zero. * "poison" if it's within range [0, UCHAR_MAX].
* Return pages freed into the buddy system. * Return pages freed into the buddy system.
*/ */
extern unsigned long free_reserved_area(void *start, void *end, extern unsigned long free_reserved_area(void *start, void *end,
@ -1348,8 +1348,9 @@ static inline void mark_page_reserved(struct page *page)
/* /*
* Default method to free all the __init memory into the buddy system. * Default method to free all the __init memory into the buddy system.
* The freed pages will be poisoned with pattern "poison" if it is * The freed pages will be poisoned with pattern "poison" if it's within
* non-zero. Return pages freed into the buddy system. * range [0, UCHAR_MAX].
* Return pages freed into the buddy system.
*/ */
static inline unsigned long free_initmem_default(int poison) static inline unsigned long free_initmem_default(int poison)
{ {

2
mm/page_alloc.c
View file

@ -5214,7 +5214,7 @@ unsigned long free_reserved_area(void *start, void *end, int poison, char *s)
start = (void *)PAGE_ALIGN((unsigned long)start); start = (void *)PAGE_ALIGN((unsigned long)start);
end = (void *)((unsigned long)end & PAGE_MASK); end = (void *)((unsigned long)end & PAGE_MASK);
for (pos = start; pos < end; pos += PAGE_SIZE, pages++) { for (pos = start; pos < end; pos += PAGE_SIZE, pages++) {
if (poison) if ((unsigned int)poison <= 0xFF)
memset(pos, poison, PAGE_SIZE); memset(pos, poison, PAGE_SIZE);
free_reserved_page(virt_to_page(pos)); free_reserved_page(virt_to_page(pos));
} }