From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1166229AbdDXHqk (ORCPT ); Mon, 24 Apr 2017 03:46:40 -0400 Received: from mga06.intel.com ([134.134.136.31]:43329 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1166016AbdDXHqd (ORCPT ); Mon, 24 Apr 2017 03:46:33 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,243,1488873600"; d="scan'208";a="80226119" From: Chen Yu To: Chen Yu Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Len Brown , "Rafael J . Wysocki" , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][RFC] x86: Fix the irq affinity in fixup_cpus Date: Mon, 24 Apr 2017 15:46:51 +0800 Message-Id: <1493020011-18536-1-git-send-email-yu.c.chen@intel.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Len Brown Cc: Rafael J. Wysocki Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Chen Yu --- 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