Commit 00bf4098 authored by Bernhard Walle's avatar Bernhard Walle Committed by Linus Torvalds
Browse files

kexec: add BSS to resource tree 



Add the BSS to the resource tree just as kernel text and kernel data are in
the resource tree.  The main reason behind this is to avoid crashkernel
reservation in that area.

While it's not strictly necessary to have the BSS in the resource tree (the
actual collision detection is done in the reserve_bootmem() function before),
the usage of the BSS resource should be presented to the user in /proc/iomem
just as Kernel data and Kernel code.

Note: The patch currently is only implemented for x86 and ia64 (because
efi_initialize_iomem_resources() has the same signature on i386 and ia64).

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarBernhard Walle <bwalle@suse.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: <linux-arch@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c03ab37c

arch/ia64/kernel/efi.c

+3 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,8 @@ efi_memmap_init(unsigned long *s, unsigned long *e) 


void

efi_initialize_iomem_resources(struct resource *code_resource,

			       struct resource *data_resource)

			       struct resource *data_resource,

			       struct resource *bss_resource)

{

	struct resource *res;

	void *efi_map_start, *efi_map_end, *p;
@@ -1171,6 +1172,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
			 */

			insert_resource(res, code_resource);

			insert_resource(res, data_resource);

			insert_resource(res, bss_resource);

#ifdef CONFIG_KEXEC

                        insert_resource(res, &efi_memmap_res);

                        insert_resource(res, &boot_param_res);

arch/ia64/kernel/setup.c

+11 −3
Original line number Diff line number Diff line
@@ -90,7 +90,12 @@ static struct resource code_resource = { 
	.name	= "Kernel code",

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

};

extern char _text[], _end[], _etext[];



static struct resource bss_resource = {

	.name	= "Kernel bss",

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

};

extern char _text[], _end[], _etext[], _edata[], _bss[];



unsigned long ia64_max_cacheline_size;
@@ -200,8 +205,11 @@ static int __init register_memory(void) 
	code_resource.start = ia64_tpa(_text);

	code_resource.end   = ia64_tpa(_etext) - 1;

	data_resource.start = ia64_tpa(_etext);

	data_resource.end   = ia64_tpa(_end) - 1;

	efi_initialize_iomem_resources(&code_resource, &data_resource);

	data_resource.end   = ia64_tpa(_edata) - 1;

	bss_resource.start  = ia64_tpa(_bss);

	bss_resource.end    = ia64_tpa(_end) - 1;

	efi_initialize_iomem_resources(&code_resource, &data_resource,

			&bss_resource);



	return 0;

}

arch/x86/kernel/e820_32.c

+15 −3
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ struct resource code_resource = { 
	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

};



struct resource bss_resource = {

	.name	= "Kernel bss",

	.start	= 0,

	.end	= 0,

	.flags	= IORESOURCE_BUSY | IORESOURCE_MEM

};



static struct resource system_rom_resource = {

	.name	= "System ROM",

	.start	= 0xf0000,
@@ -254,7 +261,9 @@ static void __init probe_roms(void) 
 * and also for regions reported as reserved by the e820.

 */

static void __init

legacy_init_iomem_resources(struct resource *code_resource, struct resource *data_resource)

legacy_init_iomem_resources(struct resource *code_resource,

			    struct resource *data_resource,

			    struct resource *bss_resource)

{

	int i;
@@ -287,6 +296,7 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat 
			 */

			request_resource(res, code_resource);

			request_resource(res, data_resource);

			request_resource(res, bss_resource);

#ifdef CONFIG_KEXEC

			if (crashk_res.start != crashk_res.end)

				request_resource(res, &crashk_res);
@@ -307,9 +317,11 @@ static int __init request_standard_resources(void) 


	printk("Setting up standard PCI resources\n");

	if (efi_enabled)

		efi_initialize_iomem_resources(&code_resource, &data_resource);

		efi_initialize_iomem_resources(&code_resource,

				&data_resource, &bss_resource);

	else

		legacy_init_iomem_resources(&code_resource, &data_resource);

		legacy_init_iomem_resources(&code_resource,

				&data_resource, &bss_resource);



	/* EFI systems may still have VGA */

	request_resource(&iomem_resource, &video_ram_resource);

arch/x86/kernel/e820_64.c

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ unsigned long end_pfn_map; 
 */

static unsigned long __initdata end_user_pfn = MAXMEM>>PAGE_SHIFT;



extern struct resource code_resource, data_resource;

extern struct resource code_resource, data_resource, bss_resource;



/* Check for some hardcoded bad areas that early boot is not allowed to touch */ 

static inline int bad_addr(unsigned long *addrp, unsigned long size)
@@ -225,6 +225,7 @@ void __init e820_reserve_resources(void) 
			 */

			request_resource(res, &code_resource);

			request_resource(res, &data_resource);

			request_resource(res, &bss_resource);

#ifdef CONFIG_KEXEC

			if (crashk_res.start != crashk_res.end)

				request_resource(res, &crashk_res);

arch/x86/kernel/efi_32.c

+3 −1
Original line number Diff line number Diff line
@@ -603,7 +603,8 @@ void __init efi_enter_virtual_mode(void) 


void __init

efi_initialize_iomem_resources(struct resource *code_resource,

			       struct resource *data_resource)

			       struct resource *data_resource,

			       struct resource *bss_resource)

{

	struct resource *res;

	efi_memory_desc_t *md;
@@ -675,6 +676,7 @@ efi_initialize_iomem_resources(struct resource *code_resource, 
		if (md->type == EFI_CONVENTIONAL_MEMORY) {

			request_resource(res, code_resource);

			request_resource(res, data_resource);

			request_resource(res, bss_resource);

#ifdef CONFIG_KEXEC

			request_resource(res, &crashk_res);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE