From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755381AbbDINva (ORCPT ); Thu, 9 Apr 2015 09:51:30 -0400 Received: from foss.arm.com ([217.140.101.70]:52841 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751636AbbDINv3 (ORCPT ); Thu, 9 Apr 2015 09:51:29 -0400 Date: Thu, 9 Apr 2015 14:51:25 +0100 From: Mark Rutland To: Mark Salter Cc: Will Deacon , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH] drivers: CCI: fix used_mask init in validate_group() Message-ID: <20150409135124.GA9648@leverpostej> References: <1428517284-7951-1-git-send-email-msalter@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1428517284-7951-1-git-send-email-msalter@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 08, 2015 at 07:21:24PM +0100, Mark Salter wrote: > Currently in validate_group(), there is a static initializer > for fake_pmu.used_mask which is based on CPU_BITS_NONE but > the used_mask array size is based on CCI_PMU_MAX_HW_EVENTS. > CCI_PMU_MAX_HW_EVENTS is not based on NR_CPUS, so CPU_BITS_NONE > is not correct and will cause a build failure if NR_CPUS > is set high enough to make CPU_BITS_NONE larger than used_mask. Whoops. My bad. > This patch changes the used_mask initialization to be runtime > based on the actual size of the array. > > Signed-off-by: Mark Salter > --- > drivers/bus/arm-cci.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c > index 84fd660..1d83072 100644 > --- a/drivers/bus/arm-cci.c > +++ b/drivers/bus/arm-cci.c > @@ -679,13 +679,13 @@ static int > validate_group(struct perf_event *event) > { > struct perf_event *sibling, *leader = event->group_leader; > - struct cci_pmu_hw_events fake_pmu = { > - /* > - * Initialise the fake PMU. We only need to populate the > - * used_mask for the purposes of validation. > - */ > - .used_mask = CPU_BITS_NONE, Can we not simply change this to: .used_mask = { 0 }, That should result in the entire array being zeroed. Thanks, Mark.