* [PATCH v2] perf/smmuv3: Remove the leftover put_cpu() in error path
@ 2019-12-11 6:43 Hanjun Guo
2019-12-16 12:20 ` Will Deacon
0 siblings, 1 reply; 3+ messages in thread
From: Hanjun Guo @ 2019-12-11 6:43 UTC (permalink / raw)
To: Mark Rutland, Will Deacon
Cc: Robin Murphy, Shameer Kolothum, linux-arm-kernel, linux-kernel,
Hanjun Guo
In smmu_pmu_probe(), there is put_cpu() in the error path,
which is wrong because we use raw_smp_processor_id() to
get the cpu ID, not get_cpu(), remove it.
While we are at it, kill 'out_cpuhp_err' altogether and
just return err if we fail to add the hotplug instance.
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
---
drivers/perf/arm_smmuv3_pmu.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index 773128f..d704ecc 100644
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -814,7 +814,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
if (err) {
dev_err(dev, "Error %d registering hotplug, PMU @%pa\n",
err, &res_0->start);
- goto out_cpuhp_err;
+ return err;
}
err = perf_pmu_register(&smmu_pmu->pmu, name, -1);
@@ -833,8 +833,6 @@ static int smmu_pmu_probe(struct platform_device *pdev)
out_unregister:
cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node);
-out_cpuhp_err:
- put_cpu();
return err;
}
--
1.7.12.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] perf/smmuv3: Remove the leftover put_cpu() in error path
2019-12-11 6:43 [PATCH v2] perf/smmuv3: Remove the leftover put_cpu() in error path Hanjun Guo
@ 2019-12-16 12:20 ` Will Deacon
2019-12-18 16:15 ` Catalin Marinas
0 siblings, 1 reply; 3+ messages in thread
From: Will Deacon @ 2019-12-16 12:20 UTC (permalink / raw)
To: Hanjun Guo, catalin.marinas
Cc: Mark Rutland, Robin Murphy, Shameer Kolothum, linux-arm-kernel,
linux-kernel
[+Catalin]
On Wed, Dec 11, 2019 at 02:43:06PM +0800, Hanjun Guo wrote:
> In smmu_pmu_probe(), there is put_cpu() in the error path,
> which is wrong because we use raw_smp_processor_id() to
> get the cpu ID, not get_cpu(), remove it.
>
> While we are at it, kill 'out_cpuhp_err' altogether and
> just return err if we fail to add the hotplug instance.
>
> Acked-by: Robin Murphy <robin.murphy@arm.com>
> Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
> ---
> drivers/perf/arm_smmuv3_pmu.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
> index 773128f..d704ecc 100644
> --- a/drivers/perf/arm_smmuv3_pmu.c
> +++ b/drivers/perf/arm_smmuv3_pmu.c
> @@ -814,7 +814,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
> if (err) {
> dev_err(dev, "Error %d registering hotplug, PMU @%pa\n",
> err, &res_0->start);
> - goto out_cpuhp_err;
> + return err;
> }
>
> err = perf_pmu_register(&smmu_pmu->pmu, name, -1);
> @@ -833,8 +833,6 @@ static int smmu_pmu_probe(struct platform_device *pdev)
>
> out_unregister:
> cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node);
> -out_cpuhp_err:
> - put_cpu();
> return err;
> }
Acked-by: Will Deacon <will@kernel.org>
Catalin -- please can you take this as a fix via the arm64 tree? I don't
have any other perf patches pending at the moment.
Cheers,
Will
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] perf/smmuv3: Remove the leftover put_cpu() in error path
2019-12-16 12:20 ` Will Deacon
@ 2019-12-18 16:15 ` Catalin Marinas
0 siblings, 0 replies; 3+ messages in thread
From: Catalin Marinas @ 2019-12-18 16:15 UTC (permalink / raw)
To: Will Deacon
Cc: Hanjun Guo, Mark Rutland, Robin Murphy, Shameer Kolothum,
linux-arm-kernel, linux-kernel
On Mon, Dec 16, 2019 at 12:20:57PM +0000, Will Deacon wrote:
> On Wed, Dec 11, 2019 at 02:43:06PM +0800, Hanjun Guo wrote:
> > In smmu_pmu_probe(), there is put_cpu() in the error path,
> > which is wrong because we use raw_smp_processor_id() to
> > get the cpu ID, not get_cpu(), remove it.
> >
> > While we are at it, kill 'out_cpuhp_err' altogether and
> > just return err if we fail to add the hotplug instance.
> >
> > Acked-by: Robin Murphy <robin.murphy@arm.com>
> > Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
> > ---
> > drivers/perf/arm_smmuv3_pmu.c | 4 +---
> > 1 file changed, 1 insertion(+), 3 deletions(-)
> >
> > diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
> > index 773128f..d704ecc 100644
> > --- a/drivers/perf/arm_smmuv3_pmu.c
> > +++ b/drivers/perf/arm_smmuv3_pmu.c
> > @@ -814,7 +814,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
> > if (err) {
> > dev_err(dev, "Error %d registering hotplug, PMU @%pa\n",
> > err, &res_0->start);
> > - goto out_cpuhp_err;
> > + return err;
> > }
> >
> > err = perf_pmu_register(&smmu_pmu->pmu, name, -1);
> > @@ -833,8 +833,6 @@ static int smmu_pmu_probe(struct platform_device *pdev)
> >
> > out_unregister:
> > cpuhp_state_remove_instance_nocalls(cpuhp_state_num, &smmu_pmu->node);
> > -out_cpuhp_err:
> > - put_cpu();
> > return err;
> > }
>
> Acked-by: Will Deacon <will@kernel.org>
>
> Catalin -- please can you take this as a fix via the arm64 tree? I don't
> have any other perf patches pending at the moment.
Queued.
--
Catalin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-18 16:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-11 6:43 [PATCH v2] perf/smmuv3: Remove the leftover put_cpu() in error path Hanjun Guo
2019-12-16 12:20 ` Will Deacon
2019-12-18 16:15 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).