From: robert.richter@amd.com (Robert Richter)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] oprofile, arm: proper release resources on failure
Date: Wed, 29 Sep 2010 16:52:25 +0200 [thread overview]
Message-ID: <20100929145225.GJ13563@erda.amd.com> (raw)
Will,
the patch below fixes a resource leak I found during code review. Can
you please review and test it (I don't have an ARM environment for
this available). If you are fine with the change, please ack. I want
to send it upstream via tip/perf/urgent.
Though you reworked the code already, parts of the fix are still valid
for latest oprofile code in oprofile/core.
Ingo,
if Will agrees with it, please apply it directly to tip/perf/urgent.
Thanks,
-Robert
--
WARNING: multiple messages have this Message-ID (diff)
From: Robert Richter <robert.richter@amd.com>
To: Will Deacon <will.deacon@arm.com>, Ingo Molnar <mingo@elte.hu>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] oprofile, arm: proper release resources on failure
Date: Wed, 29 Sep 2010 16:52:25 +0200 [thread overview]
Message-ID: <20100929145225.GJ13563@erda.amd.com> (raw)
Will,
the patch below fixes a resource leak I found during code review. Can
you please review and test it (I don't have an ARM environment for
this available). If you are fine with the change, please ack. I want
to send it upstream via tip/perf/urgent.
Though you reworked the code already, parts of the fix are still valid
for latest oprofile code in oprofile/core.
Ingo,
if Will agrees with it, please apply it directly to tip/perf/urgent.
Thanks,
-Robert
--
>From 6cb93a9063c579ec0183406933bfe07e8cc92c34 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@amd.com>
Date: Wed, 29 Sep 2010 16:03:11 +0200
Subject: [PATCH] oprofile, arm: proper release resources on failure
This patch fixes a resource leak on failure, where the oprofilefs and
some counters may not released properly.
Fix is also for 2.6.35-stable.
Cc: Will Deacon <will.deacon@arm.com>
Cc: stable@kernel.org
Signed-off-by: Robert Richter <robert.richter@amd.com>
---
arch/arm/oprofile/common.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 0691176..72e09eb 100644
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -102,6 +102,7 @@ static int op_create_counter(int cpu, int event)
if (IS_ERR(pevent)) {
ret = PTR_ERR(pevent);
} else if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
+ perf_event_release_kernel(pevent);
pr_warning("oprofile: failed to enable event %d "
"on CPU %d\n", event, cpu);
ret = -EBUSY;
@@ -365,6 +366,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
ret = init_driverfs();
if (ret) {
kfree(counter_config);
+ counter_config = NULL;
return ret;
}
@@ -402,7 +404,6 @@ void oprofile_arch_exit(void)
struct perf_event *event;
if (*perf_events) {
- exit_driverfs();
for_each_possible_cpu(cpu) {
for (id = 0; id < perf_num_counters; ++id) {
event = perf_events[cpu][id];
@@ -413,8 +414,10 @@ void oprofile_arch_exit(void)
}
}
- if (counter_config)
+ if (counter_config) {
kfree(counter_config);
+ exit_driverfs();
+ }
}
#else
int __init oprofile_arch_init(struct oprofile_operations *ops)
--
1.7.2.2
--
Advanced Micro Devices, Inc.
Operating System Research Center
next reply other threads:[~2010-09-29 14:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-29 14:52 Robert Richter [this message]
2010-09-29 14:52 ` [PATCH] oprofile, arm: proper release resources on failure Robert Richter
2010-09-29 15:39 ` Will Deacon
2010-09-29 15:39 ` Will Deacon
2010-09-29 16:50 ` Robert Richter
2010-09-29 16:50 ` Robert Richter
2010-09-29 16:59 ` Robert Richter
2010-09-29 16:59 ` Robert Richter
2010-09-29 17:32 ` Will Deacon
2010-09-29 17:32 ` Will Deacon
2010-09-29 17:39 ` Robert Richter
2010-09-29 17:39 ` Robert Richter
2010-10-04 20:24 ` [tip:perf/urgent] oprofile, ARM: Release " tip-bot for Robert Richter
2010-10-16 16:32 ` [tip:perf/core] " tip-bot for Robert Richter
-- strict thread matches above, loose matches on Subject: below --
2010-09-29 14:03 [PATCH] oprofile, arm: proper release " Robert Richter
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=20100929145225.GJ13563@erda.amd.com \
--to=robert.richter@amd.com \
--cc=linux-arm-kernel@lists.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.