Messages in this thread Patch in this message | | | Date | Sat, 28 May 2011 16:39:00 GMT | From | tip-bot for Peter Zijlstra <> | Subject | [tip:perf/core] perf: Clean up 'ctx' reference counting |
| |
Commit-ID: 9137fb28ac74d05eb66d1d8e6778eaa14e6fed43 Gitweb: http://git.kernel.org/tip/9137fb28ac74d05eb66d1d8e6778eaa14e6fed43 Author: Peter Zijlstra <a.p.zijlstra@chello.nl> AuthorDate: Sat, 9 Apr 2011 21:17:41 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sat, 28 May 2011 18:01:10 +0200
perf: Clean up 'ctx' reference counting
Small cleanup to how we refcount in find_get_context(), this also allows us to use put_ctx() to free things instead of using kfree().
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/20110409192141.719340481@chello.nl Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/events/core.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c index 4d9a1f01..d665ac4 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2835,16 +2835,12 @@ retry: unclone_ctx(ctx); ++ctx->pin_count; raw_spin_unlock_irqrestore(&ctx->lock, flags); - } - - if (!ctx) { + } else { ctx = alloc_perf_context(pmu, task); err = -ENOMEM; if (!ctx) goto errout; - get_ctx(ctx); - err = 0; mutex_lock(&task->perf_event_mutex); /* @@ -2856,14 +2852,14 @@ retry: else if (task->perf_event_ctxp[ctxn]) err = -EAGAIN; else { + get_ctx(ctx); ++ctx->pin_count; rcu_assign_pointer(task->perf_event_ctxp[ctxn], ctx); } mutex_unlock(&task->perf_event_mutex); if (unlikely(err)) { - put_task_struct(task); - kfree(ctx); + put_ctx(ctx); if (err == -EAGAIN) goto retry;
| |