Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: GIC: avoid routing interrupts to offline CPUs

The irq_set_affinity() method can be called with masks which include
offline CPUs. This allows offline CPUs to have interrupts routed to
them by writing to /proc/irq/*/smp_affinity after hotplug has taken
a CPU offline. Fix this by ensuring that we select a target CPU
present in both the required affinity and the online CPU mask.

Ensure that we return IRQ_SET_MASK_OK (which happens to be 0) on
success to ensure generic code copies the new mask into the irq_data
structure.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

+3 -3
+3 -3
arch/arm/common/gic.c
··· 179 179 { 180 180 void __iomem *reg = gic_dist_base(d) + GIC_DIST_TARGET + (gic_irq(d) & ~3); 181 181 unsigned int shift = (d->irq % 4) * 8; 182 - unsigned int cpu = cpumask_first(mask_val); 182 + unsigned int cpu = cpumask_any_and(mask_val, cpu_online_mask); 183 183 u32 val, mask, bit; 184 184 185 - if (cpu >= 8) 185 + if (cpu >= 8 || cpu >= nr_cpu_ids) 186 186 return -EINVAL; 187 187 188 188 mask = 0xff << shift; ··· 193 193 writel_relaxed(val | bit, reg); 194 194 spin_unlock(&irq_controller_lock); 195 195 196 - return 0; 196 + return IRQ_SET_MASK_OK; 197 197 } 198 198 #endif 199 199