Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1792cda authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf_counter: x86: Fix PMU resource leak 



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

Reported-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarDavid Miller <davem@davemloft.net>
LKML-Reference: <1252483487.7746.164.camel@twins>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 611a546b

arch/x86/kernel/cpu/perf_counter.c

+6 −3
Original line number Diff line number Diff line
@@ -924,6 +924,8 @@ static int __hw_perf_counter_init(struct perf_counter *counter) 
	if (err)

		return err;



	counter->destroy = hw_perf_counter_destroy;



	/*

	 * Generate PMC IRQs:

	 * (keep 'enabled' bit clear for now)
@@ -953,8 +955,6 @@ static int __hw_perf_counter_init(struct perf_counter *counter) 
			return -EOPNOTSUPP;

	}



	counter->destroy = hw_perf_counter_destroy;



	/*

	 * 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;



	err = __hw_perf_counter_init(counter);

	if (err)

	if (err) {

		if (counter->destroy)

			counter->destroy(counter);

		return ERR_PTR(err);

	}



	return &pmu;

}