aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-11-20 16:19:47 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-21 08:11:36 -0500
commitf6595f3a9680c86b6332f881a7ae2cbbcfdc8619 (patch)
treee536eae39be3de42c2c48b5ab3a7eef198aa201f /kernel/perf_event.c
parentd6ff86cfb50a72df820e7e839836d55d245306fb (diff)
perf: Optimize perf_event_comm_ctx()
Remove a rcu_read_{,un}lock() pair and a few conditionals. We can remove the rcu_read_lock() by increasing the scope of one in the calling function. We can do away with the system_state check if the machine still boots after this patch (seems to be the case). We can do away with the list_empty() check because the bare list_for_each_entry_rcu() reduces to that now that we've removed everything else. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <20091120212508.527608793@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r--kernel/perf_event.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 2afb305944af..4deefaace90e 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -3374,15 +3374,10 @@ static void perf_event_comm_ctx(struct perf_event_context *ctx,
3374{ 3374{
3375 struct perf_event *event; 3375 struct perf_event *event;
3376 3376
3377 if (system_state != SYSTEM_RUNNING || list_empty(&ctx->event_list))
3378 return;
3379
3380 rcu_read_lock();
3381 list_for_each_entry_rcu(event, &ctx->event_list, event_entry) { 3377 list_for_each_entry_rcu(event, &ctx->event_list, event_entry) {
3382 if (perf_event_comm_match(event)) 3378 if (perf_event_comm_match(event))
3383 perf_event_comm_output(event, comm_event); 3379 perf_event_comm_output(event, comm_event);
3384 } 3380 }
3385 rcu_read_unlock();
3386} 3381}
3387 3382
3388static void perf_event_comm_event(struct perf_comm_event *comm_event) 3383static void perf_event_comm_event(struct perf_comm_event *comm_event)
@@ -3401,11 +3396,11 @@ static void perf_event_comm_event(struct perf_comm_event *comm_event)
3401 3396
3402 comm_event->event_id.header.size = sizeof(comm_event->event_id) + size; 3397 comm_event->event_id.header.size = sizeof(comm_event->event_id) + size;
3403 3398
3399 rcu_read_lock();
3404 cpuctx = &get_cpu_var(perf_cpu_context); 3400 cpuctx = &get_cpu_var(perf_cpu_context);
3405 perf_event_comm_ctx(&cpuctx->ctx, comm_event); 3401 perf_event_comm_ctx(&cpuctx->ctx, comm_event);
3406 put_cpu_var(perf_cpu_context); 3402 put_cpu_var(perf_cpu_context);
3407 3403
3408 rcu_read_lock();
3409 /* 3404 /*
3410 * doesn't really matter which of the child contexts the 3405 * doesn't really matter which of the child contexts the
3411 * events ends up in. 3406 * events ends up in.