Skip to content

Commit

Permalink
x86/debug: Simplify hw_breakpoint_handler()
Browse files Browse the repository at this point in the history
This is called with interrupts disabled, there's no point in using
get_cpu() and per_cpu().

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Daniel Thompson <daniel.thompson@linaro.org>
Link: https://lore.kernel.org/r/20200902133201.292906672@infradead.org
  • Loading branch information
Peter Zijlstra authored and Thomas Gleixner committed Sep 4, 2020
1 parent b84d42b commit 21d44be
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions arch/x86/kernel/hw_breakpoint.c
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ EXPORT_SYMBOL_GPL(hw_breakpoint_restore);
*/
static int hw_breakpoint_handler(struct die_args *args)
{
int i, cpu, rc = NOTIFY_STOP;
int i, rc = NOTIFY_STOP;
struct perf_event *bp;
unsigned long dr6;
unsigned long *dr6_p;
Expand All @@ -505,12 +505,10 @@ static int hw_breakpoint_handler(struct die_args *args)
return NOTIFY_DONE;

/*
* Assert that local interrupts are disabled
* Reset the DRn bits in the virtualized register value.
* The ptrace trigger routine will add in whatever is needed.
*/
current->thread.debugreg6 &= ~DR_TRAP_BITS;
cpu = get_cpu();

/* Handle all the breakpoints that were triggered */
for (i = 0; i < HBP_NUM; ++i) {
Expand All @@ -525,7 +523,7 @@ static int hw_breakpoint_handler(struct die_args *args)
*/
rcu_read_lock();

bp = per_cpu(bp_per_reg[i], cpu);
bp = this_cpu_read(bp_per_reg[i]);
/*
* Reset the 'i'th TRAP bit in dr6 to denote completion of
* exception handling
Expand Down Expand Up @@ -560,8 +558,6 @@ static int hw_breakpoint_handler(struct die_args *args)
(dr6 & (~DR_TRAP_BITS)))
rc = NOTIFY_DONE;

put_cpu();

return rc;
}

Expand Down

0 comments on commit 21d44be

Please sign in to comment.