Commit 1ecd2765 authored by Bernhard Walle's avatar Bernhard Walle Committed by Ingo Molnar
Browse files

x86: unify crashkernel reservation for 32 and 64 bit 



This patch moves the reserve_crashkernel() to setup.c and removes the
architecture-specific version. Both versions were more or less the same.

I tested it on both x86-64 and i386, with CONFIG_KEXEC on and off (so
that it compiles).

Signed-off-by: default avatarBernhard Walle <bwalle@suse.de>
Cc: yhlu.kernel@gmail.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6236af82

arch/x86/kernel/setup.c

+61 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/init.h>

#include <linux/bootmem.h>

#include <linux/percpu.h>

#include <linux/kexec.h>

#include <asm/smp.h>

#include <asm/percpu.h>

#include <asm/sections.h>
@@ -11,6 +12,7 @@ 
#include <asm/topology.h>

#include <asm/mpspec.h>

#include <asm/apicdef.h>

#include <asm/highmem.h>



#ifdef CONFIG_X86_LOCAL_APIC

unsigned int num_processors;
@@ -404,3 +406,62 @@ EXPORT_SYMBOL(node_to_cpumask); 
#endif /* CONFIG_DEBUG_PER_CPU_MAPS */



#endif /* X86_64_NUMA */





/*

 * --------- Crashkernel reservation ------------------------------

 */



static inline unsigned long long get_total_mem(void)

{

	unsigned long long total;



	total = max_low_pfn - min_low_pfn;

#ifdef CONFIG_HIGHMEM

	total += highend_pfn - highstart_pfn;

#endif



	return total << PAGE_SHIFT;

}



#ifdef CONFIG_KEXEC

void __init reserve_crashkernel(void)

{

	unsigned long long total_mem;

	unsigned long long crash_size, crash_base;

	int ret;



	total_mem = get_total_mem();



	ret = parse_crashkernel(boot_command_line, total_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size > 0) {

		if (crash_base <= 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"you have to specify a base address\n");

			return;

		}



		if (reserve_bootmem_generic(crash_base, crash_size,

					BOOTMEM_EXCLUSIVE) < 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"memory is in use\n");

			return;

		}



		printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "

				"for crashkernel (System RAM: %ldMB)\n",

				(unsigned long)(crash_size >> 20),

				(unsigned long)(crash_base >> 20),

				(unsigned long)(total_mem >> 20));



		crashk_res.start = crash_base;

		crashk_res.end   = crash_base + crash_size - 1;

		insert_resource(&iomem_resource, &crashk_res);

	}

}

#else

void __init reserve_crashkernel(void)

{}

#endif

arch/x86/kernel/setup_32.c

+0 −53
Original line number Diff line number Diff line
@@ -429,59 +429,6 @@ extern unsigned long __init setup_memory(void); 
extern void zone_sizes_init(void);

#endif /* !CONFIG_NEED_MULTIPLE_NODES */



static inline unsigned long long get_total_mem(void)

{

	unsigned long long total;



	total = max_low_pfn - min_low_pfn;

#ifdef CONFIG_HIGHMEM

	total += highend_pfn - highstart_pfn;

#endif



	return total << PAGE_SHIFT;

}



#ifdef CONFIG_KEXEC

static void __init reserve_crashkernel(void)

{

	unsigned long long total_mem;

	unsigned long long crash_size, crash_base;

	int ret;



	total_mem = get_total_mem();



	ret = parse_crashkernel(boot_command_line, total_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size > 0) {

		if (crash_base <= 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"you have to specify a base address\n");

			return;

		}



		if (reserve_bootmem_generic(crash_base, crash_size,

					BOOTMEM_EXCLUSIVE) < 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"memory is in use\n");

			return;

		}



		printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "

				"for crashkernel (System RAM: %ldMB)\n",

				(unsigned long)(crash_size >> 20),

				(unsigned long)(crash_base >> 20),

				(unsigned long)(total_mem >> 20));



		crashk_res.start = crash_base;

		crashk_res.end   = crash_base + crash_size - 1;

		insert_resource(&iomem_resource, &crashk_res);

	}

}

#else

static inline void __init reserve_crashkernel(void)

{}

#endif



#ifdef CONFIG_BLK_DEV_INITRD



static bool do_relocate_initrd = false;

arch/x86/kernel/setup_64.c

+0 −40
Original line number Diff line number Diff line
@@ -228,46 +228,6 @@ static inline void copy_edd(void) 
}

#endif



#ifdef CONFIG_KEXEC

static void __init reserve_crashkernel(void)

{

	unsigned long long total_mem;

	unsigned long long crash_size, crash_base;

	int ret;



	total_mem = ((unsigned long long)max_low_pfn - min_low_pfn) << PAGE_SHIFT;



	ret = parse_crashkernel(boot_command_line, total_mem,

			&crash_size, &crash_base);

	if (ret == 0 && crash_size) {

		if (crash_base <= 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"you have to specify a base address\n");

			return;

		}



		if (reserve_bootmem_generic(crash_base, crash_size,

					BOOTMEM_EXCLUSIVE) < 0) {

			printk(KERN_INFO "crashkernel reservation failed - "

					"memory is in use\n");

			return;

		}



		printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "

				"for crashkernel (System RAM: %ldMB)\n",

				(unsigned long)(crash_size >> 20),

				(unsigned long)(crash_base >> 20),

				(unsigned long)(total_mem >> 20));

		crashk_res.start = crash_base;

		crashk_res.end   = crash_base + crash_size - 1;

		insert_resource(&iomem_resource, &crashk_res);

	}

}

#else

static inline void __init reserve_crashkernel(void)

{}

#endif



/*

 * setup_arch - architecture-specific boot-time initializations

 *

include/asm-x86/setup.h

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
/* Interrupt control for vSMPowered x86_64 systems */

void vsmp_init(void);



/* Crashkernel reservation */

void reserve_crashkernel(void);



#ifndef CONFIG_PARAVIRT

#define paravirt_post_allocator_init()	do {} while (0)

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE