Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795059275; b=Y6dJIX4Bifa4QZJJIDk5VdUytOGCxuq6Rnsf+mBurwAXAa8yJq3P1jqK6z+wwdlvIkxn vPZa+Ea+rpVuIb5qTcqkHEwdF8jGC2GPWcVl4yCKM/UmBI4he6rQiSvXK5Z/pz3WScUf2 V6RQL/OEiKbWh4tTRITdg27OfJY3DYlikFsS0Vt7KE9ZHzS+Er+tuNv+SwGfSoFE5/ELE xeUGJ7yLDLGG90IRdWzTOQRX0EmkSmhA3uJ+CtyW1CuIDR2EkYOa7ikq+Q2oVoo8Dovm/ r7LIhbAQ8iBiu8ekB+wMe8iK+wih4+Jnzet9DpZWpNh7CzRtcDFMVMSi6kOuOrsgJIg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059275; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Y7UQSjjFjnq3qYIyQ4c3eNvjm7ij6A8KLWwakMNY+7M=; b=KyNrzXETX6rzIHZO8pqEIwrjfqgF6FmDCuIQZ+Ko4ylC31p9Fa6YRNX7rtyXBmxMv7iJ f58Dj2FePbhowBJNusLOcXLU5xhGI80ejiVz2Y8ZhvuowIWPi9rTVSzgzGz9kw+9G3xim HCyCM2VanjwvVeTcXdIfYGhbg2ZSibFmR7hMbeDqlHyRNTVT6CYoMbXTSm2K1LVAlcL2U K2+XdW7uWv9xrbDE7pqzHNnzAOKaILMTiRRj1mevx4OiOmKn2KhGi/lJF95Hy/PNbzQ9Y sbPUZRb8eirFLy9Hd42keRAZ9xQUEez/3DH/rjgt0uBclFvlWutOvZv8WsPHpdqcSnQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Owu4kdQu; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D7E4606A325; Thu, 19 Nov 2026 03:34:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=Owu4kdQu Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A3C71F000C4; Thu, 19 Nov 2026 03:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059274; bh=Y7UQSjjFjnq3qYIyQ4c3eNvjm7ij6A8KLWwakMNY+7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Owu4kdQubB8Ql0MWSbBZO1Mx8sYKqUEtmgjPOWkuFa2ioBpkRz/J0VOaGmiPc8lOr vXvWrdG2tSYj20Os05G3ysGMZISI5iUYKDLc3M9ckR4f9X19NiPD/clW++6Jm2NB4C EnUyO7sLFewuRo9IELWdZRlk92fiQpu8m75LOyEA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Gleixner , Igor Velkov , Sasha Levin Subject: [PATCH 5.10 0782/1848] genirq/kexec: Do not take the bus lock of an interrupt chip on the crash path Date: Wed, 18 Nov 2026 15:47:00 +0100 Message-ID: <20261118145949.205989562@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Igor Velkov commit 717862eac6eff0eea8ac30a0c0de0bed84922aab upstream. machine_kexec_mask_interrupts() calls irq_set_irqchip_state() for every started interrupt. That function takes the bus lock of the chip and desc->lock, and syncs the chip when it drops them. On the crash path interrupts are off and the other CPUs are stopped, so a chip whose bus transfer is completed by an interrupt never returns from the sync. On RK3399 boards with an RK808 PMIC the RTC alarm interrupt belongs to the regmap-irq chip of the RK808, which sits on I2C. rk808_irq_chip sets init_ack_masked, so regmap_irq_sync_unlock() writes the ack register on every unlock, and the I2C controller needs its own interrupt to finish the transfer. A panic with a crash kernel loaded prints SMP: stopping secondary CPUs and then nothing until the watchdog resets the board. machine_kexec_mask_interrupts() takes neither lock for the other operations on the descriptor. Move the search for the chip that implements irq_set_irqchip_state() into __irq_set_irqchip_state(), which takes no locks, and call it from machine_kexec_mask_interrupts(). Fixes: 78fd584cdec0 ("arm64: kdump: implement machine_crash_shutdown()") Suggested-by: Thomas Gleixner Signed-off-by: Igor Velkov Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20261015-kexec-irq-bus-lock-v2-1-2af15f0757b6@iav.lv Signed-off-by: Sasha Levin --- arch/arm64/kernel/machine_kexec.c | 2 +- include/linux/interrupt.h | 1 + kernel/irq/manage.c | 49 ++++++++++++++++--------------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index a0b144cfaea71..f36a37eee1cd4 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -230,7 +230,7 @@ static void machine_kexec_mask_interrupts(void) * First try to remove the active state. If this * fails, try to EOI the interrupt. */ - ret = irq_set_irqchip_state(i, IRQCHIP_STATE_ACTIVE, false); + ret = __irq_set_irqchip_state(desc, IRQCHIP_STATE_ACTIVE, false); if (ret && irqd_irq_inprogress(&desc->irq_data) && chip->irq_eoi) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 3b85bebd82d5e..e52c742715847 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -520,6 +520,7 @@ extern int irq_get_irqchip_state(unsigned int irq, enum irqchip_irq_state which, bool *state); extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, bool state); +extern int __irq_set_irqchip_state(struct irq_desc *desc, enum irqchip_irq_state which, bool val); #ifdef CONFIG_IRQ_FORCED_THREADING # ifdef CONFIG_PREEMPT_RT diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 066af7a5522e8..a1d077068359c 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -2859,6 +2859,28 @@ int irq_get_irqchip_state(unsigned int irq, enum irqchip_irq_state which, } EXPORT_SYMBOL_GPL(irq_get_irqchip_state); +int __irq_set_irqchip_state(struct irq_desc *desc, enum irqchip_irq_state which, bool val) +{ + struct irq_data *data = irq_desc_get_irq_data(desc); + struct irq_chip *chip; + + do { + chip = irq_data_get_irq_chip(data); + + if (WARN_ON_ONCE(!chip)) + return -ENODEV; + + if (chip->irq_set_irqchip_state) + break; + + data = irqd_get_parent_data(data); + } while (data); + + if (data) + return chip->irq_set_irqchip_state(data, which, val); + return -EINVAL; +} + /** * irq_set_irqchip_state - set the state of a forwarded interrupt. * @irq: Interrupt line that is forwarded to a VM @@ -2875,36 +2897,15 @@ int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, bool val) { struct irq_desc *desc; - struct irq_data *data; - struct irq_chip *chip; unsigned long flags; - int err = -EINVAL; + int err; desc = irq_get_desc_buslock(irq, &flags, 0); if (!desc) - return err; - - data = irq_desc_get_irq_data(desc); - - do { - chip = irq_data_get_irq_chip(data); - if (WARN_ON_ONCE(!chip)) { - err = -ENODEV; - goto out_unlock; - } - if (chip->irq_set_irqchip_state) - break; -#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY - data = data->parent_data; -#else - data = NULL; -#endif - } while (data); + return -EINVAL; - if (data) - err = chip->irq_set_irqchip_state(data, which, val); + err = __irq_set_irqchip_state(desc, which, val); -out_unlock: irq_put_desc_busunlock(desc, flags); return err; } -- 2.53.0