From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, mingo@elte.hu, paulus@samba.org,
davem@davemloft.net, fweisbec@gmail.com, acme@infradead.org,
perfmon2-devel@lists.sf.net, eranian@gmail.com,
eranian@google.com
Subject: [PATCH] perf_events: fix errors path in perf_output_begin()
Date: Mon, 17 May 2010 12:46:01 +0200 [thread overview]
Message-ID: <4bf11ea4.dd29e30a.026d.4627@mx.google.com> (raw)
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 adding a new label and skipping
perf_task_unlock() in case data->nr_pages is 0.
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)
next reply other threads:[~2010-05-17 10:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-17 10:46 Stephane Eranian [this message]
2010-05-17 11:04 ` [PATCH] perf_events: fix errors path in perf_output_begin() John Kacur
2010-05-17 11:57 ` Stephane Eranian
2010-05-17 11:46 ` Frederic Weisbecker
2010-05-17 11:56 ` Stephane Eranian
2010-05-17 12:03 ` Peter Zijlstra
2010-05-17 12:04 ` Stephane Eranian
2010-05-17 12:09 ` Peter Zijlstra
2010-05-17 12:23 ` Stephane Eranian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4bf11ea4.dd29e30a.026d.4627@mx.google.com \
--to=eranian@google.com \
--cc=acme@infradead.org \
--cc=davem@davemloft.net \
--cc=eranian@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=perfmon2-devel@lists.sf.net \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).