perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Frederic Weisbecker (1):
perf: Fix static strings treated like dynamic ones
Masami Hiramatsu (1):
kprobes/x86: Fix removed int3 checking order
arch/x86/kernel/kprobes.c | 27 +++++++++++++-------------- tools/perf/util/trace-event-parse.c | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-)
arch/x86/kernel/kprobes.c +13 -14
@@ -534,20 +534,6 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)struct kprobe_ctlblk *kcb; addr = (kprobe_opcode_t *)(regs->ip -sizeof (kprobe_opcode_t)); -if (*addr !=BREAKPOINT_INSTRUCTION ) { -/* -* The breakpoint instruction was removed right -* after we hit it. Another cpu has removed -* either a probepoint or a debugger breakpoint -* at this address. In either case, no further -* handling of this interrupt is appropriate. -* Back up over the (now missing) int3 and run -* the original instruction. -*/ - regs->ip = (unsigned long )addr; -return 1 ; - } -/* * We don't want to be preempted for the entire * duration of kprobe processing. We conditionally
@@ -579,6 +565,19 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)setup_singlestep (p, regs, kcb,0 );return 1 ; } + }else if (*addr !=BREAKPOINT_INSTRUCTION ) { +/* +* The breakpoint instruction was removed right +* after we hit it. Another cpu has removed +* either a probepoint or a debugger breakpoint +* at this address. In either case, no further +* handling of this interrupt is appropriate. +* Back up over the (now missing) int3 and run +* the original instruction. +*/ + regs->ip = (unsigned long )addr; +preempt_enable_no_resched (); +return 1 ; }else if (kprobe_running ()) { p =__get_cpu_var (current_kprobe);if (p->break_handler && p->break_handler (p, regs)) {
tools/perf/util/trace-event-parse.c +1 -1
@@ -1925,7 +1925,7 @@ void *raw_field_ptr(struct event *event, const char *name, void *data)if (!field)return NULL ; -if (field->flags &FIELD_IS_STRING ) { +if (field->flags &FIELD_IS_DYNAMIC ) {int offset; offset = *(int *)(data + field->offset);
Quoted 3 lines · Ingo Molnar
Frederic Weisbecker (1):
perf: Fix static strings treated like dynamic ones
Grr. This one doesn't have a proper sign-off chain.
I pulled it, but please be more careful.
Linus