lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kdump: add is_vmcore_usable() and vmcore_unusable()

Browse Source 
The usage of elfcorehdr_addr has changed recently such that being set to
ELFCORE_ADDR_MAX is used by is_kdump_kernel() to indicate if the code is
executing in a kernel executed as a crash kernel.

However, arch/ia64/kernel/setup.c:reserve_elfcorehdr will rest
elfcorehdr_addr to ELFCORE_ADDR_MAX on error, which means any subsequent
calls to is_kdump_kernel() will return 0, even though they should return
1.

Ok, at this point in time there are no subsequent calls, but I think its
fair to say that there is ample scope for error or at the very least
confusion.

This patch add an extra state, ELFCORE_ADDR_ERR, which indicates that
elfcorehdr_addr was passed on the command line, and thus execution is
taking place in a crashdump kernel, but vmcore can't be used for some
reason.  This is tested for using is_vmcore_usable() and set using
vmcore_unusable().  A subsequent patch makes use of this new code.

To summarise, the states that elfcorehdr_addr can now be in are as follows:

ELFCORE_ADDR_MAX: not a crashdump kernel
ELFCORE_ADDR_ERR: crashdump kernel but vmcore is unusable
any other value:  crash dump kernel and vmcore is usable

Signed-off-by: Simon Horman <horms@verge.net.au>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Simon Horman
2008-10-18 20:28:29 -07:00
committed by Linus Torvalds
parent 630bf20747
commit 85a0ee342e
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/kernel/setup.c
View File

@@ -509,11 +509,11 @@ int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end)
* to work properly. * to work properly.
*/ */
if (elfcorehdr_addr >= ELFCORE_ADDR_MAX) if (!is_vmcore_usable())
return -EINVAL; return -EINVAL;
if ((length = vmcore_find_descriptor_size(elfcorehdr_addr)) == 0) { if ((length = vmcore_find_descriptor_size(elfcorehdr_addr)) == 0) {
elfcorehdr_addr = ELFCORE_ADDR_MAX; vmcore_unusable();
return -EINVAL; return -EINVAL;
} }

2
fs/proc/vmcore.c
View File

@@ -644,7 +644,7 @@ static int __init vmcore_init(void)
int rc = 0; int rc = 0;
/* If elfcorehdr= has been passed in cmdline, then capture the dump.*/ /* If elfcorehdr= has been passed in cmdline, then capture the dump.*/
if (!(elfcorehdr_addr < ELFCORE_ADDR_MAX)) if (!(is_vmcore_usable()))
return rc; return rc;
rc = parse_crash_elf_headers(); rc = parse_crash_elf_headers();
if (rc) { if (rc) {

24
include/linux/crash_dump.h
View File

@@ -8,6 +8,7 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#define ELFCORE_ADDR_MAX (-1ULL) #define ELFCORE_ADDR_MAX (-1ULL)
#define ELFCORE_ADDR_ERR (-2ULL)
extern unsigned long long elfcorehdr_addr; extern unsigned long long elfcorehdr_addr;
@@ -38,6 +39,29 @@ static inline int is_kdump_kernel(void)
{ {
return (elfcorehdr_addr != ELFCORE_ADDR_MAX) ? 1 : 0; return (elfcorehdr_addr != ELFCORE_ADDR_MAX) ? 1 : 0;
} }
/* is_vmcore_usable() checks if the kernel is booting after a panic and
* the vmcore region is usable.
*
* This makes use of the fact that due to alignment -2ULL is not
* a valid pointer, much in the vain of IS_ERR(), except
* dealing directly with an unsigned long long rather than a pointer.
*/
static inline int is_vmcore_usable(void)
{
return is_kdump_kernel() && elfcorehdr_addr != ELFCORE_ADDR_ERR ? 1 : 0;
}
/* vmcore_unusable() marks the vmcore as unusable,
* without disturbing the logic of is_kdump_kernel()
*/
static inline void vmcore_unusable(void)
{
if (is_kdump_kernel())
elfcorehdr_addr = ELFCORE_ADDR_ERR;
}
#else /* !CONFIG_CRASH_DUMP */ #else /* !CONFIG_CRASH_DUMP */
static inline int is_kdump_kernel(void) { return 0; } static inline int is_kdump_kernel(void) { return 0; }
#endif /* CONFIG_CRASH_DUMP */ #endif /* CONFIG_CRASH_DUMP */