Commit 2c31b795 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar

x86/hw-breakpoints: Don't lose GE flag while disabling a breakpoint

When we schedule out a breakpoint from the cpu, we also
incidentally remove the "Global exact breakpoint" flag from the
breakpoint control register. It makes us losing the fine grained
precision about the origin of the instructions that may trigger
breakpoint exceptions for the other breakpoints running in this
cpu.
Reported-by: default avatarPrasad <prasad@linux.vnet.ibm.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <1259211878-6013-1-git-send-regression-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 605bfaee
...@@ -59,21 +59,27 @@ static DEFINE_PER_CPU(unsigned long, cpu_debugreg[HBP_NUM]); ...@@ -59,21 +59,27 @@ static DEFINE_PER_CPU(unsigned long, cpu_debugreg[HBP_NUM]);
static DEFINE_PER_CPU(struct perf_event *, bp_per_reg[HBP_NUM]); static DEFINE_PER_CPU(struct perf_event *, bp_per_reg[HBP_NUM]);
/* static inline unsigned long
* Encode the length, type, Exact, and Enable bits for a particular breakpoint __encode_dr7(int drnum, unsigned int len, unsigned int type)
* as stored in debug register 7.
*/
unsigned long encode_dr7(int drnum, unsigned int len, unsigned int type)
{ {
unsigned long bp_info; unsigned long bp_info;
bp_info = (len | type) & 0xf; bp_info = (len | type) & 0xf;
bp_info <<= (DR_CONTROL_SHIFT + drnum * DR_CONTROL_SIZE); bp_info <<= (DR_CONTROL_SHIFT + drnum * DR_CONTROL_SIZE);
bp_info |= (DR_GLOBAL_ENABLE << (drnum * DR_ENABLE_SIZE)) | bp_info |= (DR_GLOBAL_ENABLE << (drnum * DR_ENABLE_SIZE));
DR_GLOBAL_SLOWDOWN;
return bp_info; return bp_info;
} }
/*
* Encode the length, type, Exact, and Enable bits for a particular breakpoint
* as stored in debug register 7.
*/
unsigned long encode_dr7(int drnum, unsigned int len, unsigned int type)
{
return __encode_dr7(drnum, len, type) | DR_GLOBAL_SLOWDOWN;
}
/* /*
* Decode the length and type bits for a particular breakpoint as * Decode the length and type bits for a particular breakpoint as
* stored in debug register 7. Return the "enabled" status. * stored in debug register 7. Return the "enabled" status.
...@@ -154,7 +160,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp) ...@@ -154,7 +160,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp)
return; return;
dr7 = &__get_cpu_var(cpu_dr7); dr7 = &__get_cpu_var(cpu_dr7);
*dr7 &= ~encode_dr7(i, info->len, info->type); *dr7 &= ~__encode_dr7(i, info->len, info->type);
set_debugreg(*dr7, 7); set_debugreg(*dr7, 7);
} }
......
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