21f585073d
Currently, on 8641D, which doesn't set CONFIG_HAVE_HW_BREAKPOINT we get the following splat: BUG: using smp_processor_id() in preemptible [00000000] code: login/1382 caller is set_breakpoint+0x1c/0xa0 CPU: 0 PID: 1382 Comm: login Not tainted 3.15.0-rc3-00041-g2aafe1a4d451 #1 Call Trace: [decd5d80] [c0008dc4] show_stack+0x50/0x158 (unreliable) [decd5dc0] [c03c6fa0] dump_stack+0x7c/0xdc [decd5de0] [c01f8818] check_preemption_disabled+0xf4/0x104 [decd5e00] [c00086b8] set_breakpoint+0x1c/0xa0 [decd5e10] [c00d4530] flush_old_exec+0x2bc/0x588 [decd5e40] [c011c468] load_elf_binary+0x2ac/0x1164 [decd5ec0] [c00d35f8] search_binary_handler+0xc4/0x1f8 [decd5ef0] [c00d4ee8] do_execve+0x3d8/0x4b8 [decd5f40] [c001185c] ret_from_syscall+0x0/0x38 --- Exception: c01 at 0xfeee554 LR = 0xfeee7d4 The call path in this case is: flush_thread --> set_debug_reg_defaults --> set_breakpoint --> __get_cpu_var Since preemption is enabled in the cleanup of flush thread, and there is no need to disable it, introduce the distinction between set_breakpoint and __set_breakpoint, leaving only the flush_thread instance as the current user of set_breakpoint. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
61 lines
2.0 KiB
C
61 lines
2.0 KiB
C
/*
|
|
* Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>
|
|
*/
|
|
#ifndef _ASM_POWERPC_DEBUG_H
|
|
#define _ASM_POWERPC_DEBUG_H
|
|
|
|
#include <asm/hw_breakpoint.h>
|
|
|
|
struct pt_regs;
|
|
|
|
extern struct dentry *powerpc_debugfs_root;
|
|
|
|
#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
|
|
|
|
extern int (*__debugger)(struct pt_regs *regs);
|
|
extern int (*__debugger_ipi)(struct pt_regs *regs);
|
|
extern int (*__debugger_bpt)(struct pt_regs *regs);
|
|
extern int (*__debugger_sstep)(struct pt_regs *regs);
|
|
extern int (*__debugger_iabr_match)(struct pt_regs *regs);
|
|
extern int (*__debugger_break_match)(struct pt_regs *regs);
|
|
extern int (*__debugger_fault_handler)(struct pt_regs *regs);
|
|
|
|
#define DEBUGGER_BOILERPLATE(__NAME) \
|
|
static inline int __NAME(struct pt_regs *regs) \
|
|
{ \
|
|
if (unlikely(__ ## __NAME)) \
|
|
return __ ## __NAME(regs); \
|
|
return 0; \
|
|
}
|
|
|
|
DEBUGGER_BOILERPLATE(debugger)
|
|
DEBUGGER_BOILERPLATE(debugger_ipi)
|
|
DEBUGGER_BOILERPLATE(debugger_bpt)
|
|
DEBUGGER_BOILERPLATE(debugger_sstep)
|
|
DEBUGGER_BOILERPLATE(debugger_iabr_match)
|
|
DEBUGGER_BOILERPLATE(debugger_break_match)
|
|
DEBUGGER_BOILERPLATE(debugger_fault_handler)
|
|
|
|
#else
|
|
static inline int debugger(struct pt_regs *regs) { return 0; }
|
|
static inline int debugger_ipi(struct pt_regs *regs) { return 0; }
|
|
static inline int debugger_bpt(struct pt_regs *regs) { return 0; }
|
|
static inline int debugger_sstep(struct pt_regs *regs) { return 0; }
|
|
static inline int debugger_iabr_match(struct pt_regs *regs) { return 0; }
|
|
static inline int debugger_break_match(struct pt_regs *regs) { return 0; }
|
|
static inline int debugger_fault_handler(struct pt_regs *regs) { return 0; }
|
|
#endif
|
|
|
|
void set_breakpoint(struct arch_hw_breakpoint *brk);
|
|
void __set_breakpoint(struct arch_hw_breakpoint *brk);
|
|
#ifdef CONFIG_PPC_ADV_DEBUG_REGS
|
|
extern void do_send_trap(struct pt_regs *regs, unsigned long address,
|
|
unsigned long error_code, int signal_code, int brkpt);
|
|
#else
|
|
|
|
extern void do_break(struct pt_regs *regs, unsigned long address,
|
|
unsigned long error_code);
|
|
#endif
|
|
|
|
#endif /* _ASM_POWERPC_DEBUG_H */
|