lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf_counter: x86: Fix PMU resource leak

Browse Source 
Dave noticed that we leak the PMU resource reservations when we
fail the hardware counter init.

Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: David Miller <davem@davemloft.net>
LKML-Reference: <1252483487.7746.164.camel@twins>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2009-09-09 10:04:47 +02:00
committed by Ingo Molnar
parent 611a546bec
commit a1792cdaca
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/cpu/perf_counter.c
View File

@@ -924,6 +924,8 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
if (err) if (err)
return err; return err;
counter->destroy = hw_perf_counter_destroy;
/* /*
* Generate PMC IRQs: * Generate PMC IRQs:
* (keep 'enabled' bit clear for now) * (keep 'enabled' bit clear for now)
@@ -953,8 +955,6 @@ static int __hw_perf_counter_init(struct perf_counter *counter)
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
counter->destroy = hw_perf_counter_destroy;
/* /*
* Raw event type provide the config in the event structure * Raw event type provide the config in the event structure
*/ */
@@ -2107,8 +2107,11 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter)
int err; int err;
err = __hw_perf_counter_init(counter); err = __hw_perf_counter_init(counter);
if (err) if (err) {
if (counter->destroy)
counter->destroy(counter);
return ERR_PTR(err); return ERR_PTR(err);
}
return &pmu; return &pmu;
} }