IA64 Kexec kdump patch for 2.6.20
Hi Tony,
This is the IA64 Kexec/Kdump patch against 2.6.19
Changes and updates.
1. Remove fake rendz path and related code according to discuss with Aziz.
2. fc.i offset fix in relocate_kernel.S.
3. iospic shutdown code eoi and mask race fix from Fujitsu.
4. Warm boot hook in machine_kexec to SN SAL code from Jack Steiner.
5. Send slave to SAL slave loop patch from Jay Lan.
6. Kdump on non-recoverable MCA event patch from Jay Lan
7. Use CTL_UNNUMBERED in kdump_on_init sysctl.
Signed-off-by Zou Nan hai <[email protected]>
arch/ia64/Kconfig +23 -0
@@ -434,6 +434,29 @@ config IA64_ESI source "drivers/sn/Kconfig" +config KEXEC + bool "kexec system call (EXPERIMENTAL)" + depends on EXPERIMENTAL && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot + but it is indepedent of the system firmware. And like a reboot + you can start any kernel with it, not just Linux. + + The name comes from the similiarity to the exec system call. + + It is an ongoing process to be certain the hardware in a machine + is properly shutdown, so do not be surprised if this code does not + initially work for you. It may help to enable device hotplugging + support. As of this writing the exact hardware interface is + strongly in flux, so no good recommendation can be made. + +config CRASH_DUMP + bool "kernel crash dumps (EXPERIMENTAL)" + depends on EXPERIMENTAL && IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) + help + Generate crash dump after being started by kexec. + source "drivers/firmware/Kconfig" source "fs/Kconfig.binfmt"
arch/ia64/kernel/Makefile +1 -0
@@ -28,6 +28,7 @@ obj-$(CONFIG_IA64_CYCLONE) += cyclone.o obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o +obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR) += uncached.o obj-$(CONFIG_AUDIT) += audit.o obj-$(CONFIG_PCI_MSI) += msi_ia64.o
arch/ia64/kernel/crash.c +245 -0
245 lines not on this page · raw message
arch/ia64/kernel/efi.c +62 -3
107 lines not on this page · raw message
arch/ia64/kernel/entry.S +1 -1
@@ -1575,7 +1575,7 @@ sys_call_table: data8 sys_mq_timedreceive // 1265 data8 sys_mq_notify data8 sys_mq_getsetattr - data8 sys_ni_syscall // reserved for kexec_load + data8 sys_kexec_load data8 sys_ni_syscall // reserved for vserver data8 sys_waitid // 1270 data8 sys_add_key
arch/ia64/kernel/iosapic.c +21 -0
@@ -288,6 +288,27 @@ nop (unsigned int irq)/* do nothing... */ } + +#ifdef CONFIG_KEXEC +void +kexec_disable_iosapic (void ) +{ +struct iosapic_intr_info *info; +struct iosapic_rte_info *rte; +u8 vec =0 ; +for (info = iosapic_intr_info; info < + iosapic_intr_info +IA64_NUM_VECTORS ; ++info, ++vec) { +list_for_each_entry (rte, &info->rtes, + rte_list) { +iosapic_write (rte->addr, +IOSAPIC_RTE_LOW (rte->rte_index), +IOSAPIC_MASK |vec); +iosapic_eoi (rte->addr, vec); + } + } +} +#endif +static void mask_irq (unsigned int irq) {
arch/ia64/kernel/machine_kexec.c +133 -0
133 lines not on this page · raw message
arch/ia64/kernel/mca.c +5 -0
@@ -82,6 +82,7 @@#include <asm/system.h> #include <asm/sal.h> #include <asm/mca.h> +#include <asm/kexec.h> #include <asm/irq.h> #include <asm/hw_irq.h>
@@ -1238,6 +1239,10 @@ ia64_mca_handler(struct pt_regs *regs, s }else {/* Dump buffered message to console */ ia64_mlogbuf_finish (1 ); +#ifdef CONFIG_CRASH_DUMP +atomic_set (&kdump_in_progress,1 ); + monarch_cpu =-1 ; +#endif }if (notify_die (DIE_MCA_MONARCH_LEAVE ,"MCA" , regs, (long )&nd,0 , recover) =NOTIFY_STOP )
arch/ia64/kernel/relocate_kernel.S +334 -0
334 lines not on this page · raw message
arch/ia64/kernel/setup.c +36 -0
@@ -43,6 +43,8 @@#include <linux/initrd.h> #include <linux/pm.h> #include <linux/cpufreq.h> +#include <linux/kexec.h> +#include <linux/crash_dump.h> #include <asm/ia32.h> #include <asm/machvec.h>
@@ -252,6 +254,41 @@ reserve_memory (void)efi_memmap_init (&rsvd_region[n].start, &rsvd_region[n].end); n++; +#ifdef CONFIG_KEXEC +/* crashkernel=size@offset specifies the size to reserve for a crash +* kernel.(offset is ingored for keep compatibility with other archs) +* By reserving this memory we guarantee that linux never set's it +* up as a DMA target.Useful for holding code to do something +* appropriate after a kernel panic. +*/ + { +char *from =strstr (saved_command_line,"crashkernel=" ); +unsigned long base, size; +if (from) { + size =memparse (from +12 , &from); +if (size) { +sort_regions (rsvd_region, n); + base =kdump_find_rsvd_region (size, + rsvd_region, n); +if (base != ~0UL ) { + rsvd_region[n].start + (unsigned long )__va (base); + rsvd_region[n].end + (unsigned long )__va (base + size); + n++; + crashk_res.start = base; + crashk_res.end = base + size -1 ; + } + } + } + efi_memmap_res.start = ia64_boot_param->efi_memmap; + efi_memmap_res.end = efi_memmap_res.start + + ia64_boot_param->efi_memmap_size; + boot_param_res.start =__pa (ia64_boot_param); + boot_param_res.end = boot_param_res.start + +sizeof (*ia64_boot_param); + } +#endif /* end of memory marker */ rsvd_region[n].start = ~0UL ; rsvd_region[n].end = ~0UL ;
@@ -263,6 +300,7 @@ reserve_memory (void)sort_regions (rsvd_region, num_rsvd_regions); } +/** * find_initrd - get initrd parameters from the boot parameter structure *
arch/ia64/kernel/smp.c +27 -1
@@ -30,6 +30,7 @@#include <linux/delay.h> #include <linux/efi.h> #include <linux/bitops.h> +#include <linux/kexec.h> #include <asm/atomic.h> #include <asm/current.h>
@@ -66,6 +67,7 @@ static volatile struct call_data_struct#define IPI_CALL_FUNC 0#define IPI_CPU_STOP 1 +#define IPI_KDUMP_CPU_STOP 3/* This needs to be cacheline aligned because it is written to by *other* CPUs. */ static DEFINE_PER_CPU(u64, ipi_operation) ____cacheline_aligned;
@@ -155,7 +157,11 @@ handle_IPI (int irq, void *dev_id)case IPI_CPU_STOP :stop_this_cpu ();break ; - +#ifdef CONFIG_CRASH_DUMP +case IPI_KDUMP_CPU_STOP : +unw_init_running (kdump_cpu_freeze,NULL ); +break ; +#endif default :printk (KERN_CRIT "Unknown IPI on CPU %d: %lu\n" , this_cpu, which);break ;
@@ -213,6 +219,26 @@ send_IPI_self (int op)send_IPI_single (smp_processor_id (), op); } +#ifdef CONFIG_CRASH_DUMP +void +kdump_smp_send_stop () +{ +send_IPI_allbutself (IPI_KDUMP_CPU_STOP ); +} + +void +kdump_smp_send_init () +{ +unsigned int cpu, self_cpu; + self_cpu =smp_processor_id (); +for_each_online_cpu (cpu) { +if (cpu != self_cpu) { +if (kdump_status[cpu] =0 ) +platform_send_ipi (cpu,0 ,IA64_IPI_DM_INIT ,0 ); + } + } +} +#endif /* * Called with preeemption disabled. */
arch/ia64/sn/kernel/setup.c +8 -0
@@ -751,5 +751,13 @@ int sn_prom_feature_available(int id)return 0 ;return test_bit (id, sn_prom_features); } + +void +sn_kernel_launch_event (void ) +{ +/* ignore status until we understand possible failure, if any*/ +if (ia64_sn_kernel_launch_event ()) +printk (KERN_ERR "KEXEC is not supported in this PROM, Please update the PROM.\n" ); +}EXPORT_SYMBOL (sn_prom_feature_available);
include/asm-ia64/kexec.h +47 -0
47 lines not on this page · raw message
include/asm-ia64/machvec.h +5 -0
@@ -36,6 +36,7 @@ typedef int ia64_mv_pci_legacy_read_t (stypedef int ia64_mv_pci_legacy_write_t (struct pci_bus *,u16 port,u32 val,u8 size);typedef void ia64_mv_migrate_t (struct task_struct * task); +typedef void ia64_mv_kernel_launch_event_t (void );/* DMA-mapping interface: */ typedef void ia64_mv_dma_init (void );
@@ -210,6 +211,7 @@ struct ia64_machine_vector {ia64_mv_migrate_t *migrate;ia64_mv_setup_msi_irq_t *setup_msi_irq;ia64_mv_teardown_msi_irq_t *teardown_msi_irq; +ia64_mv_kernel_launch_event_t kernel_launch_event; } __attribute__((__aligned__(16))); /* align attrib? see above comment */#define MACHVEC_INIT (name) \
@@ -309,6 +311,9 @@ extern ia64_mv_dma_supported swiotlb_dm#ifndef platform_tlb_migrate_finish# define platform_tlb_migrate_finish machvec_noop_mm#endif +#ifndef platform_kernel_launch_event +# define platform_kernel_launch_event machvec_noop +#endif #ifndef platform_dma_init# define platform_dma_init swiotlb_init#endif
include/asm-ia64/machvec_sn2.h +2 -0
@@ -67,6 +67,7 @@ extern ia64_mv_dma_sync_sg_for_device snextern ia64_mv_dma_mapping_error sn_dma_mapping_error;extern ia64_mv_dma_supported sn_dma_supported;extern ia64_mv_migrate_t sn_migrate; +extern ia64_mv_kernel_launch_event_t sn_kernel_launch_event;extern ia64_mv_setup_msi_irq_t sn_setup_msi_irq;extern ia64_mv_teardown_msi_irq_t sn_teardown_msi_irq;
@@ -120,6 +121,7 @@ extern ia64_mv_teardown_msi_irq_t sn_tea#define platform_dma_mapping_error sn_dma_mapping_error#define platform_dma_supported sn_dma_supported#define platform_migrate sn_migrate +#define platform_kernel_launch_event sn_kernel_launch_event#ifdef CONFIG_PCI_MSI #define platform_setup_msi_irq sn_setup_msi_irq#define platform_teardown_msi_irq sn_teardown_msi_irq
include/asm-ia64/meminit.h +2 -1
@@ -15,11 +15,12 @@* - initrd (optional) * - command line string * - kernel code & data +* - crash dumping code reserved region * - Kernel memory map built from EFI memory map * * More could be added if necessary */ -#define IA64_MAX_RSVD_REGIONS 6 +#define IA64_MAX_RSVD_REGIONS 7struct rsvd_region {unsigned long start;/* virtual address of beginning of element */
include/asm-ia64/sn/sn_sal.h +9 -0
@@ -87,6 +87,8 @@#define SN_SAL_INJECT_ERROR 0x02000067#define SN_SAL_SET_CPU_NUMBER 0x02000068 +#define SN_SAL_KERNEL_LAUNCH_EVENT 0x02000069 +/* * Service-specific constants */
@@ -1154,4 +1156,11 @@ ia64_sn_set_cpu_number(int cpu)SAL_CALL_NOLOCK (rv,SN_SAL_SET_CPU_NUMBER , cpu,0 ,0 ,0 ,0 ,0 ,0 ); return rv.status; } +static inline int +ia64_sn_kernel_launch_event (void ) +{ +struct ia64_sal_retval rv; +SAL_CALL_NOLOCK (rv,SN_SAL_KERNEL_LAUNCH_EVENT ,0 ,0 ,0 ,0 ,0 ,0 ,0 ); +return rv.status; +}#endif /* _ASM_IA64_SN_SN_SAL_H */
include/linux/kexec.h +5 -0
@@ -108,6 +108,10 @@ int kexec_should_crash(struct task_strucextern struct kimage *kexec_image;extern struct kimage *kexec_crash_image; +#ifndef kexec_flush_icache_page +#define kexec_flush_icache_page (page) +#endif +#define KEXEC_ON_CRASH 0x00000001#define KEXEC_ARCH_MASK 0xffff0000
@@ -131,6 +135,7 @@ extern struct resource crashk_res;typedef u32 note_buf_t [MAX_NOTE_BYTES /4 ];extern note_buf_t *crash_notes; +#else /* !CONFIG_KEXEC */ struct pt_regs ;struct task_struct ;
kernel/kexec.c +1 -0
@@ -851,6 +851,7 @@ static int kimage_load_crash_segment(strmemset (ptr + uchunk,0 , mchunk - uchunk); } result =copy_from_user (ptr, buf, uchunk); +kexec_flush_icache_page (page);kunmap (page);if (result) { result = (result <0 ) ? result : -EIO ;