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

Commit 93a72052 authored by Olaf Hering's avatar Olaf Hering Committed by Linus Torvalds
Browse files

crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr,... 


crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn

The Xen PV drivers in a crashed HVM guest can not connect to the dom0
backend drivers because both frontend and backend drivers are still in
connected state.  To run the connection reset function only in case of a
crashdump, the is_kdump_kernel() function needs to be available for the PV
driver modules.

Consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn into
kernel/crash_dump.c Also export elfcorehdr_addr to make is_kdump_kernel()
usable for modules.

Leave 'elfcorehdr' as early_param().  This changes powerpc from __setup()
to early_param().  It adds an address range check from x86 also on ia64
and powerpc.

[akpm@linux-foundation.org: additional #includes]
[akpm@linux-foundation.org: remove elfcorehdr_addr export]
[akpm@linux-foundation.org: fix for Tejun's mm/nobootmem.c changes]
Signed-off-by: default avatarOlaf Hering <olaf@aepfle.de>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 85477277

arch/arm/kernel/crash_dump.c

+0 −3
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
#include <linux/uaccess.h>

#include <linux/io.h>



/* stores the physical address of elf header of crash image */

unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;



/**

 * copy_oldmem_page() - copy one page from old kernel memory

 * @pfn: page frame number to be copied

arch/arm/kernel/setup.c

+0 −24
Original line number Diff line number Diff line
@@ -788,30 +788,6 @@ static void __init reserve_crashkernel(void) 
static inline void reserve_crashkernel(void) {}

#endif /* CONFIG_KEXEC */



/*

 * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by

 * is_kdump_kernel() to determine if we are booting after a panic. Hence

 * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.

 */



#ifdef CONFIG_CRASH_DUMP

/*

 * elfcorehdr= specifies the location of elf core header stored by the crashed

 * kernel. This option will be passed by kexec loader to the capture kernel.

 */

static int __init setup_elfcorehdr(char *arg)

{

	char *end;



	if (!arg)

		return -EINVAL;



	elfcorehdr_addr = memparse(arg, &end);

	return end > arg ? 0 : -EINVAL;

}

early_param("elfcorehdr", setup_elfcorehdr);

#endif /* CONFIG_CRASH_DUMP */



static void __init squash_mem_tags(struct tag *tag)

{

	for (; tag->hdr.size; tag = tag_next(tag))

arch/ia64/kernel/crash_dump.c

+0 −3
Original line number Diff line number Diff line
@@ -13,9 +13,6 @@ 
#include <asm/page.h>

#include <asm/uaccess.h>



/* Stores the physical address of elf header of crash image. */

unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;



/**

 * copy_oldmem_page - copy one page from "oldmem"

 * @pfn: page frame number to be copied

arch/ia64/kernel/efi.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */

#include <linux/module.h>

#include <linux/bootmem.h>

#include <linux/crash_dump.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/types.h>

arch/ia64/kernel/setup.c

+0 −18
Original line number Diff line number Diff line
@@ -479,25 +479,7 @@ static __init int setup_nomca(char *s) 
}

early_param("nomca", setup_nomca);



/*

 * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by

 * is_kdump_kernel() to determine if we are booting after a panic. Hence

 * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.

 */

#ifdef CONFIG_CRASH_DUMP

/* elfcorehdr= specifies the location of elf core header

 * stored by the crashed kernel.

 */

static int __init parse_elfcorehdr(char *arg)

{

	if (!arg)

		return -EINVAL;



        elfcorehdr_addr = memparse(arg, &arg);

	return 0;

}

early_param("elfcorehdr", parse_elfcorehdr);



int __init reserve_elfcorehdr(u64 *start, u64 *end)

{

	u64 length;