drivers/perf: hisi: Set correct IRQ affinity for PMUs with no association

[PATCH] drivers/perf: hisi: Set correct IRQ affinity for PMUs with no association

Posted by Yicong Yang 1 year, 1 month ago

From: Yicong Yang <yangyicong@hisilicon.com>

For PMUs with no association, the hisi_pmu->on_cpu is initialized
according to the NUMA locality but use a wrong CPU for the interrupt
affinity. The CPU selected from cpumask_local_spread() can be different
from the CPU by the cpuhp callback. Fix this by setting the IRQ affinity
to hisi_pmu->on_cpu.

Fixes: 6cd137088fdf ("drivers/perf: hisi: Refactor the detection of associated CPUs")
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
---
 drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c
index 83bdc9c31367..ef058b1dd509 100644
--- a/drivers/perf/hisilicon/hisi_uncore_pmu.c
+++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c
@@ -510,7 +510,7 @@ int hisi_uncore_pmu_online_cpu(unsigned int cpu, struct hlist_node *node)
 			return 0;
 
 		hisi_pmu->on_cpu = cpumask_local_spread(0, dev_to_node(hisi_pmu->dev));
-		WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(cpu)));
+		WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(hisi_pmu->on_cpu)));
 		return 0;
 	}
 
-- 
2.24.0

Re: [PATCH] drivers/perf: hisi: Set correct IRQ affinity for PMUs with no association

Posted by Will Deacon 1 year, 1 month ago

On Mon, 23 Dec 2024 20:51:34 +0800, Yicong Yang wrote:
> For PMUs with no association, the hisi_pmu->on_cpu is initialized
> according to the NUMA locality but use a wrong CPU for the interrupt
> affinity. The CPU selected from cpumask_local_spread() can be different
> from the CPU by the cpuhp callback. Fix this by setting the IRQ affinity
> to hisi_pmu->on_cpu.
> 
> 
> [...]

Applied to will (for-next/perf), thanks!

[1/1] drivers/perf: hisi: Set correct IRQ affinity for PMUs with no association
      https://git.kernel.org/will/c/555c6e9b03c1

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

Re: [PATCH] drivers/perf: hisi: Set correct IRQ affinity for PMUs with no association

Posted by Jonathan Cameron 1 year, 1 month ago

On Mon, 23 Dec 2024 20:51:34 +0800
Yicong Yang <yangyicong@huawei.com> wrote:

> From: Yicong Yang <yangyicong@hisilicon.com>
> 
> For PMUs with no association, the hisi_pmu->on_cpu is initialized
> according to the NUMA locality but use a wrong CPU for the interrupt
> affinity. The CPU selected from cpumask_local_spread() can be different
> from the CPU by the cpuhp callback. Fix this by setting the IRQ affinity
> to hisi_pmu->on_cpu.
> 
> Fixes: 6cd137088fdf ("drivers/perf: hisi: Refactor the detection of associated CPUs")
> Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

> ---
>  drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/perf/hisilicon/hisi_uncore_pmu.c b/drivers/perf/hisilicon/hisi_uncore_pmu.c
> index 83bdc9c31367..ef058b1dd509 100644
> --- a/drivers/perf/hisilicon/hisi_uncore_pmu.c
> +++ b/drivers/perf/hisilicon/hisi_uncore_pmu.c
> @@ -510,7 +510,7 @@ int hisi_uncore_pmu_online_cpu(unsigned int cpu, struct hlist_node *node)
>  			return 0;
>  
>  		hisi_pmu->on_cpu = cpumask_local_spread(0, dev_to_node(hisi_pmu->dev));
> -		WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(cpu)));
> +		WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(hisi_pmu->on_cpu)));
>  		return 0;
>  	}
>