[PATCH] perf_event: Make software events work again

[Paul Mackerras]

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@xxxxxxxxx>
---
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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/