accel/kvm: return early from kvm_irqchip_create if kvm does not support irqchip
PATCH v3 1/1 accel/kvm: return early from kvm_irqchip_create if kvm does not support irqchip
During refactoring of kvm_irqchip_create(), the refactored code was returning early from do_kvm_irqchip_create() function if the required essential capabilities were not present in KVM. This was not translating to an early return from kvm_irqchip_create() as was the case before refactoring. This is because, do_kvm_irqchip_create() did not have a means to notify the caller of the lack of required kvm capabilities. Fix this by making do_notify_irqchip_create() return EOPNOTSUPP error when capabilities are absent and then the caller can check the return code and return early.
Due to this regression during refactoring, all KVM guests on ppc64le hang immediately during startup and this completely breaks all functionality on that platform.
Message-ID: <[email protected]>
--- accel/kvm/kvm-all.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
changelogs:
v2: refactoring included which will resubmitted again for 11.1
v3: basically v1 with tags added.
accel/kvm/kvm-all.c +8 -3
@@ -2575,7 +2575,7 @@ void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_irq irq, int gsi)g_hash_table_insert (s->gsimap, irq,GINT_TO_POINTER (gsi)); } -static void do_kvm_irqchip_create (KVMState *s) +static int do_kvm_irqchip_create (KVMState *s) {int ret;if (kvm_check_extension (s,KVM_CAP_IRQCHIP )) {
@@ -2587,7 +2587,7 @@ static void do_kvm_irqchip_create(KVMState *s)exit (1 ); } }else { -return ; +return -EOPNOTSUPP ; }if (kvm_check_extension (s,KVM_CAP_IRQFD ) <=0 ) {
@@ -2610,13 +2610,17 @@ static void do_kvm_irqchip_create(KVMState *s)fprintf (stderr,"Create kernel irqchip failed: %s\n" ,strerror (-ret));exit (1 ); } + +return 0 ; }static void kvm_irqchip_create (KVMState *s) {assert (s->kernel_irqchip_split !=ON_OFF_AUTO_AUTO ); -do_kvm_irqchip_create (s); +if (do_kvm_irqchip_create (s) <0 ) { +return ; + } kvm_kernel_irqchip = true;/* If we have an in-kernel IRQ chip then we must have asynchronous * interrupt delivery (though the reverse is not necessarily true)
@@ -2835,6 +2839,7 @@ static int kvm_reset_vmfd(MachineState *ms) }if (s->kernel_irqchip_allowed) { +/* ignore return from this function */ do_kvm_irqchip_create (s); }
Signature · 1 line
2.49.0
Quoted 72 lines · Ani Sinha
During refactoring of
kvm_irqchip_create(), the refactored code was returning early fromdo_kvm_irqchip_create()function if the required essential capabilities were not present in KVM. This was not translating to an early return fromkvm_irqchip_create()as was the case before refactoring. This is because,do_kvm_irqchip_create()did not have a means to notify the caller of the lack of required kvm capabilities. Fix this by makingdo_notify_irqchip_create()return EOPNOTSUPP error when capabilities are absent and then the caller can check the return code and return early.Due to this regression during refactoring, all KVM guests on ppc64le hang immediately during startup and this completely breaks all functionality on that platform.
Fixes 98884e0cc1 ("accel/kvm: add changes required to support KVM VM file descriptor change")Message-ID: <[email protected]>
Reported-by Misbah Anjum N <[email protected]>Reported-by Gautam Menghani <[email protected]>Suggested-by Fabiano Rosas <[email protected]>Suggested-by Harsh Prateek Bora <[email protected]>Tested-by Misbah Anjum N <[email protected]>Reviewed-by Peter Maydell <[email protected]>Signed-off-by Ani Sinha <[email protected]>--- accel/kvm/kvm-all.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)changelogs:
v2: refactoring included which will resubmitted again for 11.1
v3: basically v1 with tags added.accel/kvm/kvm-all.c +7
-3@@ -2575,7 +2575,7 @@ void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_irq irq, int gsi)g_hash_table_insert (s->gsimap, irq,GINT_TO_POINTER (gsi)); } -static void do_kvm_irqchip_create (KVMState *s) +static int do_kvm_irqchip_create (KVMState *s) {int ret;if (kvm_check_extension (s,KVM_CAP_IRQCHIP )) {@@ -2587,7 +2587,7 @@ static void do_kvm_irqchip_create(KVMState *s)exit (1 ); } }else { -return ; +return -EOPNOTSUPP ; }if (kvm_check_extension (s,KVM_CAP_IRQFD ) <=0 ) {@@ -2610,13 +2610,17 @@ static void do_kvm_irqchip_create(KVMState *s)fprintf (stderr,"Create kernel irqchip failed: %s\n" ,strerror (-ret));exit (1 ); } + +return 0 ; }static void kvm_irqchip_create (KVMState *s) {assert (s->kernel_irqchip_split !=ON_OFF_AUTO_AUTO ); -do_kvm_irqchip_create (s); +if (do_kvm_irqchip_create (s) <0 ) { +return ; + } kvm_kernel_irqchip = true;/* If we have an in-kernel IRQ chip then we must have asynchronous * interrupt delivery (though the reverse is not necessarily true)
accel/kvm/kvm-all.c static int kvm_reset_vmfd(MachineState *ms) · line 2842
Quoted 4 lines
accel/kvm/kvm-all.c +1
-0@@ -2835,6 +2839,7 @@ static int kvm_reset_vmfd(MachineState *ms) }if (s->kernel_irqchip_allowed) { +/* ignore return from this function */
No need to explain the code. If you want to add a comment, explain the "why".
Quoted 3 lines
accel/kvm/kvm-all.c +0
-0do_kvm_irqchip_create (s); }
Quoted 23 lines · Ani Sinha
During refactoring of
kvm_irqchip_create(), the refactored code was returning early fromdo_kvm_irqchip_create()function if the required essential capabilities were not present in KVM. This was not translating to an early return fromkvm_irqchip_create()as was the case before refactoring. This is because,do_kvm_irqchip_create()did not have a means to notify the caller of the lack of required kvm capabilities. Fix this by makingdo_notify_irqchip_create()return EOPNOTSUPP error when capabilities are absent and then the caller can check the return code and return early.Due to this regression during refactoring, all KVM guests on ppc64le hang immediately during startup and this completely breaks all functionality on that platform.
Fixes 98884e0cc1 ("accel/kvm: add changes required to support KVM VM file descriptor change")Message-ID: <[email protected]>
Reported-by Misbah Anjum N <[email protected]>Reported-by Gautam Menghani <[email protected]>Suggested-by Fabiano Rosas <[email protected]>Suggested-by Harsh Prateek Bora <[email protected]>Tested-by Misbah Anjum N <[email protected]>Reviewed-by Peter Maydell <[email protected]>Signed-off-by Ani Sinha <[email protected]>
Quoted 3 lines
--- accel/kvm/kvm-all.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
Thanks; I'm going to apply this directly to git so we can get it into rc4.
-- PMM