perf: arm-ni: Unregister PMUs on probe failure

When a resource allocation fails in one clock domain of an NI device,
we need to properly roll back all previously registered perf PMUs in
other clock domains of the same device.

Otherwise, it can lead to kernel panics.

Calling arm_ni_init+0x0/0xff8 [arm_ni] @ 2374
arm-ni ARMHCB70:00: Failed to request PMU region 0x1f3c13000
arm-ni ARMHCB70:00: probe with driver arm-ni failed with error -16
list_add corruption: next->prev should be prev (fffffd01e9698a18),
but was 0000000000000000. (next=ffff10001a0decc8).
pstate: 6340009 (nZCv daif +PAN -UAO +TCO +DIT -SSBS BTYPE=--)
pc : list_add_valid_or_report+0x7c/0xb8
lr : list_add_valid_or_report+0x7c/0xb8
Call trace:
 __list_add_valid_or_report+0x7c/0xb8
 perf_pmu_register+0x22c/0x3a0
 arm_ni_probe+0x554/0x70c [arm_ni]
 platform_probe+0x70/0xe8
 really_probe+0xc6/0x4d8
 driver_probe_device+0x48/0x170
 __driver_attach+0x8e/0x1c0
 bus_for_each_dev+0x64/0xf0
 driver_add+0x138/0x260
 bus_add_driver+0x68/0x138
 __platform_driver_register+0x2c/0x40
 arm_ni_init+0x14/0x2a [arm_ni]
 do_init_module+0x36/0x298
---[ end trace 0000000000000000 ]---
Kernel panic - not syncing: Oops - BUG: Fatal exception
SMP: stopping secondary CPUs

Fixes: 4d5a7680f2b4 ("perf: Add driver for Arm NI-700 interconnect PMU")
Signed-off-by: Hongbo Yao <andy.xu@hj-micro.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/20250403070918.4153839-1-andy.xu@hj-micro.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/arm-ni.c b/drivers/perf/arm-ni.c
index fd7a5e60e96302fada29cd44e7bf9c582e93e4ce..0c418a7ee10f316001561bcafc01c155fac0f33f 100644 (file)
--- a/drivers/perf/arm-ni.c
+++ b/drivers/perf/arm-ni.c
@@ -575,6 +575,23 @@ static int arm_ni_init_cd(struct arm_ni *ni, struct arm_ni_node *node, u64 res_s
        return err;
 }
 
+static void arm_ni_remove(struct platform_device *pdev)
+{
+       struct arm_ni *ni = platform_get_drvdata(pdev);
+
+       for (int i = 0; i < ni->num_cds; i++) {
+               struct arm_ni_cd *cd = ni->cds + i;
+
+               if (!cd->pmu_base)
+                       continue;
+
+               writel_relaxed(0, cd->pmu_base + NI_PMCR);
+               writel_relaxed(U32_MAX, cd->pmu_base + NI_PMINTENCLR);
+               perf_pmu_unregister(&cd->pmu);
+               cpuhp_state_remove_instance_nocalls(arm_ni_hp_state, &cd->cpuhp_node);
+       }
+}
+
 static void arm_ni_probe_domain(void __iomem *base, struct arm_ni_node *node)
 {
        u32 reg = readl_relaxed(base + NI_NODE_TYPE);
@@ -656,8 +673,11 @@ static int arm_ni_probe(struct platform_device *pdev)
                                reg = readl_relaxed(pd.base + NI_CHILD_PTR(c));
                                arm_ni_probe_domain(base + reg, &cd);
                                ret = arm_ni_init_cd(ni, &cd, res->start);
-                               if (ret)
+                               if (ret) {
+                                       ni->cds[cd.id].pmu_base = NULL;
+                                       arm_ni_remove(pdev);
                                        return ret;
+                               }
                        }
                }
        }
@@ -665,23 +685,6 @@ static int arm_ni_probe(struct platform_device *pdev)
        return 0;
 }
 
-static void arm_ni_remove(struct platform_device *pdev)
-{
-       struct arm_ni *ni = platform_get_drvdata(pdev);
-
-       for (int i = 0; i < ni->num_cds; i++) {
-               struct arm_ni_cd *cd = ni->cds + i;
-
-               if (!cd->pmu_base)
-                       continue;
-
-               writel_relaxed(0, cd->pmu_base + NI_PMCR);
-               writel_relaxed(U32_MAX, cd->pmu_base + NI_PMINTENCLR);
-               perf_pmu_unregister(&cd->pmu);
-               cpuhp_state_remove_instance_nocalls(arm_ni_hp_state, &cd->cpuhp_node);
-       }
-}
-
 #ifdef CONFIG_OF
 static const struct of_device_id arm_ni_of_match[] = {
        { .compatible = "arm,ni-700" },