Commit 74c3337c authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

perf: Fix group moving

Matt found we trigger the WARN_ON_ONCE() in perf_group_attach() when we take
the move_group path in perf_event_open().

Since we cannot de-construct the group (we rely on it to move the events), we
have to simply ignore the double attach. The group state is context invariant
and doesn't need changing.
Reported-by: default avatarMatt Fleming <matt@console-pimps.org>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1287135757.29097.1368.camel@twins>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e360adbe
...@@ -315,7 +315,12 @@ static void perf_group_attach(struct perf_event *event) ...@@ -315,7 +315,12 @@ static void perf_group_attach(struct perf_event *event)
{ {
struct perf_event *group_leader = event->group_leader; struct perf_event *group_leader = event->group_leader;
WARN_ON_ONCE(event->attach_state & PERF_ATTACH_GROUP); /*
* We can have double attach due to group movement in perf_event_open.
*/
if (event->attach_state & PERF_ATTACH_GROUP)
return;
event->attach_state |= PERF_ATTACH_GROUP; event->attach_state |= PERF_ATTACH_GROUP;
if (group_leader == event) if (group_leader == event)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment