irqchip: arm-gic: take gic_lock when updating irq type
Subsystems (4)
PATCH v3 1/1 irqchip: arm-gic: take gic_lock when updating irq type
The kernel documentation states that the locking of the irq-chip registers should be handled by the irq-chip driver. In the irq-gic, the accesses to the irqchip are seemingly not protected and multiple writes to SPIs from different irq descriptors do RMW requests without taking the irq-chip lock. When multiple irqs call the request_irq at the same time, there can be a simultaneous write at the gic distributor, leading to a race. Acquire the gic_lock when the irq_type is updated.
---
Changes from V1:
* Moved the spinlock from irq-gic to irq-gic common, so that the fix is valid for GIC v1/v2/v3.
Change from V2:
* Fixup the Signed-off-by line.
drivers/irqchip/irq-gic-common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/irqchip/irq-gic-common.c +7 -1
@@ -21,6 +21,8 @@#include "irq-gic-common.h" +static DEFINE_RAW_SPINLOCK (irq_controller_lock); +static const struct gic_kvm_info *gic_kvm_info;const struct gic_kvm_info *gic_get_kvm_info (void )
@@ -57,6 +59,7 @@ int gic_configure_irq(unsigned int irq, unsigned int type,* Read current configuration register, and insert the config * for "irq", depending on "type". */ +raw_spin_lock (&irq_controller_lock); val = oldval =readl_relaxed (base +GIC_DIST_CONFIG + confoff);if (type &IRQ_TYPE_LEVEL_MASK ) val &= ~confmask;
@@ -64,8 +67,10 @@ int gic_configure_irq(unsigned int irq, unsigned int type, val |= confmask;/* If the current configuration is the same, then we are done */ -if (val == oldval) +if (val == oldval) { +raw_spin_unlock (&irq_controller_lock);return 0 ; + }/* * Write back the new configuration, and possibly re-enable
@@ -83,6 +88,7 @@ int gic_configure_irq(unsigned int irq, unsigned int type,pr_warn ("GIC: PPI%d is secure or misconfigured\n" , irq -16 ); } +raw_spin_unlock (&irq_controller_lock);if (sync_access)sync_access ();
Signature · 1 line
2.16.2
Greg KH
maintainerQuoted 16 lines · Aniruddha Banerjee
The kernel documentation states that the locking of the irq-chip registers should be handled by the irq-chip driver. In the irq-gic, the accesses to the irqchip are seemingly not protected and multiple writes to SPIs from different irq descriptors do RMW requests without taking the irq-chip lock. When multiple irqs call the
request_irqat the same time, there can be a simultaneous write at the gic distributor, leading to a race. Acquire thegic_lockwhen theirq_typeis updated.Signed-off-by Aniruddha Banerjee <[email protected]>---
Changes from V1:* Moved the spinlock from irq-gic to irq-gic common, so that the fix is valid for GIC v1/v2/v3.
Quoted 6 lines
Change from V2:
* Fixup the Signed-off-by line.
drivers/irqchip/irq-gic-common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
Hi Aniruddha,
Quoted 58 lines · Aniruddha Banerjee
The kernel documentation states that the locking of the irq-chip registers should be handled by the irq-chip driver. In the irq-gic, the accesses to the irqchip are seemingly not protected and multiple writes to SPIs from different irq descriptors do RMW requests without taking the irq-chip lock. When multiple irqs call the
request_irqat the same time, there can be a simultaneous write at the gic distributor, leading to a race. Acquire thegic_lockwhen theirq_typeis updated.Signed-off-by Aniruddha Banerjee <[email protected]>---
Changes from V1:* Moved the spinlock from irq-gic to irq-gic common, so that the fix is valid for GIC v1/v2/v3.
Change from V2:
* Fixup the Signed-off-by line.
drivers/irqchip/irq-gic-common.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/irqchip/irq-gic-common.c +6
-1@@ -21,6 +21,8 @@#include "irq-gic-common.h" +static DEFINE_RAW_SPINLOCK (irq_controller_lock); +static const struct gic_kvm_info *gic_kvm_info;const struct gic_kvm_info *gic_get_kvm_info (void )@@ -57,6 +59,7 @@ int gic_configure_irq(unsigned int irq, unsigned int type,* Read current configuration register, and insert the config * for "irq", depending on "type". */ +raw_spin_lock (&irq_controller_lock); val = oldval =readl_relaxed (base +GIC_DIST_CONFIG + confoff);if (type &IRQ_TYPE_LEVEL_MASK ) val &= ~confmask;@@ -64,8 +67,10 @@ int gic_configure_irq(unsigned int irq, unsigned int type, val |= confmask;/* If the current configuration is the same, then we are done */ -if (val == oldval) +if (val == oldval) { +raw_spin_unlock (&irq_controller_lock);return 0 ; + }/* * Write back the new configuration, and possibly re-enable
drivers/irqchip/irq-gic-common.c int gic_configure_irq(unsigned int irq, unsigned int type, · line 94
Quoted 7 lines
drivers/irqchip/irq-gic-common.c +1
-0@@ -83,6 +88,7 @@ int gic_configure_irq(unsigned int irq, unsigned int type,pr_warn ("GIC: PPI%d is secure or misconfigured\n" , irq -16 ); } +raw_spin_unlock (&irq_controller_lock);if (sync_access)sync_access ();
I've just realized a potential issue: As interrupts are not disabled here, you could take one in the middle of this critical section. If the interrupt handler has the stupid idea to change the trigger type of *any* interrupt, we deadlock.
Yes, this would be a very stupid idea, but better safe than sorry. Please use raw_pin_lock_irqsave/irqrestore instead.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...