Prev: cpu_stop: implement and use cpu_stop, take#3
Next: [patch 0/4] perf,p4 series for -tip
From: tip-bot for Paul Mackerras on 8 May 2010 07:20
Commit-ID: 6e85158cf5a2385264316870256fb6ad681156a0
Gitweb: http://git.kernel.org/tip/6e85158cf5a2385264316870256fb6ad681156a0
Author: Paul Mackerras <paulus(a)samba.org>
AuthorDate: Sat, 8 May 2010 20:58:00 +1000
Committer: Ingo Molnar <mingo(a)elte.hu>
CommitDate: Sat, 8 May 2010 13:16:55 +0200

perf_event: Make software events work again

Commit 6bde9b6ce0127e2a56228a2071536d422be31336 ("perf: Add
group scheduling transactional APIs") added code to allow a
group to be scheduled in a single transaction. However, it
introduced a bug in handling events whose pmu does not implement
transactions -- at the end of scheduling in the events in the
group, in the non-transactional case the code now falls through
to the group_error label, and proceeds to unschedule all the
events in the group and return failure.

This fixes it by returning 0 (success) in the non-transactional
case.

Signed-off-by: Paul Mackerras <paulus(a)samba.org>
Cc: Peter Zijlstra <peterz(a)infradead.org>
Cc: Lin Ming <ming.m.lin(a)intel.com>
Cc: Frederic Weisbecker <fweisbec(a)gmail.com>
Cc: eranian(a)gmail.com
LKML-Reference: <20100508105800.GB10650(a)brick.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
kernel/perf_event.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index bb06382..180151f 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -664,13 +664,13 @@ group_sched_in(struct perf_event *group_event,
}
}

- if (txn) {
- ret = pmu->commit_txn(pmu);
- if (!ret) {
- pmu->cancel_txn(pmu);
+ if (!txn)
+ return 0;

- return 0;
- }
+ ret = pmu->commit_txn(pmu);
+ if (!ret) {
+ pmu->cancel_txn(pmu);
+ return 0;
}

group_error:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: cpu_stop: implement and use cpu_stop, take#3
Next: [patch 0/4] perf,p4 series for -tip