From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754984Ab0ELSm2 (ORCPT ); Wed, 12 May 2010 14:42:28 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:42984 "EHLO e33.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754814Ab0ELSm1 (ORCPT ); Wed, 12 May 2010 14:42:27 -0400 Message-ID: <4BEAF679.7020202@linux.vnet.ibm.com> Date: Wed, 12 May 2010 11:42:01 -0700 From: Corey Ashford User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Peter Zijlstra CC: LKML , Paul Mackerras , Stephane Eranian Subject: Re: [BUG] perf_event: when events are grouped, the time enabled / running values are incorrect References: <4BE4C4BF.6020801@linux.vnet.ibm.com> <1273588935.1810.6.camel@laptop> <4BEAE476.1090100@linux.vnet.ibm.com> <1273686646.1626.145.camel@laptop> In-Reply-To: <1273686646.1626.145.camel@laptop> 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 Peter, I just tested your 2.6.33.3-specific patch, and it works great; I was able to remove the work-around in the user-space tool. Thanks, - Corey On 5/12/2010 10:50 AM, Peter Zijlstra wrote: > On Wed, 2010-05-12 at 10:25 -0700, Corey Ashford wrote: > >> Thanks for looking into this problem! Unfortunately, I've been unable >> to test your patch. It doesn't apply to 2.6.33.3 > > Strange the code looks very similar, the below is a diff against a > virgin v2.6.33.3. > > --- > kernel/perf_event.c | 26 +++++++++++++------------- > 1 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/kernel/perf_event.c b/kernel/perf_event.c > index 32d0ae2..e8ae0c2 100644 > --- a/kernel/perf_event.c > +++ b/kernel/perf_event.c > @@ -290,6 +290,18 @@ static void update_event_times(struct perf_event *event) > } > > /* > + * Update total_time_enabled and total_time_running for all events in a group. > + */ > +static void update_group_times(struct perf_event *leader) > +{ > + struct perf_event *event; > + > + update_event_times(leader); > + list_for_each_entry(event, &leader->sibling_list, group_entry) > + update_event_times(event); > +} > + > +/* > * Add a event from the lists for its context. > * Must be called with ctx->mutex and ctx->lock held. > */ > @@ -337,7 +349,7 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx) > if (event->group_leader != event) > event->group_leader->nr_siblings--; > > - update_event_times(event); > + update_group_times(event); > > /* > * If event was in error state, then keep it > @@ -508,18 +520,6 @@ retry: > } > > /* > - * Update total_time_enabled and total_time_running for all events in a group. > - */ > -static void update_group_times(struct perf_event *leader) > -{ > - struct perf_event *event; > - > - update_event_times(leader); > - list_for_each_entry(event, &leader->sibling_list, group_entry) > - update_event_times(event); > -} > - > -/* > * Cross CPU call to disable a performance event > */ > static void __perf_event_disable(void *info) > > > -- > 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/ -- Regards, - Corey Corey Ashford Software Engineer IBM Linux Technology Center, Linux Toolchain Beaverton, OR 503-578-3507 cjashfor@us.ibm.com