Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72a7fe39 authored by Bernhard Walle's avatar Bernhard Walle Committed by Linus Torvalds
Browse files

Introduce flags for reserve_bootmem() 



This patchset adds a flags variable to reserve_bootmem() and uses the
BOOTMEM_EXCLUSIVE flag in crashkernel reservation code to detect collisions
between crashkernel area and already used memory.

This patch:

Change the reserve_bootmem() function to accept a new flag BOOTMEM_EXCLUSIVE.
If that flag is set, the function returns with -EBUSY if the memory already
has been reserved in the past.  This is to avoid conflicts.

Because that code runs before SMP initialisation, there's no race condition
inside reserve_bootmem_core().

[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: fix powerpc build]
Signed-off-by: default avatarBernhard Walle <bwalle@suse.de>
Cc: <linux-arch@vger.kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 25fad945

arch/alpha/kernel/core_irongate.c

+2 −1
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ albacore_init_arch(void) 
				       size / 1024);

		}

#endif

		reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop - pci_mem);

		reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop -

				pci_mem, BOOTMEM_DEFAULT);

		printk("irongate_init_arch: temporarily reserving "

			"region %08lx-%08lx for PCI\n", pci_mem, memtop - 1);

	}

arch/alpha/kernel/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -428,7 +428,8 @@ setup_memory(void *kernel_end) 
	}



	/* Reserve the bootmap memory.  */

	reserve_bootmem(PFN_PHYS(bootmap_start), bootmap_size);

	reserve_bootmem(PFN_PHYS(bootmap_start), bootmap_size,

			BOOTMEM_DEFAULT);

	printk("reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size));



#ifdef CONFIG_BLK_DEV_INITRD
@@ -446,7 +447,7 @@ setup_memory(void *kernel_end) 
				       phys_to_virt(PFN_PHYS(max_low_pfn)));

		} else {

			reserve_bootmem(virt_to_phys((void *)initrd_start),

					INITRD_SIZE);

					INITRD_SIZE, BOOTMEM_DEFAULT);

		}

	}

#endif /* CONFIG_BLK_DEV_INITRD */

arch/alpha/mm/numa.c

+3 −2
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ setup_memory_node(int nid, void *kernel_end) 
	}



	/* Reserve the bootmap memory.  */

	reserve_bootmem_node(NODE_DATA(nid), PFN_PHYS(bootmap_start), bootmap_size);

	reserve_bootmem_node(NODE_DATA(nid), PFN_PHYS(bootmap_start),

			bootmap_size, BOOTMEM_DEFAULT);

	printk(" reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size));



	node_set_online(nid);
@@ -281,7 +282,7 @@ setup_memory(void *kernel_end) 
			nid = kvaddr_to_nid(initrd_start);

			reserve_bootmem_node(NODE_DATA(nid),

					     virt_to_phys((void *)initrd_start),

					     INITRD_SIZE);

					     INITRD_SIZE, BOOTMEM_DEFAULT);

		}

	}

#endif /* CONFIG_BLK_DEV_INITRD */

arch/arm/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi) 
	 * Reserve the bootmem bitmap for this node.

	 */

	reserve_bootmem_node(pgdat, boot_pfn << PAGE_SHIFT,

			     boot_pages << PAGE_SHIFT);

			     boot_pages << PAGE_SHIFT, BOOTMEM_DEFAULT);



#ifdef CONFIG_BLK_DEV_INITRD

	/*
@@ -247,7 +247,7 @@ bootmem_init_node(int node, int initrd_node, struct meminfo *mi) 
	 */

	if (node == initrd_node) {

		reserve_bootmem_node(pgdat, phys_initrd_start,

				     phys_initrd_size);

				     phys_initrd_size, BOOTMEM_DEFAULT);

		initrd_start = __phys_to_virt(phys_initrd_start);

		initrd_end = initrd_start + phys_initrd_size;

	}

arch/arm/mm/mmu.c

+11 −6
Original line number Diff line number Diff line
@@ -605,9 +605,11 @@ void __init reserve_node_zero(pg_data_t *pgdat) 
	 * Note that this can only be in node 0.

	 */

#ifdef CONFIG_XIP_KERNEL

	reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start);

	reserve_bootmem_node(pgdat, __pa(&__data_start), &_end - &__data_start,

			BOOTMEM_DEFAULT);

#else

	reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext);

	reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext,

			BOOTMEM_DEFAULT);

#endif



	/*
@@ -615,7 +617,7 @@ void __init reserve_node_zero(pg_data_t *pgdat) 
	 * and can only be in node 0.

	 */

	reserve_bootmem_node(pgdat, __pa(swapper_pg_dir),

			     PTRS_PER_PGD * sizeof(pgd_t));

			     PTRS_PER_PGD * sizeof(pgd_t), BOOTMEM_DEFAULT);



	/*

	 * Hmm... This should go elsewhere, but we really really need to
@@ -638,8 +640,10 @@ void __init reserve_node_zero(pg_data_t *pgdat) 
	/* H1940 and RX3715 need to reserve this for suspend */



	if (machine_is_h1940() || machine_is_rx3715()) {

		reserve_bootmem_node(pgdat, 0x30003000, 0x1000);

		reserve_bootmem_node(pgdat, 0x30081000, 0x1000);

		reserve_bootmem_node(pgdat, 0x30003000, 0x1000,

				BOOTMEM_DEFAULT);

		reserve_bootmem_node(pgdat, 0x30081000, 0x1000,

				BOOTMEM_DEFAULT);

	}



#ifdef CONFIG_SA1111
@@ -650,7 +654,8 @@ void __init reserve_node_zero(pg_data_t *pgdat) 
	res_size = __pa(swapper_pg_dir) - PHYS_OFFSET;

#endif

	if (res_size)

		reserve_bootmem_node(pgdat, PHYS_OFFSET, res_size);

		reserve_bootmem_node(pgdat, PHYS_OFFSET, res_size,

				BOOTMEM_DEFAULT);

}



/*