* [PATCH] perf_events: fix errors path in perf_output_begin() (take 2)
@ 2010-05-17 10:46 Stephane Eranian
0 siblings, 0 replies; only message in thread
From: Stephane Eranian @ 2010-05-17 10:46 UTC (permalink / raw)
To: linux-kernel
Cc: peterz, mingo, paulus, davem, fweisbec, acme, perfmon2-devel,
eranian, eranian, jkacur
In case the sampling buffer has no "payload" pages, nr_pages is 0.
The problem is that the error path in perf_output_begin() skips to
a label which assumes perf_output_lock() has been issued which is
not the case. That triggers a WARN_ON() is perf_output_unlock().
This patch fixes the problem by skipping perf_output_unlock()
in case data->nr_pages is 0 while maintaining the accounting
for data->lost.
Signed-off-by: Stephane Eranian <eranian@google.com>
--
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index a4fa381..95137b6 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -3035,8 +3035,10 @@ int perf_output_begin(struct perf_output_handle *handle,
handle->nmi = nmi;
handle->sample = sample;
- if (!data->nr_pages)
- goto fail;
+ if (!data->nr_pages) {
+ atomic_inc(&data->lost);
+ goto out;
+ }
have_lost = atomic_read(&data->lost);
if (have_lost)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-05-17 12:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-17 10:46 [PATCH] perf_events: fix errors path in perf_output_begin() (take 2) Stephane Eranian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome