Commit fd0815f6 authored by Budimir Markovic's avatar Budimir Markovic Committed by Peter Zijlstra

perf: Fix check before add_event_to_groups() in perf_group_detach()

Events should only be added to a groups rb tree if they have not been
removed from their context by list_del_event(). Since remove_on_exec
made it possible to call list_del_event() on individual events before
they are detached from their group, perf_group_detach() should check each
sibling's attach_state before calling add_event_to_groups() on it.

Fixes: 2e498d0a ("perf: Add support for event removal on exec")
Signed-off-by: default avatarBudimir Markovic <markovicbudimir@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/ZBFzvQV9tEqoHEtH@gentoo
parent baf1b12a
...@@ -2163,7 +2163,7 @@ static void perf_group_detach(struct perf_event *event) ...@@ -2163,7 +2163,7 @@ static void perf_group_detach(struct perf_event *event)
/* Inherit group flags from the previous leader */ /* Inherit group flags from the previous leader */
sibling->group_caps = event->group_caps; sibling->group_caps = event->group_caps;
if (!RB_EMPTY_NODE(&event->group_node)) { if (sibling->attach_state & PERF_ATTACH_CONTEXT) {
add_event_to_groups(sibling, event->ctx); add_event_to_groups(sibling, event->ctx);
if (sibling->state == PERF_EVENT_STATE_ACTIVE) if (sibling->state == PERF_EVENT_STATE_ACTIVE)
......
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