Skip to content

Commit

Permalink
perf: Untangle 'owner' confusion
Browse files Browse the repository at this point in the history
There are two concepts of owner wrt an event and they are conflated:

 - event::owner / event::owner_list,
   used by prctl(.option = PR_TASK_PERF_EVENTS_{EN,DIS}ABLE).

 - the 'owner' of the event object, typically the file descriptor.

Currently these two concepts are conflated, which gives trouble with
scm_rights passing of file descriptors. Passing the event and then
closing the creating task would render the event 'orphan' and would
have it cleared out. Unlikely what is expectd.

This patch untangles these two concepts by using PERF_EVENT_STATE_EXIT
to denote the second type.

Reported-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Jan 29, 2016
1 parent 45a0e07 commit 60beda8
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions kernel/events/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,7 @@ static void perf_group_detach(struct perf_event *event)
*/
static bool is_orphaned_event(struct perf_event *event)
{
return event && !is_kernel_event(event) && !READ_ONCE(event->owner);
return event && event->state == PERF_EVENT_STATE_EXIT;
}

/*
Expand Down Expand Up @@ -1771,6 +1771,7 @@ group_sched_out(struct perf_event *group_event,
}

#define DETACH_GROUP 0x01UL
#define DETACH_STATE 0x02UL

/*
* Cross CPU call to remove a performance event
Expand All @@ -1790,6 +1791,8 @@ __perf_remove_from_context(struct perf_event *event,
if (flags & DETACH_GROUP)
perf_group_detach(event);
list_del_event(event, ctx);
if (flags & DETACH_STATE)
event->state = PERF_EVENT_STATE_EXIT;

if (!ctx->nr_events && ctx->is_active) {
ctx->is_active = 0;
Expand Down Expand Up @@ -3801,9 +3804,16 @@ static void put_event(struct perf_event *event)
*/
ctx = perf_event_ctx_lock_nested(event, SINGLE_DEPTH_NESTING);
WARN_ON_ONCE(ctx->parent_ctx);
perf_remove_from_context(event, DETACH_GROUP);
perf_remove_from_context(event, DETACH_GROUP | DETACH_STATE);
perf_event_ctx_unlock(event, ctx);

/*
* At this point we must have event->state == PERF_EVENT_STATE_EXIT,
* either from the above perf_remove_from_context() or through
* perf_event_exit_event().
*/
WARN_ON_ONCE(event->state != PERF_EVENT_STATE_EXIT);

_free_event(event);
}

Expand Down

0 comments on commit 60beda8

Please sign in to comment.