Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754493AbZIWIL3 (ORCPT ); Wed, 23 Sep 2009 04:11:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754420AbZIWIL2 (ORCPT ); Wed, 23 Sep 2009 04:11:28 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:51186 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754456AbZIWIL1 (ORCPT ); Wed, 23 Sep 2009 04:11:27 -0400 Message-ID: <4AB9D7FA.5040707@cn.fujitsu.com> Date: Wed, 23 Sep 2009 16:10:34 +0800 From: Xiao Guangrong User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Ingo Molnar CC: Paul Mackerras , Peter Zijlstra , LKML Subject: [PATCH 1/2] perf_counter: cleanup for __perf_event_sched_*() References: <4AB88F06.10900@cn.fujitsu.com> <19128.39768.149110.673711@cargo.ozlabs.ibm.com> <4AB98BB0.6020202@cn.fujitsu.com> <19129.38627.94363.857137@cargo.ozlabs.ibm.com> In-Reply-To: <19129.38627.94363.857137@cargo.ozlabs.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3115 Lines: 103 Paul Mackerras says: "Actually, looking at this more closely, it has to be a group leader anyway since it's at the top level of ctx->group_list. In fact I see four places where we do: list_for_each_entry(event, &ctx->group_list, group_entry) { if (event == event->group_leader) ... or the equivalent, three of which appear to have been introduced by afedadf2 ("perf_counter: Optimize sched in/out of counters") back in May by Peter Z. As far as I can see the if () is superfluous in each case (a singleton event will be a group of 1 and will have its group_leader pointing to itself)." [Can be found at http://marc.info/?l=linux-kernel&m=125361238901442&w=2] So, this patch fix it. Signed-off-by: Xiao Guangrong --- kernel/perf_event.c | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 76ac4db..9ca975a 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -1032,10 +1032,13 @@ void __perf_event_sched_out(struct perf_event_context *ctx, perf_disable(); if (ctx->nr_active) { list_for_each_entry(event, &ctx->group_list, group_entry) { - if (event != event->group_leader) - event_sched_out(event, cpuctx, ctx); - else - group_sched_out(event, cpuctx, ctx); + + /* + * It has to be a group leader since it's at the top + * level of ctx->group_list + */ + WARN_ON_ONCE(event != event->group_leader); + group_sched_out(event, cpuctx, ctx); } } perf_enable(); @@ -1258,12 +1261,14 @@ __perf_event_sched_in(struct perf_event_context *ctx, if (event->cpu != -1 && event->cpu != cpu) continue; - if (event != event->group_leader) - event_sched_in(event, cpuctx, ctx, cpu); - else { - if (group_can_go_on(event, cpuctx, 1)) - group_sched_in(event, cpuctx, ctx, cpu); - } + /* + * It has to be a group leader since it's at the top + * level of ctx->group_list + */ + WARN_ON_ONCE(event != event->group_leader); + + if (group_can_go_on(event, cpuctx, 1)) + group_sched_in(event, cpuctx, ctx, cpu); /* * If this pinned group hasn't been scheduled, @@ -1291,15 +1296,15 @@ __perf_event_sched_in(struct perf_event_context *ctx, if (event->cpu != -1 && event->cpu != cpu) continue; - if (event != event->group_leader) { - if (event_sched_in(event, cpuctx, ctx, cpu)) + /* + * It has to be a group leader since it's at the top + * level of ctx->group_list + */ + WARN_ON_ONCE(event != event->group_leader); + + if (group_can_go_on(event, cpuctx, can_add_hw)) + if (group_sched_in(event, cpuctx, ctx, cpu)) can_add_hw = 0; - } else { - if (group_can_go_on(event, cpuctx, can_add_hw)) { - if (group_sched_in(event, cpuctx, ctx, cpu)) - can_add_hw = 0; - } - } } perf_enable(); out: -- 1.6.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/