From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 821DF1E87B for ; Thu, 3 Apr 2025 10:31:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743676297; cv=none; b=FtLl4kFI4Nv856OgKpuxjR1cH9d1hAZA/WsEhQjjvC1DiXpz4SFUA0SkivzQxKKYrMi1k+afJAiCAIZ58YXJtEYia79m8IMnhCpDTNfCdOOXUp+Ez6oQgEMwrQXL0U2HEBGiSg7/fCN50BKvF0kStlRGY4oLGer+rzTsENbh7S4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743676297; c=relaxed/simple; bh=ExILLAQhyRZREOB8jq1IkZmzLUgTGjqHe7+rXzYwCF8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=nDVOuI1XXWR4sFnDM+txIcRWX+z8jgAuITEszbQ9VuyWzd78gH05HSWE9gp8lG+06C/N5O9IP3fRT/zL2ye2aCVTjhLyYHf/Fwp16dn3m8zlA2haqGbiJtf3s1iS19F1flwFUooP7CwNjwecJr5uvnLWFTMPUa1cQFmspqZtK1M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 59817106F; Thu, 3 Apr 2025 03:31:36 -0700 (PDT) Received: from [10.57.71.20] (unknown [10.57.71.20]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2C1E33F59E; Thu, 3 Apr 2025 03:31:30 -0700 (PDT) Message-ID: Date: Thu, 3 Apr 2025 11:31:27 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] perf: arm-ni: Unregister PMUs on probe failure To: Hongbo Yao , will@kernel.org Cc: mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, allen.wang@hj-micro.com, peter.du@hj-micro.com References: <20250403070918.4153839-1-andy.xu@hj-micro.com> From: Robin Murphy Content-Language: en-GB In-Reply-To: <20250403070918.4153839-1-andy.xu@hj-micro.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2025-04-03 8:09 am, Hongbo Yao wrote: > 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 Reviewed-by: Robin Murphy > Fixes: 4d5a7680f2b4 ("perf: Add driver for Arm NI-700 interconnect PMU") > Signed-off-by: Hongbo Yao > --- > Changes in v3: > - Simplify the fix with the existing pmu_base logic. > - v2: https://lore.kernel.org/linux-arm-kernel/a1cf32e8-c711-476d-a827-e3affedba780@hj-micro.com/T/#ma3347cf5dca2c3cedbfd475f76931ca7b2751019 > > --- > drivers/perf/arm-ni.c | 39 +++++++++++++++++++++------------------ > 1 file changed, 21 insertions(+), 18 deletions(-) > > diff --git a/drivers/perf/arm-ni.c b/drivers/perf/arm-ni.c > index bdb9e6af8732..de7b6cce4d68 100644 > --- 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); > @@ -657,8 +674,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; > + } > } > } > } > @@ -666,23 +686,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" },