* [PATCH] powerpc/xive: Fix bogus error code returned by OPAL
@ 2019-09-23 6:29 Greg Kurz
2019-09-23 7:31 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Greg Kurz @ 2019-09-23 6:29 UTC (permalink / raw)
To: Sasha Levin; +Cc: Greg KH, linuxppc-dev, linux-kernel, stable
There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call
to return the 32-bit value 0xffffffff when OPAL has run out of IRQs.
Unfortunatelty, OPAL return values are signed 64-bit entities and
errors are supposed to be negative. If that happens, the linux code
confusingly treats 0xffffffff as a valid IRQ number and panics at some
point.
A fix was recently merged in skiboot:
e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()")
but we need a workaround anyway to support older skiboots already
in the field.
Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error
returned upon resource exhaustion.
Cc: stable@vger.kernel.org # v4.12+
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/156821713818.1985334.14123187368108582810.stgit@bahia.lan
(cherry picked from commit 6ccb4ac2bf8a35c694ead92f8ac5530a16e8f2c8,
groug: fix arch/powerpc/platforms/powernv/opal-wrappers.S instead of
non-existing arch/powerpc/platforms/powernv/opal-call.c)
Signed-off-by: Greg Kurz <groug@kaod.org>
---
This is for 4.14 and 4.19.
arch/powerpc/include/asm/opal.h | 2 +-
arch/powerpc/platforms/powernv/opal-wrappers.S | 2 +-
arch/powerpc/sysdev/xive/native.c | 11 +++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index 8eb3ebca02df..163970c56e2f 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -266,7 +266,7 @@ int64_t opal_xive_get_vp_info(uint64_t vp,
int64_t opal_xive_set_vp_info(uint64_t vp,
uint64_t flags,
uint64_t report_cl_pair);
-int64_t opal_xive_allocate_irq(uint32_t chip_id);
+int64_t opal_xive_allocate_irq_raw(uint32_t chip_id);
int64_t opal_xive_free_irq(uint32_t girq);
int64_t opal_xive_sync(uint32_t type, uint32_t id);
int64_t opal_xive_dump(uint32_t type, uint32_t id);
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S
index 8c1ede2d3f7e..b12a75a0ee8b 100644
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -301,7 +301,7 @@ OPAL_CALL(opal_xive_set_queue_info, OPAL_XIVE_SET_QUEUE_INFO);
OPAL_CALL(opal_xive_donate_page, OPAL_XIVE_DONATE_PAGE);
OPAL_CALL(opal_xive_alloc_vp_block, OPAL_XIVE_ALLOCATE_VP_BLOCK);
OPAL_CALL(opal_xive_free_vp_block, OPAL_XIVE_FREE_VP_BLOCK);
-OPAL_CALL(opal_xive_allocate_irq, OPAL_XIVE_ALLOCATE_IRQ);
+OPAL_CALL(opal_xive_allocate_irq_raw, OPAL_XIVE_ALLOCATE_IRQ);
OPAL_CALL(opal_xive_free_irq, OPAL_XIVE_FREE_IRQ);
OPAL_CALL(opal_xive_get_vp_info, OPAL_XIVE_GET_VP_INFO);
OPAL_CALL(opal_xive_set_vp_info, OPAL_XIVE_SET_VP_INFO);
diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
index 0f89ee557b04..aac61374afeb 100644
--- a/arch/powerpc/sysdev/xive/native.c
+++ b/arch/powerpc/sysdev/xive/native.c
@@ -234,6 +234,17 @@ static bool xive_native_match(struct device_node *node)
return of_device_is_compatible(node, "ibm,opal-xive-vc");
}
+static s64 opal_xive_allocate_irq(u32 chip_id)
+{
+ s64 irq = opal_xive_allocate_irq_raw(chip_id);
+
+ /*
+ * Old versions of skiboot can incorrectly return 0xffffffff to
+ * indicate no space, fix it up here.
+ */
+ return irq == 0xffffffff ? OPAL_RESOURCE : irq;
+}
+
#ifdef CONFIG_SMP
static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc)
{
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/xive: Fix bogus error code returned by OPAL
2019-09-23 6:29 [PATCH] powerpc/xive: Fix bogus error code returned by OPAL Greg Kurz
@ 2019-09-23 7:31 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2019-09-23 7:31 UTC (permalink / raw)
To: Greg Kurz; +Cc: Sasha Levin, linuxppc-dev, linux-kernel, stable
On Mon, Sep 23, 2019 at 08:29:40AM +0200, Greg Kurz wrote:
> There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call
> to return the 32-bit value 0xffffffff when OPAL has run out of IRQs.
> Unfortunatelty, OPAL return values are signed 64-bit entities and
> errors are supposed to be negative. If that happens, the linux code
> confusingly treats 0xffffffff as a valid IRQ number and panics at some
> point.
>
> A fix was recently merged in skiboot:
>
> e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()")
>
> but we need a workaround anyway to support older skiboots already
> in the field.
>
> Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error
> returned upon resource exhaustion.
>
> Cc: stable@vger.kernel.org # v4.12+
> Signed-off-by: Greg Kurz <groug@kaod.org>
> Reviewed-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> Link: https://lore.kernel.org/r/156821713818.1985334.14123187368108582810.stgit@bahia.lan
> (cherry picked from commit 6ccb4ac2bf8a35c694ead92f8ac5530a16e8f2c8,
> groug: fix arch/powerpc/platforms/powernv/opal-wrappers.S instead of
> non-existing arch/powerpc/platforms/powernv/opal-call.c)
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
>
> This is for 4.14 and 4.19.
Thanks for the backport, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] powerpc/xive: Fix bogus error code returned by OPAL
@ 2019-09-10 13:53 Greg Kurz
2019-09-10 13:59 ` Cédric Le Goater
2019-09-11 14:26 ` Michael Ellerman
0 siblings, 2 replies; 6+ messages in thread
From: Greg Kurz @ 2019-09-10 13:53 UTC (permalink / raw)
To: Michael Ellerman
Cc: linux-kernel, linuxppc-dev, Cédric Le Goater, David Gibson
There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call
to return the 32-bit value 0xffffffff when OPAL has run out of IRQs.
Unfortunatelty, OPAL return values are signed 64-bit entities and
errors are supposed to be negative. If that happens, the linux code
confusingly treats 0xffffffff as a valid IRQ number and panics at some
point.
A fix was recently merged in skiboot:
e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()")
but we need a workaround anyway to support older skiboots already
on the field.
Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error
returned upon resource exhaustion.
Signed-off-by: Greg Kurz <groug@kaod.org>
---
arch/powerpc/sysdev/xive/native.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
index 37987c815913..c35583f84f9f 100644
--- a/arch/powerpc/sysdev/xive/native.c
+++ b/arch/powerpc/sysdev/xive/native.c
@@ -231,6 +231,15 @@ static bool xive_native_match(struct device_node *node)
return of_device_is_compatible(node, "ibm,opal-xive-vc");
}
+static int64_t opal_xive_allocate_irq_fixup(uint32_t chip_id)
+{
+ s64 irq = opal_xive_allocate_irq(chip_id);
+
+#define XIVE_ALLOC_NO_SPACE 0xffffffff /* No possible space */
+ return
+ irq == XIVE_ALLOC_NO_SPACE ? OPAL_RESOURCE : irq;
+}
+
#ifdef CONFIG_SMP
static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc)
{
@@ -238,7 +247,7 @@ static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc)
/* Allocate an IPI and populate info about it */
for (;;) {
- irq = opal_xive_allocate_irq(xc->chip_id);
+ irq = opal_xive_allocate_irq_fixup(xc->chip_id);
if (irq == OPAL_BUSY) {
msleep(OPAL_BUSY_DELAY_MS);
continue;
@@ -259,7 +268,7 @@ u32 xive_native_alloc_irq(void)
s64 rc;
for (;;) {
- rc = opal_xive_allocate_irq(OPAL_XIVE_ANY_CHIP);
+ rc = opal_xive_allocate_irq_fixup(OPAL_XIVE_ANY_CHIP);
if (rc != OPAL_BUSY)
break;
msleep(OPAL_BUSY_DELAY_MS);
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/xive: Fix bogus error code returned by OPAL
2019-09-10 13:53 Greg Kurz
@ 2019-09-10 13:59 ` Cédric Le Goater
2019-09-11 14:26 ` Michael Ellerman
1 sibling, 0 replies; 6+ messages in thread
From: Cédric Le Goater @ 2019-09-10 13:59 UTC (permalink / raw)
To: Greg Kurz, Michael Ellerman; +Cc: linuxppc-dev, linux-kernel, David Gibson
On 10/09/2019 15:53, Greg Kurz wrote:
> There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call
> to return the 32-bit value 0xffffffff when OPAL has run out of IRQs.
> Unfortunatelty, OPAL return values are signed 64-bit entities and
> errors are supposed to be negative. If that happens, the linux code
> confusingly treats 0xffffffff as a valid IRQ number and panics at some
> point.
>
> A fix was recently merged in skiboot:
>
> e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()")
>
> but we need a workaround anyway to support older skiboots already
> on the field.
>
> Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error
> returned upon resource exhaustion.
>
> Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> arch/powerpc/sysdev/xive/native.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
> index 37987c815913..c35583f84f9f 100644
> --- a/arch/powerpc/sysdev/xive/native.c
> +++ b/arch/powerpc/sysdev/xive/native.c
> @@ -231,6 +231,15 @@ static bool xive_native_match(struct device_node *node)
> return of_device_is_compatible(node, "ibm,opal-xive-vc");
> }
>
> +static int64_t opal_xive_allocate_irq_fixup(uint32_t chip_id)
> +{
> + s64 irq = opal_xive_allocate_irq(chip_id);
> +
> +#define XIVE_ALLOC_NO_SPACE 0xffffffff /* No possible space */
> + return
> + irq == XIVE_ALLOC_NO_SPACE ? OPAL_RESOURCE : irq;
> +}
> +
> #ifdef CONFIG_SMP
> static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc)
> {
> @@ -238,7 +247,7 @@ static int xive_native_get_ipi(unsigned int cpu, struct xive_cpu *xc)
>
> /* Allocate an IPI and populate info about it */
> for (;;) {
> - irq = opal_xive_allocate_irq(xc->chip_id);
> + irq = opal_xive_allocate_irq_fixup(xc->chip_id);
> if (irq == OPAL_BUSY) {
> msleep(OPAL_BUSY_DELAY_MS);
> continue;
> @@ -259,7 +268,7 @@ u32 xive_native_alloc_irq(void)
> s64 rc;
>
> for (;;) {
> - rc = opal_xive_allocate_irq(OPAL_XIVE_ANY_CHIP);
> + rc = opal_xive_allocate_irq_fixup(OPAL_XIVE_ANY_CHIP);
> if (rc != OPAL_BUSY)
> break;
> msleep(OPAL_BUSY_DELAY_MS);
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/xive: Fix bogus error code returned by OPAL
2019-09-10 13:53 Greg Kurz
2019-09-10 13:59 ` Cédric Le Goater
@ 2019-09-11 14:26 ` Michael Ellerman
2019-09-11 14:40 ` Greg Kurz
1 sibling, 1 reply; 6+ messages in thread
From: Michael Ellerman @ 2019-09-11 14:26 UTC (permalink / raw)
To: Greg Kurz; +Cc: linux-kernel, linuxppc-dev, Cédric Le Goater, David Gibson
Hi Greg,
Couple of comments ...
Greg Kurz <groug@kaod.org> writes:
> There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call
> to return the 32-bit value 0xffffffff when OPAL has run out of IRQs.
> Unfortunatelty, OPAL return values are signed 64-bit entities and
> errors are supposed to be negative. If that happens, the linux code
> confusingly treats 0xffffffff as a valid IRQ number and panics at some
> point.
>
> A fix was recently merged in skiboot:
>
> e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()")
>
> but we need a workaround anyway to support older skiboots already
> on the field.
^
in
>
> Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error
> returned upon resource exhaustion.
This should go to stable, any idea what versions it should go back to?
Probably whenever the xive code was introduced?
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> arch/powerpc/sysdev/xive/native.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
> index 37987c815913..c35583f84f9f 100644
> --- a/arch/powerpc/sysdev/xive/native.c
> +++ b/arch/powerpc/sysdev/xive/native.c
> @@ -231,6 +231,15 @@ static bool xive_native_match(struct device_node *node)
> return of_device_is_compatible(node, "ibm,opal-xive-vc");
> }
>
> +static int64_t opal_xive_allocate_irq_fixup(uint32_t chip_id)
^ ^
Can you use s64 here and u32 here ....
Instead of calling this opal_xive_allocate_irq_fixup() and relying on
all callers to call the fixup, can we rename the opal wrapper and leave
this function's name unchanged, eg:
-OPAL_CALL(opal_xive_allocate_irq, OPAL_XIVE_ALLOCATE_IRQ);
+OPAL_CALL(opal_xive_allocate_irq_raw, OPAL_XIVE_ALLOCATE_IRQ);
> +{
> + s64 irq = opal_xive_allocate_irq(chip_id);
> +
> +#define XIVE_ALLOC_NO_SPACE 0xffffffff /* No possible space */
> + return
> + irq == XIVE_ALLOC_NO_SPACE ? OPAL_RESOURCE : irq;
> +}
I don't really like the #define and the weird indenting and so on, can
we instead do it like:
/*
* Old versions of skiboot can incorrectly return 0xffffffff to
* indicate no space, fix it up here.
*/
return irq == 0xffffffff ? OPAL_RESOURCE : irq;
cheers
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] powerpc/xive: Fix bogus error code returned by OPAL
2019-09-11 14:26 ` Michael Ellerman
@ 2019-09-11 14:40 ` Greg Kurz
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kurz @ 2019-09-11 14:40 UTC (permalink / raw)
To: Michael Ellerman
Cc: linux-kernel, linuxppc-dev, Cédric Le Goater, David Gibson
On Thu, 12 Sep 2019 00:26:19 +1000
Michael Ellerman <mpe@ellerman.id.au> wrote:
> Hi Greg,
>
Bom dia ! :)
> Couple of comments ...
>
> Greg Kurz <groug@kaod.org> writes:
> > There's a bug in skiboot that causes the OPAL_XIVE_ALLOCATE_IRQ call
> > to return the 32-bit value 0xffffffff when OPAL has run out of IRQs.
> > Unfortunatelty, OPAL return values are signed 64-bit entities and
> > errors are supposed to be negative. If that happens, the linux code
> > confusingly treats 0xffffffff as a valid IRQ number and panics at some
> > point.
> >
> > A fix was recently merged in skiboot:
> >
> > e97391ae2bb5 ("xive: fix return value of opal_xive_allocate_irq()")
> >
> > but we need a workaround anyway to support older skiboots already
> > on the field.
> ^
> in
>
> >
> > Internally convert 0xffffffff to OPAL_RESOURCE which is the usual error
> > returned upon resource exhaustion.
>
> This should go to stable, any idea what versions it should go back to?
> Probably whenever the xive code was introduced?
>
Yes I guess so. This would mean v4.12. I'll add the appropriate stable
tag before re-posting, and address all the other remarks of course.
> > Signed-off-by: Greg Kurz <groug@kaod.org>
> > ---
> > arch/powerpc/sysdev/xive/native.c | 13 +++++++++++--
> > 1 file changed, 11 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
> > index 37987c815913..c35583f84f9f 100644
> > --- a/arch/powerpc/sysdev/xive/native.c
> > +++ b/arch/powerpc/sysdev/xive/native.c
> > @@ -231,6 +231,15 @@ static bool xive_native_match(struct device_node *node)
> > return of_device_is_compatible(node, "ibm,opal-xive-vc");
> > }
> >
> > +static int64_t opal_xive_allocate_irq_fixup(uint32_t chip_id)
> ^ ^
> Can you use s64 here and u32 here ....
>
> Instead of calling this opal_xive_allocate_irq_fixup() and relying on
> all callers to call the fixup, can we rename the opal wrapper and leave
> this function's name unchanged, eg:
>
> -OPAL_CALL(opal_xive_allocate_irq, OPAL_XIVE_ALLOCATE_IRQ);
> +OPAL_CALL(opal_xive_allocate_irq_raw, OPAL_XIVE_ALLOCATE_IRQ);
>
>
> > +{
> > + s64 irq = opal_xive_allocate_irq(chip_id);
> > +
> > +#define XIVE_ALLOC_NO_SPACE 0xffffffff /* No possible space */
> > + return
> > + irq == XIVE_ALLOC_NO_SPACE ? OPAL_RESOURCE : irq;
> > +}
>
> I don't really like the #define and the weird indenting and so on, can
> we instead do it like:
>
> /*
> * Old versions of skiboot can incorrectly return 0xffffffff to
> * indicate no space, fix it up here.
> */
> return irq == 0xffffffff ? OPAL_RESOURCE : irq;
>
> cheers
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-09-23 7:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-23 6:29 [PATCH] powerpc/xive: Fix bogus error code returned by OPAL Greg Kurz
2019-09-23 7:31 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2019-09-10 13:53 Greg Kurz
2019-09-10 13:59 ` Cédric Le Goater
2019-09-11 14:26 ` Michael Ellerman
2019-09-11 14:40 ` Greg Kurz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).