| 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
| ||
|
Message-ID: <tencent_B5CE9A8654E8B2476383AEC85C25BDA7BD05@qq.com>
Date: Mon, 6 Oct 2025 18:34:09 +0000
From: Guangbo Cui <2407018371@...com>
To: Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
Clark Williams <clrkwllms@...nel.org>,
Steven Rostedt <rostedt@...dmis.org>,
Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>,
Will Deacon <will@...nel.org>,
Boqun Feng <boqun.feng@...il.com>,
Thomas Gleixner <tglx@...utronix.de>,
Bjorn Helgaas <bhelgaas@...gle.com>
Cc: linux-rt-devel@...ts.linux.dev,
Waiman Long <longman@...hat.com>,
linux-kernel@...r.kernel.org,
linux-pci@...r.kernel.org,
Guangbo Cui <2407018371@...com>
Subject: [PATCH] lockdep: Account for lockdep hardirq context in irq_forced_thread_fn under PREEMPT_RT
In PREEMPT_RT, IRQs are forced to run in threaded. However, lockdep did not correctly
account for this case, causing false-positive warnings about hardirq context violations
when analyzing lock acquisition in such threaded IRQs (see function `task_wait_context`).
This patch updates `irq_forced_thread_fn` to explicitly call `lockdep_hardirq_enter()`
and `lockdep_hardirq_exit()` when PREEMPT_RT is enabled, ensuring lockdep correctly
tracks the hardirq context even when the IRQ is executed in a forced thread.
This was discovered while testing PCIe AER error injection on an arm64 QEMU virtual machine:
```
qemu-system-aarch64 \
-nographic \
-machine virt,highmem=off,gic-version=3 \
-cpu cortex-a72 \
-kernel arch/arm64/boot/Image \
-initrd initramfs.cpio.gz \
-append "console=ttyAMA0 root=/dev/ram rdinit=/linuxrc earlyprintk nokaslr" \
-m 2G \
-smp 1 \
-netdev user,id=net0,hostfwd=tcp::2223-:22 \
-device virtio-net-pci,netdev=net0 \
-device pcie-root-port,id=rp0,chassis=1,slot=0x0 \
-device pci-testdev -s -S
```
Injecting a correctable PCIe error via /dev/aer_inject caused a BUG
report with "Invalid wait context" in the irq/PCIe thread.
```
~ # export HEX="00020000000000000100000000000000000000000000000000000000"
~ # echo -n "$HEX" | xxd -r -p | tee /dev/aer_inject >/dev/null
[ 1850.947170] pcieport 0000:00:02.0: aer_inject: Injecting errors 00000001/00000000 into device 0000:00:02.0
[ 1850.949951]
[ 1850.950479] =============================
[ 1850.950780] [ BUG: Invalid wait context ]
[ 1850.951152] 6.17.0-11316-g7a405dbb0f03-dirty #7 Not tainted
[ 1850.951457] -----------------------------
[ 1850.951680] irq/16-PCIe PME/56 is trying to lock:
[ 1850.952004] ffff800082865238 (inject_lock){+.+.}-{3:3}, at: aer_inj_read_config+0x38/0x1dc
[ 1850.952731] other info that might help us debug this:
[ 1850.952997] context-{5:5}
[ 1850.953192] 5 locks held by irq/16-PCIe PME/56:
[ 1850.953415] #0: ffff800082647390 (local_bh){.+.+}-{1:3}, at: __local_bh_disable_ip+0x30/0x268
[ 1850.953931] #1: ffff8000826c6b38 (rcu_read_lock){....}-{1:3}, at: rcu_lock_acquire+0x4/0x48
[ 1850.954453] #2: ffff000004bb6c58 (&data->lock){+...}-{3:3}, at: pcie_pme_irq+0x34/0xc4
[ 1850.954949] #3: ffff8000826c6b38 (rcu_read_lock){....}-{1:3}, at: rcu_lock_acquire+0x4/0x48
[ 1850.955420] #4: ffff800082863d10 (pci_lock){....}-{2:2}, at: pci_bus_read_config_dword+0x5c/0xd8
[ 1850.955932] stack backtrace:
[ 1850.956412] CPU: 0 UID: 0 PID: 56 Comm: irq/16-PCIe PME Not tainted 6.17.0-11316-g7a405dbb0f03-dirty #7 PREEMPT_{RT,(full)}
[ 1850.957039] Hardware name: linux,dummy-virt (DT)
[ 1850.957409] Call trace:
[ 1850.957727] show_stack+0x18/0x24 (C)
[ 1850.958089] dump_stack_lvl+0x40/0xbc
[ 1850.958339] dump_stack+0x18/0x24
[ 1850.958586] __lock_acquire+0xa84/0x3008
[ 1850.958907] lock_acquire+0x128/0x2a8
[ 1850.959171] rt_spin_lock+0x50/0x1b8
[ 1850.959476] aer_inj_read_config+0x38/0x1dc
[ 1850.959821] pci_bus_read_config_dword+0x80/0xd8
[ 1850.960079] pcie_capability_read_dword+0xac/0xd8
[ 1850.960454] pcie_pme_irq+0x44/0xc4
[ 1850.960728] irq_forced_thread_fn+0x30/0x94
[ 1850.960984] irq_thread+0x1ac/0x3a4
[ 1850.961308] kthread+0x1b4/0x208
[ 1850.961557] ret_from_fork+0x10/0x20
[ 1850.963088] pcieport 0000:00:02.0: AER: Correctable error message received from 0000:00:02.0
[ 1850.963330] pcieport 0000:00:02.0: PCIe Bus Error: severity=Correctable, type=Physical Layer, (Receiver ID)
[ 1850.963351] pcieport 0000:00:02.0: device [1b36:000c] error status/mask=00000001/0000e000
[ 1850.963385] pcieport 0000:00:02.0: [ 0] RxErr (First)
```
Signed-off-by: Guangbo Cui <2407018371@...com>
---
kernel/irq/manage.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index c94837382037..80007bce5625 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1150,9 +1150,13 @@ static irqreturn_t irq_forced_thread_fn(struct irq_desc *desc, struct irqaction
local_bh_disable();
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
local_irq_disable();
+ else
+ lockdep_hardirq_enter();
ret = irq_thread_fn(desc, action);
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
local_irq_enable();
+ else
+ lockdep_hardirq_exit();
local_bh_enable();
return ret;
}
--
2.43.0
Powered by blists - more mailing lists