[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1301153868.2250.359.camel@laptop>
Date: Sat, 26 Mar 2011 16:37:48 +0100
From: Peter Zijlstra <a.p.zijlstra@...llo.nl>
To: Jiri Olsa <jolsa@...hat.com>
Cc: Paul Mackerras <paulus@...ba.org>, Ingo Molnar <mingo@...e.hu>,
oleg@...hat.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH,RFC] perf: panic due to inclied cpu context task_ctx
value
On Thu, 2011-03-24 at 17:44 +0100, Jiri Olsa wrote:
>
> Now here's what I think is happening..
>
> - once an event is created by sys_perf_event_open, task context
> is created and it stays even if the event is closed, until the task
> is finished ... thats what I see in code and I assume it's correct
Correct, I recently spoke to someone interested in 'curing' that, but as
it stands that's how it is.
> - when the task opens event, perf_sched_events jump label is incremented
> and following callbacks are started from scheduler
>
> __perf_event_task_sched_in
> __perf_event_task_sched_out
>
> These callback *in/out set/unset cpuctx->task_ctx value to the task
> context.
*nod*
> - close is called on event on CPU 0:
> - the task is scheduled on CPU 0
> - __perf_event_task_sched_in is called
> - cpuctx->task_ctx is set
> - perf_sched_events jump label is decremented and == 0
> - __perf_event_task_sched_out is not called
> - cpuctx->task_ctx on CPU 0 stays set
>
> - exit is called on CPU 1:
> - the task is scheduled on CPU 1
> - perf_event_exit_task is called
> - task_ctx_sched_out unsets cpuctx->task_ctx on CPU 1
> - put_ctx destroys the context
>
> - another call of perf_rotate_context on CPU 0 will use invalid
> task_ctx pointer, and eventualy panic
>
>
> The attached workaround makes sure that the task_ctx is not set
> when the context is being removed. As I said it's not ment to be
> fix.
Still having somewhat of a cold, how does the below look?
(completely untested so far, will have to bang on your testcase a bit to
make it work).
---
kernel/perf_event.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index c75925c..2a03cc4 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -1112,6 +1112,8 @@ static int __perf_remove_from_context(void *info)
raw_spin_lock(&ctx->lock);
event_sched_out(event, cpuctx, ctx);
list_del_event(event, ctx);
+ if (cpuctx->task_ctx == event->ctx && !event->ctx->nr_active)
+ cpuctx->task_ctx = NULL;
raw_spin_unlock(&ctx->lock);
return 0;
--
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