Commit aaf06665 authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Michael Ellerman

powerpc/xmon: Fix disabling tracing while in xmon

Commit ed49f7fd ("powerpc/xmon: Disable tracing when entering
xmon") added code to disable recording trace entries while in xmon. The
commit introduced a variable 'tracing_enabled' to record if tracing was
enabled on xmon entry, and used this to conditionally enable tracing
during exit from xmon.

However, we are not checking the value of 'fromipi' variable in
xmon_core() when setting 'tracing_enabled'. Due to this, when secondary
cpus enter xmon, they will see tracing as being disabled already and
tracing won't be re-enabled on exit. Fix the same.

Fixes: ed49f7fd ("powerpc/xmon: Disable tracing when entering xmon")
Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6820e565
...@@ -469,8 +469,10 @@ static int xmon_core(struct pt_regs *regs, int fromipi) ...@@ -469,8 +469,10 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
local_irq_save(flags); local_irq_save(flags);
hard_irq_disable(); hard_irq_disable();
tracing_enabled = tracing_is_on(); if (!fromipi) {
tracing_off(); tracing_enabled = tracing_is_on();
tracing_off();
}
bp = in_breakpoint_table(regs->nip, &offset); bp = in_breakpoint_table(regs->nip, &offset);
if (bp != NULL) { if (bp != NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment