* [Qemu-devel] [PATCH v2] kvm-irqchip: only commit route when irqchip is used
@ 2016-08-03 3:07 Peter Xu
2016-08-03 3:37 ` David Gibson
0 siblings, 1 reply; 2+ messages in thread
From: Peter Xu @ 2016-08-03 3:07 UTC (permalink / raw)
To: qemu-devel
Cc: aik, qemu-ppc, david, pbonzini, alex.williamson, mst, thuth, peterx
Reported from Alexey Kardashevskiy:
3f1fea0fb5bf "kvm-irqchip: do explicit commit when update irq" produces
a crash on pseries guest running with VFIO on POWER8 machine as it does
not support KVM_CAP_IRQCHIP (KVM_CAP_IRQ_XICS is there instead). At the
result, KVMState::irq_routes is NULL when VFIO calls
kvm_irqchip_commit_routes.
This makes the routing update conditional.
Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
kvm-all.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/kvm-all.c b/kvm-all.c
index ef81ca5..65608de 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1047,6 +1047,14 @@ void kvm_irqchip_commit_routes(KVMState *s)
{
int ret;
+ if (kvm_gsi_direct_mapping()) {
+ return;
+ }
+
+ if (!kvm_gsi_routing_enabled()) {
+ return;
+ }
+
s->irq_routes->flags = 0;
trace_kvm_irqchip_commit_routes();
ret = kvm_vm_ioctl(s, KVM_SET_GSI_ROUTING, s->irq_routes);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v2] kvm-irqchip: only commit route when irqchip is used
2016-08-03 3:07 [Qemu-devel] [PATCH v2] kvm-irqchip: only commit route when irqchip is used Peter Xu
@ 2016-08-03 3:37 ` David Gibson
0 siblings, 0 replies; 2+ messages in thread
From: David Gibson @ 2016-08-03 3:37 UTC (permalink / raw)
To: Peter Xu; +Cc: qemu-devel, aik, qemu-ppc, pbonzini, alex.williamson, mst, thuth
[-- Attachment #1: Type: text/plain, Size: 1428 bytes --]
On Wed, Aug 03, 2016 at 11:07:21AM +0800, Peter Xu wrote:
> Reported from Alexey Kardashevskiy:
>
> 3f1fea0fb5bf "kvm-irqchip: do explicit commit when update irq" produces
> a crash on pseries guest running with VFIO on POWER8 machine as it does
> not support KVM_CAP_IRQCHIP (KVM_CAP_IRQ_XICS is there instead). At the
> result, KVMState::irq_routes is NULL when VFIO calls
> kvm_irqchip_commit_routes.
>
> This makes the routing update conditional.
>
> Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: Peter Xu <peterx@redhat.com>
Applied to ppc-for-2.7, thanks.
> ---
> kvm-all.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/kvm-all.c b/kvm-all.c
> index ef81ca5..65608de 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1047,6 +1047,14 @@ void kvm_irqchip_commit_routes(KVMState *s)
> {
> int ret;
>
> + if (kvm_gsi_direct_mapping()) {
> + return;
> + }
> +
> + if (!kvm_gsi_routing_enabled()) {
> + return;
> + }
> +
> s->irq_routes->flags = 0;
> trace_kvm_irqchip_commit_routes();
> ret = kvm_vm_ioctl(s, KVM_SET_GSI_ROUTING, s->irq_routes);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-03 3:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-03 3:07 [Qemu-devel] [PATCH v2] kvm-irqchip: only commit route when irqchip is used Peter Xu
2016-08-03 3:37 ` David Gibson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.