Skip to contentSkip to conversation

Revert "perf: Fix exit() vs PERF_FORMAT_GROUP"

tip:perf/core tip-bot for Ingo Molnar 1 participant 1 message May 11, 2010 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  e3174cfd2a1e28fff774681f00a0eef3d31da970
Gitweb:     http://git.kernel.org/tip/e3174cfd2a1e28fff774681f00a0eef3d31da970
Author:     Ingo Molnar <[email protected]>
AuthorDate: Tue, 11 May 2010 08:31:49 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 11 May 2010 08:31:49 +0200

Revert "perf: Fix exit() vs PERF_FORMAT_GROUP"

This reverts commit 4fd38e4595e2f6c9d27732c042a0e16b2753049c.

It causes various crashes and hangs when events are activated.

The cause is not fully understood yet but we need to revert it because the effects are severe.

Cc Peter Zijlstra <[email protected]>
Cc Corey Ashford <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Frederic Weisbecker <[email protected]>

LKML-Reference: <new-submission>

---
 include/linux/perf_event.h |    1 -
 kernel/perf_event.c        |    5 -----
 2 files changed, 0 insertions(+), 6 deletions(-)
include/linux/perf_event.h +0 -1
index 4924c96..3fd5c82 100644
@@ -575,7 +575,6 @@ struct pmu {
  * enum perf_event_active_state - the states of a event
  */
 enum perf_event_active_state {
-	PERF_EVENT_STATE_FREE		= -3,
 	PERF_EVENT_STATE_ERROR		= -2,
 	PERF_EVENT_STATE_OFF		= -1,
 	PERF_EVENT_STATE_INACTIVE	=  0,
kernel/perf_event.c +0 -5
index 180151f..a904746 100644
@@ -334,9 +334,6 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
 	if (event->state > PERF_EVENT_STATE_OFF)
 		event->state = PERF_EVENT_STATE_OFF;
 
-	if (event->state > PERF_EVENT_STATE_FREE)
-		return;
-
 	/*
 	 * If this was a group event with sibling events then
 	 * upgrade the siblings to singleton events by adding them
@@ -1871,8 +1868,6 @@ int perf_event_release_kernel(struct perf_event *event)
 {
 	struct perf_event_context *ctx = event->ctx;
 
-	event->state = PERF_EVENT_STATE_FREE;
-
 	WARN_ON_ONCE(ctx->parent_ctx);
 	/*
 	 * There are two ways this annotation is useful: