* [PATCH for 4.6] xen/tools: Widen the machine_irq in xc_domain_*bind_pt_irq_int
@ 2015-07-17 14:06 Julien Grall
2015-07-21 14:15 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Julien Grall @ 2015-07-17 14:06 UTC (permalink / raw)
To: xen-devel
Cc: Iurii Konovalenko, Wei.Liu2, ian.campbell, ian.jackson,
Julien Grall, stefano.stabellini
The DOMCTLs {,un}bind_pt_irq are using uint32_t for the machine_irq
while the helper is using uint8_t.
Currently on ARM, we are supporting SPIs whose irq number can go up to
1019 which doesn't fit in an uint8_t. The helpers xc_domain_bind_pt_spi
and xc_domain_unbint_pt_spi are correctly taking an uint16_t so the
libxc was truncating without noticing the user which may end up to
route the wrong IRQ.
Fix the problem by widening the machine_irq parameter in
xc_domain_*bind_pt_irq_int.
Note that XEN_DOMCTL_irq_permission has the same problem but it's not
used at the moment on ARM. So we can defer the changes after the release
of Xen 4.7.
Reported-by: Iurii Konovalenko <iurii.konovalenko@globallogic.com>
Signed-off-by: Julien Grall <julien.grall@citrix.com>
---
This is based on the patch "arm: irq: increase size of irq from uint8_t
to uint32_t" [1] by Iurii few months ago.
The bug has been introduced by the device passthrough series pushed
in Xen 2 months ago. It prevents to route any IRQ number > 256 on ARM.
The changes are minimal in order to get it fixed for Xen 4.6. There
is technically change for x86 as the machine_irq field in the
DOMCTL was already uint32_t. Only the parameter of the internal
helper is widen.
[1] http://lists.xen.org/archives/html/xen-devel/2015-04/msg00681.html
---
tools/libxc/xc_domain.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index 6db8d13..b7a41e4 100644
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -1880,7 +1880,7 @@ int xc_domain_unbind_msi_irq(
static int xc_domain_bind_pt_irq_int(
xc_interface *xch,
uint32_t domid,
- uint8_t machine_irq,
+ uint32_t machine_irq,
uint8_t irq_type,
uint8_t bus,
uint8_t device,
@@ -1939,7 +1939,7 @@ int xc_domain_bind_pt_irq(
static int xc_domain_unbind_pt_irq_int(
xc_interface *xch,
uint32_t domid,
- uint8_t machine_irq,
+ uint32_t machine_irq,
uint8_t irq_type,
uint8_t bus,
uint8_t device,
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH for 4.6] xen/tools: Widen the machine_irq in xc_domain_*bind_pt_irq_int
2015-07-17 14:06 [PATCH for 4.6] xen/tools: Widen the machine_irq in xc_domain_*bind_pt_irq_int Julien Grall
@ 2015-07-21 14:15 ` Ian Campbell
2015-07-24 11:06 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Ian Campbell @ 2015-07-21 14:15 UTC (permalink / raw)
To: Julien Grall, xen-devel
Cc: Wei.Liu2, Iurii Konovalenko, stefano.stabellini, ian.jackson
On Fri, 2015-07-17 at 15:06 +0100, Julien Grall wrote:
> The DOMCTLs {,un}bind_pt_irq are using uint32_t for the machine_irq
> while the helper is using uint8_t.
>
> Currently on ARM, we are supporting SPIs whose irq number can go up
> to
> 1019 which doesn't fit in an uint8_t. The helpers
> xc_domain_bind_pt_spi
> and xc_domain_unbint_pt_spi are correctly taking an uint16_t so the
> libxc was truncating without noticing the user which may end up to
> route the wrong IRQ.
>
> Fix the problem by widening the machine_irq parameter in
> xc_domain_*bind_pt_irq_int.
>
> Note that XEN_DOMCTL_irq_permission has the same problem but it's not
> used at the moment on ARM. So we can defer the changes after the
> release
> of Xen 4.7.
>
> Reported-by: Iurii Konovalenko <iurii.konovalenko@globallogic.com>
> Signed-off-by: Julien Grall <julien.grall@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
I think this is a bugfix and should be applied for 4.6.
Ian.
>
> ---
> This is based on the patch "arm: irq: increase size of irq from
> uint8_t
> to uint32_t" [1] by Iurii few months ago.
>
> The bug has been introduced by the device passthrough series
> pushed
> in Xen 2 months ago. It prevents to route any IRQ number > 256 on
> ARM.
>
> The changes are minimal in order to get it fixed for Xen 4.6.
> There
> is technically change for x86 as the machine_irq field in the
> DOMCTL was already uint32_t. Only the parameter of the internal
> helper is widen.
>
> [1]
> http://lists.xen.org/archives/html/xen-devel/2015-04/msg00681.html
> ---
> tools/libxc/xc_domain.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
> index 6db8d13..b7a41e4 100644
> --- a/tools/libxc/xc_domain.c
> +++ b/tools/libxc/xc_domain.c
> @@ -1880,7 +1880,7 @@ int xc_domain_unbind_msi_irq(
> static int xc_domain_bind_pt_irq_int(
> xc_interface *xch,
> uint32_t domid,
> - uint8_t machine_irq,
> + uint32_t machine_irq,
> uint8_t irq_type,
> uint8_t bus,
> uint8_t device,
> @@ -1939,7 +1939,7 @@ int xc_domain_bind_pt_irq(
> static int xc_domain_unbind_pt_irq_int(
> xc_interface *xch,
> uint32_t domid,
> - uint8_t machine_irq,
> + uint32_t machine_irq,
> uint8_t irq_type,
> uint8_t bus,
> uint8_t device,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH for 4.6] xen/tools: Widen the machine_irq in xc_domain_*bind_pt_irq_int
2015-07-21 14:15 ` Ian Campbell
@ 2015-07-24 11:06 ` Ian Campbell
0 siblings, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2015-07-24 11:06 UTC (permalink / raw)
To: Julien Grall, xen-devel
Cc: stefano.stabellini, Iurii Konovalenko, Wei.Liu2, ian.jackson
On Tue, 2015-07-21 at 15:15 +0100, Ian Campbell wrote:
> On Fri, 2015-07-17 at 15:06 +0100, Julien Grall wrote:
> > The DOMCTLs {,un}bind_pt_irq are using uint32_t for the machine_irq
> > while the helper is using uint8_t.
> >
> > Currently on ARM, we are supporting SPIs whose irq number can go up
> >
> > to
> > 1019 which doesn't fit in an uint8_t. The helpers
> > xc_domain_bind_pt_spi
> > and xc_domain_unbint_pt_spi are correctly taking an uint16_t so the
> > libxc was truncating without noticing the user which may end up to
> > route the wrong IRQ.
> >
> > Fix the problem by widening the machine_irq parameter in
> > xc_domain_*bind_pt_irq_int.
> >
> > Note that XEN_DOMCTL_irq_permission has the same problem but it's
> > not
> > used at the moment on ARM. So we can defer the changes after the
> > release
> > of Xen 4.7.
> >
> > Reported-by: Iurii Konovalenko <iurii.konovalenko@globallogic.com>
> > Signed-off-by: Julien Grall <julien.grall@citrix.com>
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
> I think this is a bugfix and should be applied for 4.6.
Done.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-24 11:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-17 14:06 [PATCH for 4.6] xen/tools: Widen the machine_irq in xc_domain_*bind_pt_irq_int Julien Grall
2015-07-21 14:15 ` Ian Campbell
2015-07-24 11:06 ` Ian Campbell
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).