From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755572AbcAMRaS (ORCPT ); Wed, 13 Jan 2016 12:30:18 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:56188 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755545AbcAMRaO (ORCPT ); Wed, 13 Jan 2016 12:30:14 -0500 Date: Wed, 13 Jan 2016 18:30:05 +0100 From: Peter Zijlstra To: Alexander Shishkin Cc: mingo@kernel.org, eranian@google.com, 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: <20160113173005.GT6357@twins.programming.kicks-ass.net> References: <20160111162458.427203780@infradead.org> <20160111163229.411314288@infradead.org> <20160113105056.GR6357@twins.programming.kicks-ass.net> <87wprd8uct.fsf@ashishki-desk.ger.corp.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87wprd8uct.fsf@ashishki-desk.ger.corp.intel.com> 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 Wed, Jan 13, 2016 at 03:46:58PM +0200, Alexander Shishkin wrote: > Peter Zijlstra writes: > > > @@ -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); > > Afaict, ctx_resched() path already does this in task_ctx_sched_out(). It does not; that got changed somewhere along the way :-)