Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1399896

[tip:perf/core] perf/core: Disable the event on a truncated AUX record

Show all headers | View raw

Commit-ID:  3f56e687a138481894a1088d5aa7d41951bdb020
Gitweb:     http://git.kernel.org/tip/3f56e687a138481894a1088d5aa7d41951bdb020
Author:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
AuthorDate: Tue, 10 May 2016 16:18:33 +0300
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 12 May 2016 10:14:55 +0200

perf/core: Disable the event on a truncated AUX record

When the PMU driver reports a truncated AUX record, it effectively means
that there is no more usable room in the event's AUX buffer (even though
there may still be some room, so that perf_aux_output_begin() doesn't take
action). At this point the consumer still has to be woken up and the event
has to be disabled, otherwise the event will just keep spinning between
perf_aux_output_begin() and perf_aux_output_end() until its context gets
unscheduled.

Again, for cpu-wide events this means never, so once in this condition,
they will be forever losing data.

Fix this by disabling the event and waking up the consumer in case of a
truncated AUX record.

Reported-by: Markus Metzger <markus.t.metzger@intel.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/1462886313-13660-3-git-send-email-alexander.shishkin@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/events/ring_buffer.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index c49bab4..ae9b90d 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -405,6 +405,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size,
 			 bool truncated)
 {
 	struct ring_buffer *rb = handle->rb;
+	bool wakeup = truncated;
 	unsigned long aux_head;
 	u64 flags = 0;
 
@@ -433,9 +434,16 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size,
 	aux_head = rb->user_page->aux_head = local_read(&rb->aux_head);
 
 	if (aux_head - local_read(&rb->aux_wakeup) >= rb->aux_watermark) {
-		perf_output_wakeup(handle);
+		wakeup = true;
 		local_add(rb->aux_watermark, &rb->aux_wakeup);
 	}
+
+	if (wakeup) {
+		if (truncated)
+			handle->event->pending_disable = 1;
+		perf_output_wakeup(handle);
+	}
+
 	handle->event = NULL;
 
 	local_set(&rb->aux_nest, 0);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] perf, pt: Fix massive data losses Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-10 15:20 +0200
  [PATCH 1/2] perf/x86/intel/pt: Generate PMI in the STOP region as well Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-10 15:20 +0200
    [tip:perf/core] perf/x86/intel/pt: Generate PMI in the STOP region  as well tip-bot for Alexander Shishkin <tipbot@zytor.com> - 2016-05-12 12:40 +0200
      Re: [tip:perf/core] perf/x86/intel/pt: Generate PMI in the STOP region as well Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-12 14:30 +0200
        Re: [tip:perf/core] perf/x86/intel/pt: Generate PMI in the STOP  region as well Ingo Molnar <mingo@kernel.org> - 2016-05-12 14:50 +0200
          Re: [tip:perf/core] perf/x86/intel/pt: Generate PMI in the STOP region as well Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-12 15:10 +0200
    [tip:perf/urgent] perf/x86/intel/pt: Generate PMI in the STOP  region as well tip-bot for Alexander Shishkin <tipbot@zytor.com> - 2016-05-12 15:00 +0200
      Re: [tip:perf/urgent] perf/x86/intel/pt: Generate PMI in the STOP region as well Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-17 09:40 +0200
        Re: [tip:perf/urgent] perf/x86/intel/pt: Generate PMI in the STOP  region as well Ingo Molnar <mingo@kernel.org> - 2016-05-17 10:50 +0200
          Re: [tip:perf/urgent] perf/x86/intel/pt: Generate PMI in the STOP  region as well Greg KH <gregkh@linuxfoundation.org> - 2016-05-21 07:30 +0200
  [PATCH 2/2] perf: Disable the event on a truncated AUX record Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-10 15:20 +0200
    Re: [PATCH 2/2] perf: Disable the event on a truncated AUX record Peter Zijlstra <peterz@infradead.org> - 2016-05-11 11:20 +0200
      Re: [PATCH 2/2] perf: Disable the event on a truncated AUX record Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-11 11:50 +0200
        Re: [PATCH 2/2] perf: Disable the event on a truncated AUX record Peter Zijlstra <peterz@infradead.org> - 2016-05-11 12:00 +0200
          Re: [PATCH 2/2] perf: Disable the event on a truncated AUX record Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-05-11 12:10 +0200
    [tip:perf/core] perf/core: Disable the event on a truncated AUX  record tip-bot for Alexander Shishkin <tipbot@zytor.com> - 2016-05-12 12:40 +0200
    [tip:perf/urgent] perf/core: Disable the event on a truncated AUX  record tip-bot for Alexander Shishkin <tipbot@zytor.com> - 2016-05-12 15:00 +0200

csiph-web