[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-1d5f003f5a964711853514b04ddc872eec0fdc7b@git.kernel.org>
Date: Fri, 18 Nov 2011 15:32:58 -0800
From: tip-bot for Gleb Natapov <gleb@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, gleb@...hat.com, hpa@...or.com,
mingo@...hat.com, a.p.zijlstra@...llo.nl, tglx@...utronix.de,
mingo@...e.hu
Subject: [tip:perf/urgent] perf: Do not set task_ctx pointer in cpuctx if there are no events in the context
Commit-ID: 1d5f003f5a964711853514b04ddc872eec0fdc7b
Gitweb: http://git.kernel.org/tip/1d5f003f5a964711853514b04ddc872eec0fdc7b
Author: Gleb Natapov <gleb@...hat.com>
AuthorDate: Sun, 23 Oct 2011 19:10:33 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 14 Nov 2011 13:01:21 +0100
perf: Do not set task_ctx pointer in cpuctx if there are no events in 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@...hat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Link: http://lkml.kernel.org/r/20111023171033.GI17571@redhat.com
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/events/core.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 0e8457d..b0c1186 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists