Since the PMU register interface is banked per CPU, CPU PMU interrrupts cannot be handled by a CPU other than the one with the PMU asserting the interrupt. This means that migrating PMU SPIs, as we do during a CPU hotplug operation doesn't make any sense and can lead to the IRQ being disabled entirely if we route a spurious IRQ to the new affinity target. This has been observed in practice on AMD Seattle, where CPUs on the non-boot cluster appear to take a spurious PMU IRQ when coming online, which is routed to CPU0 where it cannot be handled. This patch passes IRQF_PERCPU for PMU SPIs and forcefully sets their affinity prior to requesting them, ensuring that they cannot be migrated during hotplug events. This interacts badly with the DB8500 erratum workaround that ping-pongs the interrupt affinity from the handler, so we avoid passing IRQF_PERCPU in that case by allowing the IRQ flags to be overridden in the platdata.
Unified · Split
| @@ -133,6 +133,7 @@ static irqreturn_t db8500_pmu_handler(int irq, void *dev, irq_handler_t handler) · 132 unmodified lines | ||
| 133 | 133 | |
| 134 | 134 | static struct arm_pmu_platdata db8500_pmu_platdata = { |
| 135 | 135 | .handle_irq = db8500_pmu_handler, |
| 136 | + .irq_flags = IRQF_NOBALANCING | IRQF_NO_THREAD, | |
| 136 | 137 | }; |
| 137 | 138 | |
| 138 | 139 | static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { |
| @@ -569,22 +569,41 @@ int armpmu_request_irq(struct arm_pmu *armpmu, int cpu) · 568 unmodified lines | ||
| 569 | 569 | if (irq != other_irq) { |
| 570 | 570 | pr_warn("mismatched PPIs detected.\n"); |
| 571 | 571 | err = -EINVAL; |
| 572 | + goto err_out; | |
| 572 | 573 | } |
| 573 | 574 | } else { |
| 574 | − err = request_irq(irq, handler, | |
| 575 | − IRQF_NOBALANCING | IRQF_NO_THREAD, "arm-pmu", | |
| 575 | + struct arm_pmu_platdata *platdata = armpmu_get_platdata(armpmu); | |
| 576 | + unsigned long irq_flags; | |
| 577 | + | |
| 578 | + err = irq_force_affinity(irq, cpumask_of(cpu)); | |
| 579 | + | |
| 580 | + if (err && num_possible_cpus() > 1) { | |
| 581 | + pr_warn("unable to set irq affinity (irq=%d, cpu=%u)\n", | |
| 582 | + irq, cpu); | |
| 583 | + goto err_out; | |
| 584 | + } | |
| 585 | + | |
| 586 | + if (platdata && platdata->irq_flags) { | |
| 587 | + irq_flags = platdata->irq_flags; | |
| 588 | + } else { | |
| 589 | + irq_flags = IRQF_PERCPU | | |
| 590 | + IRQF_NOBALANCING | | |
| 591 | + IRQF_NO_THREAD; | |
| 592 | + } | |
| 593 | + | |
| 594 | + err = request_irq(irq, handler, irq_flags, "arm-pmu", | |
| 576 | 595 | per_cpu_ptr(&hw_events->percpu_pmu, cpu)); |
| 577 | 596 | } |
| 578 | 597 | |
| 579 | − if (err) { | |
| 580 | − pr_err("unable to request IRQ%d for ARM PMU counters\n", | |
| 581 | − irq); | |
| 582 | − return err; | |
| 583 | − } | |
| 598 | + if (err) | |
| 599 | + goto err_out; | |
| 584 | 600 | |
| 585 | 601 | cpumask_set_cpu(cpu, &armpmu->active_irqs); |
| 586 | − | |
| 587 | 602 | return 0; |
| 603 | + | |
| 604 | +err_out: | |
| 605 | + pr_err("unable to request IRQ%d for ARM PMU counters\n", irq); | |
| 606 | + return err; | |
| 588 | 607 | } |
| 589 | 608 | |
| 590 | 609 | int armpmu_request_irqs(struct arm_pmu *armpmu) |
| @@ -628,12 +647,6 @@ static int arm_perf_starting_cpu(unsigned int cpu, struct hlist_node *node) · 37 unmodified lines | ||
| 628 | 647 | enable_percpu_irq(irq, IRQ_TYPE_NONE); |
| 629 | 648 | return 0; |
| 630 | 649 | } |
| 631 | − | |
| 632 | − if (irq_force_affinity(irq, cpumask_of(cpu)) && | |
| 633 | − num_possible_cpus() > 1) { | |
| 634 | − pr_warn("unable to set irq affinity (irq=%d, cpu=%u)\n", | |
| 635 | − irq, cpu); | |
| 636 | − } | |
| 637 | 650 | } |
| 638 | 651 | |
| 639 | 652 | return 0; |
| @@ -24,10 +24,14 @@ · 23 unmodified lines | ||
| 24 | 24 | * interrupt and passed the address of the low level handler, |
| 25 | 25 | * and can be used to implement any platform specific handling |
| 26 | 26 | * before or after calling it. |
| 27 | + * | |
| 28 | + * @irq_flags: if non-zero, these flags will be passed to request_irq | |
| 29 | + * when requesting interrupts for this PMU device. | |
| 27 | 30 | */ |
| 28 | 31 | struct arm_pmu_platdata { |
| 29 | 32 | irqreturn_t (*handle_irq)(int irq, void *dev, |
| 30 | 33 | irq_handler_t pmu_handler); |
| 34 | + unsigned long irq_flags; | |
| 31 | 35 | }; |
| 32 | 36 | |
| 33 | 37 | #ifdef CONFIG_ARM_PMU |