* [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()
@ 2020-11-28 11:31 Julien Grall
2020-11-28 11:37 ` Julien Grall
0 siblings, 1 reply; 6+ messages in thread
From: Julien Grall @ 2020-11-28 11:31 UTC (permalink / raw)
To: xen-devel; +Cc: julien, Julien Grall, Roger Paul Monné
From: Julien Grall <jgrall@amazon.com>
init_one_desc_irq() can return an error if it is unable to allocate
memory. While this is unlikely to happen during boot (called from
init_{,local_}irq_data()), it is better to harden the code by
propagting the return value.
Spotted by coverity.
CID: 106529
Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Roger Paul Monné <roger.pau@citrix.com>
---
Changes in v2:
- Add Roger's reviewed-by for x86
- Handle
---
xen/arch/arm/irq.c | 12 ++++++++++--
xen/arch/x86/irq.c | 7 ++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index 3877657a5277..b71b099e6fa2 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -88,7 +88,11 @@ static int __init init_irq_data(void)
for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ )
{
struct irq_desc *desc = irq_to_desc(irq);
- init_one_irq_desc(desc);
+ int rc = init_one_irq_desc(desc);
+
+ if ( rc )
+ return rc;
+
desc->irq = irq;
desc->action = NULL;
}
@@ -105,7 +109,11 @@ static int init_local_irq_data(void)
for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ )
{
struct irq_desc *desc = irq_to_desc(irq);
- init_one_irq_desc(desc);
+ int rc = init_one_irq_desc(desc);
+
+ if ( rc )
+ return rc;
+
desc->irq = irq;
desc->action = NULL;
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 45966947919e..3ebd684415ac 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -428,9 +428,14 @@ int __init init_irq_data(void)
for ( irq = 0; irq < nr_irqs_gsi; irq++ )
{
+ int rc;
+
desc = irq_to_desc(irq);
desc->irq = irq;
- init_one_irq_desc(desc);
+
+ rc = init_one_irq_desc(desc);
+ if ( rc )
+ return rc;
}
for ( ; irq < nr_irqs; irq++ )
irq_to_desc(irq)->irq = irq;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()
2020-11-28 11:31 [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data() Julien Grall
@ 2020-11-28 11:37 ` Julien Grall
0 siblings, 0 replies; 6+ messages in thread
From: Julien Grall @ 2020-11-28 11:37 UTC (permalink / raw)
To: xen-devel; +Cc: Julien Grall, Roger Paul Monné
Hi,
Please ignore this version as I forgot to call add_maintainers.pl.
Sorry for the noise.
Cheers,
On 28/11/2020 11:31, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
>
> init_one_desc_irq() can return an error if it is unable to allocate
> memory. While this is unlikely to happen during boot (called from
> init_{,local_}irq_data()), it is better to harden the code by
> propagting the return value.
>
> Spotted by coverity.
>
> CID: 106529
>
> Signed-off-by: Julien Grall <jgrall@amazon.com>
> Reviewed-by: Roger Paul Monné <roger.pau@citrix.com>
>
> ---
> Changes in v2:
> - Add Roger's reviewed-by for x86
> - Handle
> ---
> xen/arch/arm/irq.c | 12 ++++++++++--
> xen/arch/x86/irq.c | 7 ++++++-
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
> index 3877657a5277..b71b099e6fa2 100644
> --- a/xen/arch/arm/irq.c
> +++ b/xen/arch/arm/irq.c
> @@ -88,7 +88,11 @@ static int __init init_irq_data(void)
> for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ )
> {
> struct irq_desc *desc = irq_to_desc(irq);
> - init_one_irq_desc(desc);
> + int rc = init_one_irq_desc(desc);
> +
> + if ( rc )
> + return rc;
> +
> desc->irq = irq;
> desc->action = NULL;
> }
> @@ -105,7 +109,11 @@ static int init_local_irq_data(void)
> for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ )
> {
> struct irq_desc *desc = irq_to_desc(irq);
> - init_one_irq_desc(desc);
> + int rc = init_one_irq_desc(desc);
> +
> + if ( rc )
> + return rc;
> +
> desc->irq = irq;
> desc->action = NULL;
>
> diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
> index 45966947919e..3ebd684415ac 100644
> --- a/xen/arch/x86/irq.c
> +++ b/xen/arch/x86/irq.c
> @@ -428,9 +428,14 @@ int __init init_irq_data(void)
>
> for ( irq = 0; irq < nr_irqs_gsi; irq++ )
> {
> + int rc;
> +
> desc = irq_to_desc(irq);
> desc->irq = irq;
> - init_one_irq_desc(desc);
> +
> + rc = init_one_irq_desc(desc);
> + if ( rc )
> + return rc;
> }
> for ( ; irq < nr_irqs; irq++ )
> irq_to_desc(irq)->irq = irq;
>
--
Julien Grall
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()
@ 2020-11-28 11:36 Julien Grall
2020-11-30 23:04 ` Volodymyr Babchuk
2020-12-02 17:03 ` Bertrand Marquis
0 siblings, 2 replies; 6+ messages in thread
From: Julien Grall @ 2020-11-28 11:36 UTC (permalink / raw)
To: xen-devel
Cc: julien, Julien Grall, Stefano Stabellini, Volodymyr Babchuk,
Jan Beulich, Andrew Cooper, Roger Pau Monné,
Wei Liu
From: Julien Grall <jgrall@amazon.com>
init_one_desc_irq() can return an error if it is unable to allocate
memory. While this is unlikely to happen during boot (called from
init_{,local_}irq_data()), it is better to harden the code by
propagting the return value.
Spotted by coverity.
CID: 106529
Signed-off-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Roger Paul Monné <roger.pau@citrix.com>
---
Changes in v2:
- Add Roger's reviewed-by for x86
- Handle
---
xen/arch/arm/irq.c | 12 ++++++++++--
xen/arch/x86/irq.c | 7 ++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index 3877657a5277..b71b099e6fa2 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -88,7 +88,11 @@ static int __init init_irq_data(void)
for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ )
{
struct irq_desc *desc = irq_to_desc(irq);
- init_one_irq_desc(desc);
+ int rc = init_one_irq_desc(desc);
+
+ if ( rc )
+ return rc;
+
desc->irq = irq;
desc->action = NULL;
}
@@ -105,7 +109,11 @@ static int init_local_irq_data(void)
for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ )
{
struct irq_desc *desc = irq_to_desc(irq);
- init_one_irq_desc(desc);
+ int rc = init_one_irq_desc(desc);
+
+ if ( rc )
+ return rc;
+
desc->irq = irq;
desc->action = NULL;
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 45966947919e..3ebd684415ac 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -428,9 +428,14 @@ int __init init_irq_data(void)
for ( irq = 0; irq < nr_irqs_gsi; irq++ )
{
+ int rc;
+
desc = irq_to_desc(irq);
desc->irq = irq;
- init_one_irq_desc(desc);
+
+ rc = init_one_irq_desc(desc);
+ if ( rc )
+ return rc;
}
for ( ; irq < nr_irqs; irq++ )
irq_to_desc(irq)->irq = irq;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()
2020-11-28 11:36 Julien Grall
@ 2020-11-30 23:04 ` Volodymyr Babchuk
2020-12-02 17:03 ` Bertrand Marquis
1 sibling, 0 replies; 6+ messages in thread
From: Volodymyr Babchuk @ 2020-11-30 23:04 UTC (permalink / raw)
To: Julien Grall
Cc: xen-devel, Julien Grall, Stefano Stabellini, Jan Beulich,
Andrew Cooper, Roger Pau Monné,
Wei Liu
Hi Julien,
Julien Grall writes:
> From: Julien Grall <jgrall@amazon.com>
>
> init_one_desc_irq() can return an error if it is unable to allocate
> memory. While this is unlikely to happen during boot (called from
> init_{,local_}irq_data()), it is better to harden the code by
> propagting the return value.
>
> Spotted by coverity.
>
> CID: 106529
>
> Signed-off-by: Julien Grall <jgrall@amazon.com>
> Reviewed-by: Roger Paul Monné <roger.pau@citrix.com>
Reviewed-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
For ARM part, obviously.
>
> ---
> Changes in v2:
> - Add Roger's reviewed-by for x86
> - Handle
> ---
> xen/arch/arm/irq.c | 12 ++++++++++--
> xen/arch/x86/irq.c | 7 ++++++-
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
> index 3877657a5277..b71b099e6fa2 100644
> --- a/xen/arch/arm/irq.c
> +++ b/xen/arch/arm/irq.c
> @@ -88,7 +88,11 @@ static int __init init_irq_data(void)
> for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ )
> {
> struct irq_desc *desc = irq_to_desc(irq);
> - init_one_irq_desc(desc);
> + int rc = init_one_irq_desc(desc);
> +
> + if ( rc )
> + return rc;
> +
> desc->irq = irq;
> desc->action = NULL;
> }
> @@ -105,7 +109,11 @@ static int init_local_irq_data(void)
> for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ )
> {
> struct irq_desc *desc = irq_to_desc(irq);
> - init_one_irq_desc(desc);
> + int rc = init_one_irq_desc(desc);
> +
> + if ( rc )
> + return rc;
> +
> desc->irq = irq;
> desc->action = NULL;
>
> diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
> index 45966947919e..3ebd684415ac 100644
> --- a/xen/arch/x86/irq.c
> +++ b/xen/arch/x86/irq.c
> @@ -428,9 +428,14 @@ int __init init_irq_data(void)
>
> for ( irq = 0; irq < nr_irqs_gsi; irq++ )
> {
> + int rc;
> +
> desc = irq_to_desc(irq);
> desc->irq = irq;
> - init_one_irq_desc(desc);
> +
> + rc = init_one_irq_desc(desc);
> + if ( rc )
> + return rc;
> }
> for ( ; irq < nr_irqs; irq++ )
> irq_to_desc(irq)->irq = irq;
--
Volodymyr Babchuk at EPAM
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()
2020-11-28 11:36 Julien Grall
2020-11-30 23:04 ` Volodymyr Babchuk
@ 2020-12-02 17:03 ` Bertrand Marquis
2020-12-03 18:59 ` Stefano Stabellini
1 sibling, 1 reply; 6+ messages in thread
From: Bertrand Marquis @ 2020-12-02 17:03 UTC (permalink / raw)
To: Julien Grall
Cc: Xen-devel, Julien Grall, Stefano Stabellini, Volodymyr Babchuk,
Jan Beulich, Andrew Cooper, Roger Pau Monné,
Wei Liu
> On 28 Nov 2020, at 11:36, Julien Grall <julien@xen.org> wrote:
>
> From: Julien Grall <jgrall@amazon.com>
>
> init_one_desc_irq() can return an error if it is unable to allocate
> memory. While this is unlikely to happen during boot (called from
> init_{,local_}irq_data()), it is better to harden the code by
> propagting the return value.
>
> Spotted by coverity.
>
> CID: 106529
>
> Signed-off-by: Julien Grall <jgrall@amazon.com>
> Reviewed-by: Roger Paul Monné <roger.pau@citrix.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Cheers
Bertrand
>
> ---
> Changes in v2:
> - Add Roger's reviewed-by for x86
> - Handle
> ---
> xen/arch/arm/irq.c | 12 ++++++++++--
> xen/arch/x86/irq.c | 7 ++++++-
> 2 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
> index 3877657a5277..b71b099e6fa2 100644
> --- a/xen/arch/arm/irq.c
> +++ b/xen/arch/arm/irq.c
> @@ -88,7 +88,11 @@ static int __init init_irq_data(void)
> for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ )
> {
> struct irq_desc *desc = irq_to_desc(irq);
> - init_one_irq_desc(desc);
> + int rc = init_one_irq_desc(desc);
> +
> + if ( rc )
> + return rc;
> +
> desc->irq = irq;
> desc->action = NULL;
> }
> @@ -105,7 +109,11 @@ static int init_local_irq_data(void)
> for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ )
> {
> struct irq_desc *desc = irq_to_desc(irq);
> - init_one_irq_desc(desc);
> + int rc = init_one_irq_desc(desc);
> +
> + if ( rc )
> + return rc;
> +
> desc->irq = irq;
> desc->action = NULL;
>
> diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
> index 45966947919e..3ebd684415ac 100644
> --- a/xen/arch/x86/irq.c
> +++ b/xen/arch/x86/irq.c
> @@ -428,9 +428,14 @@ int __init init_irq_data(void)
>
> for ( irq = 0; irq < nr_irqs_gsi; irq++ )
> {
> + int rc;
> +
> desc = irq_to_desc(irq);
> desc->irq = irq;
> - init_one_irq_desc(desc);
> +
> + rc = init_one_irq_desc(desc);
> + if ( rc )
> + return rc;
> }
> for ( ; irq < nr_irqs; irq++ )
> irq_to_desc(irq)->irq = irq;
> --
> 2.17.1
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data()
2020-12-02 17:03 ` Bertrand Marquis
@ 2020-12-03 18:59 ` Stefano Stabellini
0 siblings, 0 replies; 6+ messages in thread
From: Stefano Stabellini @ 2020-12-03 18:59 UTC (permalink / raw)
To: Bertrand Marquis
Cc: Julien Grall, Xen-devel, Julien Grall, Stefano Stabellini,
Volodymyr Babchuk, Jan Beulich, Andrew Cooper,
Roger Pau Monné,
Wei Liu
[-- Attachment #1: Type: text/plain, Size: 2521 bytes --]
On Wed, 2 Dec 2020, Bertrand Marquis wrote:
> > On 28 Nov 2020, at 11:36, Julien Grall <julien@xen.org> wrote:
> >
> > From: Julien Grall <jgrall@amazon.com>
> >
> > init_one_desc_irq() can return an error if it is unable to allocate
> > memory. While this is unlikely to happen during boot (called from
> > init_{,local_}irq_data()), it is better to harden the code by
> > propagting the return value.
> >
> > Spotted by coverity.
> >
> > CID: 106529
> >
> > Signed-off-by: Julien Grall <jgrall@amazon.com>
> > Reviewed-by: Roger Paul Monné <roger.pau@citrix.com>
>
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
> > ---
> > Changes in v2:
> > - Add Roger's reviewed-by for x86
> > - Handle
> > ---
> > xen/arch/arm/irq.c | 12 ++++++++++--
> > xen/arch/x86/irq.c | 7 ++++++-
> > 2 files changed, 16 insertions(+), 3 deletions(-)
> >
> > diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
> > index 3877657a5277..b71b099e6fa2 100644
> > --- a/xen/arch/arm/irq.c
> > +++ b/xen/arch/arm/irq.c
> > @@ -88,7 +88,11 @@ static int __init init_irq_data(void)
> > for ( irq = NR_LOCAL_IRQS; irq < NR_IRQS; irq++ )
> > {
> > struct irq_desc *desc = irq_to_desc(irq);
> > - init_one_irq_desc(desc);
> > + int rc = init_one_irq_desc(desc);
> > +
> > + if ( rc )
> > + return rc;
> > +
> > desc->irq = irq;
> > desc->action = NULL;
> > }
> > @@ -105,7 +109,11 @@ static int init_local_irq_data(void)
> > for ( irq = 0; irq < NR_LOCAL_IRQS; irq++ )
> > {
> > struct irq_desc *desc = irq_to_desc(irq);
> > - init_one_irq_desc(desc);
> > + int rc = init_one_irq_desc(desc);
> > +
> > + if ( rc )
> > + return rc;
> > +
> > desc->irq = irq;
> > desc->action = NULL;
> >
> > diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
> > index 45966947919e..3ebd684415ac 100644
> > --- a/xen/arch/x86/irq.c
> > +++ b/xen/arch/x86/irq.c
> > @@ -428,9 +428,14 @@ int __init init_irq_data(void)
> >
> > for ( irq = 0; irq < nr_irqs_gsi; irq++ )
> > {
> > + int rc;
> > +
> > desc = irq_to_desc(irq);
> > desc->irq = irq;
> > - init_one_irq_desc(desc);
> > +
> > + rc = init_one_irq_desc(desc);
> > + if ( rc )
> > + return rc;
> > }
> > for ( ; irq < nr_irqs; irq++ )
> > irq_to_desc(irq)->irq = irq;
> > --
> > 2.17.1
> >
> >
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-03 19:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-28 11:31 [PATCH v2] xen/irq: Propagate the error from init_one_desc_irq() in init_*_irq_data() Julien Grall
2020-11-28 11:37 ` Julien Grall
2020-11-28 11:36 Julien Grall
2020-11-30 23:04 ` Volodymyr Babchuk
2020-12-02 17:03 ` Bertrand Marquis
2020-12-03 18:59 ` Stefano Stabellini
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).