Skip to content

Commit

Permalink
debug_core: disable hw_breakpoints on all cores in kgdb_cpu_enter()
Browse files Browse the repository at this point in the history
The slave cpus do not have the hw breakpoints disabled upon entry to
the debug_core and as a result could cause unrecoverable recursive
faults on badly placed breakpoints, or get out of sync with the arch
specific hw breakpoint operations.

This patch addresses the problem by invoking kgdb_disable_hw_debug()
earlier in kgdb_enter_cpu for each cpu that enters the debug core.

The hw breakpoint dis/enable flow should be:

master_debug_cpu   slave_debug_cpu
         \              /
          kgdb_cpu_enter
                |
        kgdb_disable_hw_debug --> uninstall pre-enabled hw_breakpoint
                |
 do add/rm dis/enable operates to hw_breakpoints on master_debug_cpu..
                |
        correct_hw_break --> correct/install the enabled hw_breakpoint
                |
           leave_kgdb

Signed-off-by: Dongdong Deng <[email protected]>
Signed-off-by: Jason Wessel <[email protected]>
  • Loading branch information
Dongdong Deng authored and jwessel committed Oct 22, 2010
1 parent 91b152a commit c1bb9a9
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions kernel/debug/debug_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,9 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs)
int error;
int i, cpu;
int trace_on = 0;

kgdb_disable_hw_debug(ks->linux_regs);

acquirelock:
/*
* Interrupts will be restored by the 'trap return' code, except when
Expand Down Expand Up @@ -569,8 +572,6 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs)
if (dbg_io_ops->pre_exception)
dbg_io_ops->pre_exception();

kgdb_disable_hw_debug(ks->linux_regs);

/*
* Get the passive CPU lock which will hold all the non-primary
* CPU in a spin state while the debugger is active
Expand Down Expand Up @@ -661,6 +662,8 @@ static int kgdb_cpu_enter(struct kgdb_state *ks, struct pt_regs *regs)
else
kgdb_sstep_pid = 0;
}
if (arch_kgdb_ops.correct_hw_break)
arch_kgdb_ops.correct_hw_break();
if (trace_on)
tracing_on();
/* Free kgdb_active */
Expand Down

0 comments on commit c1bb9a9

Please sign in to comment.