Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull leftover perf fixes from Ingo Molnar:
 "Two perf fixes left over from the previous cycle"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf session: Do not fail on processing out of order event
  x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs

2 files changed, 6 insertions, 6 deletions

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 09b9e8d3fcf7..c4ffe2bd0738 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -242,6 +242,7 @@ struct events_stats {
         u32 nr_invalid_chains;
         u32 nr_unknown_id;
         u32 nr_unprocessable_samples;
+        u32 nr_unordered_events;
 };
 
 struct attr_event {
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 6ac62ae6b8fa..5f0e05a76c05 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -533,15 +533,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);
@@ -1118,6 +1114,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;