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

Commit 57cac4d1 authored by Vivek Goyal's avatar Vivek Goyal Committed by Linus Torvalds
Browse files

kdump: make elfcorehdr_addr independent of CONFIG_PROC_VMCORE 



o elfcorehdr_addr is used by not only the code under CONFIG_PROC_VMCORE
  but also by the code which is not inside CONFIG_PROC_VMCORE.  For
  example, is_kdump_kernel() is used by powerpc code to determine if
  kernel is booting after a panic then use previous kernel's TCE table.
  So even if CONFIG_PROC_VMCORE is not set in second kernel, one should be
  able to correctly determine that we are booting after a panic and setup
  calgary iommu accordingly.

o So remove the assumption that elfcorehdr_addr is under
  CONFIG_PROC_VMCORE.

o Move definition of elfcorehdr_addr to arch dependent crash files.
  (Unfortunately crash dump does not have an arch independent file
  otherwise that would have been the best place).

o kexec.c is not the right place as one can Have CRASH_DUMP enabled in
  second kernel without KEXEC being enabled.

o I don't see sh setup code parsing the command line for
  elfcorehdr_addr.  I am wondering how does vmcore interface work on sh.
  Anyway, I am atleast defining elfcoredhr_addr so that compilation is not
  broken on sh.

Signed-off-by: default avatarVivek Goyal <vgoyal@redhat.com>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarSimon Horman <horms@verge.net.au>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
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 293adee6

arch/ia64/kernel/crash_dump.c

+4 −0
Original line number Diff line number Diff line
@@ -8,10 +8,14 @@ 


#include <linux/errno.h>

#include <linux/types.h>

#include <linux/crash_dump.h>



#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/setup.c

+8 −1
Original line number Diff line number Diff line
@@ -478,7 +478,12 @@ static __init int setup_nomca(char *s) 
}

early_param("nomca", setup_nomca);



#ifdef CONFIG_PROC_VMCORE

/*

 * 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.

 */
@@ -491,7 +496,9 @@ static int __init parse_elfcorehdr(char *arg) 
	return 0;

}

early_param("elfcorehdr", parse_elfcorehdr);

#endif



#ifdef CONFIG_PROC_VMCORE

int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end)

{

	unsigned long length;

arch/powerpc/kernel/crash_dump.c

+8 −2
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ 
#define DBG(fmt...)

#endif



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

unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;



void __init reserve_kdump_trampoline(void)

{

	lmb_reserve(0, KDUMP_RESERVE_LIMIT);
@@ -66,7 +69,11 @@ void __init setup_kdump_trampoline(void) 
	DBG(" <- setup_kdump_trampoline()\n");

}



#ifdef CONFIG_PROC_VMCORE

/*

 * 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.

 */

static int __init parse_elfcorehdr(char *p)

{

	if (p)
@@ -75,7 +82,6 @@ static int __init parse_elfcorehdr(char *p) 
	return 1;

}

__setup("elfcorehdr=", parse_elfcorehdr);

#endif



static int __init parse_savemaxmem(char *p)

{

arch/sh/kernel/crash_dump.c

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
#include <linux/io.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/x86/kernel/crash_dump_32.c

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 


static void *kdump_buf_page;



/* 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