x86/uv changes for v3.13, UV KDB support
Subsystems (3)
Linus,
Please pull the latest x86-uv-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-uv-for-linus
# HEAD: b5dfcb09debc38582c3cb72a3c1a88b919b07f2d Revert "x86/UV: Add uvtrace support"
Various SGI UV debuggability improvements, amongst them KDB support, with related core KDB enabling patches changing kernel/debug/kdb/.
out-of-topic modifications in x86-uv-for-linus:
-------------------------------------------------
include/linux/kdb.h # 8daaa5f: kdb: Add support for external NMI include/linux/kgdb.h # 8daaa5f: kdb: Add support for external NMI kernel/debug/debug_core.c # 8daaa5f: kdb: Add support for external NMI kernel/debug/debug_core.h # 8daaa5f: kdb: Add support for external NMI kernel/debug/kdb/kdb_debugger.c # 8daaa5f: kdb: Add support for external NMI kernel/debug/kdb/kdb_main.c # 8daaa5f: kdb: Add support for external NMI
Thanks,
Ingo
------------------>
Ingo Molnar (2):
x86/UV: Check for alloc_cpumask_var() failures properly in uv_nmi_setup() Revert "x86/UV: Add uvtrace support"
Mike Travis (7):
x86/UV: Move NMI support
x86/UV: Update UV support for external NMI signals x86/UV: Add summary of cpu activity to UV NMI handler x86/UV: Add kdump to UV NMI handler
x86/UV: Add uvtrace support
kdb: Add support for external NMI handler to call KGDB/KDB x86/UV: Add call to KGDB/KDB from NMI handler
arch/x86/include/asm/uv/uv.h | 2 + arch/x86/include/asm/uv/uv_hub.h | 57 ++- arch/x86/include/asm/uv/uv_mmrs.h | 31 ++ arch/x86/kernel/apic/x2apic_uv_x.c | 70 +--- arch/x86/platform/uv/Makefile | 2 +- arch/x86/platform/uv/uv_nmi.c | 700 +++++++++++++++++++++++++++++++++++++ include/linux/kdb.h | 1 + include/linux/kgdb.h | 1 + kernel/debug/debug_core.c | 32 +- kernel/debug/debug_core.h | 3 + kernel/debug/kdb/kdb_debugger.c | 5 +- kernel/debug/kdb/kdb_main.c | 3 + 12 files changed, 832 insertions(+), 75 deletions(-) create mode 100644 arch/x86/platform/uv/uv_nmi.c
arch/x86/include/asm/uv/uv.h +2 -0
@@ -12,6 +12,7 @@ extern enum uv_system_type get_uv_system_type(void);extern int is_uv_system (void );extern void uv_cpu_init (void );extern void uv_nmi_init (void ); +extern void uv_register_nmi_notifier (void );extern void uv_system_init (void ); extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask, struct mm_struct *mm,
@@ -25,6 +26,7 @@ static inline enum uv_system_type get_uv_system_type(void) { return UV_NONE; }static inline int is_uv_system (void ) {return 0 ; }static inline void uv_cpu_init (void ) { }static inline void uv_system_init (void ) { } +static inline void uv_register_nmi_notifier (void ) { }static inline const struct cpumask *uv_flush_tlb_others (const struct cpumask *cpumask,struct mm_struct *mm,unsigned long start,unsigned long end,unsigned int cpu)
arch/x86/include/asm/uv/uv_hub.h +55 -2
69 lines not on this page · raw message
arch/x86/include/asm/uv/uv_mmrs.h +31 -0
@@ -461,6 +461,23 @@ union uvh_event_occurred0_u {/* ========================================================================= */ +/* UVH_EXTIO_INT0_BROADCAST */ +/* ========================================================================= */ +#define UVH_EXTIO_INT0_BROADCAST 0x61448UL +#define UVH_EXTIO_INT0_BROADCAST_32 0x3f0 + +#define UVH_EXTIO_INT0_BROADCAST_ENABLE_SHFT 0 +#define UVH_EXTIO_INT0_BROADCAST_ENABLE_MASK 0x0000000000000001UL + +union uvh_extio_int0_broadcast_u { +unsigned long v; +struct uvh_extio_int0_broadcast_s { +unsigned long enable:1 ;/* RW */ +unsigned long rsvd_1_63:63 ; + } s; +}; + +/* ========================================================================= */ /* UVH_GR0_TLB_INT0_CONFIG */ /* ========================================================================= */ #define UVH_GR0_TLB_INT0_CONFIG 0x61b00UL
@@ -2606,6 +2623,20 @@ union uvh_scratch5_u { };/* ========================================================================= */ +/* UVH_SCRATCH5_ALIAS */ +/* ========================================================================= */ +#define UVH_SCRATCH5_ALIAS 0x2d0208UL +#define UVH_SCRATCH5_ALIAS_32 0x780 + + +/* ========================================================================= */ +/* UVH_SCRATCH5_ALIAS_2 */ +/* ========================================================================= */ +#define UVH_SCRATCH5_ALIAS_2 0x2d0210UL +#define UVH_SCRATCH5_ALIAS_2_32 0x788 + + +/* ========================================================================= */ /* UVXH_EVENT_OCCURRED2 */ /* ========================================================================= */ #define UVXH_EVENT_OCCURRED2 0x70100UL
arch/x86/kernel/apic/x2apic_uv_x.c +1 -69
94 lines not on this page · raw message
arch/x86/platform/uv/Makefile +1 -1
@@ -1 +1 @@ -obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o +obj-$(CONFIG_X86_UV) += tlb_uv.o bios_uv.o uv_irq.o uv_sysfs.o uv_time.o uv_nmi.o
arch/x86/platform/uv/uv_nmi.c new file +700 -0
700 lines not on this page · raw message
include/linux/kdb.h +1 -0
@@ -109,6 +109,7 @@ typedef enum {KDB_REASON_RECURSE ,/* Recursive entry to kdb; * regs probably valid */ KDB_REASON_SSTEP ,/* Single Step trap. - regs valid */ +KDB_REASON_SYSTEM_NMI ,/* In NMI due to SYSTEM cmd; regs valid */ } kdb_reason_t;extern int kdb_trap_printk;
include/linux/kgdb.h +1 -0
@@ -310,6 +310,7 @@ extern int kgdb_handle_exception(int ex_vector, int signo, int err_code, struct pt_regs *regs);extern int kgdb_nmicallback (int cpu,void *regs); +extern int kgdb_nmicallin (int cpu,int trapnr,void *regs,atomic_t *snd_rdy);extern void gdbstub_exit (int status);extern int kgdb_single_step;
kernel/debug/debug_core.c +30 -2
@@ -575,8 +575,12 @@ return_normal:raw_spin_lock (&dbg_slave_lock);#ifdef CONFIG_SMP +/* If send_ready set, slaves are already waiting */ +if (ks->send_ready) +atomic_set (ks->send_ready,1 ); +/* Signal the other CPUs to enter kgdb_wait() */ -if ((!kgdb_single_step) && kgdb_do_roundup) +else if ((!kgdb_single_step) && kgdb_do_roundup)kgdb_roundup_cpus (flags);#endif
@@ -678,11 +682,11 @@ kgdb_handle_exception(int evector, int signo, int ecode, struct pt_regs *regs)if (arch_kgdb_ops.enable_nmi) arch_kgdb_ops.enable_nmi (0 ); +memset (ks,0 ,sizeof (struct kgdb_state )); ks->cpu =raw_smp_processor_id (); ks->ex_vector = evector; ks->signo = signo; ks->err_code = ecode; - ks->kgdb_usethreadid =0 ; ks->linux_regs = regs;if (kgdb_reenter_check (ks))
@@ -732,6 +736,30 @@ int kgdb_nmicallback(int cpu, void *regs)return 1 ; } +int kgdb_nmicallin (int cpu,int trapnr,void *regs,atomic_t *send_ready) +{ +#ifdef CONFIG_SMP +if (!kgdb_io_ready (0 ) || !send_ready) +return 1 ; + +if (kgdb_info[cpu].enter_kgdb ==0 ) { +struct kgdb_state kgdb_var; +struct kgdb_state *ks = &kgdb_var; + +memset (ks,0 ,sizeof (struct kgdb_state )); + ks->cpu = cpu; + ks->ex_vector = trapnr; + ks->signo =SIGTRAP ; + ks->err_code =KGDB_KDB_REASON_SYSTEM_NMI ; + ks->linux_regs = regs; + ks->send_ready = send_ready; +kgdb_cpu_enter (ks, regs,DCPU_WANT_MASTER ); +return 0 ; + } +#endif +return 1 ; +} +static void kgdb_console_write (struct console *co,const char *s,unsigned count) {
kernel/debug/debug_core.h +3 -0
@@ -26,6 +26,7 @@ struct kgdb_state {unsigned long threadid;long kgdb_usethreadid;struct pt_regs *linux_regs; +atomic_t *send_ready; };/* Exception state values */
@@ -74,11 +75,13 @@ extern int kdb_stub(struct kgdb_state *ks);extern int kdb_parse (const char *cmdstr);extern int kdb_common_init_state (struct kgdb_state *ks);extern int kdb_common_deinit_state (void ); +#define KGDB_KDB_REASON_SYSTEM_NMI KDB_REASON_SYSTEM_NMI#else /* ! CONFIG_KGDB_KDB */ static inline int kdb_stub (struct kgdb_state *ks) {return DBG_PASS_EVENT ; } +#define KGDB_KDB_REASON_SYSTEM_NMI 0#endif /* CONFIG_KGDB_KDB */ #endif /* _DEBUG_CORE_H_ */
kernel/debug/kdb/kdb_debugger.c +4 -1
@@ -69,7 +69,10 @@ int kdb_stub(struct kgdb_state *ks)if (atomic_read (&kgdb_setting_breakpoint)) reason =KDB_REASON_KEYBOARD ; -if (in_nmi ()) +if (ks->err_code ==KDB_REASON_SYSTEM_NMI && ks->signo ==SIGTRAP ) + reason =KDB_REASON_SYSTEM_NMI ; + +else if (in_nmi ()) reason =KDB_REASON_NMI ;for (i =0 , bp = kdb_breakpoints; i <KDB_MAXBPT ; i++, bp++) {
kernel/debug/kdb/kdb_main.c +3 -0
@@ -1200,6 +1200,9 @@ static int kdb_local(kdb_reason_t reason, int error, struct pt_regs *regs, instruction_pointer(regs));kdb_dumpregs (regs);break ; +case KDB_REASON_SYSTEM_NMI : +kdb_printf ("due to System NonMaskable Interrupt\n" ); +break ;case KDB_REASON_NMI : kdb_printf("due to NonMaskable Interrupt @ " kdb_machreg_fmt "\n",