irqchip/gic-v3-its: fix raw_local_irq_restore() called with IRQs enabled
PATCH v2 1/1 irqchip/gic-v3-its: fix raw_local_irq_restore() called with IRQs enabled
The following call-chain leads to misuse of spinlock_irq when spinlock_irqsave was hold.
irq_set_vcpu_affinity
-> irq_get_desc_lock (spinlock_irqsave)
-> its_irq_set_vcpu_affinity
-> guard(raw_spin_lock_irq) <--- this enables interrupts
-> irq_put_desc_unlock // <--- WARN IRQs enabled
Fix the issue by using guard(raw_spinlock), since the function is
already called with irqsave and raw_spin_lock was used before the commit b97e8a2f7130 ("irqchip/gic-v3-its: Fix potential race condition in its_vlpi_prop_update()") introducing the guard as well.
This was discovered through the lock debugging, and the corresponding log is as follows:
raw_local_irq_restore() called with IRQs enabled
WARNING: CPU: 38 PID: 444 at kernel/locking/irqflag-debug.c:10 warn_bogus_irq_restore+0x2c/0x38 Call trace: warn_bogus_irq_restore+0x2c/0x38 _raw_spin_unlock_irqrestore+0x68/0x88 __irq_put_desc_unlock+0x1c/0x48 irq_set_vcpu_affinity+0x74/0xc0 its_map_vlpi+0x44/0x88 kvm_vgic_v4_set_forwarding+0x148/0x230 kvm_arch_irq_bypass_add_producer+0x20/0x28 __connect+0x98/0xb8 irq_bypass_register_consumer+0x150/0x178 kvm_irqfd+0x6dc/0x744 kvm_vm_ioctl+0xe44/0x16b0
--- drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-its.c +1 -1
@@ -2045,7 +2045,7 @@ static int its_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info)if (!is_v4 (its_dev->its))return -EINVAL ; -guard (raw_spinlock_irq)(&its_dev->event_map.vlpi_lock); +guard (raw_spinlock)(&its_dev->event_map.vlpi_lock);/* Unmap request? */ if (!info)
Signature · 12 lines
2.40.1 Amazon Web Services Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B Sitz: Berlin Ust-ID: DE 365 538 597
Ping for this one.
Quoted 58 lines · Tomas Krcka
The following call-chain leads to misuse of
spinlock_irqwhenspinlock_irqsavewas hold.
irq_set_vcpu_affinity
->irq_get_desc_lock(spinlock_irqsave)
->its_irq_set_vcpu_affinity
->guard(raw_spin_lock_irq)<--- this enables interrupts
->irq_put_desc_unlock// <--- WARN IRQs enabledFix the issue by using
guard(raw_spinlock), since the function is
already called with irqsave andraw_spin_lockwas used before the commitb97e8a2f7130("irqchip/gic-v3-its: Fix potential race condition inits_vlpi_prop_update()") introducing the guard as well.This was discovered through the lock debugging, and the corresponding log is as follows:
raw_local_irq_restore()called with IRQs enabledWARNING: CPU: 38 PID: 444 at kernel/locking/irqflag-debug.c:10 warn_bogus_irq_restore+0x2c/0x38 Call trace: warn_bogus_irq_restore+0x2c/0x38 _raw_spin_unlock_irqrestore+0x68/0x88 __irq_put_desc_unlock+0x1c/0x48 irq_set_vcpu_affinity+0x74/0xc0 its_map_vlpi+0x44/0x88 kvm_vgic_v4_set_forwarding+0x148/0x230 kvm_arch_irq_bypass_add_producer+0x20/0x28 __connect+0x98/0xb8 irq_bypass_register_consumer+0x150/0x178 kvm_irqfd+0x6dc/0x744 kvm_vm_ioctl+0xe44/0x16b0Fixes b97e8a2f7130 ("irqchip/gic-v3-its: Fix potential race condition in its_vlpi_prop_update()")Signed-off-by Tomas Krcka <[email protected]>Reviewed-by Marc Zyngier <[email protected]>---
drivers/irqchip/irq-gic-v3-its.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)drivers/irqchip/irq-gic-v3-its.c +1
-1@@ -2045,7 +2045,7 @@ static int its_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info)if (!is_v4 (its_dev->its))return -EINVAL ; -guard (raw_spinlock_irq)(&its_dev->event_map.vlpi_lock); +guard (raw_spinlock)(&its_dev->event_map.vlpi_lock);/* Unmap request? */ if (!info)Signature · 1 line
2.40.1
[tip: irq/urgent] irqchip/gic-v3-its: Don't enable interrupts in its_irq_set_vcpu_affinity()
In reply to Tomas KrckaThe following commit has been merged into the irq/urgent branch of tip:
The following commit has been merged into the irq/urgent branch of tip:
Commit-ID: 35cb2c6ce7da545f3b5cb1e6473ad7c3a6f08310 Gitweb: https://git.kernel.org/tip/35cb2c6ce7da545f3b5cb1e6473ad7c3a6f08310 Author: Tomas Krcka <[email protected]> AuthorDate: Mon, 30 Dec 2024 15:08:25 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 15 Jan 2025 09:42:45 +01:00
irqchip/gic-v3-its: Don't enable interrupts in its_irq_set_vcpu_affinity()
The following call-chain leads to enabling interrupts in a nested interrupt disabled section:
irq_set_vcpu_affinity()
irq_get_desc_lock()
raw_spin_lock_irqsave() <--- Disable interrupts
its_irq_set_vcpu_affinity()
guard(raw_spinlock_irq) <--- Enables interrupts when leaving the guard()
irq_put_desc_unlock() <--- Warns because interrupts are enabled
This was broken in commit b97e8a2f7130, which replaced the original raw_spin_[un]lock() pair with guard(raw_spinlock_irq).
Fix the issue by using guard(raw_spinlock).
[ tglx: Massaged change log ]
--- drivers/irqchip/irq-gic-v3-its.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-its.c +1 -1
@@ -2045,7 +2045,7 @@ static int its_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info)if (!is_v4 (its_dev->its))return -EINVAL ; -guard (raw_spinlock_irq)(&its_dev->event_map.vlpi_lock); +guard (raw_spinlock)(&its_dev->event_map.vlpi_lock);/* Unmap request? */ if (!info)