Skip to content

Commit

Permalink
perf_counter: Annotate exit ctx recursion
Browse files Browse the repository at this point in the history
Ever since Paul fixed it to unclone the context before taking the
ctx->lock this became a false positive, annotate it away.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Jun 11, 2009
1 parent f7b7c26 commit 66fff22
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion kernel/perf_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -3879,7 +3879,18 @@ void perf_counter_exit_task(struct task_struct *child)
spin_unlock(&child_ctx->lock);
local_irq_restore(flags);

mutex_lock(&child_ctx->mutex);
/*
* We can recurse on the same lock type through:
*
* __perf_counter_exit_task()
* sync_child_counter()
* fput(parent_counter->filp)
* perf_release()
* mutex_lock(&ctx->mutex)
*
* But since its the parent context it won't be the same instance.
*/
mutex_lock_nested(&child_ctx->mutex, SINGLE_DEPTH_NESTING);

again:
list_for_each_entry_safe(child_counter, tmp, &child_ctx->counter_list,
Expand Down

0 comments on commit 66fff22

Please sign in to comment.