On Wed, Mar 27, 2013 at 03:09:32PM +0100, Peter Zijlstra wrote:
> On Wed, 2013-03-27 at 10:49 +0100, Borislav Petkov wrote:
> > Ok, just for my own understanding: how do the events on the
> > ->task_ctx->event_list relate to the current cpu in this path? I mean,
> > we're on the task exit path here so is it possible to be rescheduled
> > somewhere else and the check in event_filter_match to become
> > meaningless?
>
> Events can be per-cpu, so what could happen is that we'd send the exit
> notification to a cpu we're not actually running on (anymore).
>
> Furthermore, since we evaluate smp_processor_id() for every
> event_filter_match(), it is possible we'd send the notification to
> multiple events if our task migrates just right.
>
> Also, I suspect we want something like preempt_disable_notrace() to be
> sure we don't recurse or something daft like that... but I'm not
> entirely sure.
hum, I did not find reason for using the *_notrace stuff in here
also we use preempt_disable indirectly via get_cpu_ptr
sending updated patch.. tests looks ok so far
thanks for comments,
jirka
---
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 82c01bf..bdcbda8 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4459,7 +4459,7 @@ static void perf_event_task_ctx(struct perf_event_context
*ctx,
static void perf_event_task_event(struct perf_task_event *task_event)
{
struct perf_cpu_context *cpuctx;
- struct perf_event_context *ctx;
+ struct perf_event_context *ctx, *task_ctx = task_event->task_ctx;
struct pmu *pmu;
int ctxn;
@@ -4470,20 +4470,22 @@ static void perf_event_task_event(struct
perf_task_event *task_event)
goto next;
perf_event_task_ctx(&cpuctx->ctx, task_event);
- ctx = task_event->task_ctx;
- if (!ctx) {
- ctxn = pmu->task_ctx_nr;
- if (ctxn < 0)
- goto next;
- ctx = rcu_dereference(current->perf_event_ctxp[ctxn]);
- if (ctx)
- perf_event_task_ctx(ctx, task_event);
- }
+ if (task_ctx)
+ goto next;
+ ctxn = pmu->task_ctx_nr;
+ if (ctxn < 0)
+ goto next;
+ ctx = rcu_dereference(current->perf_event_ctxp[ctxn]);
+ if (ctx)
+ perf_event_task_ctx(ctx, task_event);
next:
put_cpu_ptr(pmu->pmu_cpu_context);
}
- if (task_event->task_ctx)
- perf_event_task_ctx(task_event->task_ctx, task_event);
+ if (task_ctx) {
+ preempt_disable();
+ perf_event_task_ctx(task_ctx, task_event);
+ preempt_enable();
+ }
rcu_read_unlock();
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
