From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934086AbcAMKvF (ORCPT ); Wed, 13 Jan 2016 05:51:05 -0500 Received: from casper.infradead.org ([85.118.1.10]:56641 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934013AbcAMKvC (ORCPT ); Wed, 13 Jan 2016 05:51:02 -0500 Date: Wed, 13 Jan 2016 11:50:56 +0100 From: Peter Zijlstra To: mingo@kernel.org, alexander.shishkin@linux.intel.com, eranian@google.com Cc: linux-kernel@vger.kernel.org, vince@deater.net, dvyukov@google.com, andi@firstfloor.org, jolsa@redhat.com Subject: Re: [RFC][PATCH 12/12] perf: Collapse and fix event_function_call() users Message-ID: <20160113105056.GR6357@twins.programming.kicks-ass.net> References: <20160111162458.427203780@infradead.org> <20160111163229.411314288@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160111163229.411314288@infradead.org> User-Agent: Mutt/1.5.21 (2012-12-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 11, 2016 at 05:25:10PM +0100, Peter Zijlstra wrote: > --- a/kernel/events/core.c > +++ b/kernel/events/core.c > @@ -2202,44 +2219,28 @@ static void __perf_event_mark_enabled(st > /* > * Cross CPU call to enable a performance event > */ > +static void __perf_event_enable(struct perf_event *event, > + struct perf_cpu_context *cpuctx, > + struct perf_event_context *ctx, > + void *info) > { > struct perf_event *leader = event->group_leader; > - struct perf_event_context *task_ctx = cpuctx->task_ctx; deleted too much ^^ > > if (event->state >= PERF_EVENT_STATE_INACTIVE) > + return; > > + update_context_time(ctx); > __perf_event_mark_enabled(event); > > + if (!ctx->is_active) > + return; > + > if (!event_filter_match(event)) { > + if (is_cgroup_event(event)) { > + perf_cgroup_set_timestamp(current, ctx); // XXX ? > perf_cgroup_defer_enabled(event); > + } > + return; > } > > /* > @@ -2247,19 +2248,9 @@ static int __perf_event_enable(void *inf > * then don't put it on unless the group is on. > */ > if (leader != event && leader->state != PERF_EVENT_STATE_ACTIVE) > + return; > > + ctx_resched(cpuctx, ctx); > } --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -2225,6 +2243,7 @@ static void __perf_event_enable(struct p void *info) { struct perf_event *leader = event->group_leader; + struct perf_event_context *task_ctx; if (event->state >= PERF_EVENT_STATE_INACTIVE) return; @@ -2250,7 +2269,11 @@ static void __perf_event_enable(struct p if (leader != event && leader->state != PERF_EVENT_STATE_ACTIVE) return; - ctx_resched(cpuctx, ctx); + task_ctx = cpuctx->task_ctx; + if (ctx->task) + WARN_ON_ONCE(task_ctx != ctx); + + ctx_resched(cpuctx, task_ctx); } /*