linux-kernel - [tip: irq/drivers] PCI/MSI: Check MSI_FLAG_PCI_MSI_MASK_PARENT in cond_[startup|shutdown]

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <175681722544.1920.17009750793019581928.tip-bot2@tip-bot2>
Date: Tue, 02 Sep 2025 12:47:05 -0000
From: "tip-bot2 for Inochi Amaoto" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Linux Kernel Functional Testing <lkft@...aro.org>,
 Nathan Chancellor <nathan@...nel.org>, Wei Fang <wei.fang@....com>,
 Inochi Amaoto <inochiama@...il.com>, Thomas Gleixner <tglx@...utronix.de>,
 Jon Hunter <jonathanh@...dia.com>, Chen Wang <unicorn_wang@...look.com>,
 Bjorn Helgaas <bhelgaas@...gle.com>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject: [tip: irq/drivers] PCI/MSI: Check MSI_FLAG_PCI_MSI_MASK_PARENT in
 cond_[startup|shutdown]_parent()

The following commit has been merged into the irq/drivers branch of tip:

Commit-ID:     727e914bbfbbda9e6efa5cb1abe4e96a949d576f
Gitweb:        https://git.kernel.org/tip/727e914bbfbbda9e6efa5cb1abe4e96a949d576f
Author:        Inochi Amaoto <inochiama@...il.com>
AuthorDate:    Thu, 28 Aug 2025 07:09:42 +08:00
Committer:     Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Tue, 02 Sep 2025 14:42:09 +02:00

PCI/MSI: Check MSI_FLAG_PCI_MSI_MASK_PARENT in cond_[startup|shutdown]_parent()

For MSI controllers which only support MSI_FLAG_PCI_MSI_MASK_PARENT, the
newly added callback irq_startup() and irq_shutdown() for
pci_msi[x]_template will not unmask or mask the interrupt when startup()
resp.  shutdown() is invoked. This prevents the interrupt from being
enabled resp. disabled.

Invoke irq_[un]mask_parent() in cond_[startup|shutdown]_parent(), when the
interrupt has the MSI_FLAG_PCI_MSI_MASK_PARENT flag set.

Fixes: 54f45a30c0d0 ("PCI/MSI: Add startup/shutdown for per device domains")
Reported-by: Linux Kernel Functional Testing <lkft@...aro.org>
Reported-by: Nathan Chancellor <nathan@...nel.org>
Reported-by: Wei Fang <wei.fang@....com>
Signed-off-by: Inochi Amaoto <inochiama@...il.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Tested-by: Nathan Chancellor <nathan@...nel.org>
Tested-by: Linux Kernel Functional Testing <lkft@...aro.org>
Tested-by: Jon Hunter <jonathanh@...dia.com>
Tested-by: Wei Fang <wei.fang@....com>
Tested-by: Chen Wang <unicorn_wang@...look.com> # Pioneerbox/SG2042
Acked-by: Bjorn Helgaas <bhelgaas@...gle.com>
Link: https://lore.kernel.org/all/20250827230943.17829-1-inochiama@gmail.com
Closes: https://lore.kernel.org/regressions/aK4O7Hl8NCVEMznB@monster/
Closes: https://lore.kernel.org/regressions/20250826220959.GA4119563@ax162/
Closes: https://lore.kernel.org/all/20250827093911.1218640-1-wei.fang@nxp.com/
---
 drivers/pci/msi/irqdomain.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/pci/msi/irqdomain.c b/drivers/pci/msi/irqdomain.c
index e0a800f..b11b7f6 100644
--- a/drivers/pci/msi/irqdomain.c
+++ b/drivers/pci/msi/irqdomain.c
@@ -154,6 +154,8 @@ static void cond_shutdown_parent(struct irq_data *data)
 
 	if (unlikely(info->flags & MSI_FLAG_PCI_MSI_STARTUP_PARENT))
 		irq_chip_shutdown_parent(data);
+	else if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
+		irq_chip_mask_parent(data);
 }
 
 static unsigned int cond_startup_parent(struct irq_data *data)
@@ -162,6 +164,9 @@ static unsigned int cond_startup_parent(struct irq_data *data)
 
 	if (unlikely(info->flags & MSI_FLAG_PCI_MSI_STARTUP_PARENT))
 		return irq_chip_startup_parent(data);
+	else if (unlikely(info->flags & MSI_FLAG_PCI_MSI_MASK_PARENT))
+		irq_chip_unmask_parent(data);
+
 	return 0;
 }