Commit aaf06665 authored Jun 27, 2019 by Naveen N. Rao Committed by Michael Ellerman Jul 01, 2019

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: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 6820e565

arch/powerpc/xmon/xmon.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -469,8 +469,10 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
		local_irq_save(flags);
		hard_irq_disable();

		if (!fromipi) {
		tracing_enabled = tracing_is_on();
		tracing_off();
		}

		bp = in_breakpoint_table(regs->nip, &offset);
		if (bp != NULL) {

Admin message