Skip to contentSkip to conversation

genirq/msi: fix populating multiple interrupts

PATCH Superseded John Keeping 3 participants 4 messages Sep 5, 2017 – Sep 6, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 genirq/msi: fix populating multiple interrupts

Use the correct variable to set up each interrupt in turn rather than configuring the first interrupt "nvec" times.

---
 kernel/irq/msi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/irq/msi.c +3 -2
index 48eadf416c24..3fa4bd59f569 100644
@@ -315,11 +315,12 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,
 
 		ops->set_desc(arg, desc);
 		/* Assumes the domain mutex is held! */
-		ret = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg);
+		ret = irq_domain_alloc_irqs_hierarchy(domain, desc->irq, 1,
+						      arg);
 		if (ret)
 			break;
 
-		irq_set_msi_desc_off(virq, 0, desc);
+		irq_set_msi_desc_off(desc->irq, 0, desc);
 	}
 
 	if (ret) {
Signature · 1 line
2.14.1
Reviewed-by on v1 1/1
#1 lore raw

Hi John,

Quoted 2 lines · John Keeping

Use the correct variable to set up each interrupt in turn rather than configuring the first interrupt "nvec" times.

Thanks for addressing this. I think this bug deserves a slightly better write-up. How about something like:

<quote>
On allocating the interrupts routed via to a wire-to-MSI bridge, we iterate over the MSI descriptors to build the hierarchy, but fail to use the descriptor interrupt number, and instead use the base number, generating the wrong IRQ domain mappings.

The fix is to use the MSI descriptor interrupt number when setting up the interrupt instead of the base interrupt for the allocation range.

The only saving grace is that although the MSI descriptors are allocated in bulk, the wired interrupts are only allocated one by one (so desc->irq == virq) and the bug goes unnoticed.
</quote>

Quoted 15 lines
---
 kernel/irq/msi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/irq/msi.c +0 -1
index 48eadf416c24..3fa4bd59f569 100644
@@ -315,11 +315,12 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,
 
 		ops->set_desc(arg, desc);
 		/* Assumes the domain mutex is held! */
-		ret = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg);

kernel/irq/msi.c int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev, · line 326

Quoted 10 lines
kernel/irq/msi.c +3 -1
+		ret = irq_domain_alloc_irqs_hierarchy(domain, desc->irq, 1,
+						      arg);
 		if (ret)
 			break;
 
-		irq_set_msi_desc_off(virq, 0, desc);
+		irq_set_msi_desc_off(desc->irq, 0, desc);
 	}
 
 	if (ret) {
Fixes 2145ac9310b60 ("genirq/msi: Add msi_domain_populate_irqs")

Thanks,

	M.
Signature · 1 line
Jazz is not dead. It just smells funny...
#2 lore raw

PATCH v2 1/1 genirq/msi: Fix populating multiple interrupts

On allocating the interrupts routed via to a wire-to-MSI bridge, we iterate over the MSI descriptors to build the hierarchy, but fail to use the descriptor interrupt number, and instead use the base number, generating the wrong IRQ domain mappings.

The fix is to use the MSI descriptor interrupt number when setting up the interrupt instead of the base interrupt for the allocation range.

The only saving grace is that although the MSI descriptors are allocated in bulk, the wired interrupts are only allocated one by one (so desc->irq == virq) and the bug goes unnoticed.

Fixes 2145ac9310b60 ("genirq/msi: Add msi_domain_populate_irqs")

---

Quoted 6 lines · Marc Zyngier
Quoted 2 lines · John Keeping

Use the correct variable to set up each interrupt in turn rather than configuring the first interrupt "nvec" times.

Thanks for addressing this. I think this bug deserves a slightly better write-up. How about something like:

Much better, thanks. I've copied and pasted your suggestion for v2.

Changes in v2:
- Use Marc's text for the commit message
- Add Fixes, Cc, Reviewed-by tags

 kernel/irq/msi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/irq/msi.c +3 -2
index 48eadf416c24..3fa4bd59f569 100644
@@ -315,11 +315,12 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,
 
 		ops->set_desc(arg, desc);
 		/* Assumes the domain mutex is held! */
-		ret = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg);
+		ret = irq_domain_alloc_irqs_hierarchy(domain, desc->irq, 1,
+						      arg);
 		if (ret)
 			break;
 
-		irq_set_msi_desc_off(virq, 0, desc);
+		irq_set_msi_desc_off(desc->irq, 0, desc);
 	}
 
 	if (ret) {
Signature · 1 line
2.14.1
#3 lore raw

[tip:irq/urgent] genirq/msi: Fix populating multiple interrupts

genirq/msi: Fix populating multiple interrupts
Commit-ID:  596a7a1d0989c621c3ae49be73a1d1f9de22eb5a
Gitweb:     http://git.kernel.org/tip/596a7a1d0989c621c3ae49be73a1d1f9de22eb5a
Author:     John Keeping <[email protected]>
AuthorDate: Wed, 6 Sep 2017 10:35:40 +0100
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 6 Sep 2017 11:41:20 +0200

genirq/msi: Fix populating multiple interrupts

On allocating the interrupts routed via a wire-to-MSI bridge, the allocator iterates over the MSI descriptors to build the hierarchy, but fails to use the descriptor interrupt number, and instead uses the base number, generating the wrong IRQ domain mappings.

The fix is to use the MSI descriptor interrupt number when setting up the interrupt instead of the base interrupt for the allocation range.

The only saving grace is that although the MSI descriptors are allocated in bulk, the wired interrupts are only allocated one by one (so desc->irq == virq) and the bug went unnoticed so far.

---
 kernel/irq/msi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/irq/msi.c +3 -2
index 48eadf4..3fa4bd5 100644
@@ -315,11 +315,12 @@ int msi_domain_populate_irqs(struct irq_domain *domain, struct device *dev,
 
 		ops->set_desc(arg, desc);
 		/* Assumes the domain mutex is held! */
-		ret = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg);
+		ret = irq_domain_alloc_irqs_hierarchy(domain, desc->irq, 1,
+						      arg);
 		if (ret)
 			break;
 
-		irq_set_msi_desc_off(virq, 0, desc);
+		irq_set_msi_desc_off(desc->irq, 0, desc);
 	}
 
 	if (ret) {