From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: mingo@elte.hu, linux-kernel@vger.kernel.org
Cc: paulus@samba.org, eranian@google.com, robert.richter@amd.com,
fweisbec@gmail.com, Arnaldo Carvalho de Melo <acme@infradead.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 2/5] perf, x86: Fix silly bug in data store buffer allocation
Date: Fri, 05 Mar 2010 16:39:28 +0100 [thread overview]
Message-ID: <20100305154128.813452402@chello.nl> (raw)
In-Reply-To: 20100305153926.639506880@chello.nl
[-- Attachment #1: perf-fixup-intel-ds.patch --]
[-- Type: text/plain, Size: 762 bytes --]
Fix up the ds allocation error path, where we could free @buffer
before we used it.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
arch/x86/kernel/cpu/perf_event_intel_ds.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: linux-2.6/arch/x86/kernel/cpu/perf_event_intel_ds.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ linux-2.6/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -127,10 +127,8 @@ static int reserve_ds_buffers(void)
err = -ENOMEM;
ds = kzalloc(sizeof(*ds), GFP_KERNEL);
- if (unlikely(!ds)) {
- kfree(buffer);
+ if (unlikely(!ds))
break;
- }
per_cpu(cpu_hw_events, cpu).ds = ds;
if (x86_pmu.bts) {
--
next prev parent reply other threads:[~2010-03-05 15:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-05 15:39 [PATCH 0/5] PEBS and LBR fixes Peter Zijlstra
2010-03-05 15:39 ` [PATCH 1/5] perf: Rework the arch CPU-hotplug hooks Peter Zijlstra
2010-03-10 13:10 ` [tip:perf/urgent] perf: Rework and fix " tip-bot for Peter Zijlstra
2010-03-05 15:39 ` Peter Zijlstra [this message]
2010-03-10 13:20 ` [tip:perf/pebs] perf, x86: Fix silly bug in data store buffer allocation tip-bot for Peter Zijlstra
2010-03-05 15:39 ` [PATCH 3/5] perf, x86: Disable PEBS on clowertown chips Peter Zijlstra
2010-03-05 18:58 ` Stephane Eranian
2010-03-05 19:15 ` Peter Zijlstra
2010-03-05 19:28 ` Stephane Eranian
2010-03-05 19:37 ` Peter Zijlstra
2010-03-05 21:05 ` Peter Zijlstra
2010-03-05 21:22 ` Stephane Eranian
2010-03-05 21:35 ` Peter Zijlstra
2010-03-05 21:38 ` Stephane Eranian
2010-03-05 21:43 ` Peter Zijlstra
2010-03-05 21:57 ` Stephane Eranian
2010-03-05 22:25 ` Peter Zijlstra
2010-03-05 22:33 ` Stephane Eranian
2010-03-10 13:21 ` [tip:perf/pebs] perf, x86: Disable PEBS on clovertown chips tip-bot for Peter Zijlstra
2010-03-05 15:39 ` [PATCH 4/5] perf, x86: Clear the LBRs on init Peter Zijlstra
2010-03-10 13:21 ` [tip:perf/pebs] " tip-bot for Peter Zijlstra
2010-03-05 15:39 ` [PATCH 5/5] perf, x86: Robustify PEBS fixup Peter Zijlstra
2010-03-10 13:21 ` [tip:perf/pebs] " tip-bot for Peter Zijlstra
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=20100305154128.813452402@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=acme@infradead.org \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=robert.richter@amd.com \
/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