Home » Mailing list archives » linux-kernel » 2008 » April » 23

[PATCH 2/2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed

Previous thread: [PATCH] Document SEQ_SKIP by Jonathan Corbet on Wednesday, April 23, 2008 - 12:39 pm. (1 message)

Next thread: [PATCH -next 2/2] sysfs: sysfs_update_group stub for CONFIG_SYSFS=n by Randy Dunlap on Wednesday, April 23, 2008 - 12:56 pm. (2 messages)
[view original message]
From: Roel Kluin <12o3l@...>
To: <paulus@...>, <linuxppc-dev@...>
Cc: lkml <linux-kernel@...>
Subject: [PATCH] powerpc: mpic_pasemi_msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 12:51 pm

bitmap_find_free_region(), called by mpic_msi_alloc_hwirqs() may

return -ENOMEM, but hwirq of type irq_hw_number_t which is unsigned.


Signed-off-by: Roel Kluin <12o3l@tiscali.nl>

---

The functions can be found respectively in:

//---[ vi lib/bitmap.c +807 ]---

//---[ vi arch/powerpc/sysdev/mpic_msi.c +39 ]---


diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c

index 33cbfb2..a15ac5c 100644

--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c

+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c

@@ -109,7 +109,7 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

 		 * sources can be changed independently.

 		 */

 		hwirq = mpic_msi_alloc_hwirqs(msi_mpic, ALLOC_CHUNK);

-		if (hwirq < 0) {

+		if (hwirq == -ENOMEM) {

 			pr_debug("pasemi_msi: failed allocating hwirq\n");

 			return hwirq;

 		}

--
[view original message]
From: Roel Kluin <12o3l@...>
To: <paulus@...>, <linuxppc-dev@...>
Cc: lkml <linux-kernel@...>, Segher Boessenkool <segher@...>
Subject: [PATCH 1/2 v2] powerpc: mpic_pasemi_msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 6:32 pm

also please add my signoff to

[PATCH 2/2 v2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed

---

bitmap_find_free_region(), called by mpic_msi_alloc_hwirqs() may return

signed, but hwirq is unsigned. A failed allocation remains unnoticed.


Signed-off-by: Roel Kluin <12o3l@tiscali.nl>

---

diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c

index 33cbfb2..68aff60 100644

--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c

+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c

@@ -95,6 +95,7 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

 	unsigned int virq;

 	struct msi_desc *entry;

 	struct msi_msg msg;

+	int ret;


 	pr_debug("pasemi_msi_setup_msi_irqs, pdev %p nvec %d type %d\n",

 		 pdev, nvec, type);

@@ -108,8 +109,9 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

 		 * few MSIs for someone, but restrictions will apply to how the

 		 * sources can be changed independently.

 		 */

-		hwirq = mpic_msi_alloc_hwirqs(msi_mpic, ALLOC_CHUNK);

-		if (hwirq < 0) {

+		ret = mpic_msi_alloc_hwirqs(msi_mpic, ALLOC_CHUNK);

+		hwirq = ret;

+		if (ret < 0) {

 			pr_debug("pasemi_msi: failed allocating hwirq\n");

 			return hwirq;

 		}


--
[view original message]
From: Roel Kluin <12o3l@...>
To: <paulus@...>, <linuxppc-dev@...>
Cc: lkml <linux-kernel@...>
Subject: [PATCH 2/2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 3:00 pm

A similar problem in arch/powerpc/sysdev/mpic_u3msi.c,

sorry for the dup, fixed header.

---

bitmap_find_free_region(), called by mpic_msi_alloc_hwirqs() may

return -ENOMEM, but hwirq of type irq_hw_number_t which is unsigned.


Signed-off-by: Roel Kluin <12o3l@tiscali.nl>

---

The functions can be found respectively in:

//---[ vi lib/bitmap.c +807 ]---

//---[ vi arch/powerpc/sysdev/mpic_msi.c +39 ]---


diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c

index 1d5a408..30a4e27 100644

--- a/arch/powerpc/sysdev/mpic_u3msi.c

+++ b/arch/powerpc/sysdev/mpic_u3msi.c

@@ -122,7 +122,7 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)


 	list_for_each_entry(entry, &pdev->msi_list, list) {

 		hwirq = mpic_msi_alloc_hwirqs(msi_mpic, 1);

-		if (hwirq < 0) {

+		if (hwirq == -ENOMEM) {

 			pr_debug("u3msi: failed allocating hwirq\n");

 			return hwirq;

 		}


--
[view original message]
From: Segher Boessenkool <segher@...>
To: Roel Kluin <12o3l@...>
Cc: <paulus@...>, <linuxppc-dev@...>, lkml <linux-kernel@...>
Subject: Re: [PATCH 2/2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 6:09 pm

Please test for _all_ error values, instead.


Segher


--
[view original message]
From: Roel Kluin <12o3l@...>
To: Segher Boessenkool <segher@...>
Cc: <paulus@...>, <linuxppc-dev@...>, lkml <linux-kernel@...>
Subject: [PATCH 2/2 v2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 6:25 pm

In this case -ENOMEM was _all_ error values, but I get your point.

---

bitmap_find_free_region(), called by mpic_msi_alloc_hwirqs() may return

signed, but hwirq is unsigned. A failed allocation remains unnoticed.


diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c

index 1d5a408..e790f39 100644

--- a/arch/powerpc/sysdev/mpic_u3msi.c

+++ b/arch/powerpc/sysdev/mpic_u3msi.c

@@ -115,14 +115,16 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

 	struct msi_desc *entry;

 	struct msi_msg msg;

 	u64 addr;

+	int ret;


 	addr = find_ht_magic_addr(pdev);

 	msg.address_lo = addr & 0xFFFFFFFF;

 	msg.address_hi = addr >> 32;


 	list_for_each_entry(entry, &pdev->msi_list, list) {

-		hwirq = mpic_msi_alloc_hwirqs(msi_mpic, 1);

-		if (hwirq < 0) {

+		ret = mpic_msi_alloc_hwirqs(msi_mpic, 1);

+		hwirq = ret;

+		if (ret < 0) {

 			pr_debug("u3msi: failed allocating hwirq\n");

 			return hwirq;

 		}

--
[view original message]
From: Michael Ellerman <michael@...>
To: Roel Kluin <12o3l@...>
Cc: Segher Boessenkool <segher@...>, <linuxppc-dev@...>, <paulus@...>, lkml <linux-kernel@...>
Subject: Re: [PATCH 2/2 v2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 7:36 pm

I'm not sure I like this.


I think the real bug is that we're using irq_hw_number_t to represent

something which isn't. At the end of the day we have to stash the hwirq

into the MSI message data, which is a u32.


I guess we could imagine a driver that does something magic to allow it

to put something bigger than a u32 in the MSI message, but I doubt it.


So I think =EF=BB=BFmpic_msi_alloc_hwirqs() should return a long, which all=

ows

it to return a full u32 plus the negative error values.


cheers


--=20

Michael Ellerman

OzLabs, IBM Australia Development Lab


wwweb: http://michael.ellerman.id.au

phone: +61 2 6212 1183 (tie line 70 21183)


We do not inherit the earth from our ancestors,

we borrow it from our children. - S.M.A.R.T Person
[view original message]
From: Benjamin Herrenschmidt <benh@...>
To: <michael@...>
Cc: Roel Kluin <12o3l@...>, <linuxppc-dev@...>, <paulus@...>, lkml <linux-kernel@...>
Subject: Re: [PATCH 2/2 v2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 8:42 pm

Until it's used on 32 bits...


Make it return an int error code and pass the hwirq elsewhere or use the

"illegal" hwirq number (each PIC defines one) as the error return.


Cheers,

Ben.


--
[view original message]
From: Roel Kluin <12o3l@...>
To: Segher Boessenkool <segher@...>
Cc: <paulus@...>, <linuxppc-dev@...>, lkml <linux-kernel@...>
Subject: Re: [PATCH 2/2 v2] mpic_u3msi: mpic_u3msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 7:03 pm

Again thanks to Segher and Joe Perches

---

bitmap_find_free_region(), called by mpic_msi_alloc_hwirqs() may return

signed, but hwirq is unsigned. A failed allocation remains unnoticed.


Signed-off-by: Roel Kluin <12o3l@tiscali.nl>

---

diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c

index 1d5a408..6e2f868 100644

--- a/arch/powerpc/sysdev/mpic_u3msi.c

+++ b/arch/powerpc/sysdev/mpic_u3msi.c

@@ -115,17 +115,19 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)

 	struct msi_desc *entry;

 	struct msi_msg msg;

 	u64 addr;

+	int ret;


 	addr = find_ht_magic_addr(pdev);

 	msg.address_lo = addr & 0xFFFFFFFF;

 	msg.address_hi = addr >> 32;


 	list_for_each_entry(entry, &pdev->msi_list, list) {

-		hwirq = mpic_msi_alloc_hwirqs(msi_mpic, 1);

-		if (hwirq < 0) {

+		ret = mpic_msi_alloc_hwirqs(msi_mpic, 1);

+		if (ret < 0) {

 			pr_debug("u3msi: failed allocating hwirq\n");

-			return hwirq;

+			return ret;

 		}

+		hwirq = ret;


 		virq = irq_create_mapping(msi_mpic->irqhost, hwirq);

 		if (virq == NO_IRQ) {


--
[view original message]
From: Roel Kluin <12o3l@...>
To: <paulus@...>, <linuxppc-dev@...>
Cc: lkml <linux-kernel@...>
Subject: [PATCH 2/2] powerpc: mpic_pasemi_msi: failed allocation unnoticed
Date: Wednesday, April 23, 2008 - 12:54 pm

A similar problem in arch/powerpc/sysdev/mpic_u3msi.c:

---

bitmap_find_free_region(), called by mpic_msi_alloc_hwirqs() may

return -ENOMEM, but hwirq of type irq_hw_number_t which is unsigned.


Signed-off-by: Roel Kluin <12o3l@tiscali.nl>

---

The functions can be found respectively in:

//---[ vi lib/bitmap.c +807 ]---

//---[ vi arch/powerpc/sysdev/mpic_msi.c +39 ]---


diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c

index 1d5a408..30a4e27 100644

--- a/arch/powerpc/sysdev/mpic_u3msi.c

+++ b/arch/powerpc/sysdev/mpic_u3msi.c

@@ -122,7 +122,7 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)


 	list_for_each_entry(entry, &pdev->msi_list, list) {

 		hwirq = mpic_msi_alloc_hwirqs(msi_mpic, 1);

-		if (hwirq < 0) {

+		if (hwirq == -ENOMEM) {

 			pr_debug("u3msi: failed allocating hwirq\n");

 			return hwirq;

 		}

--
Previous thread: [PATCH] Document SEQ_SKIP by Jonathan Corbet on Wednesday, April 23, 2008 - 12:39 pm. (1 message)

Next thread: [PATCH -next 2/2] sysfs: sysfs_update_group stub for CONFIG_SYSFS=n by Randy Dunlap on Wednesday, April 23, 2008 - 12:56 pm. (2 messages)