perf_events: Disable events when we detach them
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Mon, 23 Nov 2009 10:37:25 +0000 (11:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Nov 2009 10:49:56 +0000 (11:49 +0100)
If we leave the event in STATE_INACTIVE, any read of the event
after the detach will increase the running count but not the
enabled count and cause funny scaling artefacts.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091123103819.689055515@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c

index 1f14481c2337d0a08657b220e44a5f780aca63cb..fb851ec34461c932620374f8d8236dbbcb57bb84 100644 (file)
@@ -294,6 +294,8 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
        if (event->group_leader != event)
                event->group_leader->nr_siblings--;
 
+       event->state = PERF_EVENT_STATE_OFF;
+
        /*
         * If this was a group event with sibling events then
         * upgrade the siblings to singleton events by adding them