fixup_cpus() is to set appropriate irq affinity once the CPU has been brought down, however we should also adjust the desc->irq_common_data.affinity otherwise we will get an incorrect irqmask during cpu offline:
cat /proc/irq/31/smp_affinity 00000000,80000000 echo 0 > /sys/devices/system/cpu/cpu31/online cat /proc/irq/31/smp_affinity 00000000,80000000 This might bring potential problems, as reported we saw plenty of irq flood during hibernation restore: do_IRQ: 1.51 No irq handler for vector Maybe it is due to some drivers get incorrect irq mask during hibernation. Fix this by invoking the interface of irq_set_affinity_locked() to also update the desc->irq_common_data.affinity. Link: https://bugzilla.kernel.org/show_bug.cgi?id=188281 Reported-and-tested-by: Thomas Mitterfellner <tho...@mitterfellner.at> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Ingo Molnar <mi...@redhat.com> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Borislav Petkov <b...@suse.de> Cc: Len Brown <len.br...@intel.com> Cc: Rafael J. Wysocki <rafael.j.wyso...@intel.com> Cc: x...@kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Chen Yu <yu.c.c...@intel.com> --- arch/x86/kernel/irq.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 4d8183b..a108ed2 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -480,13 +480,14 @@ void fixup_irqs(void) if (!irqd_can_move_in_process_context(data) && chip->irq_mask) chip->irq_mask(data); - if (chip->irq_set_affinity) { - ret = chip->irq_set_affinity(data, affinity, true); - if (ret == -ENOSPC) + ret = irq_set_affinity_locked(data, affinity, true); + if (ret) { + if (ret == -ENOSPC) { pr_crit("IRQ %d set affinity failed because there are no available vectors. The device assigned to this IRQ is unstable.\n", irq); - } else { - if (!(warned++)) - set_affinity = 0; + } else { + if (!(warned++)) + set_affinity = 0; + } } /* -- 2.7.4
