From nobody Sat Oct 4 00:28:11 2025 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA26A29BDBD; Fri, 22 Aug 2025 03:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755834149; cv=none; b=XFeeurSc2A2h9DTmBPXTzewLC64S0EnUc5XvsMxR033ZXvnINAJGGTneIsPoQJnP1cg7NB9VJUpEkkCkgmRGjxyyUCpBAKYKB8R+og/+clIIhM2bNjR23PGPTyu48pZSP2d982x1eXTfcanZb8NftDV5KXvVJhWu96PhCNMM+Vg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755834149; c=relaxed/simple; bh=frSjHxcz5wQGTT03nIVjQIUknAbgxxB7znIBpHnTIq0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DBBDgzOpqiTLX8+HK3uIegxVCAI9ZRQyscACsv53auJlF7DAj3EWfcglt9gQxRFRVa2ZYdJ/c51CaZzI/eW4nQVXLPKnXg5NslqF9sLgub0cOt93fEmp2kJRPGQBrghJ+2yWVCtbDzUJRc/8ULKu2fwLStTV3hIBgX54SILVpb0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4c7QyW0Rfhz27j83; Fri, 22 Aug 2025 11:43:31 +0800 (CST) Received: from dggpemf500011.china.huawei.com (unknown [7.185.36.131]) by mail.maildlp.com (Postfix) with ESMTPS id 633101A0188; Fri, 22 Aug 2025 11:42:25 +0800 (CST) Received: from huawei.com (10.67.174.55) by dggpemf500011.china.huawei.com (7.185.36.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 22 Aug 2025 11:42:24 +0800 From: Jinjie Ruan To: , , , , , , , , , CC: Subject: [PATCH v6.6 RESEND 1/2] x86/irq: Factor out handler invocation from common_interrupt() Date: Fri, 22 Aug 2025 03:38:24 +0000 Message-ID: <20250822033825.1096753-2-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250822033825.1096753-1-ruanjinjie@huawei.com> References: <20250822033825.1096753-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems500002.china.huawei.com (7.221.188.17) To dggpemf500011.china.huawei.com (7.185.36.131) Content-Type: text/plain; charset="utf-8" From: Jacob Pan commit 6087c7f36ab293a06bc0bcf3857ed4d7eb1f9905 upstream. Prepare for calling external interrupt handlers directly from the posted MSI demultiplexing loop. Extract the common code from common_interrupt() to avoid code duplication. Signed-off-by: Jacob Pan Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20240423174114.526704-8-jacob.jun.pan@linux= .intel.com Signed-off-by: Jinjie Ruan --- arch/x86/kernel/irq.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 6573678c4bf4..1f066268ec29 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -242,18 +242,10 @@ static __always_inline void handle_irq(struct irq_des= c *desc, __handle_irq(desc, regs); } =20 -/* - * common_interrupt() handles all normal device IRQ's (the special SMP - * cross-CPU interrupts have their own entry points). - */ -DEFINE_IDTENTRY_IRQ(common_interrupt) +static __always_inline void call_irq_handler(int vector, struct pt_regs *r= egs) { - struct pt_regs *old_regs =3D set_irq_regs(regs); struct irq_desc *desc; =20 - /* entry code tells RCU that we're not quiescent. Check it. */ - RCU_LOCKDEP_WARN(!rcu_is_watching(), "IRQ failed to wake up RCU"); - desc =3D __this_cpu_read(vector_irq[vector]); if (likely(!IS_ERR_OR_NULL(desc))) { handle_irq(desc, regs); @@ -268,7 +260,20 @@ DEFINE_IDTENTRY_IRQ(common_interrupt) __this_cpu_write(vector_irq[vector], VECTOR_UNUSED); } } +} + +/* + * common_interrupt() handles all normal device IRQ's (the special SMP + * cross-CPU interrupts have their own entry points). + */ +DEFINE_IDTENTRY_IRQ(common_interrupt) +{ + struct pt_regs *old_regs =3D set_irq_regs(regs); + + /* entry code tells RCU that we're not quiescent. Check it. */ + RCU_LOCKDEP_WARN(!rcu_is_watching(), "IRQ failed to wake up RCU"); =20 + call_irq_handler(vector, regs); set_irq_regs(old_regs); } =20 --=20 2.34.1 From nobody Sat Oct 4 00:28:11 2025 Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 709692BCF75; Fri, 22 Aug 2025 03:42:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.32 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755834150; cv=none; b=bE31xaroIEWFnqm9k/lbCSGRZW+VkunAK0+TeyA78/bMneOsvjuNBlWKdSHhxboZsAIj91zMsS50tMPkGvAQuCCaeIApYGQfyaAbJg94UWo+gxFXSOjireBf2QDBVeQQ+5HmOw83iK5m4IviPyKnQzIzJ3hRV9mKKjxFN0EFd8w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755834150; c=relaxed/simple; bh=9dID8pTHCNar8rKg9quXxFFqpPjurfeLsJacG9AjbBo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LEQhsejxHD92HH8fDB9eeG5TwFYAmkMaYPm07SDguXiGsqbP8Sj/5qTOS2P0WvgP3hBBTLuwoDY0qNQCbTBLYM/no32cAOEDh7RIJeuO0gaUnE8GmS/Pb2Mj3q7e1lXrnKFd02C/sMdnkYjK0QkHPg2ZHsT82/jTfnPv7bbZWOs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4c7QyW6S33z27jDG; Fri, 22 Aug 2025 11:43:31 +0800 (CST) Received: from dggpemf500011.china.huawei.com (unknown [7.185.36.131]) by mail.maildlp.com (Postfix) with ESMTPS id 3DAEC140158; Fri, 22 Aug 2025 11:42:26 +0800 (CST) Received: from huawei.com (10.67.174.55) by dggpemf500011.china.huawei.com (7.185.36.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 22 Aug 2025 11:42:25 +0800 From: Jinjie Ruan To: , , , , , , , , , CC: Subject: [PATCH v6.6 RESEND 2/2] x86/irq: Plug vector setup race Date: Fri, 22 Aug 2025 03:38:25 +0000 Message-ID: <20250822033825.1096753-3-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250822033825.1096753-1-ruanjinjie@huawei.com> References: <20250822033825.1096753-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems500002.china.huawei.com (7.221.188.17) To dggpemf500011.china.huawei.com (7.185.36.131) Content-Type: text/plain; charset="utf-8" From: Thomas Gleixner commit ce0b5eedcb753697d43f61dd2e27d68eb5d3150f upstream. Hogan reported a vector setup race, which overwrites the interrupt descriptor in the per CPU vector array resulting in a disfunctional device. CPU0 CPU1 interrupt is raised in APIC IRR but not handled free_irq() per_cpu(vector_irq, CPU1)[vector] =3D VECTOR_SHUTDOWN; request_irq() common_interrupt() d =3D this_cpu_read(vector_irq[vector]); per_cpu(vector_irq, CPU1)[vector] =3D desc; if (d =3D=3D VECTOR_SHUTDOWN) this_cpu_write(vector_irq[vector], VECTOR_UNUSED); free_irq() cannot observe the pending vector in the CPU1 APIC as there is no way to query the remote CPUs APIC IRR. This requires that request_irq() uses the same vector/CPU as the one which was freed, but this also can be triggered by a spurious interrupt. Interestingly enough this problem managed to be hidden for more than a decade. Prevent this by reevaluating vector_irq under the vector lock, which is held by the interrupt activation code when vector_irq is updated. To avoid ifdeffery or IS_ENABLED() nonsense, move the [un]lock_vector_lock() declarations out under the CONFIG_IRQ_DOMAIN_HIERARCHY guard as it's only provided when CONFIG_X86_LOCAL_APIC=3Dy. The current CONFIG_IRQ_DOMAIN_HIERARCHY guard is selected by CONFIG_X86_LOCAL_APIC, but can also be selected by other parts of the Kconfig system, which makes 32-bit UP builds with CONFIG_X86_LOCAL_APIC=3Dn fail. Can we just get rid of this !APIC nonsense once and forever? Fixes: 9345005f4eed ("x86/irq: Fix do_IRQ() interrupt warning for cpu hotpl= ug retriggered irqs") Cc: stable@vger.kernel.org#6.6.x Cc: gregkh@linuxfoundation.org Reported-by: Hogan Wang Signed-off-by: Thomas Gleixner Tested-by: Hogan Wang Link: https://lore.kernel.org/all/draft-87ikjhrhhh.ffs@tglx [ Conflicts in arch/x86/kernel/irq.c because call_irq_handler() has been refactored to do apic_eoi() according to the return value. Conflicts in arch/x86/include/asm/hw_irq.h because (un)lock_vector_lock() are already controlled by CONFIG_X86_LOCAL_APIC. ] Signed-off-by: Jinjie Ruan --- arch/x86/kernel/irq.c | 65 +++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 1f066268ec29..29d0fc94232e 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -242,24 +242,59 @@ static __always_inline void handle_irq(struct irq_des= c *desc, __handle_irq(desc, regs); } =20 -static __always_inline void call_irq_handler(int vector, struct pt_regs *r= egs) +static struct irq_desc *reevaluate_vector(int vector) { - struct irq_desc *desc; + struct irq_desc *desc =3D __this_cpu_read(vector_irq[vector]); + + if (!IS_ERR_OR_NULL(desc)) + return desc; + + if (desc =3D=3D VECTOR_UNUSED) + pr_emerg_ratelimited("No irq handler for %d.%u\n", smp_processor_id(), v= ector); + else + __this_cpu_write(vector_irq[vector], VECTOR_UNUSED); + return NULL; +} + +static __always_inline bool call_irq_handler(int vector, struct pt_regs *r= egs) +{ + struct irq_desc *desc =3D __this_cpu_read(vector_irq[vector]); =20 - desc =3D __this_cpu_read(vector_irq[vector]); if (likely(!IS_ERR_OR_NULL(desc))) { handle_irq(desc, regs); - } else { - apic_eoi(); - - if (desc =3D=3D VECTOR_UNUSED) { - pr_emerg_ratelimited("%s: %d.%u No irq handler for vector\n", - __func__, smp_processor_id(), - vector); - } else { - __this_cpu_write(vector_irq[vector], VECTOR_UNUSED); - } + return true; } + + /* + * Reevaluate with vector_lock held to prevent a race against + * request_irq() setting up the vector: + * + * CPU0 CPU1 + * interrupt is raised in APIC IRR + * but not handled + * free_irq() + * per_cpu(vector_irq, CPU1)[vector] =3D VECTOR_SHUTDOWN; + * + * request_irq() common_interrupt() + * d =3D this_cpu_read(vector_irq[vector]); + * + * per_cpu(vector_irq, CPU1)[vector] =3D desc; + * + * if (d =3D=3D VECTOR_SHUTDOWN) + * this_cpu_write(vector_irq[vector], VECTOR_UNUSED); + * + * This requires that the same vector on the same target CPU is + * handed out or that a spurious interrupt hits that CPU/vector. + */ + lock_vector_lock(); + desc =3D reevaluate_vector(vector); + unlock_vector_lock(); + + if (!desc) + return false; + + handle_irq(desc, regs); + return true; } =20 /* @@ -273,7 +308,9 @@ DEFINE_IDTENTRY_IRQ(common_interrupt) /* entry code tells RCU that we're not quiescent. Check it. */ RCU_LOCKDEP_WARN(!rcu_is_watching(), "IRQ failed to wake up RCU"); =20 - call_irq_handler(vector, regs); + if (unlikely(!call_irq_handler(vector, regs))) + apic_eoi(); + set_irq_regs(old_regs); } =20 --=20 2.34.1