Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756160AbbEUNYh (ORCPT ); Thu, 21 May 2015 09:24:37 -0400 Received: from mail-oi0-f52.google.com ([209.85.218.52]:34692 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755170AbbEUNYd (ORCPT ); Thu, 21 May 2015 09:24:33 -0400 MIME-Version: 1.0 In-Reply-To: <20150521111933.307605209@infradead.org> References: <20150521111710.475482798@infradead.org> <20150521111933.307605209@infradead.org> Date: Thu, 21 May 2015 06:24:32 -0700 Message-ID: Subject: Re: [PATCH 08/10] perf/x86: Remove pointless tests From: Stephane Eranian To: Peter Zijlstra Cc: Ingo Molnar , Vince Weaver , Jiri Olsa , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1994 Lines: 55 On Thu, May 21, 2015 at 4:17 AM, Peter Zijlstra wrote: > Both intel_commit_scheduling() and intel_get_excl_contraints() test > for cntr < 0. > > The only way that can happen (aside from a bug) is through > validate_event(), however that is already captured by the > cpuc->is_fake test. > You are saying that we can never get called with assign[i] = -1. I believe this is correct. The test was leftover from debugging. > So remove these test and simplify the code. > > Signed-off-by: Peter Zijlstra (Intel) > --- > arch/x86/kernel/cpu/perf_event_intel.c | 14 ++++---------- > 1 file changed, 4 insertions(+), 10 deletions(-) > > --- a/arch/x86/kernel/cpu/perf_event_intel.c > +++ b/arch/x86/kernel/cpu/perf_event_intel.c > @@ -1955,12 +1955,10 @@ static void intel_commit_scheduling(stru > > lockdep_assert_held(&excl_cntrs->lock); > > - if (cntr >= 0) { > - if (c->flags & PERF_X86_EVENT_EXCL) > - xl->init_state[cntr] = INTEL_EXCL_EXCLUSIVE; > - else > - xl->init_state[cntr] = INTEL_EXCL_SHARED; > - } > + if (c->flags & PERF_X86_EVENT_EXCL) > + xl->init_state[cntr] = INTEL_EXCL_EXCLUSIVE; > + else > + xl->init_state[cntr] = INTEL_EXCL_SHARED; > } > > static void > @@ -2028,10 +2026,6 @@ intel_get_excl_constraints(struct cpu_hw > if (!(c->flags & PERF_X86_EVENT_DYNAMIC)) { > struct event_constraint *cx; > > - /* sanity check */ > - if (idx < 0) > - return &emptyconstraint; > - > /* > * grab pre-allocated constraint entry > */ > > -- 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/