Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21f58507 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix smp_processor_id() in preemptible splat in set_breakpoint 



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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 04c32a51

arch/powerpc/include/asm/debug.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 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);

arch/powerpc/include/asm/hw_breakpoint.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static inline void hw_breakpoint_disable(void) 
	brk.address = 0;

	brk.type = 0;

	brk.len = 0;

	set_breakpoint(&brk);

	__set_breakpoint(&brk);

}

extern void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs);

arch/powerpc/kernel/hw_breakpoint.c

+4 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp) 
	 * If so, DABR will be populated in single_step_dabr_instruction().

	 */

	if (current->thread.last_hit_ubp != bp)

		set_breakpoint(info);

		__set_breakpoint(info);



	return 0;

}
@@ -198,7 +198,7 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs) 


	info = counter_arch_bp(tsk->thread.last_hit_ubp);

	regs->msr &= ~MSR_SE;

	set_breakpoint(info);

	__set_breakpoint(info);

	tsk->thread.last_hit_ubp = NULL;

}
@@ -284,7 +284,7 @@ int __kprobes hw_breakpoint_handler(struct die_args *args) 
	if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))

		perf_bp_event(bp, regs);



	set_breakpoint(info);

	__set_breakpoint(info);

out:

	rcu_read_unlock();

	return rc;
@@ -316,7 +316,7 @@ int __kprobes single_step_dabr_instruction(struct die_args *args) 
	if (!(info->type & HW_BRK_TYPE_EXTRANEOUS_IRQ))

		perf_bp_event(bp, regs);



	set_breakpoint(info);

	__set_breakpoint(info);

	current->thread.last_hit_ubp = NULL;



	/*

arch/powerpc/kernel/process.c

+9 −2
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static inline int set_dawr(struct arch_hw_breakpoint *brk) 
	return 0;

}



void set_breakpoint(struct arch_hw_breakpoint *brk)

void __set_breakpoint(struct arch_hw_breakpoint *brk)

{

	__get_cpu_var(current_brk) = *brk;
@@ -506,6 +506,13 @@ void set_breakpoint(struct arch_hw_breakpoint *brk) 
		set_dabr(brk);

}



void set_breakpoint(struct arch_hw_breakpoint *brk)

{

	preempt_disable();

	__set_breakpoint(brk);

	preempt_enable();

}



#ifdef CONFIG_PPC64

DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array);

#endif
@@ -835,7 +842,7 @@ struct task_struct *__switch_to(struct task_struct *prev, 
 */

#ifndef CONFIG_HAVE_HW_BREAKPOINT

	if (unlikely(!hw_brk_match(&__get_cpu_var(current_brk), &new->thread.hw_brk)))

		set_breakpoint(&new->thread.hw_brk);

		__set_breakpoint(&new->thread.hw_brk);

#endif /* CONFIG_HAVE_HW_BREAKPOINT */

#endif

arch/powerpc/kernel/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int do_signal(struct pt_regs *regs) 
	 */

	if (current->thread.hw_brk.address &&

		current->thread.hw_brk.type)

		set_breakpoint(&current->thread.hw_brk);

		__set_breakpoint(&current->thread.hw_brk);

#endif

	/* Re-enable the breakpoints for the signal stack */

	thread_change_pc(current, regs);