Skip to contentSkip to conversation

xen: fix bugs in error conditions

PATCH In review Amit Shah 4 participants 15 messages Feb 26, 2018 – Feb 27, 2018

Subsystems (2)
lore
Share & tools
lore

Amit Shah

author
#0 lore raw

cover xen: fix bugs in error conditions

Hello,

These bugs were found during code review. Details in the commits.

Please review and apply.

CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>

Amit Shah (2):
xen: fix out-of-bounds irq unbind for MSI message groups
xen: events: free irqs in error condition

 drivers/xen/events/events_base.c | 2 ++
 1 file changed, 2 insertions(+)
Signature · 8 lines
2.7.3.AMZN

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
author
#1 lore raw

PATCH 1/2 xen: fix out-of-bounds irq unbind for MSI message groups

When an MSI descriptor was not available, the error path would try to unbind an irq that was never acquired - potentially unbinding an unrelated irq.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +1 -0
index 1ab4bd1..b6b8b29 100644
@@ -749,6 +749,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 	}
 
 	ret = irq_set_msi_desc(irq, msidesc);
+	i--;
 	if (ret < 0)
 		goto error_irq;
 out:
Signature · 8 lines
2.7.3.AMZN

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
#2 lore raw

Re: [PATCH 1/2] xen: fix out-of-bounds irq unbind for MSI message groups

Quoted 26 lines · Amit Shah

When an MSI descriptor was not available, the error path would try to unbind an irq that was never acquired - potentially unbinding an unrelated irq.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +0 -0
index 1ab4bd1..b6b8b29 100644

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 754

Quoted 6 lines
drivers/xen/events/events_base.c +1 -0
@@ -749,6 +749,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 	}
 
 	ret = irq_set_msi_desc(irq, msidesc);
+	i--;
 	if (ret < 0)
 		goto error_irq;

We really only need to do this in case of an error.

(And this patch needs to go to stable trees as well.)

Thanks
-boris

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#3 lore raw

Re: [PATCH 1/2] xen: fix out-of-bounds irq unbind for MSI message groups

In reply to Amit Shah
Quoted 26 lines · Amit Shah

When an MSI descriptor was not available, the error path would try to unbind an irq that was never acquired - potentially unbinding an unrelated irq.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +0 -0
index 1ab4bd1..b6b8b29 100644

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 754

Quoted 6 lines
drivers/xen/events/events_base.c +1 -0
@@ -749,6 +749,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 	}
 
 	ret = irq_set_msi_desc(irq, msidesc);
+	i--;
 	if (ret < 0)
 		goto error_irq;

We really only need to do this in case of an error.

(And this patch needs to go to stable trees as well.)

Thanks
-boris

author
#4 lore raw

PATCH 1/2 xen: fix out-of-bounds irq unbind for MSI message groups

In reply to Amit Shah

When an MSI descriptor was not available, the error path would try to unbind an irq that was never acquired - potentially unbinding an unrelated irq.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +1 -0
index 1ab4bd1..b6b8b29 100644
@@ -749,6 +749,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 	}
 
 	ret = irq_set_msi_desc(irq, msidesc);
+	i--;
 	if (ret < 0)
 		goto error_irq;
 out:
Signature · 12 lines
2.7.3.AMZN

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
author
#5 lore raw

PATCH 2/2 xen: events: free irqs in error condition

In reply to Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +1 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 error_irq:
 	for (; i >= 0; i--)
 		__unbind_from_irq(irq + i);
+	xen_free_irq(irq);
 	mutex_unlock(&irq_mapping_update_lock);
 	return ret;
 }
Signature · 8 lines
2.7.3.AMZN

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
#6 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

Quoted 24 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 4 lines
drivers/xen/events/events_base.c +1 -0
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 error_irq:
 	for (; i >= 0; i--)
 		__unbind_from_irq(irq + i);
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is irq_free_descs(irq, 1), I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Thanks, Roger.

#7 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

Quoted 21 lines · Roger Pau Monné
Quoted 20 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>

---
 drivers/xen/events/events_base.c | 1 +

 1 file changed, 1 insertion(+)
Quoted 13 lines

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 11 lines
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev
 *dev, struct msi_desc *msidesc,

 error_irq:
  for (; i >= 0; i--) __unbind_from_irq(irq + i);

drivers/xen/events/events_base.c +1 -0
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is irq_free_descs(irq, 1),

Er...  right.

Quoted 5 lines

I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Actually, xen_free_irq() is already done in __unbind_from_irq(), so this patch is actually wrong and not needed.

Amit
Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B

#8 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

Quoted 39 lines · Amit
Quoted 21 lines · Roger Pau Monné
Quoted 20 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>

---
 drivers/xen/events/events_base.c | 1 +

 1 file changed, 1 insertion(+)
Quoted 13 lines

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 11 lines
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev
 *dev, struct msi_desc *msidesc,

 error_irq:
  for (; i >= 0; i--) __unbind_from_irq(irq + i);

drivers/xen/events/events_base.c +1 -0
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is irq_free_descs(irq, 1),

Er...  right.

Quoted 8 lines
Quoted 5 lines

I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Actually, xen_free_irq() is already done in __unbind_from_irq(), so this patch is actually wrong and not needed.

You still need to free unbound IRQs, AFAICT you could fix the issue with a single patch, like:

while (nvec--) {
	if (nvec >= i)
		xen_free_irq(irq + i);
	else
		__unbind_from_irq(irq + i);
}

Roger.

#9 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

Quoted 56 lines · Roger Pau Monné
Quoted 45 lines · Amit
Quoted 25 lines · Roger Pau Monné
Quoted 23 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message

groups")

CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>

---
 drivers/xen/events/events_base.c | 1 +

 1 file changed, 1 insertion(+)
Quoted 14 lines

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 11 lines
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev
 *dev, struct msi_desc *msidesc,

 error_irq:
  for (; i >= 0; i--) __unbind_from_irq(irq + i);

drivers/xen/events/events_base.c +1 -0
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is
irq_free_descs(irq,
1),

Er...  right.

Quoted 1 line
Quoted 7 lines
Quoted 5 lines

I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Actually, xen_free_irq() is already done in __unbind_from_irq(), so this patch is actually wrong and not needed.

You still need to free unbound IRQs, AFAICT you could fix the issue with a single patch, like:

Quoted 6 lines
while (nvec--) {
	if (nvec >= i)
		xen_free_irq(irq + i);
	else
		__unbind_from_irq(irq + i);
}

Agreed.

However, since these are two different things, I'd still like to separate out into two patches, and two paths so it's easier to see what's being done.

Sending v2 in a bit.

    Amit

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B

#10 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

In reply to Roger Pau Monné
Quoted 56 lines · Roger Pau Monné
Quoted 45 lines · Amit
Quoted 25 lines · Roger Pau Monné
Quoted 23 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message

groups")

CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>

---
 drivers/xen/events/events_base.c | 1 +

 1 file changed, 1 insertion(+)
Quoted 14 lines

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 11 lines
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev
 *dev, struct msi_desc *msidesc,

 error_irq:
  for (; i >= 0; i--) __unbind_from_irq(irq + i);

drivers/xen/events/events_base.c +1 -0
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is
irq_free_descs(irq,
1),

Er...  right.

Quoted 1 line
Quoted 7 lines
Quoted 5 lines

I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Actually, xen_free_irq() is already done in __unbind_from_irq(), so this patch is actually wrong and not needed.

You still need to free unbound IRQs, AFAICT you could fix the issue with a single patch, like:

Quoted 6 lines
while (nvec--) {
	if (nvec >= i)
		xen_free_irq(irq + i);
	else
		__unbind_from_irq(irq + i);
}

Agreed.

However, since these are two different things, I'd still like to separate out into two patches, and two paths so it's easier to see what's being done.

Sending v2 in a bit.

    Amit

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
_______________________________________________
Xen-devel mailing list [email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#11 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

In reply to Shah, Amit
Quoted 39 lines · Amit
Quoted 21 lines · Roger Pau Monné
Quoted 20 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>

---
 drivers/xen/events/events_base.c | 1 +

 1 file changed, 1 insertion(+)
Quoted 13 lines

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 11 lines
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev
 *dev, struct msi_desc *msidesc,

 error_irq:
  for (; i >= 0; i--) __unbind_from_irq(irq + i);

drivers/xen/events/events_base.c +1 -0
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is irq_free_descs(irq, 1),

Er...  right.

Quoted 8 lines
Quoted 5 lines

I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Actually, xen_free_irq() is already done in __unbind_from_irq(), so this patch is actually wrong and not needed.

You still need to free unbound IRQs, AFAICT you could fix the issue with a single patch, like:

while (nvec--) {
	if (nvec >= i)
		xen_free_irq(irq + i);
	else
		__unbind_from_irq(irq + i);
}

Roger.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#12 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

In reply to Roger Pau Monné
Quoted 21 lines · Roger Pau Monné
Quoted 20 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>

---
 drivers/xen/events/events_base.c | 1 +

 1 file changed, 1 insertion(+)
Quoted 13 lines

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 11 lines
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev
 *dev, struct msi_desc *msidesc,

 error_irq:
  for (; i >= 0; i--) __unbind_from_irq(irq + i);

drivers/xen/events/events_base.c +1 -0
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is irq_free_descs(irq, 1),

Er...  right.

Quoted 5 lines

I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Actually, xen_free_irq() is already done in __unbind_from_irq(), so this patch is actually wrong and not needed.

Amit
Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
_______________________________________________
Xen-devel mailing list [email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#13 lore raw

Re: [PATCH 2/2] xen: events: free irqs in error condition

In reply to Amit Shah
Quoted 24 lines · Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +0 -0
index b6b8b29..96aa575 100644

drivers/xen/events/events_base.c int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, · line 761

Quoted 4 lines
drivers/xen/events/events_base.c +1 -0
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 error_irq:
 	for (; i >= 0; i--)
 		__unbind_from_irq(irq + i);
+	xen_free_irq(irq);

Hm, xen_free_irq calls irq_free_desc, which is irq_free_descs(irq, 1), I think you will have to introduce a new free function:

xen_free_irqs(unsigned irq, unsigned int nr)

That calls irq_free_descs(irq, nr)

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

author
#14 lore raw

PATCH 2/2 xen: events: free irqs in error condition

In reply to Amit Shah

In case of errors in irq setup for MSI, free up the allocated irqs.

Fixes 4892c9b4ada9f9 ("xen: add support for MSI message groups")
CC Roger Pau Monné <[email protected]>
CC David Vrabel <[email protected]>
CC Boris Ostrovsky <[email protected]>
CC Eduardo Valentin <[email protected]>
CC Juergen Gross <[email protected]>
CC Thomas Gleixner <[email protected]>
CC "K. Y. Srinivasan" <[email protected]>
CC Liu Shuo <[email protected]>
CC Anoob Soman <[email protected]>
---
 drivers/xen/events/events_base.c | 1 +
 1 file changed, 1 insertion(+)
drivers/xen/events/events_base.c +1 -0
index b6b8b29..96aa575 100644
@@ -758,6 +758,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 error_irq:
 	for (; i >= 0; i--)
 		__unbind_from_irq(irq + i);
+	xen_free_irq(irq);
 	mutex_unlock(&irq_mapping_update_lock);
 	return ret;
 }
Signature · 12 lines
2.7.3.AMZN

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel