kexec jump -v8 : kexec jump basic
Subsystems (9)
PATCH 1/3 kexec jump -v8 : kexec jump basic
This patch implements the functionality of jumping between the kexeced kernel and the original kernel.
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.
To support jumping without reserving memory. One shadow backup page (source page) is allocated for each page used by new (kexeced) kernel (destination page). When do kexec_load, the image of new kernel is loaded into source pages, and before executing, the destination pages and the source pages are swapped, so the contents of destination pages are backupped. Before jumping to the new (kexeced) kernel and after jumping back to the original kernel, the destination pages and the source pages are swapped too.
A jump back protocol for kexec is defined and documented. It is an extension to ordinary function calling protocol. So, the facility provided by this patch can be used to call ordinary C function in physical mode.
A flag named KEXEC_PRESERVE_CONTEXT for sys_kexec_load is added to indicate that the loaded kernel image is used for jumping back.
--- Documentation/i386/jump_back_protocol.txt | 66 ++++++++++ arch/powerpc/kernel/machine_kexec.c | 2 arch/ppc/kernel/machine_kexec.c | 2 arch/sh/kernel/machine_kexec.c | 2 arch/x86/kernel/machine_kexec_32.c | 39 +++++- arch/x86/kernel/machine_kexec_64.c | 2 arch/x86/kernel/relocate_kernel_32.S | 194 ++++++++++++++++++++++++++---- include/asm-x86/kexec_32.h | 34 ++++- include/linux/kexec.h | 14 +- kernel/kexec.c | 65 +++++++++- kernel/power/Kconfig | 2 kernel/sys.c | 35 +++-- 12 files changed, 403 insertions(+), 54 deletions(-)
arch/x86/kernel/machine_kexec_32.c +33 -6
@@ -20,6 +20,7 @@#include <asm/cpufeature.h> #include <asm/desc.h> #include <asm/system.h> +#include <asm/cacheflush.h> #define PAGE_ALIGNED __attribute__ ((__aligned__(PAGE_SIZE))) static u32 kexec_pgd[1024] PAGE_ALIGNED;
@@ -83,10 +84,14 @@ static void load_segments(void)* reboot code buffer to allow us to avoid allocations * later. * -* Currently nothing. +* Turn off NX bit for control page. */ int machine_kexec_prepare (struct kimage *image) { +if (nx_enabled) { +change_page_attr (image->control_code_page,1 ,PAGE_KERNEL_EXEC ); +global_flush_tlb (); + }return 0 ; }
@@ -96,25 +101,45 @@ int machine_kexec_prepare(struct kimage*/ void machine_kexec_cleanup (struct kimage *image) { +if (nx_enabled) { +change_page_attr (image->control_code_page,1 ,PAGE_KERNEL ); +global_flush_tlb (); + } }/* * Do not allocate memory (or fail in any way) in machine_kexec(). * We are past the point of no return, committed to rebooting now. */ -NORET_TYPE void machine_kexec(struct kimage *image) +void machine_kexec (struct kimage *image) {unsigned long page_list[PAGES_NR ];void *control_page; + asmlinkage NORET_TYPE void + (*relocate_kernel_ptr)(unsigned long indirection_page, + unsigned long control_page, + unsigned long start_address, + unsigned int has_pae) ATTRIB_NORET;/* Interrupts aren't acceptable while we reboot */ local_irq_disable (); control_page =page_address (image->control_code_page); -memcpy (control_page, relocate_kernel,PAGE_SIZE ); +memcpy (control_page, relocate_page,PAGE_SIZE /2 ); +KJUMP_MAGIC (control_page) =0 ; +if (image->preserve_context) { +KJUMP_MAGIC (control_page) =KJUMP_MAGIC_NUMBER ; +if (kexec_jump_save_cpu (control_page)) { + image->start =KJUMP_ENTRY (control_page); +return ; + } + } + + relocate_kernel_ptr = control_page + + ((void *)relocate_kernel - (void *)relocate_page); page_list[PA_CONTROL_PAGE ] =__pa (control_page); - page_list[VA_CONTROL_PAGE ] = (unsigned long )relocate_kernel; + page_list[VA_CONTROL_PAGE ] = (unsigned long )control_page; page_list[PA_PGD ] =__pa (kexec_pgd); page_list[VA_PGD ] = (unsigned long )kexec_pgd;#ifdef CONFIG_X86_PAE
@@ -127,6 +152,7 @@ NORET_TYPE void machine_kexec(struct kim page_list[VA_PTE_0 ] = (unsigned long )kexec_pte0; page_list[PA_PTE_1 ] =__pa (kexec_pte1); page_list[VA_PTE_1 ] = (unsigned long )kexec_pte1; + page_list[PA_SWAP_PAGE ] = (page_to_pfn (image->swap_page) <<PAGE_SHIFT );/* The segment registers are funny things, they have both a * visible and an invisible part. Whenever the visible part is
@@ -145,8 +171,9 @@ NORET_TYPE void machine_kexec(struct kimset_idt (phys_to_virt (0 ),0 );/* now call it */ -relocate_kernel ((unsigned long )image->head, (unsigned long )page_list, - image->start, cpu_has_pae); +relocate_kernel_ptr ((unsigned long )image->head, + (unsigned long )page_list, + image->start, cpu_has_pae); }void arch_crash_save_vmcoreinfo (void )
include/asm-x86/kexec_32.h +28 -6
@@ -9,16 +9,35 @@#define VA_PTE_0 5#define PA_PTE_1 6#define VA_PTE_1 7 +#define PA_SWAP_PAGE 8#ifdef CONFIG_X86_PAE -#define PA_PMD_0 8 -#define VA_PMD_0 9 -#define PA_PMD_1 10 -#define VA_PMD_1 11 -#define PAGES_NR 12 +#define PA_PMD_0 9 +#define VA_PMD_0 10 +#define PA_PMD_1 11 +#define VA_PMD_1 12 +#define PAGES_NR 13#else -#define PAGES_NR 8 +#define PAGES_NR 9#endif +#define KJUMP_DATA_BASE 0x800 + +#define KJUMP_MAGIC_NUMBER 0xe1b6a57d + +#define KJUMP_DATA (buf) ((__u8 *)(buf)+KJUMP_DATA_BASE) +#define KJUMP_OFF (off) (KJUMP_DATA_BASE+(off)) + +/* +* The following are not a part of jump back protocol, for internal +* use only +*/ +#define KJUMP_MAGIC_OFF KJUMP_OFF(0x0) +#define KJUMP_MAGIC (buf) (*(__u32 *)(KJUMP_DATA(buf)+0x0)) +#define KJUMP_ENTRY_OFF KJUMP_OFF(0x4) +#define KJUMP_ENTRY (buf) (*(__u32 *)(KJUMP_DATA(buf)+0x4)) +/* Other internal data fields base */ +#define KJUMP_OTHER_OFF KJUMP_OFF(0x8) +#ifndef __ASSEMBLY__#include <asm/ptrace.h>
@@ -94,6 +113,9 @@ relocate_kernel(unsigned long indirectiounsigned long start_address, unsigned int has_pae) ATTRIB_NORET; +extern char relocate_page[PAGE_SIZE ]; + +extern asmlinkage int kexec_jump_save_cpu(void *buf);#endif /* __ASSEMBLY__ */ #endif /* _I386_KEXEC_H */
include/linux/kexec.h +10 -4
@@ -83,6 +83,7 @@ struct kimage {unsigned long start;struct page *control_code_page; +struct page *swap_page;unsigned long nr_segments;struct kexec_segment segment[KEXEC_SEGMENT_MAX ];
@@ -98,18 +99,20 @@ struct kimage { unsigned int type : 1;#define KEXEC_TYPE_DEFAULT 0#define KEXEC_TYPE_CRASH 1 + unsigned int preserve_context : 1; };/* kexec interface functions */ -extern NORET_TYPE void machine_kexec(struct kimage *image) ATTRIB_NORET; +extern void machine_kexec (struct kimage *image);extern int machine_kexec_prepare (struct kimage *image);extern void machine_kexec_cleanup (struct kimage *image);extern asmlinkage long sys_kexec_load (unsigned long entry,unsigned long nr_segments,struct kexec_segment __user *segments,unsigned long flags); +extern int kexec_jump (struct kimage *image);#ifdef CONFIG_COMPAT extern asmlinkage long compat_sys_kexec_load(unsigned long entry, unsigned long nr_segments,
@@ -151,13 +154,15 @@ unsigned long paddr_vmcoreinfo_note(voidextern struct kimage *kexec_image;extern struct kimage *kexec_crash_image; +extern int kexec_lock;#ifndef kexec_flush_icache_page#define kexec_flush_icache_page (page)#endif -#define KEXEC_ON_CRASH 0x00000001 -#define KEXEC_ARCH_MASK 0xffff0000 +#define KEXEC_ON_CRASH 0x00000001 +#define KEXEC_PRESERVE_CONTEXT 0x00000002 +#define KEXEC_ARCH_MASK 0xffff0000/* These values match the ELF architecture values. * Unless there is a good reason that should continue to be the case.
@@ -174,7 +179,8 @@ extern struct kimage *kexec_crash_image;#define KEXEC_ARCH_MIPS_LE (10 << 16)#define KEXEC_ARCH_MIPS ( 8 << 16) -#define KEXEC_FLAGS (KEXEC_ON_CRASH)/* List of defined/legal kexec flags */ +/* List of defined/legal kexec flags */ +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT)#define VMCOREINFO_BYTES (4096)#define VMCOREINFO_NOTE_NAME "VMCOREINFO"
kernel/kexec.c +64 -1
92 lines not on this page · raw message
kernel/sys.c +23 -12
@@ -301,18 +301,26 @@ EXPORT_SYMBOL_GPL(kernel_restart);* Move into place and start executing a preloaded standalone * executable. If nothing was preloaded return an error. */ -static void kernel_kexec (void ) +static int kernel_kexec (void ) { +int ret = -ENOSYS ;#ifdef CONFIG_KEXEC -struct kimage *image; - image =xchg (&kexec_image,NULL ); -if (!image) -return ; -kernel_restart_prepare (NULL ); -printk (KERN_EMERG "Starting new kernel\n" ); -machine_shutdown (); -machine_kexec (image); +if (xchg (&kexec_lock,1 )) +return -EBUSY ; +if (!kexec_image) { + ret = -EINVAL ; + goto unlock; + } +if (!kexec_image->preserve_context) { +kernel_restart_prepare (NULL ); +printk (KERN_EMERG "Starting new kernel\n" ); +machine_shutdown (); + } + ret =kexec_jump (kexec_image); +unlock: +xchg (&kexec_lock,0 );#endif +return ret; }static void kernel_shutdown_prepare (enum system_states state)
@@ -420,9 +428,12 @@ asmlinkage long sys_reboot(int magic1, ibreak ;case LINUX_REBOOT_CMD_KEXEC : -kernel_kexec (); -unlock_kernel (); -return -EINVAL ; + { +int ret; + ret =kernel_kexec (); +unlock_kernel (); +return ret; + }#ifdef CONFIG_HIBERNATION case LINUX_REBOOT_CMD_SW_SUSPEND :
kernel/power/Kconfig +1 -1
@@ -92,7 +92,7 @@ config PM_SLEEP_SMP config PM_SLEEP bool - depends on SUSPEND || HIBERNATION + depends on SUSPEND || HIBERNATION || KEXEC default y config SUSPEND
arch/x86/kernel/relocate_kernel_32.S +174 -20
240 lines not on this page · raw message
Documentation/i386/jump_back_protocol.txt new file +66 -0
66 lines not on this page · raw message
arch/ppc/kernel/machine_kexec.c +1 -1
@@ -66,7 +66,7 @@ void machine_kexec_cleanup(struct kimage* Do not allocate memory (or fail in any way) in machine_kexec(). * We are past the point of no return, committed to rebooting now. */ -NORET_TYPE void machine_kexec(struct kimage *image) +void machine_kexec (struct kimage *image) {if (ppc_md.machine_kexec) ppc_md.machine_kexec (image);
arch/x86/kernel/machine_kexec_64.c +1 -1
@@ -179,7 +179,7 @@ void machine_kexec_cleanup(struct kimage* Do not allocate memory (or fail in any way) in machine_kexec(). * We are past the point of no return, committed to rebooting now. */ -NORET_TYPE void machine_kexec(struct kimage *image) +void machine_kexec (struct kimage *image) {unsigned long page_list[PAGES_NR ];void *control_page;
arch/sh/kernel/machine_kexec.c +1 -1
@@ -70,7 +70,7 @@ static void kexec_info(struct kimage *im* Do not allocate memory (or fail in any way) in machine_kexec(). * We are past the point of no return, committed to rebooting now. */ -NORET_TYPE void machine_kexec(struct kimage *image) +void machine_kexec (struct kimage *image) {unsigned long page_list;
arch/powerpc/kernel/machine_kexec.c +1 -1
@@ -47,7 +47,7 @@ void machine_kexec_cleanup(struct kimage* Do not allocate memory (or fail in any way) in machine_kexec(). * We are past the point of no return, committed to rebooting now. */ -NORET_TYPE void machine_kexec(struct kimage *image) +void machine_kexec (struct kimage *image) {if (ppc_md.machine_kexec) ppc_md.machine_kexec (image);
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec