Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933161AbbDILGM (ORCPT ); Thu, 9 Apr 2015 07:06:12 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]:34292 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755304AbbDILGL convert rfc822-to-8bit (ORCPT ); Thu, 9 Apr 2015 07:06:11 -0400 Message-ID: <55265D1E.8050700@arm.com> Date: Thu, 09 Apr 2015 12:06:06 +0100 From: "Suzuki K. Poulose" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Mark Salter , Will Deacon CC: Mark Rutland , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH] drivers: CCI: fix used_mask init in validate_group() References: <1428517284-7951-1-git-send-email-msalter@redhat.com> In-Reply-To: <1428517284-7951-1-git-send-email-msalter@redhat.com> X-OriginalArrivalTime: 09 Apr 2015 11:06:06.0701 (UTC) FILETIME=[2D3799D0:01D072B5] X-MC-Unique: tK1pySyaSly--aWBx1AwlA-1 Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1762 Lines: 48 On 08/04/15 19:21, 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. > 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, > - }; > + struct cci_pmu_hw_events fake_pmu; > + > + /* > + * Initialise the fake PMU. We only need to populate the > + * used_mask for the purposes of validation. > + */ > + memset(fake_pmu.used_mask, 0, sizeof(fake_pmu.used_mask)); The patch looks good to me. Reviewed-by: Suzuki K. Poulose Suzuki -- 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/