target/s390x/kvm: Officially require at least kernel 3.15
PATCH v2 1/1 target/s390x/kvm: Officially require at least kernel 3.15
Since QEMU v2.10, the KVM acceleration does not work on older kernels anymore since the code accidentally requires the KVM_CAP_DEVICE_CTRL capability now - it should have been optional instead. Instead of fixing the bug, we asked in the ChangeLog of QEMU 2.11 - 3.0 that people should speak up if they still need support of QEMU running with KVM on older kernels, but seems like nobody really complained. Thus let's make this official now and turn it into a proper error message, telling the users to use at least kernel 3.15 now.
---
v2: Remove also the entry in trace-events
hw/intc/s390_flic_kvm.c | 6 ------ hw/intc/trace-events | 1 - target/s390x/kvm.c | 7 +++++++ 3 files changed, 7 insertions(+), 7 deletions(-)
hw/intc/s390_flic_kvm.c +0 -6
@@ -589,12 +589,6 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp) goto fail; } flic_state->fd =-1 ; -if (!kvm_check_extension (kvm_state,KVM_CAP_DEVICE_CTRL )) { -error_setg_errno (&errp_local, errno,"KVM is missing capability" -" KVM_CAP_DEVICE_CTRL" ); -trace_flic_no_device_api (errno); - goto fail; - } cd.type =KVM_DEV_TYPE_FLIC ; ret =kvm_vm_ioctl (kvm_state,KVM_CREATE_DEVICE , &cd);
hw/intc/trace-events +0 -1
@@ -75,7 +75,6 @@ xics_ics_simple_eoi(int nr) "ics_eoi: irq 0x%x" # s390_flic_kvm.c flic_create_device(int err) "flic: create device failed %d" -flic_no_device_api(int err) "flic: no Device Contral API support %d" flic_reset_failed(int err) "flic: reset failed %d" # s390_flic.c
target/s390x/kvm.c +7 -0
@@ -316,6 +316,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s)MachineClass *mc =MACHINE_GET_CLASS (ms); mc->default_cpu_type =S390_CPU_TYPE_NAME ("host" ); + +if (!kvm_check_extension (kvm_state,KVM_CAP_DEVICE_CTRL )) { +error_report ("KVM is missing capability KVM_CAP_DEVICE_CTRL - " +"please use kernel 3.15 or newer" ); +return -1 ; + } + cap_sync_regs =kvm_check_extension (s,KVM_CAP_SYNC_REGS ); cap_async_pf =kvm_check_extension (s,KVM_CAP_ASYNC_PF ); cap_mem_op =kvm_check_extension (s,KVM_CAP_S390_MEM_OP );
Signature · 1 line
2.18.1
I'd use the title "s390x/kvm: ..."
Quoted 66 lines · Thomas Huth
Since QEMU v2.10, the KVM acceleration does not work on older kernels anymore since the code accidentally requires the
KVM_CAP_DEVICE_CTRLcapability now - it should have been optional instead. Instead of fixing the bug, we asked in the ChangeLog of QEMU 2.11 - 3.0 that people should speak up if they still need support of QEMU running with KVM on older kernels, but seems like nobody really complained. Thus let's make this official now and turn it into a proper error message, telling the users to use at least kernel 3.15 now.Signed-off-by Thomas Huth <[email protected]>---
v2: Remove also the entry in trace-eventshw/intc/s390_flic_kvm.c | 6 ------ hw/intc/trace-events | 1 - target/s390x/kvm.c | 7 +++++++ 3 files changed, 7 insertions(+), 7 deletions(-)hw/intc/s390_flic_kvm.c +0
-6@@ -589,12 +589,6 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp) goto fail; } flic_state->fd =-1 ; -if (!kvm_check_extension (kvm_state,KVM_CAP_DEVICE_CTRL )) { -error_setg_errno (&errp_local, errno,"KVM is missing capability" -" KVM_CAP_DEVICE_CTRL" ); -trace_flic_no_device_api (errno); - goto fail; - } cd.type =KVM_DEV_TYPE_FLIC ; ret =kvm_vm_ioctl (kvm_state,KVM_CREATE_DEVICE , &cd);hw/intc/trace-events +0
-1@@ -75,7 +75,6 @@ xics_ics_simple_eoi(int nr) "ics_eoi: irq 0x%x" # s390_flic_kvm.c flic_create_device(int err) "flic: create device failed %d" -flic_no_device_api(int err) "flic: no Device Contral API support %d" flic_reset_failed(int err) "flic: reset failed %d" # s390_flic.ctarget/s390x/kvm.c +7
-0@@ -316,6 +316,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s)MachineClass *mc =MACHINE_GET_CLASS (ms); mc->default_cpu_type =S390_CPU_TYPE_NAME ("host" ); + +if (!kvm_check_extension (kvm_state,KVM_CAP_DEVICE_CTRL )) { +error_report ("KVM is missing capability KVM_CAP_DEVICE_CTRL - " +"please use kernel 3.15 or newer" ); +return -1 ; + } + cap_sync_regs =kvm_check_extension (s,KVM_CAP_SYNC_REGS ); cap_async_pf =kvm_check_extension (s,KVM_CAP_ASYNC_PF ); cap_mem_op =kvm_check_extension (s,KVM_CAP_S390_MEM_OP );
Signature · 3 lines
Thanks, David / dhildenb
Cornelia Huck
AppliedOn Fri, 13 Sep 2019 11:14:43 +0200
Thomas Huth <[email protected]> wrote:
Modified the subject, as suggested by David.
Quoted 17 lines
Since QEMU v2.10, the KVM acceleration does not work on older kernels anymore since the code accidentally requires the
KVM_CAP_DEVICE_CTRLcapability now - it should have been optional instead. Instead of fixing the bug, we asked in the ChangeLog of QEMU 2.11 - 3.0 that people should speak up if they still need support of QEMU running with KVM on older kernels, but seems like nobody really complained. Thus let's make this official now and turn it into a proper error message, telling the users to use at least kernel 3.15 now.Signed-off-by Thomas Huth <[email protected]>---
v2: Remove also the entry in trace-eventshw/intc/s390_flic_kvm.c | 6 ------ hw/intc/trace-events | 1 - target/s390x/kvm.c | 7 +++++++ 3 files changed, 7 insertions(+), 7 deletions(-)
(...)
hw/intc/trace-events xics_ics_simple_eoi(int nr) "ics_eoi: irq 0x%x" · line 78
Quoted 9 lines
hw/intc/trace-events +0
-1@@ -75,7 +75,6 @@ xics_ics_simple_eoi(int nr) "ics_eoi: irq 0x%x" # s390_flic_kvm.c flic_create_device(int err) "flic: create device failed %d" -flic_no_device_api(int err) "flic: no Device Contral API support %d"
Nice, this also gets rid of a typo :)
hw/intc/trace-events xics_ics_simple_eoi(int nr) "ics_eoi: irq 0x%x" · line 80
Quoted 3 lines
hw/intc/trace-events +0
-0flic_reset_failed(int err) "flic: reset failed %d" # s390_flic.c
(...)
Thanks, applied.