2005-06-26 05:57:52 +08:00
|
|
|
/*
|
|
|
|
* kexec.c - kexec system call
|
|
|
|
* Copyright (C) 2002-2004 Eric Biederman <ebiederm@xmission.com>
|
|
|
|
*
|
|
|
|
* This source code is licensed under the GNU General Public License,
|
|
|
|
* Version 2. See the file COPYING for more details.
|
|
|
|
*/
|
|
|
|
|
2006-01-12 04:17:46 +08:00
|
|
|
#include <linux/capability.h>
|
2005-06-26 05:57:52 +08:00
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/file.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/kexec.h>
|
2008-08-15 15:40:27 +08:00
|
|
|
#include <linux/mutex.h>
|
2005-06-26 05:57:52 +08:00
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/highmem.h>
|
|
|
|
#include <linux/syscalls.h>
|
|
|
|
#include <linux/reboot.h>
|
|
|
|
#include <linux/ioport.h>
|
2005-06-26 05:58:26 +08:00
|
|
|
#include <linux/hardirq.h>
|
2006-12-07 12:40:41 +08:00
|
|
|
#include <linux/elf.h>
|
|
|
|
#include <linux/elfcore.h>
|
2007-10-17 14:27:27 +08:00
|
|
|
#include <linux/utsname.h>
|
|
|
|
#include <linux/numa.h>
|
2008-07-26 10:45:07 +08:00
|
|
|
#include <linux/suspend.h>
|
|
|
|
#include <linux/device.h>
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
#include <linux/freezer.h>
|
|
|
|
#include <linux/pm.h>
|
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <linux/console.h>
|
2008-10-21 06:23:40 +08:00
|
|
|
#include <linux/vmalloc.h>
|
2009-12-16 08:47:46 +08:00
|
|
|
#include <linux/swap.h>
|
2011-04-20 06:36:11 +08:00
|
|
|
#include <linux/syscore_ops.h>
|
2014-04-08 06:39:20 +08:00
|
|
|
#include <linux/compiler.h>
|
2014-07-31 07:08:39 +08:00
|
|
|
#include <linux/hugetlb.h>
|
2005-06-26 05:58:26 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
#include <asm/page.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <asm/io.h>
|
2007-10-17 14:27:27 +08:00
|
|
|
#include <asm/sections.h>
|
2005-06-26 05:57:52 +08:00
|
|
|
|
2006-01-10 12:51:41 +08:00
|
|
|
/* Per cpu memory for storing cpu states in case of system crash. */
|
2010-02-02 13:38:57 +08:00
|
|
|
note_buf_t __percpu *crash_notes;
|
2006-01-10 12:51:41 +08:00
|
|
|
|
2007-10-17 14:27:27 +08:00
|
|
|
/* vmcoreinfo stuff */
|
2009-04-03 07:58:58 +08:00
|
|
|
static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES];
|
2007-10-17 14:27:27 +08:00
|
|
|
u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4];
|
2007-10-17 14:27:28 +08:00
|
|
|
size_t vmcoreinfo_size;
|
|
|
|
size_t vmcoreinfo_max_size = sizeof(vmcoreinfo_data);
|
2007-10-17 14:27:27 +08:00
|
|
|
|
2013-11-28 06:19:25 +08:00
|
|
|
/* Flag to indicate we are going to kexec a new kernel */
|
|
|
|
bool kexec_in_progress = false;
|
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
/* Location of the reserved area for the crash kernel */
|
|
|
|
struct resource crashk_res = {
|
|
|
|
.name = "Crash kernel",
|
|
|
|
.start = 0,
|
|
|
|
.end = 0,
|
|
|
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
|
|
|
};
|
2013-01-25 04:20:11 +08:00
|
|
|
struct resource crashk_low_res = {
|
2013-04-16 13:23:46 +08:00
|
|
|
.name = "Crash kernel",
|
2013-01-25 04:20:11 +08:00
|
|
|
.start = 0,
|
|
|
|
.end = 0,
|
|
|
|
.flags = IORESOURCE_BUSY | IORESOURCE_MEM
|
|
|
|
};
|
2005-06-26 05:57:52 +08:00
|
|
|
|
2005-06-26 05:58:26 +08:00
|
|
|
int kexec_should_crash(struct task_struct *p)
|
|
|
|
{
|
2007-10-19 14:39:52 +08:00
|
|
|
if (in_interrupt() || !p->pid || is_global_init(p) || panic_on_oops)
|
2005-06-26 05:58:26 +08:00
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
/*
|
|
|
|
* When kexec transitions to the new kernel there is a one-to-one
|
|
|
|
* mapping between physical and virtual addresses. On processors
|
|
|
|
* where you can disable the MMU this is trivial, and easy. For
|
|
|
|
* others it is still a simple predictable page table to setup.
|
|
|
|
*
|
|
|
|
* In that environment kexec copies the new kernel to its final
|
|
|
|
* resting place. This means I can only support memory whose
|
|
|
|
* physical address can fit in an unsigned long. In particular
|
|
|
|
* addresses where (pfn << PAGE_SHIFT) > ULONG_MAX cannot be handled.
|
|
|
|
* If the assembly stub has more restrictive requirements
|
|
|
|
* KEXEC_SOURCE_MEMORY_LIMIT and KEXEC_DEST_MEMORY_LIMIT can be
|
|
|
|
* defined more restrictively in <asm/kexec.h>.
|
|
|
|
*
|
|
|
|
* The code for the transition from the current kernel to the
|
|
|
|
* the new kernel is placed in the control_code_buffer, whose size
|
2008-08-15 15:40:22 +08:00
|
|
|
* is given by KEXEC_CONTROL_PAGE_SIZE. In the best case only a single
|
2005-06-26 05:57:52 +08:00
|
|
|
* page of memory is necessary, but some architectures require more.
|
|
|
|
* Because this memory must be identity mapped in the transition from
|
|
|
|
* virtual to physical addresses it must live in the range
|
|
|
|
* 0 - TASK_SIZE, as only the user space mappings are arbitrarily
|
|
|
|
* modifiable.
|
|
|
|
*
|
|
|
|
* The assembly stub in the control code buffer is passed a linked list
|
|
|
|
* of descriptor pages detailing the source pages of the new kernel,
|
|
|
|
* and the destination addresses of those source pages. As this data
|
|
|
|
* structure is not used in the context of the current OS, it must
|
|
|
|
* be self-contained.
|
|
|
|
*
|
|
|
|
* The code has been made to work with highmem pages and will use a
|
|
|
|
* destination page in its final resting place (if it happens
|
|
|
|
* to allocate it). The end product of this is that most of the
|
|
|
|
* physical address space, and most of RAM can be used.
|
|
|
|
*
|
|
|
|
* Future directions include:
|
|
|
|
* - allocating a page table with the control code buffer identity
|
|
|
|
* mapped, to simplify machine_kexec and make kexec_on_panic more
|
|
|
|
* reliable.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* KIMAGE_NO_DEST is an impossible destination address..., for
|
|
|
|
* allocating pages whose destination address we do not care about.
|
|
|
|
*/
|
|
|
|
#define KIMAGE_NO_DEST (-1UL)
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
static int kimage_is_destination_range(struct kimage *image,
|
|
|
|
unsigned long start, unsigned long end);
|
|
|
|
static struct page *kimage_alloc_page(struct kimage *image,
|
2005-10-21 15:22:03 +08:00
|
|
|
gfp_t gfp_mask,
|
2005-06-26 05:58:28 +08:00
|
|
|
unsigned long dest);
|
2005-06-26 05:57:52 +08:00
|
|
|
|
2014-08-09 05:25:45 +08:00
|
|
|
static int copy_user_segment_list(struct kimage *image,
|
|
|
|
unsigned long nr_segments,
|
|
|
|
struct kexec_segment __user *segments)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
2014-08-09 05:25:45 +08:00
|
|
|
int ret;
|
2005-06-26 05:57:52 +08:00
|
|
|
size_t segment_bytes;
|
|
|
|
|
|
|
|
/* Read in the segments */
|
|
|
|
image->nr_segments = nr_segments;
|
|
|
|
segment_bytes = nr_segments * sizeof(*segments);
|
2014-08-09 05:25:45 +08:00
|
|
|
ret = copy_from_user(image->segment, segments, segment_bytes);
|
|
|
|
if (ret)
|
|
|
|
ret = -EFAULT;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sanity_check_segment_list(struct kimage *image)
|
|
|
|
{
|
|
|
|
int result, i;
|
|
|
|
unsigned long nr_segments = image->nr_segments;
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify we have good destination addresses. The caller is
|
|
|
|
* responsible for making certain we don't attempt to load
|
|
|
|
* the new image into invalid or reserved areas of RAM. This
|
|
|
|
* just verifies it is an address we can use.
|
|
|
|
*
|
|
|
|
* Since the kernel does everything in page size chunks ensure
|
tree-wide: fix comment/printk typos
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-11-02 03:38:34 +08:00
|
|
|
* the destination addresses are page aligned. Too many
|
2005-06-26 05:57:52 +08:00
|
|
|
* special cases crop of when we don't do this. The most
|
|
|
|
* insidious is getting overlapping destination addresses
|
|
|
|
* simply because addresses are changed to page size
|
|
|
|
* granularity.
|
|
|
|
*/
|
|
|
|
result = -EADDRNOTAVAIL;
|
|
|
|
for (i = 0; i < nr_segments; i++) {
|
|
|
|
unsigned long mstart, mend;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
mstart = image->segment[i].mem;
|
|
|
|
mend = mstart + image->segment[i].memsz;
|
|
|
|
if ((mstart & ~PAGE_MASK) || (mend & ~PAGE_MASK))
|
2014-08-09 05:25:45 +08:00
|
|
|
return result;
|
2005-06-26 05:57:52 +08:00
|
|
|
if (mend >= KEXEC_DESTINATION_MEMORY_LIMIT)
|
2014-08-09 05:25:45 +08:00
|
|
|
return result;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Verify our destination addresses do not overlap.
|
|
|
|
* If we alloed overlapping destination addresses
|
|
|
|
* through very weird things can happen with no
|
|
|
|
* easy explanation as one segment stops on another.
|
|
|
|
*/
|
|
|
|
result = -EINVAL;
|
2005-06-26 05:58:28 +08:00
|
|
|
for (i = 0; i < nr_segments; i++) {
|
2005-06-26 05:57:52 +08:00
|
|
|
unsigned long mstart, mend;
|
|
|
|
unsigned long j;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
mstart = image->segment[i].mem;
|
|
|
|
mend = mstart + image->segment[i].memsz;
|
2005-06-26 05:58:28 +08:00
|
|
|
for (j = 0; j < i; j++) {
|
2005-06-26 05:57:52 +08:00
|
|
|
unsigned long pstart, pend;
|
|
|
|
pstart = image->segment[j].mem;
|
|
|
|
pend = pstart + image->segment[j].memsz;
|
|
|
|
/* Do the segments overlap ? */
|
|
|
|
if ((mend > pstart) && (mstart < pend))
|
2014-08-09 05:25:45 +08:00
|
|
|
return result;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ensure our buffer sizes are strictly less than
|
|
|
|
* our memory sizes. This should always be the case,
|
|
|
|
* and it is easier to check up front than to be surprised
|
|
|
|
* later on.
|
|
|
|
*/
|
|
|
|
result = -EINVAL;
|
2005-06-26 05:58:28 +08:00
|
|
|
for (i = 0; i < nr_segments; i++) {
|
2005-06-26 05:57:52 +08:00
|
|
|
if (image->segment[i].bufsz > image->segment[i].memsz)
|
2014-08-09 05:25:45 +08:00
|
|
|
return result;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
|
2014-08-09 05:25:45 +08:00
|
|
|
/*
|
|
|
|
* Verify we have good destination addresses. Normally
|
|
|
|
* the caller is responsible for making certain we don't
|
|
|
|
* attempt to load the new image into invalid or reserved
|
|
|
|
* areas of RAM. But crash kernels are preloaded into a
|
|
|
|
* reserved area of ram. We must ensure the addresses
|
|
|
|
* are in the reserved area otherwise preloading the
|
|
|
|
* kernel could corrupt things.
|
|
|
|
*/
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2014-08-09 05:25:45 +08:00
|
|
|
if (image->type == KEXEC_TYPE_CRASH) {
|
|
|
|
result = -EADDRNOTAVAIL;
|
|
|
|
for (i = 0; i < nr_segments; i++) {
|
|
|
|
unsigned long mstart, mend;
|
|
|
|
|
|
|
|
mstart = image->segment[i].mem;
|
|
|
|
mend = mstart + image->segment[i].memsz - 1;
|
|
|
|
/* Ensure we are within the crash kernel limits */
|
|
|
|
if ((mstart < crashk_res.start) ||
|
|
|
|
(mend > crashk_res.end))
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
2005-06-26 05:57:52 +08:00
|
|
|
|
2014-08-09 05:25:45 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct kimage *do_kimage_alloc_init(void)
|
|
|
|
{
|
|
|
|
struct kimage *image;
|
|
|
|
|
|
|
|
/* Allocate a controlling structure */
|
|
|
|
image = kzalloc(sizeof(*image), GFP_KERNEL);
|
|
|
|
if (!image)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
image->head = 0;
|
|
|
|
image->entry = &image->head;
|
|
|
|
image->last_entry = &image->head;
|
|
|
|
image->control_page = ~0; /* By default this does not apply */
|
|
|
|
image->type = KEXEC_TYPE_DEFAULT;
|
|
|
|
|
|
|
|
/* Initialize the list of control pages */
|
|
|
|
INIT_LIST_HEAD(&image->control_pages);
|
|
|
|
|
|
|
|
/* Initialize the list of destination pages */
|
|
|
|
INIT_LIST_HEAD(&image->dest_pages);
|
|
|
|
|
|
|
|
/* Initialize the list of unusable pages */
|
|
|
|
INIT_LIST_HEAD(&image->unusable_pages);
|
|
|
|
|
|
|
|
return image;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
|
2013-02-28 09:03:29 +08:00
|
|
|
static void kimage_free_page_list(struct list_head *list);
|
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
static int kimage_normal_alloc(struct kimage **rimage, unsigned long entry,
|
2005-06-26 05:58:28 +08:00
|
|
|
unsigned long nr_segments,
|
|
|
|
struct kexec_segment __user *segments)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
int result;
|
|
|
|
struct kimage *image;
|
|
|
|
|
|
|
|
/* Allocate and initialize a controlling structure */
|
2014-08-09 05:25:45 +08:00
|
|
|
image = do_kimage_alloc_init();
|
|
|
|
if (!image)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
image->start = entry;
|
|
|
|
|
|
|
|
result = copy_user_segment_list(image, nr_segments, segments);
|
|
|
|
if (result)
|
|
|
|
goto out_free_image;
|
|
|
|
|
|
|
|
result = sanity_check_segment_list(image);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result)
|
2014-08-09 05:25:45 +08:00
|
|
|
goto out_free_image;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
/*
|
|
|
|
* Find a location for the control code buffer, and add it
|
|
|
|
* the vector of segments so that it's pages will also be
|
|
|
|
* counted as destination pages.
|
|
|
|
*/
|
|
|
|
result = -ENOMEM;
|
|
|
|
image->control_code_page = kimage_alloc_control_pages(image,
|
2008-08-15 15:40:22 +08:00
|
|
|
get_order(KEXEC_CONTROL_PAGE_SIZE));
|
2005-06-26 05:57:52 +08:00
|
|
|
if (!image->control_code_page) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_err("Could not allocate control_code_buffer\n");
|
2014-08-09 05:25:45 +08:00
|
|
|
goto out_free_image;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
|
2008-07-26 10:45:07 +08:00
|
|
|
image->swap_page = kimage_alloc_control_pages(image, 0);
|
|
|
|
if (!image->swap_page) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_err("Could not allocate swap buffer\n");
|
2014-08-09 05:25:45 +08:00
|
|
|
goto out_free_control_pages;
|
2008-07-26 10:45:07 +08:00
|
|
|
}
|
|
|
|
|
2013-02-28 09:03:29 +08:00
|
|
|
*rimage = image;
|
|
|
|
return 0;
|
2014-08-09 05:25:45 +08:00
|
|
|
out_free_control_pages:
|
2013-02-28 09:03:29 +08:00
|
|
|
kimage_free_page_list(&image->control_pages);
|
2014-08-09 05:25:45 +08:00
|
|
|
out_free_image:
|
2013-02-28 09:03:29 +08:00
|
|
|
kfree(image);
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry,
|
2005-06-26 05:58:28 +08:00
|
|
|
unsigned long nr_segments,
|
2005-06-28 13:29:33 +08:00
|
|
|
struct kexec_segment __user *segments)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
int result;
|
|
|
|
struct kimage *image;
|
|
|
|
|
|
|
|
/* Verify we have a valid entry point */
|
2014-08-09 05:25:45 +08:00
|
|
|
if ((entry < crashk_res.start) || (entry > crashk_res.end))
|
|
|
|
return -EADDRNOTAVAIL;
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
/* Allocate and initialize a controlling structure */
|
2014-08-09 05:25:45 +08:00
|
|
|
image = do_kimage_alloc_init();
|
|
|
|
if (!image)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
image->start = entry;
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
/* Enable the special crash kernel control page
|
|
|
|
* allocation policy.
|
|
|
|
*/
|
|
|
|
image->control_page = crashk_res.start;
|
|
|
|
image->type = KEXEC_TYPE_CRASH;
|
|
|
|
|
2014-08-09 05:25:45 +08:00
|
|
|
result = copy_user_segment_list(image, nr_segments, segments);
|
|
|
|
if (result)
|
|
|
|
goto out_free_image;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2014-08-09 05:25:45 +08:00
|
|
|
result = sanity_check_segment_list(image);
|
|
|
|
if (result)
|
|
|
|
goto out_free_image;
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Find a location for the control code buffer, and add
|
|
|
|
* the vector of segments so that it's pages will also be
|
|
|
|
* counted as destination pages.
|
|
|
|
*/
|
|
|
|
result = -ENOMEM;
|
|
|
|
image->control_code_page = kimage_alloc_control_pages(image,
|
2008-08-15 15:40:22 +08:00
|
|
|
get_order(KEXEC_CONTROL_PAGE_SIZE));
|
2005-06-26 05:57:52 +08:00
|
|
|
if (!image->control_code_page) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_err("Could not allocate control_code_buffer\n");
|
2014-08-09 05:25:45 +08:00
|
|
|
goto out_free_image;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
|
2013-02-28 09:03:31 +08:00
|
|
|
*rimage = image;
|
|
|
|
return 0;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2014-08-09 05:25:45 +08:00
|
|
|
out_free_image:
|
2013-02-28 09:03:31 +08:00
|
|
|
kfree(image);
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
static int kimage_is_destination_range(struct kimage *image,
|
|
|
|
unsigned long start,
|
|
|
|
unsigned long end)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
unsigned long i;
|
|
|
|
|
|
|
|
for (i = 0; i < image->nr_segments; i++) {
|
|
|
|
unsigned long mstart, mend;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
mstart = image->segment[i].mem;
|
2005-06-26 05:58:28 +08:00
|
|
|
mend = mstart + image->segment[i].memsz;
|
|
|
|
if ((end > mstart) && (start < mend))
|
2005-06-26 05:57:52 +08:00
|
|
|
return 1;
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-10-21 15:22:03 +08:00
|
|
|
static struct page *kimage_alloc_pages(gfp_t gfp_mask, unsigned int order)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
struct page *pages;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
pages = alloc_pages(gfp_mask, order);
|
|
|
|
if (pages) {
|
|
|
|
unsigned int count, i;
|
|
|
|
pages->mapping = NULL;
|
[PATCH] mm: split page table lock
Christoph Lameter demonstrated very poor scalability on the SGI 512-way, with
a many-threaded application which concurrently initializes different parts of
a large anonymous area.
This patch corrects that, by using a separate spinlock per page table page, to
guard the page table entries in that page, instead of using the mm's single
page_table_lock. (But even then, page_table_lock is still used to guard page
table allocation, and anon_vma allocation.)
In this implementation, the spinlock is tucked inside the struct page of the
page table page: with a BUILD_BUG_ON in case it overflows - which it would in
the case of 32-bit PA-RISC with spinlock debugging enabled.
Splitting the lock is not quite for free: another cacheline access. Ideally,
I suppose we would use split ptlock only for multi-threaded processes on
multi-cpu machines; but deciding that dynamically would have its own costs.
So for now enable it by config, at some number of cpus - since the Kconfig
language doesn't support inequalities, let preprocessor compare that with
NR_CPUS. But I don't think it's worth being user-configurable: for good
testing of both split and unsplit configs, split now at 4 cpus, and perhaps
change that to 8 later.
There is a benefit even for singly threaded processes: kswapd can be attacking
one part of the mm while another part is busy faulting.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-30 09:16:40 +08:00
|
|
|
set_page_private(pages, order);
|
2005-06-26 05:57:52 +08:00
|
|
|
count = 1 << order;
|
2005-06-26 05:58:28 +08:00
|
|
|
for (i = 0; i < count; i++)
|
2005-06-26 05:57:52 +08:00
|
|
|
SetPageReserved(pages + i);
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return pages;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void kimage_free_pages(struct page *page)
|
|
|
|
{
|
|
|
|
unsigned int order, count, i;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
[PATCH] mm: split page table lock
Christoph Lameter demonstrated very poor scalability on the SGI 512-way, with
a many-threaded application which concurrently initializes different parts of
a large anonymous area.
This patch corrects that, by using a separate spinlock per page table page, to
guard the page table entries in that page, instead of using the mm's single
page_table_lock. (But even then, page_table_lock is still used to guard page
table allocation, and anon_vma allocation.)
In this implementation, the spinlock is tucked inside the struct page of the
page table page: with a BUILD_BUG_ON in case it overflows - which it would in
the case of 32-bit PA-RISC with spinlock debugging enabled.
Splitting the lock is not quite for free: another cacheline access. Ideally,
I suppose we would use split ptlock only for multi-threaded processes on
multi-cpu machines; but deciding that dynamically would have its own costs.
So for now enable it by config, at some number of cpus - since the Kconfig
language doesn't support inequalities, let preprocessor compare that with
NR_CPUS. But I don't think it's worth being user-configurable: for good
testing of both split and unsplit configs, split now at 4 cpus, and perhaps
change that to 8 later.
There is a benefit even for singly threaded processes: kswapd can be attacking
one part of the mm while another part is busy faulting.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-10-30 09:16:40 +08:00
|
|
|
order = page_private(page);
|
2005-06-26 05:57:52 +08:00
|
|
|
count = 1 << order;
|
2005-06-26 05:58:28 +08:00
|
|
|
for (i = 0; i < count; i++)
|
2005-06-26 05:57:52 +08:00
|
|
|
ClearPageReserved(page + i);
|
|
|
|
__free_pages(page, order);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void kimage_free_page_list(struct list_head *list)
|
|
|
|
{
|
|
|
|
struct list_head *pos, *next;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
list_for_each_safe(pos, next, list) {
|
|
|
|
struct page *page;
|
|
|
|
|
|
|
|
page = list_entry(pos, struct page, lru);
|
|
|
|
list_del(&page->lru);
|
|
|
|
kimage_free_pages(page);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
static struct page *kimage_alloc_normal_control_pages(struct kimage *image,
|
|
|
|
unsigned int order)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
/* Control pages are special, they are the intermediaries
|
|
|
|
* that are needed while we copy the rest of the pages
|
|
|
|
* to their final resting place. As such they must
|
|
|
|
* not conflict with either the destination addresses
|
|
|
|
* or memory the kernel is already using.
|
|
|
|
*
|
|
|
|
* The only case where we really need more than one of
|
|
|
|
* these are for architectures where we cannot disable
|
|
|
|
* the MMU and must instead generate an identity mapped
|
|
|
|
* page table for all of the memory.
|
|
|
|
*
|
|
|
|
* At worst this runs in O(N) of the image size.
|
|
|
|
*/
|
|
|
|
struct list_head extra_pages;
|
|
|
|
struct page *pages;
|
|
|
|
unsigned int count;
|
|
|
|
|
|
|
|
count = 1 << order;
|
|
|
|
INIT_LIST_HEAD(&extra_pages);
|
|
|
|
|
|
|
|
/* Loop while I can allocate a page and the page allocated
|
|
|
|
* is a destination page.
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
unsigned long pfn, epfn, addr, eaddr;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
pages = kimage_alloc_pages(GFP_KERNEL, order);
|
|
|
|
if (!pages)
|
|
|
|
break;
|
|
|
|
pfn = page_to_pfn(pages);
|
|
|
|
epfn = pfn + count;
|
|
|
|
addr = pfn << PAGE_SHIFT;
|
|
|
|
eaddr = epfn << PAGE_SHIFT;
|
|
|
|
if ((epfn >= (KEXEC_CONTROL_MEMORY_LIMIT >> PAGE_SHIFT)) ||
|
2005-06-26 05:58:28 +08:00
|
|
|
kimage_is_destination_range(image, addr, eaddr)) {
|
2005-06-26 05:57:52 +08:00
|
|
|
list_add(&pages->lru, &extra_pages);
|
|
|
|
pages = NULL;
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
} while (!pages);
|
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
if (pages) {
|
|
|
|
/* Remember the allocated page... */
|
|
|
|
list_add(&pages->lru, &image->control_pages);
|
|
|
|
|
|
|
|
/* Because the page is already in it's destination
|
|
|
|
* location we will never allocate another page at
|
|
|
|
* that address. Therefore kimage_alloc_pages
|
|
|
|
* will not return it (again) and we don't need
|
|
|
|
* to give it an entry in image->segment[].
|
|
|
|
*/
|
|
|
|
}
|
|
|
|
/* Deal with the destination pages I have inadvertently allocated.
|
|
|
|
*
|
|
|
|
* Ideally I would convert multi-page allocations into single
|
2011-03-31 09:57:33 +08:00
|
|
|
* page allocations, and add everything to image->dest_pages.
|
2005-06-26 05:57:52 +08:00
|
|
|
*
|
|
|
|
* For now it is simpler to just free the pages.
|
|
|
|
*/
|
|
|
|
kimage_free_page_list(&extra_pages);
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
return pages;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
|
|
|
|
unsigned int order)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
/* Control pages are special, they are the intermediaries
|
|
|
|
* that are needed while we copy the rest of the pages
|
|
|
|
* to their final resting place. As such they must
|
|
|
|
* not conflict with either the destination addresses
|
|
|
|
* or memory the kernel is already using.
|
|
|
|
*
|
|
|
|
* Control pages are also the only pags we must allocate
|
|
|
|
* when loading a crash kernel. All of the other pages
|
|
|
|
* are specified by the segments and we just memcpy
|
|
|
|
* into them directly.
|
|
|
|
*
|
|
|
|
* The only case where we really need more than one of
|
|
|
|
* these are for architectures where we cannot disable
|
|
|
|
* the MMU and must instead generate an identity mapped
|
|
|
|
* page table for all of the memory.
|
|
|
|
*
|
|
|
|
* Given the low demand this implements a very simple
|
|
|
|
* allocator that finds the first hole of the appropriate
|
|
|
|
* size in the reserved memory region, and allocates all
|
|
|
|
* of the memory up to and including the hole.
|
|
|
|
*/
|
|
|
|
unsigned long hole_start, hole_end, size;
|
|
|
|
struct page *pages;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
pages = NULL;
|
|
|
|
size = (1 << order) << PAGE_SHIFT;
|
|
|
|
hole_start = (image->control_page + (size - 1)) & ~(size - 1);
|
|
|
|
hole_end = hole_start + size - 1;
|
2005-06-26 05:58:28 +08:00
|
|
|
while (hole_end <= crashk_res.end) {
|
2005-06-26 05:57:52 +08:00
|
|
|
unsigned long i;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2011-10-30 22:16:36 +08:00
|
|
|
if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT)
|
2005-06-26 05:57:52 +08:00
|
|
|
break;
|
|
|
|
/* See if I overlap any of the segments */
|
2005-06-26 05:58:28 +08:00
|
|
|
for (i = 0; i < image->nr_segments; i++) {
|
2005-06-26 05:57:52 +08:00
|
|
|
unsigned long mstart, mend;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
mstart = image->segment[i].mem;
|
|
|
|
mend = mstart + image->segment[i].memsz - 1;
|
|
|
|
if ((hole_end >= mstart) && (hole_start <= mend)) {
|
|
|
|
/* Advance the hole to the end of the segment */
|
|
|
|
hole_start = (mend + (size - 1)) & ~(size - 1);
|
|
|
|
hole_end = hole_start + size - 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* If I don't overlap any segments I have found my hole! */
|
|
|
|
if (i == image->nr_segments) {
|
|
|
|
pages = pfn_to_page(hole_start >> PAGE_SHIFT);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
if (pages)
|
2005-06-26 05:57:52 +08:00
|
|
|
image->control_page = hole_end;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return pages;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
struct page *kimage_alloc_control_pages(struct kimage *image,
|
|
|
|
unsigned int order)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
struct page *pages = NULL;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
|
|
|
switch (image->type) {
|
2005-06-26 05:57:52 +08:00
|
|
|
case KEXEC_TYPE_DEFAULT:
|
|
|
|
pages = kimage_alloc_normal_control_pages(image, order);
|
|
|
|
break;
|
|
|
|
case KEXEC_TYPE_CRASH:
|
|
|
|
pages = kimage_alloc_crash_control_pages(image, order);
|
|
|
|
break;
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return pages;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int kimage_add_entry(struct kimage *image, kimage_entry_t entry)
|
|
|
|
{
|
2005-06-26 05:58:28 +08:00
|
|
|
if (*image->entry != 0)
|
2005-06-26 05:57:52 +08:00
|
|
|
image->entry++;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
if (image->entry == image->last_entry) {
|
|
|
|
kimage_entry_t *ind_page;
|
|
|
|
struct page *page;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
page = kimage_alloc_page(image, GFP_KERNEL, KIMAGE_NO_DEST);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (!page)
|
2005-06-26 05:57:52 +08:00
|
|
|
return -ENOMEM;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
ind_page = page_address(page);
|
|
|
|
*image->entry = virt_to_phys(ind_page) | IND_INDIRECTION;
|
|
|
|
image->entry = ind_page;
|
2005-06-26 05:58:28 +08:00
|
|
|
image->last_entry = ind_page +
|
|
|
|
((PAGE_SIZE/sizeof(kimage_entry_t)) - 1);
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
*image->entry = entry;
|
|
|
|
image->entry++;
|
|
|
|
*image->entry = 0;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
static int kimage_set_destination(struct kimage *image,
|
|
|
|
unsigned long destination)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
int result;
|
|
|
|
|
|
|
|
destination &= PAGE_MASK;
|
|
|
|
result = kimage_add_entry(image, destination | IND_DESTINATION);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result == 0)
|
2005-06-26 05:57:52 +08:00
|
|
|
image->destination = destination;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int kimage_add_page(struct kimage *image, unsigned long page)
|
|
|
|
{
|
|
|
|
int result;
|
|
|
|
|
|
|
|
page &= PAGE_MASK;
|
|
|
|
result = kimage_add_entry(image, page | IND_SOURCE);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result == 0)
|
2005-06-26 05:57:52 +08:00
|
|
|
image->destination += PAGE_SIZE;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void kimage_free_extra_pages(struct kimage *image)
|
|
|
|
{
|
|
|
|
/* Walk through and free any extra destination pages I may have */
|
|
|
|
kimage_free_page_list(&image->dest_pages);
|
|
|
|
|
2011-03-31 09:57:33 +08:00
|
|
|
/* Walk through and free any unusable pages I have cached */
|
2014-08-09 05:25:43 +08:00
|
|
|
kimage_free_page_list(&image->unusable_pages);
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
}
|
2008-07-26 10:45:02 +08:00
|
|
|
static void kimage_terminate(struct kimage *image)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
2005-06-26 05:58:28 +08:00
|
|
|
if (*image->entry != 0)
|
2005-06-26 05:57:52 +08:00
|
|
|
image->entry++;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
*image->entry = IND_DONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define for_each_kimage_entry(image, ptr, entry) \
|
|
|
|
for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \
|
2014-06-07 05:37:09 +08:00
|
|
|
ptr = (entry & IND_INDIRECTION) ? \
|
|
|
|
phys_to_virt((entry & PAGE_MASK)) : ptr + 1)
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
static void kimage_free_entry(kimage_entry_t entry)
|
|
|
|
{
|
|
|
|
struct page *page;
|
|
|
|
|
|
|
|
page = pfn_to_page(entry >> PAGE_SHIFT);
|
|
|
|
kimage_free_pages(page);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void kimage_free(struct kimage *image)
|
|
|
|
{
|
|
|
|
kimage_entry_t *ptr, entry;
|
|
|
|
kimage_entry_t ind = 0;
|
|
|
|
|
|
|
|
if (!image)
|
|
|
|
return;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
kimage_free_extra_pages(image);
|
|
|
|
for_each_kimage_entry(image, ptr, entry) {
|
|
|
|
if (entry & IND_INDIRECTION) {
|
|
|
|
/* Free the previous indirection page */
|
2005-06-26 05:58:28 +08:00
|
|
|
if (ind & IND_INDIRECTION)
|
2005-06-26 05:57:52 +08:00
|
|
|
kimage_free_entry(ind);
|
|
|
|
/* Save this indirection page until we are
|
|
|
|
* done with it.
|
|
|
|
*/
|
|
|
|
ind = entry;
|
2014-06-07 05:37:09 +08:00
|
|
|
} else if (entry & IND_SOURCE)
|
2005-06-26 05:57:52 +08:00
|
|
|
kimage_free_entry(entry);
|
|
|
|
}
|
|
|
|
/* Free the final indirection page */
|
2005-06-26 05:58:28 +08:00
|
|
|
if (ind & IND_INDIRECTION)
|
2005-06-26 05:57:52 +08:00
|
|
|
kimage_free_entry(ind);
|
|
|
|
|
|
|
|
/* Handle any machine specific cleanup */
|
|
|
|
machine_kexec_cleanup(image);
|
|
|
|
|
|
|
|
/* Free the kexec control pages... */
|
|
|
|
kimage_free_page_list(&image->control_pages);
|
|
|
|
kfree(image);
|
|
|
|
}
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
static kimage_entry_t *kimage_dst_used(struct kimage *image,
|
|
|
|
unsigned long page)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
kimage_entry_t *ptr, entry;
|
|
|
|
unsigned long destination = 0;
|
|
|
|
|
|
|
|
for_each_kimage_entry(image, ptr, entry) {
|
2005-06-26 05:58:28 +08:00
|
|
|
if (entry & IND_DESTINATION)
|
2005-06-26 05:57:52 +08:00
|
|
|
destination = entry & PAGE_MASK;
|
|
|
|
else if (entry & IND_SOURCE) {
|
2005-06-26 05:58:28 +08:00
|
|
|
if (page == destination)
|
2005-06-26 05:57:52 +08:00
|
|
|
return ptr;
|
|
|
|
destination += PAGE_SIZE;
|
|
|
|
}
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-28 13:29:33 +08:00
|
|
|
return NULL;
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
static struct page *kimage_alloc_page(struct kimage *image,
|
2005-10-21 15:22:03 +08:00
|
|
|
gfp_t gfp_mask,
|
2005-06-26 05:58:28 +08:00
|
|
|
unsigned long destination)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Here we implement safeguards to ensure that a source page
|
|
|
|
* is not copied to its destination page before the data on
|
|
|
|
* the destination page is no longer useful.
|
|
|
|
*
|
|
|
|
* To do this we maintain the invariant that a source page is
|
|
|
|
* either its own destination page, or it is not a
|
|
|
|
* destination page at all.
|
|
|
|
*
|
|
|
|
* That is slightly stronger than required, but the proof
|
|
|
|
* that no problems will not occur is trivial, and the
|
|
|
|
* implementation is simply to verify.
|
|
|
|
*
|
|
|
|
* When allocating all pages normally this algorithm will run
|
|
|
|
* in O(N) time, but in the worst case it will run in O(N^2)
|
|
|
|
* time. If the runtime is a problem the data structures can
|
|
|
|
* be fixed.
|
|
|
|
*/
|
|
|
|
struct page *page;
|
|
|
|
unsigned long addr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Walk through the list of destination pages, and see if I
|
|
|
|
* have a match.
|
|
|
|
*/
|
|
|
|
list_for_each_entry(page, &image->dest_pages, lru) {
|
|
|
|
addr = page_to_pfn(page) << PAGE_SHIFT;
|
|
|
|
if (addr == destination) {
|
|
|
|
list_del(&page->lru);
|
|
|
|
return page;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
page = NULL;
|
|
|
|
while (1) {
|
|
|
|
kimage_entry_t *old;
|
|
|
|
|
|
|
|
/* Allocate a page, if we run out of memory give up */
|
|
|
|
page = kimage_alloc_pages(gfp_mask, 0);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (!page)
|
2005-06-28 13:29:33 +08:00
|
|
|
return NULL;
|
2005-06-26 05:57:52 +08:00
|
|
|
/* If the page cannot be used file it away */
|
2005-06-26 05:58:28 +08:00
|
|
|
if (page_to_pfn(page) >
|
|
|
|
(KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) {
|
2014-08-09 05:25:43 +08:00
|
|
|
list_add(&page->lru, &image->unusable_pages);
|
2005-06-26 05:57:52 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
addr = page_to_pfn(page) << PAGE_SHIFT;
|
|
|
|
|
|
|
|
/* If it is the destination page we want use it */
|
|
|
|
if (addr == destination)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* If the page is not a destination page use it */
|
2005-06-26 05:58:28 +08:00
|
|
|
if (!kimage_is_destination_range(image, addr,
|
|
|
|
addr + PAGE_SIZE))
|
2005-06-26 05:57:52 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* I know that the page is someones destination page.
|
|
|
|
* See if there is already a source page for this
|
|
|
|
* destination page. And if so swap the source pages.
|
|
|
|
*/
|
|
|
|
old = kimage_dst_used(image, addr);
|
|
|
|
if (old) {
|
|
|
|
/* If so move it */
|
|
|
|
unsigned long old_addr;
|
|
|
|
struct page *old_page;
|
|
|
|
|
|
|
|
old_addr = *old & PAGE_MASK;
|
|
|
|
old_page = pfn_to_page(old_addr >> PAGE_SHIFT);
|
|
|
|
copy_highpage(page, old_page);
|
|
|
|
*old = addr | (*old & ~PAGE_MASK);
|
|
|
|
|
|
|
|
/* The old page I have found cannot be a
|
2008-09-23 04:57:45 +08:00
|
|
|
* destination page, so return it if it's
|
|
|
|
* gfp_flags honor the ones passed in.
|
2005-06-26 05:57:52 +08:00
|
|
|
*/
|
2008-09-23 04:57:45 +08:00
|
|
|
if (!(gfp_mask & __GFP_HIGHMEM) &&
|
|
|
|
PageHighMem(old_page)) {
|
|
|
|
kimage_free_pages(old_page);
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-26 05:57:52 +08:00
|
|
|
addr = old_addr;
|
|
|
|
page = old_page;
|
|
|
|
break;
|
2014-06-07 05:37:09 +08:00
|
|
|
} else {
|
2005-06-26 05:57:52 +08:00
|
|
|
/* Place the page on the destination list I
|
|
|
|
* will use it later.
|
|
|
|
*/
|
|
|
|
list_add(&page->lru, &image->dest_pages);
|
|
|
|
}
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return page;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int kimage_load_normal_segment(struct kimage *image,
|
2005-06-26 05:58:28 +08:00
|
|
|
struct kexec_segment *segment)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
unsigned long maddr;
|
2013-05-01 06:28:21 +08:00
|
|
|
size_t ubytes, mbytes;
|
2005-06-26 05:57:52 +08:00
|
|
|
int result;
|
2005-06-28 13:29:33 +08:00
|
|
|
unsigned char __user *buf;
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
result = 0;
|
|
|
|
buf = segment->buf;
|
|
|
|
ubytes = segment->bufsz;
|
|
|
|
mbytes = segment->memsz;
|
|
|
|
maddr = segment->mem;
|
|
|
|
|
|
|
|
result = kimage_set_destination(image, maddr);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result < 0)
|
2005-06-26 05:57:52 +08:00
|
|
|
goto out;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
|
|
|
while (mbytes) {
|
2005-06-26 05:57:52 +08:00
|
|
|
struct page *page;
|
|
|
|
char *ptr;
|
|
|
|
size_t uchunk, mchunk;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
page = kimage_alloc_page(image, GFP_HIGHUSER, maddr);
|
2007-10-18 18:07:05 +08:00
|
|
|
if (!page) {
|
2005-06-26 05:57:52 +08:00
|
|
|
result = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
result = kimage_add_page(image, page_to_pfn(page)
|
|
|
|
<< PAGE_SHIFT);
|
|
|
|
if (result < 0)
|
2005-06-26 05:57:52 +08:00
|
|
|
goto out;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
ptr = kmap(page);
|
|
|
|
/* Start with a clear page */
|
2010-10-27 05:22:27 +08:00
|
|
|
clear_page(ptr);
|
2005-06-26 05:57:52 +08:00
|
|
|
ptr += maddr & ~PAGE_MASK;
|
2013-05-01 06:28:23 +08:00
|
|
|
mchunk = min_t(size_t, mbytes,
|
|
|
|
PAGE_SIZE - (maddr & ~PAGE_MASK));
|
|
|
|
uchunk = min(ubytes, mchunk);
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
result = copy_from_user(ptr, buf, uchunk);
|
|
|
|
kunmap(page);
|
|
|
|
if (result) {
|
2010-08-11 09:03:31 +08:00
|
|
|
result = -EFAULT;
|
2005-06-26 05:57:52 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ubytes -= uchunk;
|
|
|
|
maddr += mchunk;
|
|
|
|
buf += mchunk;
|
|
|
|
mbytes -= mchunk;
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
out:
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int kimage_load_crash_segment(struct kimage *image,
|
2005-06-26 05:58:28 +08:00
|
|
|
struct kexec_segment *segment)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
/* For crash dumps kernels we simply copy the data from
|
|
|
|
* user space to it's destination.
|
|
|
|
* We do things a page at a time for the sake of kmap.
|
|
|
|
*/
|
|
|
|
unsigned long maddr;
|
2013-05-01 06:28:21 +08:00
|
|
|
size_t ubytes, mbytes;
|
2005-06-26 05:57:52 +08:00
|
|
|
int result;
|
2005-06-28 13:29:33 +08:00
|
|
|
unsigned char __user *buf;
|
2005-06-26 05:57:52 +08:00
|
|
|
|
|
|
|
result = 0;
|
|
|
|
buf = segment->buf;
|
|
|
|
ubytes = segment->bufsz;
|
|
|
|
mbytes = segment->memsz;
|
|
|
|
maddr = segment->mem;
|
2005-06-26 05:58:28 +08:00
|
|
|
while (mbytes) {
|
2005-06-26 05:57:52 +08:00
|
|
|
struct page *page;
|
|
|
|
char *ptr;
|
|
|
|
size_t uchunk, mchunk;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
page = pfn_to_page(maddr >> PAGE_SHIFT);
|
2007-10-18 18:07:05 +08:00
|
|
|
if (!page) {
|
2005-06-26 05:57:52 +08:00
|
|
|
result = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ptr = kmap(page);
|
|
|
|
ptr += maddr & ~PAGE_MASK;
|
2013-05-01 06:28:23 +08:00
|
|
|
mchunk = min_t(size_t, mbytes,
|
|
|
|
PAGE_SIZE - (maddr & ~PAGE_MASK));
|
|
|
|
uchunk = min(ubytes, mchunk);
|
|
|
|
if (mchunk > uchunk) {
|
2005-06-26 05:57:52 +08:00
|
|
|
/* Zero the trailing part of the page */
|
|
|
|
memset(ptr + uchunk, 0, mchunk - uchunk);
|
|
|
|
}
|
|
|
|
result = copy_from_user(ptr, buf, uchunk);
|
2006-12-08 01:51:35 +08:00
|
|
|
kexec_flush_icache_page(page);
|
2005-06-26 05:57:52 +08:00
|
|
|
kunmap(page);
|
|
|
|
if (result) {
|
2010-08-11 09:03:31 +08:00
|
|
|
result = -EFAULT;
|
2005-06-26 05:57:52 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ubytes -= uchunk;
|
|
|
|
maddr += mchunk;
|
|
|
|
buf += mchunk;
|
|
|
|
mbytes -= mchunk;
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
out:
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int kimage_load_segment(struct kimage *image,
|
2005-06-26 05:58:28 +08:00
|
|
|
struct kexec_segment *segment)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
int result = -ENOMEM;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
|
|
|
switch (image->type) {
|
2005-06-26 05:57:52 +08:00
|
|
|
case KEXEC_TYPE_DEFAULT:
|
|
|
|
result = kimage_load_normal_segment(image, segment);
|
|
|
|
break;
|
|
|
|
case KEXEC_TYPE_CRASH:
|
|
|
|
result = kimage_load_crash_segment(image, segment);
|
|
|
|
break;
|
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Exec Kernel system call: for obvious reasons only root may call it.
|
|
|
|
*
|
|
|
|
* This call breaks up into three pieces.
|
|
|
|
* - A generic part which loads the new kernel from the current
|
|
|
|
* address space, and very carefully places the data in the
|
|
|
|
* allocated pages.
|
|
|
|
*
|
|
|
|
* - A generic part that interacts with the kernel and tells all of
|
|
|
|
* the devices to shut down. Preventing on-going dmas, and placing
|
|
|
|
* the devices in a consistent state so a later kernel can
|
|
|
|
* reinitialize them.
|
|
|
|
*
|
|
|
|
* - A machine specific part that includes the syscall number
|
2013-09-15 17:35:37 +08:00
|
|
|
* and then copies the image to it's final destination. And
|
2005-06-26 05:57:52 +08:00
|
|
|
* jumps into the image at entry.
|
|
|
|
*
|
|
|
|
* kexec does not sync, or unmount filesystems so if you need
|
|
|
|
* that to happen you need to do that yourself.
|
|
|
|
*/
|
2006-06-23 17:05:07 +08:00
|
|
|
struct kimage *kexec_image;
|
|
|
|
struct kimage *kexec_crash_image;
|
kexec: add sysctl to disable kexec_load
For general-purpose (i.e. distro) kernel builds it makes sense to build
with CONFIG_KEXEC to allow end users to choose what kind of things they
want to do with kexec. However, in the face of trying to lock down a
system with such a kernel, there needs to be a way to disable kexec_load
(much like module loading can be disabled). Without this, it is too easy
for the root user to modify kernel memory even when CONFIG_STRICT_DEVMEM
and modules_disabled are set. With this change, it is still possible to
load an image for use later, then disable kexec_load so the image (or lack
of image) can't be altered.
The intention is for using this in environments where "perfect"
enforcement is hard. Without a verified boot, along with verified
modules, and along with verified kexec, this is trying to give a system a
better chance to defend itself (or at least grow the window of
discoverability) against attack in the face of a privilege escalation.
In my mind, I consider several boot scenarios:
1) Verified boot of read-only verified root fs loading fd-based
verification of kexec images.
2) Secure boot of writable root fs loading signed kexec images.
3) Regular boot loading kexec (e.g. kcrash) image early and locking it.
4) Regular boot with no control of kexec image at all.
1 and 2 don't exist yet, but will soon once the verified kexec series has
landed. 4 is the state of things now. The gap between 2 and 4 is too
large, so this change creates scenario 3, a middle-ground above 4 when 2
and 1 are not possible for a system.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-01-24 07:55:59 +08:00
|
|
|
int kexec_load_disabled;
|
2008-08-15 15:40:27 +08:00
|
|
|
|
|
|
|
static DEFINE_MUTEX(kexec_mutex);
|
2005-06-26 05:57:52 +08:00
|
|
|
|
2009-01-14 21:14:09 +08:00
|
|
|
SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
|
|
|
|
struct kexec_segment __user *, segments, unsigned long, flags)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
struct kimage **dest_image, *image;
|
|
|
|
int result;
|
|
|
|
|
|
|
|
/* We only trust the superuser with rebooting the system. */
|
kexec: add sysctl to disable kexec_load
For general-purpose (i.e. distro) kernel builds it makes sense to build
with CONFIG_KEXEC to allow end users to choose what kind of things they
want to do with kexec. However, in the face of trying to lock down a
system with such a kernel, there needs to be a way to disable kexec_load
(much like module loading can be disabled). Without this, it is too easy
for the root user to modify kernel memory even when CONFIG_STRICT_DEVMEM
and modules_disabled are set. With this change, it is still possible to
load an image for use later, then disable kexec_load so the image (or lack
of image) can't be altered.
The intention is for using this in environments where "perfect"
enforcement is hard. Without a verified boot, along with verified
modules, and along with verified kexec, this is trying to give a system a
better chance to defend itself (or at least grow the window of
discoverability) against attack in the face of a privilege escalation.
In my mind, I consider several boot scenarios:
1) Verified boot of read-only verified root fs loading fd-based
verification of kexec images.
2) Secure boot of writable root fs loading signed kexec images.
3) Regular boot loading kexec (e.g. kcrash) image early and locking it.
4) Regular boot with no control of kexec image at all.
1 and 2 don't exist yet, but will soon once the verified kexec series has
landed. 4 is the state of things now. The gap between 2 and 4 is too
large, so this change creates scenario 3, a middle-ground above 4 when 2
and 1 are not possible for a system.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-01-24 07:55:59 +08:00
|
|
|
if (!capable(CAP_SYS_BOOT) || kexec_load_disabled)
|
2005-06-26 05:57:52 +08:00
|
|
|
return -EPERM;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Verify we have a legal set of flags
|
|
|
|
* This leaves us room for future extensions.
|
|
|
|
*/
|
|
|
|
if ((flags & KEXEC_FLAGS) != (flags & ~KEXEC_ARCH_MASK))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* Verify we are on the appropriate architecture */
|
|
|
|
if (((flags & KEXEC_ARCH_MASK) != KEXEC_ARCH) &&
|
|
|
|
((flags & KEXEC_ARCH_MASK) != KEXEC_ARCH_DEFAULT))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* Put an artificial cap on the number
|
|
|
|
* of segments passed to kexec_load.
|
|
|
|
*/
|
|
|
|
if (nr_segments > KEXEC_SEGMENT_MAX)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
image = NULL;
|
|
|
|
result = 0;
|
|
|
|
|
|
|
|
/* Because we write directly to the reserved memory
|
|
|
|
* region when loading crash kernels we need a mutex here to
|
|
|
|
* prevent multiple crash kernels from attempting to load
|
|
|
|
* simultaneously, and to prevent a crash kernel from loading
|
|
|
|
* over the top of a in use crash kernel.
|
|
|
|
*
|
|
|
|
* KISS: always take the mutex.
|
|
|
|
*/
|
2008-08-15 15:40:27 +08:00
|
|
|
if (!mutex_trylock(&kexec_mutex))
|
2005-06-26 05:57:52 +08:00
|
|
|
return -EBUSY;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
dest_image = &kexec_image;
|
2005-06-26 05:58:28 +08:00
|
|
|
if (flags & KEXEC_ON_CRASH)
|
2005-06-26 05:57:52 +08:00
|
|
|
dest_image = &kexec_crash_image;
|
|
|
|
if (nr_segments > 0) {
|
|
|
|
unsigned long i;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
/* Loading another kernel to reboot into */
|
2005-06-26 05:58:28 +08:00
|
|
|
if ((flags & KEXEC_ON_CRASH) == 0)
|
|
|
|
result = kimage_normal_alloc(&image, entry,
|
|
|
|
nr_segments, segments);
|
2005-06-26 05:57:52 +08:00
|
|
|
/* Loading another kernel to switch to if this one crashes */
|
|
|
|
else if (flags & KEXEC_ON_CRASH) {
|
|
|
|
/* Free any current crash dump kernel before
|
|
|
|
* we corrupt it.
|
|
|
|
*/
|
|
|
|
kimage_free(xchg(&kexec_crash_image, NULL));
|
2005-06-26 05:58:28 +08:00
|
|
|
result = kimage_crash_alloc(&image, entry,
|
|
|
|
nr_segments, segments);
|
2011-10-30 22:16:43 +08:00
|
|
|
crash_map_reserved_pages();
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result)
|
2005-06-26 05:57:52 +08:00
|
|
|
goto out;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2008-07-26 10:45:07 +08:00
|
|
|
if (flags & KEXEC_PRESERVE_CONTEXT)
|
|
|
|
image->preserve_context = 1;
|
2005-06-26 05:57:52 +08:00
|
|
|
result = machine_kexec_prepare(image);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result)
|
2005-06-26 05:57:52 +08:00
|
|
|
goto out;
|
2005-06-26 05:58:28 +08:00
|
|
|
|
|
|
|
for (i = 0; i < nr_segments; i++) {
|
2005-06-26 05:57:52 +08:00
|
|
|
result = kimage_load_segment(image, &image->segment[i]);
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result)
|
2005-06-26 05:57:52 +08:00
|
|
|
goto out;
|
|
|
|
}
|
2008-07-26 10:45:02 +08:00
|
|
|
kimage_terminate(image);
|
2011-10-30 22:16:43 +08:00
|
|
|
if (flags & KEXEC_ON_CRASH)
|
|
|
|
crash_unmap_reserved_pages();
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
/* Install the new kernel, and Uninstall the old */
|
|
|
|
image = xchg(dest_image, image);
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
out:
|
2008-08-15 15:40:27 +08:00
|
|
|
mutex_unlock(&kexec_mutex);
|
2005-06-26 05:57:52 +08:00
|
|
|
kimage_free(image);
|
2005-06-26 05:58:28 +08:00
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2011-10-30 22:16:43 +08:00
|
|
|
/*
|
|
|
|
* Add and remove page tables for crashkernel memory
|
|
|
|
*
|
|
|
|
* Provide an empty default implementation here -- architecture
|
|
|
|
* code may override this
|
|
|
|
*/
|
|
|
|
void __weak crash_map_reserved_pages(void)
|
|
|
|
{}
|
|
|
|
|
|
|
|
void __weak crash_unmap_reserved_pages(void)
|
|
|
|
{}
|
|
|
|
|
2005-06-26 05:57:52 +08:00
|
|
|
#ifdef CONFIG_COMPAT
|
2014-03-05 00:13:42 +08:00
|
|
|
COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
|
|
|
|
compat_ulong_t, nr_segments,
|
|
|
|
struct compat_kexec_segment __user *, segments,
|
|
|
|
compat_ulong_t, flags)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
|
|
|
struct compat_kexec_segment in;
|
|
|
|
struct kexec_segment out, __user *ksegments;
|
|
|
|
unsigned long i, result;
|
|
|
|
|
|
|
|
/* Don't allow clients that don't understand the native
|
|
|
|
* architecture to do anything.
|
|
|
|
*/
|
2005-06-26 05:58:28 +08:00
|
|
|
if ((flags & KEXEC_ARCH_MASK) == KEXEC_ARCH_DEFAULT)
|
2005-06-26 05:57:52 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2005-06-26 05:58:28 +08:00
|
|
|
if (nr_segments > KEXEC_SEGMENT_MAX)
|
2005-06-26 05:57:52 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
ksegments = compat_alloc_user_space(nr_segments * sizeof(out));
|
2014-06-07 05:37:09 +08:00
|
|
|
for (i = 0; i < nr_segments; i++) {
|
2005-06-26 05:57:52 +08:00
|
|
|
result = copy_from_user(&in, &segments[i], sizeof(in));
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result)
|
2005-06-26 05:57:52 +08:00
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
out.buf = compat_ptr(in.buf);
|
|
|
|
out.bufsz = in.bufsz;
|
|
|
|
out.mem = in.mem;
|
|
|
|
out.memsz = in.memsz;
|
|
|
|
|
|
|
|
result = copy_to_user(&ksegments[i], &out, sizeof(out));
|
2005-06-26 05:58:28 +08:00
|
|
|
if (result)
|
2005-06-26 05:57:52 +08:00
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
|
|
|
|
return sys_kexec_load(entry, nr_segments, ksegments, flags);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-06-26 05:58:26 +08:00
|
|
|
void crash_kexec(struct pt_regs *regs)
|
2005-06-26 05:57:52 +08:00
|
|
|
{
|
2008-08-15 15:40:27 +08:00
|
|
|
/* Take the kexec_mutex here to prevent sys_kexec_load
|
2005-06-26 05:57:52 +08:00
|
|
|
* running on one cpu from replacing the crash kernel
|
|
|
|
* we are using after a panic on a different cpu.
|
|
|
|
*
|
|
|
|
* If the crash kernel was not located in a fixed area
|
|
|
|
* of memory the xchg(&kexec_crash_image) would be
|
|
|
|
* sufficient. But since I reuse the memory...
|
|
|
|
*/
|
2008-08-15 15:40:27 +08:00
|
|
|
if (mutex_trylock(&kexec_mutex)) {
|
2006-06-24 06:29:34 +08:00
|
|
|
if (kexec_crash_image) {
|
2006-01-10 12:51:44 +08:00
|
|
|
struct pt_regs fixed_regs;
|
2009-12-22 11:15:43 +08:00
|
|
|
|
2006-01-10 12:51:44 +08:00
|
|
|
crash_setup_regs(&fixed_regs, regs);
|
2007-10-17 14:27:27 +08:00
|
|
|
crash_save_vmcoreinfo();
|
2006-01-10 12:51:44 +08:00
|
|
|
machine_crash_shutdown(&fixed_regs);
|
2006-06-24 06:29:34 +08:00
|
|
|
machine_kexec(kexec_crash_image);
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
2008-08-15 15:40:27 +08:00
|
|
|
mutex_unlock(&kexec_mutex);
|
2005-06-26 05:57:52 +08:00
|
|
|
}
|
|
|
|
}
|
2006-01-10 12:51:41 +08:00
|
|
|
|
2009-12-16 08:47:46 +08:00
|
|
|
size_t crash_get_memory_size(void)
|
|
|
|
{
|
2010-06-30 06:05:28 +08:00
|
|
|
size_t size = 0;
|
2009-12-16 08:47:46 +08:00
|
|
|
mutex_lock(&kexec_mutex);
|
2010-06-30 06:05:28 +08:00
|
|
|
if (crashk_res.end != crashk_res.start)
|
2011-06-10 00:13:32 +08:00
|
|
|
size = resource_size(&crashk_res);
|
2009-12-16 08:47:46 +08:00
|
|
|
mutex_unlock(&kexec_mutex);
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2010-08-25 08:22:58 +08:00
|
|
|
void __weak crash_free_reserved_phys_range(unsigned long begin,
|
|
|
|
unsigned long end)
|
2009-12-16 08:47:46 +08:00
|
|
|
{
|
|
|
|
unsigned long addr;
|
|
|
|
|
2013-04-30 06:06:58 +08:00
|
|
|
for (addr = begin; addr < end; addr += PAGE_SIZE)
|
|
|
|
free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
|
2009-12-16 08:47:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int crash_shrink_memory(unsigned long new_size)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
unsigned long start, end;
|
2012-01-13 09:20:15 +08:00
|
|
|
unsigned long old_size;
|
2012-01-13 09:20:14 +08:00
|
|
|
struct resource *ram_res;
|
2009-12-16 08:47:46 +08:00
|
|
|
|
|
|
|
mutex_lock(&kexec_mutex);
|
|
|
|
|
|
|
|
if (kexec_crash_image) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
start = crashk_res.start;
|
|
|
|
end = crashk_res.end;
|
2012-01-13 09:20:15 +08:00
|
|
|
old_size = (end == 0) ? 0 : end - start + 1;
|
|
|
|
if (new_size >= old_size) {
|
|
|
|
ret = (new_size == old_size) ? 0 : -EINVAL;
|
2009-12-16 08:47:46 +08:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2012-01-13 09:20:14 +08:00
|
|
|
ram_res = kzalloc(sizeof(*ram_res), GFP_KERNEL);
|
|
|
|
if (!ram_res) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2011-10-30 22:16:43 +08:00
|
|
|
start = roundup(start, KEXEC_CRASH_MEM_ALIGN);
|
|
|
|
end = roundup(start + new_size, KEXEC_CRASH_MEM_ALIGN);
|
2009-12-16 08:47:46 +08:00
|
|
|
|
2011-10-30 22:16:43 +08:00
|
|
|
crash_map_reserved_pages();
|
2010-08-25 08:22:58 +08:00
|
|
|
crash_free_reserved_phys_range(end, crashk_res.end);
|
2009-12-16 08:47:46 +08:00
|
|
|
|
2010-06-30 06:05:28 +08:00
|
|
|
if ((start == end) && (crashk_res.parent != NULL))
|
2009-12-16 08:47:46 +08:00
|
|
|
release_resource(&crashk_res);
|
2012-01-13 09:20:14 +08:00
|
|
|
|
|
|
|
ram_res->start = end;
|
|
|
|
ram_res->end = crashk_res.end;
|
|
|
|
ram_res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
|
|
|
|
ram_res->name = "System RAM";
|
|
|
|
|
2010-05-12 05:06:51 +08:00
|
|
|
crashk_res.end = end - 1;
|
2012-01-13 09:20:14 +08:00
|
|
|
|
|
|
|
insert_resource(&iomem_resource, ram_res);
|
2011-10-30 22:16:43 +08:00
|
|
|
crash_unmap_reserved_pages();
|
2009-12-16 08:47:46 +08:00
|
|
|
|
|
|
|
unlock:
|
|
|
|
mutex_unlock(&kexec_mutex);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-12-07 12:40:41 +08:00
|
|
|
static u32 *append_elf_note(u32 *buf, char *name, unsigned type, void *data,
|
|
|
|
size_t data_len)
|
|
|
|
{
|
|
|
|
struct elf_note note;
|
|
|
|
|
|
|
|
note.n_namesz = strlen(name) + 1;
|
|
|
|
note.n_descsz = data_len;
|
|
|
|
note.n_type = type;
|
|
|
|
memcpy(buf, ¬e, sizeof(note));
|
|
|
|
buf += (sizeof(note) + 3)/4;
|
|
|
|
memcpy(buf, name, note.n_namesz);
|
|
|
|
buf += (note.n_namesz + 3)/4;
|
|
|
|
memcpy(buf, data, note.n_descsz);
|
|
|
|
buf += (note.n_descsz + 3)/4;
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void final_note(u32 *buf)
|
|
|
|
{
|
|
|
|
struct elf_note note;
|
|
|
|
|
|
|
|
note.n_namesz = 0;
|
|
|
|
note.n_descsz = 0;
|
|
|
|
note.n_type = 0;
|
|
|
|
memcpy(buf, ¬e, sizeof(note));
|
|
|
|
}
|
|
|
|
|
|
|
|
void crash_save_cpu(struct pt_regs *regs, int cpu)
|
|
|
|
{
|
|
|
|
struct elf_prstatus prstatus;
|
|
|
|
u32 *buf;
|
|
|
|
|
2009-01-01 07:42:15 +08:00
|
|
|
if ((cpu < 0) || (cpu >= nr_cpu_ids))
|
2006-12-07 12:40:41 +08:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* Using ELF notes here is opportunistic.
|
|
|
|
* I need a well defined structure format
|
|
|
|
* for the data I pass, and I need tags
|
|
|
|
* on the data to indicate what information I have
|
|
|
|
* squirrelled away. ELF notes happen to provide
|
|
|
|
* all of that, so there is no need to invent something new.
|
|
|
|
*/
|
2014-06-07 05:37:09 +08:00
|
|
|
buf = (u32 *)per_cpu_ptr(crash_notes, cpu);
|
2006-12-07 12:40:41 +08:00
|
|
|
if (!buf)
|
|
|
|
return;
|
|
|
|
memset(&prstatus, 0, sizeof(prstatus));
|
|
|
|
prstatus.pr_pid = current->pid;
|
2009-02-09 21:17:39 +08:00
|
|
|
elf_core_copy_kernel_regs(&prstatus.pr_reg, regs);
|
2007-05-08 15:28:22 +08:00
|
|
|
buf = append_elf_note(buf, KEXEC_CORE_NOTE_NAME, NT_PRSTATUS,
|
2014-06-07 05:37:09 +08:00
|
|
|
&prstatus, sizeof(prstatus));
|
2006-12-07 12:40:41 +08:00
|
|
|
final_note(buf);
|
|
|
|
}
|
|
|
|
|
2006-01-10 12:51:41 +08:00
|
|
|
static int __init crash_notes_memory_init(void)
|
|
|
|
{
|
|
|
|
/* Allocate memory for saving cpu registers. */
|
|
|
|
crash_notes = alloc_percpu(note_buf_t);
|
|
|
|
if (!crash_notes) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("Kexec: Memory allocation for saving cpu register states failed\n");
|
2006-01-10 12:51:41 +08:00
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2014-04-04 05:48:35 +08:00
|
|
|
subsys_initcall(crash_notes_memory_init);
|
2007-10-17 14:27:27 +08:00
|
|
|
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* parsing the "crashkernel" commandline
|
|
|
|
*
|
|
|
|
* this code is intended to be called from architecture specific code
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This function parses command lines in the format
|
|
|
|
*
|
|
|
|
* crashkernel=ramsize-range:size[,...][@offset]
|
|
|
|
*
|
|
|
|
* The function returns 0 on success and -EINVAL on failure.
|
|
|
|
*/
|
2014-06-07 05:37:09 +08:00
|
|
|
static int __init parse_crashkernel_mem(char *cmdline,
|
|
|
|
unsigned long long system_ram,
|
|
|
|
unsigned long long *crash_size,
|
|
|
|
unsigned long long *crash_base)
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
{
|
|
|
|
char *cur = cmdline, *tmp;
|
|
|
|
|
|
|
|
/* for each entry of the comma-separated list */
|
|
|
|
do {
|
|
|
|
unsigned long long start, end = ULLONG_MAX, size;
|
|
|
|
|
|
|
|
/* get the start of the range */
|
|
|
|
start = memparse(cur, &tmp);
|
|
|
|
if (cur == tmp) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: Memory value expected\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
cur = tmp;
|
|
|
|
if (*cur != '-') {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: '-' expected\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
cur++;
|
|
|
|
|
|
|
|
/* if no ':' is here, than we read the end */
|
|
|
|
if (*cur != ':') {
|
|
|
|
end = memparse(cur, &tmp);
|
|
|
|
if (cur == tmp) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: Memory value expected\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
cur = tmp;
|
|
|
|
if (end <= start) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: end <= start\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*cur != ':') {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: ':' expected\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
cur++;
|
|
|
|
|
|
|
|
size = memparse(cur, &tmp);
|
|
|
|
if (cur == tmp) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("Memory value expected\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
cur = tmp;
|
|
|
|
if (size >= system_ram) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: invalid size\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* match ? */
|
2008-05-01 19:34:49 +08:00
|
|
|
if (system_ram >= start && system_ram < end) {
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
*crash_size = size;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} while (*cur++ == ',');
|
|
|
|
|
|
|
|
if (*crash_size > 0) {
|
2009-07-30 06:02:08 +08:00
|
|
|
while (*cur && *cur != ' ' && *cur != '@')
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
cur++;
|
|
|
|
if (*cur == '@') {
|
|
|
|
cur++;
|
|
|
|
*crash_base = memparse(cur, &tmp);
|
|
|
|
if (cur == tmp) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("Memory value expected after '@'\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* That function parses "simple" (old) crashkernel command lines like
|
|
|
|
*
|
2014-06-07 05:37:09 +08:00
|
|
|
* crashkernel=size[@offset]
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
*
|
|
|
|
* It returns 0 on success and -EINVAL on failure.
|
|
|
|
*/
|
2014-06-07 05:37:09 +08:00
|
|
|
static int __init parse_crashkernel_simple(char *cmdline,
|
|
|
|
unsigned long long *crash_size,
|
|
|
|
unsigned long long *crash_base)
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
{
|
|
|
|
char *cur = cmdline;
|
|
|
|
|
|
|
|
*crash_size = memparse(cmdline, &cur);
|
|
|
|
if (cmdline == cur) {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: memory value expected\n");
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*cur == '@')
|
|
|
|
*crash_base = memparse(cur+1, &cur);
|
2012-03-29 05:42:47 +08:00
|
|
|
else if (*cur != ' ' && *cur != '\0') {
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_warn("crashkernel: unrecognized char\n");
|
2012-03-29 05:42:47 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
#define SUFFIX_HIGH 0
|
|
|
|
#define SUFFIX_LOW 1
|
|
|
|
#define SUFFIX_NULL 2
|
|
|
|
static __initdata char *suffix_tbl[] = {
|
|
|
|
[SUFFIX_HIGH] = ",high",
|
|
|
|
[SUFFIX_LOW] = ",low",
|
|
|
|
[SUFFIX_NULL] = NULL,
|
|
|
|
};
|
|
|
|
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
/*
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
* That function parses "suffix" crashkernel command lines like
|
|
|
|
*
|
|
|
|
* crashkernel=size,[high|low]
|
|
|
|
*
|
|
|
|
* It returns 0 on success and -EINVAL on failure.
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
*/
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
static int __init parse_crashkernel_suffix(char *cmdline,
|
|
|
|
unsigned long long *crash_size,
|
|
|
|
unsigned long long *crash_base,
|
|
|
|
const char *suffix)
|
|
|
|
{
|
|
|
|
char *cur = cmdline;
|
|
|
|
|
|
|
|
*crash_size = memparse(cmdline, &cur);
|
|
|
|
if (cmdline == cur) {
|
|
|
|
pr_warn("crashkernel: memory value expected\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check with suffix */
|
|
|
|
if (strncmp(cur, suffix, strlen(suffix))) {
|
|
|
|
pr_warn("crashkernel: unrecognized char\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
cur += strlen(suffix);
|
|
|
|
if (*cur != ' ' && *cur != '\0') {
|
|
|
|
pr_warn("crashkernel: unrecognized char\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __init char *get_last_crashkernel(char *cmdline,
|
|
|
|
const char *name,
|
|
|
|
const char *suffix)
|
|
|
|
{
|
|
|
|
char *p = cmdline, *ck_cmdline = NULL;
|
|
|
|
|
|
|
|
/* find crashkernel and use the last one if there are more */
|
|
|
|
p = strstr(p, name);
|
|
|
|
while (p) {
|
|
|
|
char *end_p = strchr(p, ' ');
|
|
|
|
char *q;
|
|
|
|
|
|
|
|
if (!end_p)
|
|
|
|
end_p = p + strlen(p);
|
|
|
|
|
|
|
|
if (!suffix) {
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* skip the one with any known suffix */
|
|
|
|
for (i = 0; suffix_tbl[i]; i++) {
|
|
|
|
q = end_p - strlen(suffix_tbl[i]);
|
|
|
|
if (!strncmp(q, suffix_tbl[i],
|
|
|
|
strlen(suffix_tbl[i])))
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
ck_cmdline = p;
|
|
|
|
} else {
|
|
|
|
q = end_p - strlen(suffix);
|
|
|
|
if (!strncmp(q, suffix, strlen(suffix)))
|
|
|
|
ck_cmdline = p;
|
|
|
|
}
|
|
|
|
next:
|
|
|
|
p = strstr(p+1, name);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ck_cmdline)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return ck_cmdline;
|
|
|
|
}
|
|
|
|
|
2013-01-25 04:20:11 +08:00
|
|
|
static int __init __parse_crashkernel(char *cmdline,
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
unsigned long long system_ram,
|
|
|
|
unsigned long long *crash_size,
|
2013-01-25 04:20:11 +08:00
|
|
|
unsigned long long *crash_base,
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
const char *name,
|
|
|
|
const char *suffix)
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
{
|
|
|
|
char *first_colon, *first_space;
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
char *ck_cmdline;
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
|
|
|
|
BUG_ON(!crash_size || !crash_base);
|
|
|
|
*crash_size = 0;
|
|
|
|
*crash_base = 0;
|
|
|
|
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
ck_cmdline = get_last_crashkernel(cmdline, name, suffix);
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
|
|
|
|
if (!ck_cmdline)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-01-25 04:20:11 +08:00
|
|
|
ck_cmdline += strlen(name);
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
if (suffix)
|
|
|
|
return parse_crashkernel_suffix(ck_cmdline, crash_size,
|
|
|
|
crash_base, suffix);
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
/*
|
|
|
|
* if the commandline contains a ':', then that's the extended
|
|
|
|
* syntax -- if not, it must be the classic syntax
|
|
|
|
*/
|
|
|
|
first_colon = strchr(ck_cmdline, ':');
|
|
|
|
first_space = strchr(ck_cmdline, ' ');
|
|
|
|
if (first_colon && (!first_space || first_colon < first_space))
|
|
|
|
return parse_crashkernel_mem(ck_cmdline, system_ram,
|
|
|
|
crash_size, crash_base);
|
|
|
|
|
2013-09-12 05:24:47 +08:00
|
|
|
return parse_crashkernel_simple(ck_cmdline, crash_size, crash_base);
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
}
|
|
|
|
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
/*
|
|
|
|
* That function is the entry point for command line parsing and should be
|
|
|
|
* called from the arch-specific code.
|
|
|
|
*/
|
2013-01-25 04:20:11 +08:00
|
|
|
int __init parse_crashkernel(char *cmdline,
|
|
|
|
unsigned long long system_ram,
|
|
|
|
unsigned long long *crash_size,
|
|
|
|
unsigned long long *crash_base)
|
|
|
|
{
|
|
|
|
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
"crashkernel=", NULL);
|
2013-01-25 04:20:11 +08:00
|
|
|
}
|
2013-04-16 13:23:47 +08:00
|
|
|
|
|
|
|
int __init parse_crashkernel_high(char *cmdline,
|
|
|
|
unsigned long long system_ram,
|
|
|
|
unsigned long long *crash_size,
|
|
|
|
unsigned long long *crash_base)
|
|
|
|
{
|
|
|
|
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
"crashkernel=", suffix_tbl[SUFFIX_HIGH]);
|
2013-04-16 13:23:47 +08:00
|
|
|
}
|
2013-01-25 04:20:11 +08:00
|
|
|
|
|
|
|
int __init parse_crashkernel_low(char *cmdline,
|
|
|
|
unsigned long long system_ram,
|
|
|
|
unsigned long long *crash_size,
|
|
|
|
unsigned long long *crash_base)
|
|
|
|
{
|
|
|
|
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
|
x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low
Per hpa, use crashkernel=X,high crashkernel=Y,low instead of
crashkernel_hign=X crashkernel_low=Y. As that could be extensible.
-v2: according to Vivek, change delimiter to ;
-v3: let hign and low only handle simple form and it conforms to
description in kernel-parameters.txt
still keep crashkernel=X override any crashkernel=X,high
crashkernel=Y,low
-v4: update get_last_crashkernel returning and add more strict
checking in parse_crashkernel_simple() found by HATAYAMA.
-v5: Change delimiter back to , according to HPA.
also separate parse_suffix from parse_simper according to vivek.
so we can avoid @pos in that path.
-v6: Tight the checking about crashkernel=X,highblahblah,high
found by HTYAYAMA.
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1366089828-19692-5-git-send-email-yinghai@kernel.org
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-04-16 13:23:48 +08:00
|
|
|
"crashkernel=", suffix_tbl[SUFFIX_LOW]);
|
2013-01-25 04:20:11 +08:00
|
|
|
}
|
Extended crashkernel command line
This patch adds a extended crashkernel syntax that makes the value of reserved
system RAM dependent on the system RAM itself:
crashkernel=<range1>:<size1>[,<range2>:<size2>,...][@offset]
range=start-[end]
For example:
crashkernel=512M-2G:64M,2G-:128M
The motivation comes from distributors that configure their crashkernel
command line automatically with some configuration tool (YaST, you know ;)).
Of course that tool knows the value of System RAM, but if the user removes
RAM, then the system becomes unbootable or at least unusable and error
handling is very difficult.
This series implements this change for i386, x86_64, ia64, ppc64 and sh. That
should be all platforms that support kdump in current mainline. I tested all
platforms except sh due to the lack of a sh processor.
This patch:
This is the generic part of the patch. It adds a parse_crashkernel() function
in kernel/kexec.c that is called by the architecture specific code that
actually reserves the memory. That function takes the whole command line and
looks itself for "crashkernel=" in it.
If there are multiple occurrences, then the last one is taken. The advantage
is that if you have a bootloader like lilo or elilo which allows you to append
a command line parameter but not to remove one (like in GRUB), then you can
add another crashkernel value for testing at the boot command line and this
one overwrites the command line in the configuration then.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 14:40:58 +08:00
|
|
|
|
2011-10-30 22:16:41 +08:00
|
|
|
static void update_vmcoreinfo_note(void)
|
2007-10-17 14:27:27 +08:00
|
|
|
{
|
2011-10-30 22:16:41 +08:00
|
|
|
u32 *buf = vmcoreinfo_note;
|
2007-10-17 14:27:27 +08:00
|
|
|
|
|
|
|
if (!vmcoreinfo_size)
|
|
|
|
return;
|
|
|
|
buf = append_elf_note(buf, VMCOREINFO_NOTE_NAME, 0, vmcoreinfo_data,
|
|
|
|
vmcoreinfo_size);
|
|
|
|
final_note(buf);
|
|
|
|
}
|
|
|
|
|
2011-10-30 22:16:41 +08:00
|
|
|
void crash_save_vmcoreinfo(void)
|
|
|
|
{
|
2012-07-31 05:42:36 +08:00
|
|
|
vmcoreinfo_append_str("CRASHTIME=%ld\n", get_seconds());
|
2011-10-30 22:16:41 +08:00
|
|
|
update_vmcoreinfo_note();
|
|
|
|
}
|
|
|
|
|
2007-10-17 14:27:27 +08:00
|
|
|
void vmcoreinfo_append_str(const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
char buf[0x50];
|
2013-05-01 06:28:21 +08:00
|
|
|
size_t r;
|
2007-10-17 14:27:27 +08:00
|
|
|
|
|
|
|
va_start(args, fmt);
|
2014-01-28 09:07:13 +08:00
|
|
|
r = vscnprintf(buf, sizeof(buf), fmt, args);
|
2007-10-17 14:27:27 +08:00
|
|
|
va_end(args);
|
|
|
|
|
2013-05-01 06:28:23 +08:00
|
|
|
r = min(r, vmcoreinfo_max_size - vmcoreinfo_size);
|
2007-10-17 14:27:27 +08:00
|
|
|
|
|
|
|
memcpy(&vmcoreinfo_data[vmcoreinfo_size], buf, r);
|
|
|
|
|
|
|
|
vmcoreinfo_size += r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* provide an empty default implementation here -- architecture
|
|
|
|
* code may override this
|
|
|
|
*/
|
2014-04-08 06:39:20 +08:00
|
|
|
void __weak arch_crash_save_vmcoreinfo(void)
|
2007-10-17 14:27:27 +08:00
|
|
|
{}
|
|
|
|
|
2014-04-08 06:39:20 +08:00
|
|
|
unsigned long __weak paddr_vmcoreinfo_note(void)
|
2007-10-17 14:27:27 +08:00
|
|
|
{
|
|
|
|
return __pa((unsigned long)(char *)&vmcoreinfo_note);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init crash_save_vmcoreinfo_init(void)
|
|
|
|
{
|
2008-02-07 16:15:22 +08:00
|
|
|
VMCOREINFO_OSRELEASE(init_uts_ns.name.release);
|
|
|
|
VMCOREINFO_PAGESIZE(PAGE_SIZE);
|
2007-10-17 14:27:27 +08:00
|
|
|
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_SYMBOL(init_uts_ns);
|
|
|
|
VMCOREINFO_SYMBOL(node_online_map);
|
2012-03-29 05:42:47 +08:00
|
|
|
#ifdef CONFIG_MMU
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_SYMBOL(swapper_pg_dir);
|
2012-03-29 05:42:47 +08:00
|
|
|
#endif
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_SYMBOL(_stext);
|
2013-04-30 06:07:37 +08:00
|
|
|
VMCOREINFO_SYMBOL(vmap_area_list);
|
2007-10-17 14:27:27 +08:00
|
|
|
|
|
|
|
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_SYMBOL(mem_map);
|
|
|
|
VMCOREINFO_SYMBOL(contig_page_data);
|
2007-10-17 14:27:27 +08:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SPARSEMEM
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_SYMBOL(mem_section);
|
|
|
|
VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
|
2008-02-07 16:15:20 +08:00
|
|
|
VMCOREINFO_STRUCT_SIZE(mem_section);
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_OFFSET(mem_section, section_mem_map);
|
2007-10-17 14:27:27 +08:00
|
|
|
#endif
|
2008-02-07 16:15:20 +08:00
|
|
|
VMCOREINFO_STRUCT_SIZE(page);
|
|
|
|
VMCOREINFO_STRUCT_SIZE(pglist_data);
|
|
|
|
VMCOREINFO_STRUCT_SIZE(zone);
|
|
|
|
VMCOREINFO_STRUCT_SIZE(free_area);
|
|
|
|
VMCOREINFO_STRUCT_SIZE(list_head);
|
|
|
|
VMCOREINFO_SIZE(nodemask_t);
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_OFFSET(page, flags);
|
|
|
|
VMCOREINFO_OFFSET(page, _count);
|
|
|
|
VMCOREINFO_OFFSET(page, mapping);
|
|
|
|
VMCOREINFO_OFFSET(page, lru);
|
2013-02-28 09:03:25 +08:00
|
|
|
VMCOREINFO_OFFSET(page, _mapcount);
|
|
|
|
VMCOREINFO_OFFSET(page, private);
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_OFFSET(pglist_data, node_zones);
|
|
|
|
VMCOREINFO_OFFSET(pglist_data, nr_zones);
|
2007-10-17 14:27:27 +08:00
|
|
|
#ifdef CONFIG_FLAT_NODE_MEM_MAP
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_OFFSET(pglist_data, node_mem_map);
|
2007-10-17 14:27:27 +08:00
|
|
|
#endif
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_OFFSET(pglist_data, node_start_pfn);
|
|
|
|
VMCOREINFO_OFFSET(pglist_data, node_spanned_pages);
|
|
|
|
VMCOREINFO_OFFSET(pglist_data, node_id);
|
|
|
|
VMCOREINFO_OFFSET(zone, free_area);
|
|
|
|
VMCOREINFO_OFFSET(zone, vm_stat);
|
|
|
|
VMCOREINFO_OFFSET(zone, spanned_pages);
|
|
|
|
VMCOREINFO_OFFSET(free_area, free_list);
|
|
|
|
VMCOREINFO_OFFSET(list_head, next);
|
|
|
|
VMCOREINFO_OFFSET(list_head, prev);
|
2013-04-30 06:07:40 +08:00
|
|
|
VMCOREINFO_OFFSET(vmap_area, va_start);
|
|
|
|
VMCOREINFO_OFFSET(vmap_area, list);
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_LENGTH(zone.free_area, MAX_ORDER);
|
2009-04-03 07:58:57 +08:00
|
|
|
log_buf_kexec_setup();
|
2008-01-09 07:33:05 +08:00
|
|
|
VMCOREINFO_LENGTH(free_area.free_list, MIGRATE_TYPES);
|
2007-10-17 14:27:30 +08:00
|
|
|
VMCOREINFO_NUMBER(NR_FREE_PAGES);
|
2008-04-28 17:13:04 +08:00
|
|
|
VMCOREINFO_NUMBER(PG_lru);
|
|
|
|
VMCOREINFO_NUMBER(PG_private);
|
|
|
|
VMCOREINFO_NUMBER(PG_swapcache);
|
2013-02-28 09:03:25 +08:00
|
|
|
VMCOREINFO_NUMBER(PG_slab);
|
2013-02-28 09:03:27 +08:00
|
|
|
#ifdef CONFIG_MEMORY_FAILURE
|
|
|
|
VMCOREINFO_NUMBER(PG_hwpoison);
|
|
|
|
#endif
|
2014-06-24 04:22:03 +08:00
|
|
|
VMCOREINFO_NUMBER(PG_head_mask);
|
2013-02-28 09:03:25 +08:00
|
|
|
VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
|
2014-07-31 10:05:55 +08:00
|
|
|
#ifdef CONFIG_HUGETLBFS
|
2014-07-31 07:08:39 +08:00
|
|
|
VMCOREINFO_SYMBOL(free_huge_page);
|
2014-07-31 10:05:55 +08:00
|
|
|
#endif
|
2007-10-17 14:27:27 +08:00
|
|
|
|
|
|
|
arch_crash_save_vmcoreinfo();
|
2011-10-30 22:16:41 +08:00
|
|
|
update_vmcoreinfo_note();
|
2007-10-17 14:27:27 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-04-04 05:48:35 +08:00
|
|
|
subsys_initcall(crash_save_vmcoreinfo_init);
|
2008-07-26 10:45:07 +08:00
|
|
|
|
2008-08-15 15:40:21 +08:00
|
|
|
/*
|
|
|
|
* Move into place and start executing a preloaded standalone
|
|
|
|
* executable. If nothing was preloaded return an error.
|
2008-07-26 10:45:07 +08:00
|
|
|
*/
|
|
|
|
int kernel_kexec(void)
|
|
|
|
{
|
|
|
|
int error = 0;
|
|
|
|
|
2008-08-15 15:40:27 +08:00
|
|
|
if (!mutex_trylock(&kexec_mutex))
|
2008-07-26 10:45:07 +08:00
|
|
|
return -EBUSY;
|
|
|
|
if (!kexec_image) {
|
|
|
|
error = -EINVAL;
|
|
|
|
goto Unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_KEXEC_JUMP
|
2008-08-15 15:40:21 +08:00
|
|
|
if (kexec_image->preserve_context) {
|
2011-12-08 05:29:54 +08:00
|
|
|
lock_system_sleep();
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
pm_prepare_console();
|
|
|
|
error = freeze_processes();
|
|
|
|
if (error) {
|
|
|
|
error = -EBUSY;
|
|
|
|
goto Restore_console;
|
|
|
|
}
|
|
|
|
suspend_console();
|
2009-05-25 04:05:42 +08:00
|
|
|
error = dpm_suspend_start(PMSG_FREEZE);
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
if (error)
|
|
|
|
goto Resume_console;
|
2009-05-25 04:05:42 +08:00
|
|
|
/* At this point, dpm_suspend_start() has been called,
|
2012-01-30 03:38:29 +08:00
|
|
|
* but *not* dpm_suspend_end(). We *must* call
|
|
|
|
* dpm_suspend_end() now. Otherwise, drivers for
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
* some devices (e.g. interrupt controllers) become
|
|
|
|
* desynchronized with the actual state of the
|
|
|
|
* hardware at resume time, and evil weirdness ensues.
|
|
|
|
*/
|
2012-01-30 03:38:29 +08:00
|
|
|
error = dpm_suspend_end(PMSG_FREEZE);
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
if (error)
|
2009-03-17 05:34:35 +08:00
|
|
|
goto Resume_devices;
|
|
|
|
error = disable_nonboot_cpus();
|
|
|
|
if (error)
|
|
|
|
goto Enable_cpus;
|
2009-03-17 05:34:06 +08:00
|
|
|
local_irq_disable();
|
2011-04-27 01:15:07 +08:00
|
|
|
error = syscore_suspend();
|
2009-02-23 01:38:50 +08:00
|
|
|
if (error)
|
2009-03-17 05:34:35 +08:00
|
|
|
goto Enable_irqs;
|
2008-08-15 15:40:21 +08:00
|
|
|
} else
|
2008-07-26 10:45:07 +08:00
|
|
|
#endif
|
2008-08-15 15:40:21 +08:00
|
|
|
{
|
2013-11-28 06:19:25 +08:00
|
|
|
kexec_in_progress = true;
|
2008-08-15 15:40:24 +08:00
|
|
|
kernel_restart_prepare(NULL);
|
2013-12-19 09:08:31 +08:00
|
|
|
migrate_to_reboot_cpu();
|
powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode
If we try to perform a kexec when the machine is in ST (Single-Threaded) mode
(ppc64_cpu --smt=off), the kexec operation doesn't succeed properly, and we
get the following messages during boot:
[ 0.089866] POWER8 performance monitor hardware support registered
[ 0.089985] power8-pmu: PMAO restore workaround active.
[ 5.095419] Processor 1 is stuck.
[ 10.097933] Processor 2 is stuck.
[ 15.100480] Processor 3 is stuck.
[ 20.102982] Processor 4 is stuck.
[ 25.105489] Processor 5 is stuck.
[ 30.108005] Processor 6 is stuck.
[ 35.110518] Processor 7 is stuck.
[ 40.113369] Processor 9 is stuck.
[ 45.115879] Processor 10 is stuck.
[ 50.118389] Processor 11 is stuck.
[ 55.120904] Processor 12 is stuck.
[ 60.123425] Processor 13 is stuck.
[ 65.125970] Processor 14 is stuck.
[ 70.128495] Processor 15 is stuck.
[ 75.131316] Processor 17 is stuck.
Note that only the sibling threads are stuck, while the primary threads (0, 8,
16 etc) boot just fine. Looking closer at the previous step of kexec, we observe
that kexec tries to wakeup (bring online) the sibling threads of all the cores,
before performing kexec:
[ 9464.131231] Starting new kernel
[ 9464.148507] kexec: Waking offline cpu 1.
[ 9464.148552] kexec: Waking offline cpu 2.
[ 9464.148600] kexec: Waking offline cpu 3.
[ 9464.148636] kexec: Waking offline cpu 4.
[ 9464.148671] kexec: Waking offline cpu 5.
[ 9464.148708] kexec: Waking offline cpu 6.
[ 9464.148743] kexec: Waking offline cpu 7.
[ 9464.148779] kexec: Waking offline cpu 9.
[ 9464.148815] kexec: Waking offline cpu 10.
[ 9464.148851] kexec: Waking offline cpu 11.
[ 9464.148887] kexec: Waking offline cpu 12.
[ 9464.148922] kexec: Waking offline cpu 13.
[ 9464.148958] kexec: Waking offline cpu 14.
[ 9464.148994] kexec: Waking offline cpu 15.
[ 9464.149030] kexec: Waking offline cpu 17.
Instrumenting this piece of code revealed that the cpu_up() operation actually
fails with -EBUSY. Thus, only the primary threads of all the cores are online
during kexec, and hence this is a sure-shot receipe for disaster, as explained
in commit e8e5c2155b (powerpc/kexec: Fix orphaned offline CPUs across kexec),
as well as in the comment above wake_offline_cpus().
It turns out that cpu_up() was returning -EBUSY because the variable
'cpu_hotplug_disabled' was set to 1; and this disabling of CPU hotplug was done
by migrate_to_reboot_cpu() inside kernel_kexec().
Now, migrate_to_reboot_cpu() was originally written with the assumption that
any further code will not need to perform CPU hotplug, since we are anyway in
the reboot path. However, kexec is clearly not such a case, since we depend on
onlining CPUs, atleast on powerpc.
So re-enable cpu-hotplug after returning from migrate_to_reboot_cpu() in the
kexec path, to fix this regression in kexec on powerpc.
Also, wrap the cpu_up() in powerpc kexec code within a WARN_ON(), so that we
can catch such issues more easily in the future.
Fixes: c97102ba963 (kexec: migrate to reboot cpu)
Cc: stable@vger.kernel.org
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
2014-05-27 18:55:34 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* migrate_to_reboot_cpu() disables CPU hotplug assuming that
|
|
|
|
* no further code needs to use CPU hotplug (which is true in
|
|
|
|
* the reboot case). However, the kexec path depends on using
|
|
|
|
* CPU hotplug again; so re-enable it here.
|
|
|
|
*/
|
|
|
|
cpu_hotplug_enable();
|
2014-06-07 05:37:09 +08:00
|
|
|
pr_emerg("Starting new kernel\n");
|
2008-07-26 10:45:07 +08:00
|
|
|
machine_shutdown();
|
|
|
|
}
|
|
|
|
|
|
|
|
machine_kexec(kexec_image);
|
|
|
|
|
|
|
|
#ifdef CONFIG_KEXEC_JUMP
|
2008-08-15 15:40:21 +08:00
|
|
|
if (kexec_image->preserve_context) {
|
2011-04-20 06:36:11 +08:00
|
|
|
syscore_resume();
|
2009-03-17 05:34:35 +08:00
|
|
|
Enable_irqs:
|
2008-07-26 10:45:07 +08:00
|
|
|
local_irq_enable();
|
2009-03-17 05:34:35 +08:00
|
|
|
Enable_cpus:
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
enable_nonboot_cpus();
|
2012-01-30 03:38:29 +08:00
|
|
|
dpm_resume_start(PMSG_RESTORE);
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
Resume_devices:
|
2009-05-25 04:05:42 +08:00
|
|
|
dpm_resume_end(PMSG_RESTORE);
|
kexec jump: save/restore device state
This patch implements devices state save/restore before after kexec.
This patch together with features in kexec_jump patch can be used for
following:
- A simple hibernation implementation without ACPI support. You can kexec a
hibernating kernel, save the memory image of original system and shutdown
the system. When resuming, you restore the memory image of original system
via ordinary kexec load then jump back.
- Kernel/system debug through making system snapshot. You can make system
snapshot, jump back, do some thing and make another system snapshot.
- Cooperative multi-kernel/system. With kexec jump, you can switch between
several kernels/systems quickly without boot process except the first time.
This appears like swap a whole kernel/system out/in.
- A general method to call program in physical mode (paging turning
off). This can be used to invoke BIOS code under Linux.
The following user-space tools can be used with kexec jump:
- kexec-tools needs to be patched to support kexec jump. The patches
and the precompiled kexec can be download from the following URL:
source: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-src_git_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec-tools-patches_git_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/kexec-tools/kexec_git_kh10
- makedumpfile with patches are used as memory image saving tool, it
can exclude free pages from original kernel memory image file. The
patches and the precompiled makedumpfile can be download from the
following URL:
source: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-src_cvs_kh10.tar.bz2
patches: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile-patches_cvs_kh10.tar.bz2
binary: http://khibernation.sourceforge.net/download/release_v10/makedumpfile/makedumpfile_cvs_kh10
- An initramfs image can be used as the root file system of kexeced
kernel. An initramfs image built with "BuildRoot" can be downloaded
from the following URL:
initramfs image: http://khibernation.sourceforge.net/download/release_v10/initramfs/rootfs_cvs_kh10.gz
All user space tools above are included in the initramfs image.
Usage example of simple hibernation:
1. Compile and install patched kernel with following options selected:
CONFIG_X86_32=y
CONFIG_RELOCATABLE=y
CONFIG_KEXEC=y
CONFIG_CRASH_DUMP=y
CONFIG_PM=y
CONFIG_HIBERNATION=y
CONFIG_KEXEC_JUMP=y
2. Build an initramfs image contains kexec-tool and makedumpfile, or
download the pre-built initramfs image, called rootfs.gz in
following text.
3. Prepare a partition to save memory image of original kernel, called
hibernating partition in following text.
4. Boot kernel compiled in step 1 (kernel A).
5. In the kernel A, load kernel compiled in step 1 (kernel B) with
/sbin/kexec. The shell command line can be as follow:
/sbin/kexec --load-preserve-context /boot/bzImage --mem-min=0x100000
--mem-max=0xffffff --initrd=rootfs.gz
6. Boot the kernel B with following shell command line:
/sbin/kexec -e
7. The kernel B will boot as normal kexec. In kernel B the memory
image of kernel A can be saved into hibernating partition as
follow:
jump_back_entry=`cat /proc/cmdline | tr ' ' '\n' | grep kexec_jump_back_entry | cut -d '='`
echo $jump_back_entry > kexec_jump_back_entry
cp /proc/vmcore dump.elf
Then you can shutdown the machine as normal.
8. Boot kernel compiled in step 1 (kernel C). Use the rootfs.gz as
root file system.
9. In kernel C, load the memory image of kernel A as follow:
/sbin/kexec -l --args-none --entry=`cat kexec_jump_back_entry` dump.elf
10. Jump back to the kernel A as follow:
/sbin/kexec -e
Then, kernel A is resumed.
Implementation point:
To support jumping between two kernels, before jumping to (executing)
the new kernel and jumping back to the original kernel, the devices
are put into quiescent state, and the state of devices and CPU is
saved. After jumping back from kexeced kernel and jumping to the new
kernel, the state of devices and CPU are restored accordingly. The
devices/CPU state save/restore code of software suspend is called to
implement corresponding function.
Known issues:
- Because the segment number supported by sys_kexec_load is limited,
hibernation image with many segments may not be load. This is
planned to be eliminated by adding a new flag to sys_kexec_load to
make a image can be loaded with multiple sys_kexec_load invoking.
Now, only the i386 architecture is supported.
Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-07-26 10:45:10 +08:00
|
|
|
Resume_console:
|
|
|
|
resume_console();
|
|
|
|
thaw_processes();
|
|
|
|
Restore_console:
|
|
|
|
pm_restore_console();
|
2011-12-08 05:29:54 +08:00
|
|
|
unlock_system_sleep();
|
2008-07-26 10:45:07 +08:00
|
|
|
}
|
2008-08-15 15:40:21 +08:00
|
|
|
#endif
|
2008-07-26 10:45:07 +08:00
|
|
|
|
|
|
|
Unlock:
|
2008-08-15 15:40:27 +08:00
|
|
|
mutex_unlock(&kexec_mutex);
|
2008-07-26 10:45:07 +08:00
|
|
|
return error;
|
|
|
|
}
|