Skip to content

Commit

Permalink
powerpc64/ftrace: Delay enabling ftrace on secondary cpus
Browse files Browse the repository at this point in the history
On the boot cpu, though we enable paca->ftrace_enabled in early_setup()
(via cpu_ready_for_interrupts()), we don't start tracing until much
later since ftrace is not initialized yet and since we only support
DYNAMIC_FTRACE on powerpc. However, it is possible that ftrace has been
initialized by the time some of the secondary cpus start up. In this
case, we will try to trace some of the early boot code which can cause
problems.

To address this, move setting paca->ftrace_enabled from
cpu_ready_for_interrupts() to early_setup() for the boot cpu, and towards
the end of start_secondary() for secondary cpus.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Naveen N. Rao authored and Michael Ellerman committed May 3, 2018
1 parent acd55b1 commit d103978
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
10 changes: 7 additions & 3 deletions arch/powerpc/kernel/setup_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,6 @@ static void cpu_ready_for_interrupts(void)

/* Set IR and DR in PACA MSR */
get_paca()->kernel_msr = MSR_KERNEL;

/* We are now ok to enable ftrace */
get_paca()->ftrace_enabled = 1;
}

unsigned long spr_default_dscr = 0;
Expand Down Expand Up @@ -349,6 +346,13 @@ void __init early_setup(unsigned long dt_ptr)
*/
cpu_ready_for_interrupts();

/*
* We enable ftrace here, but since we only support DYNAMIC_FTRACE, it
* will only actually get enabled on the boot cpu much later once
* ftrace itself has been initialized.
*/
this_cpu_enable_ftrace();

DBG(" <- early_setup()\n");

#ifdef CONFIG_PPC_EARLY_DEBUG_BOOTX
Expand Down
4 changes: 4 additions & 0 deletions arch/powerpc/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
#include <asm/kexec.h>
#include <asm/asm-prototypes.h>
#include <asm/cpu_has_feature.h>
#include <asm/ftrace.h>

#ifdef DEBUG
#include <asm/udbg.h>
Expand Down Expand Up @@ -1066,6 +1067,9 @@ void start_secondary(void *unused)

local_irq_enable();

/* We can enable ftrace for secondary cpus now */
this_cpu_enable_ftrace();

cpu_startup_entry(CPUHP_AP_ONLINE_IDLE);

BUG();
Expand Down

0 comments on commit d103978

Please sign in to comment.