Skip to content

Commit

Permalink
perf: Do not set task_ctx pointer in cpuctx if there are no events in…
Browse files Browse the repository at this point in the history
… the context

Do not set task_ctx pointer during sched_in if there are no
events associated with the context.  Otherwise if during task
execution total number of events in the system will become zero
perf_event_context_sched_out() will not be called and cpuctx->task_ctx
will be left with a stale value.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20111023171033.GI17571@redhat.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Gleb Natapov authored and Ingo Molnar committed Nov 14, 2011
1 parent 57d1c0c commit 1d5f003
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion kernel/events/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2173,7 +2173,8 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx,

perf_event_sched_in(cpuctx, ctx, task);

cpuctx->task_ctx = ctx;
if (ctx->nr_events)
cpuctx->task_ctx = ctx;

perf_pmu_enable(ctx->pmu);
perf_ctx_unlock(cpuctx, ctx);
Expand Down

0 comments on commit 1d5f003

Please sign in to comment.