perf fixes, leftover from the v3.18 cycle
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: 201e7deb9062bb9a8a5bc113e36457c3ff55b226 Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Two perf fixes left over from the previous cycle.
Thanks,
Ingo
------------------>
Andy Lutomirski (1):
x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs
Jiri Olsa (1):
perf session: Do not fail on processing out of order event
arch/x86/kernel/traps.c | 5 +++-- tools/perf/util/event.h | 1 + tools/perf/util/session.c | 11 +++++------ 3 files changed, 9 insertions(+), 8 deletions(-)
arch/x86/kernel/traps.c +3 -2
@@ -387,7 +387,7 @@ NOKPROBE_SYMBOL(do_int3);* for scheduling or signal handling. The actual stack switch is done in * entry.S */ -asmlinkage __visible struct pt_regs *sync_regs(struct pt_regs *eregs) +asmlinkage __visible notrace struct pt_regs *sync_regs(struct pt_regs *eregs) {struct pt_regs *regs = eregs;/* Did already sync */
@@ -413,7 +413,7 @@ struct bad_iret_stack {struct pt_regs regs; }; -asmlinkage __visible +asmlinkage __visible notracestruct bad_iret_stack *fixup_bad_iret (struct bad_iret_stack *s) {/*
@@ -436,6 +436,7 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)BUG_ON (!user_mode_vm (&new_stack->regs)); return new_stack; } +NOKPROBE_SYMBOL (fixup_bad_iret);#endif /*
tools/perf/util/event.h +1 -0
@@ -214,6 +214,7 @@ struct events_stats {u32 nr_invalid_chains;u32 nr_unknown_id;u32 nr_unprocessable_samples; +u32 nr_unordered_events; };struct attr_event {
tools/perf/util/session.c +5 -6
@@ -521,15 +521,11 @@ int perf_session_queue_event(struct perf_session *s, union perf_event *event,return -ETIME ;if (timestamp < oe->last_flush) { -WARN_ONCE (1 ,"Timestamp below last timeslice flush\n" ); - -pr_oe_time (timestamp,"out of order event" ); +pr_oe_time (timestamp,"out of order event\n" );pr_oe_time (oe->last_flush,"last flush, last_flush_type %d\n" , oe->last_flush_type); -/* We could get out of order messages after forced flush. */ -if (oe->last_flush_type !=OE_FLUSH__HALF ) -return -EINVAL ; + s->stats.nr_unordered_events++; } new =ordered_events__new (oe, timestamp, event);
@@ -1057,6 +1053,9 @@ static void perf_session__warn_about_errors(const struct perf_session *session,"Do you have a KVM guest running and not using 'perf kvm'?\n" , session->stats.nr_unprocessable_samples); } + +if (session->stats.nr_unordered_events !=0 ) +ui__warning ("%u out of order events recorded.\n" , session->stats.nr_unordered_events); }volatile int session_done;