From nobody Mon Jun 8 20:53:15 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 ED68A4014AB; Tue, 26 May 2026 14:22:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779805354; cv=none; b=gDsV4GUa/DTj1BXbdkUOotFOdOsWxIeQYnV7+Fpe4Uvqd6fuopwHxJtPzkA0VGcT0ndrQp/tNndSYiYR1QnALUhdQXgHEeiX647yTyCbQXzFTy7cXSMoZSCMX3AI/kbiXNQK04XILIrUCjdlKMxPfcJWmAyrfSjZzZDaaYxUUhg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779805354; c=relaxed/simple; bh=mUxb/R7YYyRtX2GZvLVGcJ03Q+1K7Ef5B2qPrs084uc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=n9iCJwsMeO5UYw8NrwQhwOdKIb8ynDkQtcuJlumoYYhHM12UxkHE0thRH1475hdZDvGA4rIHrM7eobYnkqeBaN2Rmq39RI1oUw4Rmzujqp/KsKKyU0UmoqGvrT7dekugHN3sM4GWksOJE0jrizlU23C16C6LoRX56cZtVOsG26g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=o3oNiFEs; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=p+2RLkBo; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="o3oNiFEs"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="p+2RLkBo" Date: Tue, 26 May 2026 14:22:27 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779805349; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dFil+WAe+JpAkrf3NtVmR8/FsrInGHMYyOK6/PxqwhU=; b=o3oNiFEsdBFi/HFGUeWP07R3KEqVHyMV6HXbRD+di6YgfdMiuv7TgvQvo4Oco5W4TJCFjO wekpMgRove2ohWhTSHobzwBUUnDH789M/xcmYiS8MXY29V/AYXqCO0KscFEiMCnR0IOJVa CjajHm5PuN0Dmt1PWvVjHy/eEWNlDccGHRHJnE0xQslg3bO0Lt4Qv9uep2kZc607vjV3OS 38DyMop9prXO+bBzvVHjp6j+tSMv58qo0zvxA/UjPMS+11GhbPF7Lqd2HNlkj9n44tFYUg c6YwF+ywxlvBrhkLUYiu+vXBs1EvKxOfoKNxBJ8Yfd1CPdO6TUesO1NELERCGQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779805349; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dFil+WAe+JpAkrf3NtVmR8/FsrInGHMYyOK6/PxqwhU=; b=p+2RLkBofjrvAatg24gfjd0YTqXLInN8XHGUFGfyFS6QLvXT0hdoAg2HPCum+Sl8PMRbDJ s2GYM85J50jnRUAw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] genirq/manage: Make NMI cleanup RT safe Cc: Thomas Gleixner , Michael Kelley , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20260517194931.601972758@kernel.org> References: <20260517194931.601972758@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177980534797.1039918.6593202305901701427.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/core branch of tip: Commit-ID: 3ba92f6a28203e30d0b2c7d75b59f48d5ff9fbcc Gitweb: https://git.kernel.org/tip/3ba92f6a28203e30d0b2c7d75b59f48d5= ff9fbcc Author: Thomas Gleixner AuthorDate: Sun, 17 May 2026 22:02:14 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 26 May 2026 16:21:13 +02:00 genirq/manage: Make NMI cleanup RT safe Eventually blocking functions cannot be invoked with interrupts disabled and a raw spin lock held. Restructure the code so this happens outside of the descriptor lock held region. Signed-off-by: Thomas Gleixner Tested-by: Michael Kelley Link: https://patch.msgid.link/20260517194931.601972758@kernel.org --- kernel/irq/manage.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 2e80724..8863b2d 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -2026,24 +2026,30 @@ const void *free_irq(unsigned int irq, void *dev_id) } EXPORT_SYMBOL(free_irq); =20 -/* This function must be called with desc->lock held */ static const void *__cleanup_nmi(unsigned int irq, struct irq_desc *desc) { + struct irqaction *action =3D NULL; const char *devname =3D NULL; =20 - desc->istate &=3D ~IRQS_NMI; + scoped_guard(raw_spinlock_irqsave, &desc->lock) { + irq_nmi_teardown(desc); =20 - if (!WARN_ON(desc->action =3D=3D NULL)) { - irq_pm_remove_action(desc, desc->action); - devname =3D desc->action->name; - unregister_handler_proc(irq, desc->action); + desc->istate &=3D ~IRQS_NMI; =20 - kfree(desc->action); + if (!WARN_ON(desc->action =3D=3D NULL)) { + action =3D desc->action; + irq_pm_remove_action(desc, action); + devname =3D action->name; + } desc->action =3D NULL; + + irq_settings_clr_disable_unlazy(desc); + irq_shutdown_and_deactivate(desc); } =20 - irq_settings_clr_disable_unlazy(desc); - irq_shutdown_and_deactivate(desc); + if (action) + unregister_handler_proc(irq, action); + kfree(action); =20 irq_release_resources(desc); =20 @@ -2067,8 +2073,6 @@ const void *free_nmi(unsigned int irq, void *dev_id) if (WARN_ON(desc->depth =3D=3D 0)) disable_nmi_nosync(irq); =20 - guard(raw_spinlock_irqsave)(&desc->lock); - irq_nmi_teardown(desc); return __cleanup_nmi(irq, desc); } =20 @@ -2318,13 +2322,14 @@ int request_nmi(unsigned int irq, irq_handler_t han= dler, /* Setup NMI state */ desc->istate |=3D IRQS_NMI; retval =3D irq_nmi_setup(desc); - if (retval) { - __cleanup_nmi(irq, desc); - return -EINVAL; - } - return 0; } =20 + if (retval) { + __cleanup_nmi(irq, desc); + return -EINVAL; + } + return 0; + err_irq_setup: irq_chip_pm_put(&desc->irq_data); err_out: