Commit 77b06ddc authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Will Deacon
Browse files

perf/hisi: Use irq_set_affinity() 



These drivers use irq_set_affinity_hint() to set the affinity for the PMU
interrupts, which relies on the undocumented side effect that this function
actually sets the affinity under the hood.

Setting an hint is clearly not a guarantee and for these PMU interrupts an
affinity hint, which is supposed to guide userspace for setting affinity,
is beyond pointless, because the affinity of these interrupts cannot be
modified from user space.

Aside of that the error checks are bogus because the only error which is
returned from irq_set_affinity_hint() is when there is no irq descriptor
for the interrupt number, but not when the affinity set fails. That's on
purpose because the hint can point to an offline CPU.

Replace the mindless abuse with irq_set_affinity().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20210518093118.813375875@linutronix.de


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent ba4489fb

drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c

+0 −3
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ static int hisi_ddrc_pmu_probe(struct platform_device *pdev) 
		dev_err(ddrc_pmu->dev, "DDRC PMU register failed!\n");

		cpuhp_state_remove_instance_nocalls(

			CPUHP_AP_PERF_ARM_HISI_DDRC_ONLINE, &ddrc_pmu->node);

		irq_set_affinity_hint(ddrc_pmu->irq, NULL);

	}



	return ret;
@@ -550,8 +549,6 @@ static int hisi_ddrc_pmu_remove(struct platform_device *pdev) 
	perf_pmu_unregister(&ddrc_pmu->pmu);

	cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_HISI_DDRC_ONLINE,

					    &ddrc_pmu->node);

	irq_set_affinity_hint(ddrc_pmu->irq, NULL);



	return 0;

}

drivers/perf/hisilicon/hisi_uncore_hha_pmu.c

+0 −3
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ static int hisi_hha_pmu_probe(struct platform_device *pdev) 
		dev_err(hha_pmu->dev, "HHA PMU register failed!\n");

		cpuhp_state_remove_instance_nocalls(

			CPUHP_AP_PERF_ARM_HISI_HHA_ONLINE, &hha_pmu->node);

		irq_set_affinity_hint(hha_pmu->irq, NULL);

	}



	return ret;
@@ -553,8 +552,6 @@ static int hisi_hha_pmu_remove(struct platform_device *pdev) 
	perf_pmu_unregister(&hha_pmu->pmu);

	cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_HISI_HHA_ONLINE,

					    &hha_pmu->node);

	irq_set_affinity_hint(hha_pmu->irq, NULL);



	return 0;

}

drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c

+0 −3
Original line number Diff line number Diff line
@@ -578,7 +578,6 @@ static int hisi_l3c_pmu_probe(struct platform_device *pdev) 
		dev_err(l3c_pmu->dev, "L3C PMU register failed!\n");

		cpuhp_state_remove_instance_nocalls(

			CPUHP_AP_PERF_ARM_HISI_L3_ONLINE, &l3c_pmu->node);

		irq_set_affinity_hint(l3c_pmu->irq, NULL);

	}



	return ret;
@@ -591,8 +590,6 @@ static int hisi_l3c_pmu_remove(struct platform_device *pdev) 
	perf_pmu_unregister(&l3c_pmu->pmu);

	cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_HISI_L3_ONLINE,

					    &l3c_pmu->node);

	irq_set_affinity_hint(l3c_pmu->irq, NULL);



	return 0;

}

drivers/perf/hisilicon/hisi_uncore_pa_pmu.c

+0 −3
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ static int hisi_pa_pmu_probe(struct platform_device *pdev) 
		dev_err(pa_pmu->dev, "PMU register failed, ret = %d\n", ret);

		cpuhp_state_remove_instance(CPUHP_AP_PERF_ARM_HISI_PA_ONLINE,

					    &pa_pmu->node);

		irq_set_affinity_hint(pa_pmu->irq, NULL);

		return ret;

	}
@@ -451,8 +450,6 @@ static int hisi_pa_pmu_remove(struct platform_device *pdev) 
	perf_pmu_unregister(&pa_pmu->pmu);

	cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_HISI_PA_ONLINE,

					    &pa_pmu->node);

	irq_set_affinity_hint(pa_pmu->irq, NULL);



	return 0;

}

drivers/perf/hisilicon/hisi_uncore_pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ int hisi_uncore_pmu_online_cpu(unsigned int cpu, struct hlist_node *node) 
	hisi_pmu->on_cpu = cpu;



	/* Overflow interrupt also should use the same CPU */

	WARN_ON(irq_set_affinity_hint(hisi_pmu->irq, cpumask_of(cpu)));

	WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(cpu)));



	return 0;

}
@@ -521,7 +521,7 @@ int hisi_uncore_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node) 
	perf_pmu_migrate_context(&hisi_pmu->pmu, cpu, target);

	/* Use this CPU for event counting */

	hisi_pmu->on_cpu = target;

	WARN_ON(irq_set_affinity_hint(hisi_pmu->irq, cpumask_of(target)));

	WARN_ON(irq_set_affinity(hisi_pmu->irq, cpumask_of(target)));



	return 0;

}