From mboxrd@z Thu Jan 1 00:00:00 1970 From: will.deacon@arm.com (Will Deacon) Date: Fri, 3 Nov 2017 12:18:16 +0000 Subject: [PATCH 2/2] arm-ccn: perf: Prevent module unload while PMU is in use In-Reply-To: <20171103114518.5311-2-suzuki.poulose@arm.com> References: <20171103114518.5311-1-suzuki.poulose@arm.com> <20171103114518.5311-2-suzuki.poulose@arm.com> Message-ID: <20171103121816.GC11628@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Nov 03, 2017 at 11:45:18AM +0000, Suzuki K Poulose wrote: > When the PMU driver is built as a module, the perf expects the > pmu->module to be valid, so that the driver is prevented from > being unloaded while it is in use. Fix the CCN pmu driver to > fill in this field. > > Fixes: commit a33b0daab73a0 ("bus: ARM CCN PMU driver") nit: don't need "commit" here. > Cc: Pawel Moll > Cc: Will Deacon > Cc: Mark Rutland > Signed-off-by: Suzuki K Poulose > --- > drivers/bus/arm-ccn.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c > index e8c6946fed9d..3063f5312397 100644 > --- a/drivers/bus/arm-ccn.c > +++ b/drivers/bus/arm-ccn.c > @@ -1276,6 +1276,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) > > /* Perf driver registration */ > ccn->dt.pmu = (struct pmu) { > + .module = THIS_MODULE, > .attr_groups = arm_ccn_pmu_attr_groups, > .task_ctx_nr = perf_invalid_context, > .event_init = arm_ccn_pmu_event_init, I'll pick this up since I'm taking the SPE fix via arm64 anyway. Will From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756154AbdKCMSO (ORCPT ); Fri, 3 Nov 2017 08:18:14 -0400 Received: from foss.arm.com ([217.140.101.70]:41696 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752045AbdKCMSN (ORCPT ); Fri, 3 Nov 2017 08:18:13 -0400 Date: Fri, 3 Nov 2017 12:18:16 +0000 From: Will Deacon To: Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Pawel Moll , Mark Rutland Subject: Re: [PATCH 2/2] arm-ccn: perf: Prevent module unload while PMU is in use Message-ID: <20171103121816.GC11628@arm.com> References: <20171103114518.5311-1-suzuki.poulose@arm.com> <20171103114518.5311-2-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171103114518.5311-2-suzuki.poulose@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 03, 2017 at 11:45:18AM +0000, Suzuki K Poulose wrote: > When the PMU driver is built as a module, the perf expects the > pmu->module to be valid, so that the driver is prevented from > being unloaded while it is in use. Fix the CCN pmu driver to > fill in this field. > > Fixes: commit a33b0daab73a0 ("bus: ARM CCN PMU driver") nit: don't need "commit" here. > Cc: Pawel Moll > Cc: Will Deacon > Cc: Mark Rutland > Signed-off-by: Suzuki K Poulose > --- > drivers/bus/arm-ccn.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c > index e8c6946fed9d..3063f5312397 100644 > --- a/drivers/bus/arm-ccn.c > +++ b/drivers/bus/arm-ccn.c > @@ -1276,6 +1276,7 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) > > /* Perf driver registration */ > ccn->dt.pmu = (struct pmu) { > + .module = THIS_MODULE, > .attr_groups = arm_ccn_pmu_attr_groups, > .task_ctx_nr = perf_invalid_context, > .event_init = arm_ccn_pmu_event_init, I'll pick this up since I'm taking the SPE fix via arm64 anyway. Will