david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM_CAP_IRQFD and KVM_CAP_IRQFD_RESAMPLE checks

Browse Source 
Compute kvm_irqfds_allowed by checking the KVM_CAP_IRQFD extension.
Remove direct settings in architecture specific files.

Add a new kvm_resamplefds_allowed variable, initialized by
checking the KVM_CAP_IRQFD_RESAMPLE extension. Add a corresponding
kvm_resamplefds_enabled() function.

A special notice for s390 where KVM_CAP_IRQFD was not immediatly
advirtised when irqfd capability was introduced in the kernel.
KVM_CAP_IRQ_ROUTING was advertised instead.

This was fixed in "KVM: s390: announce irqfd capability",
ebc3226202d5956a5963185222982d435378b899 whereas irqfd support
was brought in 84223598778ba08041f4297fda485df83414d57e,
"KVM: s390: irq routing for adapter interrupts".  Both commits
first appear in 3.15 so there should not be any kernel
version impacted by this QEMU modification.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Eric Auger 2014-10-31 13:38:18 +00:00 committed by Paolo Bonzini
parent 9551ea6991
commit f41389ae3c
6 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/intc/openpic_kvm.c
View File

@ -248,7 +248,6 @@ static void kvm_openpic_realize(DeviceState *dev, Error **errp)
kvm_irqchip_add_irq_route(kvm_state, i, 0, i); kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
} }
kvm_irqfds_allowed = true;
kvm_msi_via_irqfd_allowed = true; kvm_msi_via_irqfd_allowed = true;
kvm_gsi_routing_allowed = true; kvm_gsi_routing_allowed = true;

1
hw/intc/xics_kvm.c
View File

@ -448,7 +448,6 @@ static void xics_kvm_realize(DeviceState *dev, Error **errp)
} }
kvm_kernel_irqchip = true; kvm_kernel_irqchip = true;
kvm_irqfds_allowed = true;
kvm_msi_via_irqfd_allowed = true; kvm_msi_via_irqfd_allowed = true;
kvm_gsi_direct_mapping = true; kvm_gsi_direct_mapping = true;

10
include/sysemu/kvm.h
View File

@ -45,6 +45,7 @@ extern bool kvm_async_interrupts_allowed;
extern bool kvm_halt_in_kernel_allowed; extern bool kvm_halt_in_kernel_allowed;
extern bool kvm_eventfds_allowed; extern bool kvm_eventfds_allowed;
extern bool kvm_irqfds_allowed; extern bool kvm_irqfds_allowed;
extern bool kvm_resamplefds_allowed;
extern bool kvm_msi_via_irqfd_allowed; extern bool kvm_msi_via_irqfd_allowed;
extern bool kvm_gsi_routing_allowed; extern bool kvm_gsi_routing_allowed;
extern bool kvm_gsi_direct_mapping; extern bool kvm_gsi_direct_mapping;
@ -101,6 +102,15 @@ extern bool kvm_readonly_mem_allowed;
*/ */
#define kvm_irqfds_enabled() (kvm_irqfds_allowed) #define kvm_irqfds_enabled() (kvm_irqfds_allowed)
/**
* kvm_resamplefds_enabled:
*
* Returns: true if we can use resamplefds to inject interrupts into
* a KVM CPU (ie the kernel supports resamplefds and we are running
* with a configuration where it is meaningful to use them).
*/
#define kvm_resamplefds_enabled() (kvm_resamplefds_allowed)
/** /**
* kvm_msi_via_irqfd_enabled: * kvm_msi_via_irqfd_enabled:
* *

7
kvm-all.c
View File

@ -120,6 +120,7 @@ bool kvm_async_interrupts_allowed;
bool kvm_halt_in_kernel_allowed; bool kvm_halt_in_kernel_allowed;
bool kvm_eventfds_allowed; bool kvm_eventfds_allowed;
bool kvm_irqfds_allowed; bool kvm_irqfds_allowed;
bool kvm_resamplefds_allowed;
bool kvm_msi_via_irqfd_allowed; bool kvm_msi_via_irqfd_allowed;
bool kvm_gsi_routing_allowed; bool kvm_gsi_routing_allowed;
bool kvm_gsi_direct_mapping; bool kvm_gsi_direct_mapping;
@ -1584,6 +1585,12 @@ static int kvm_init(MachineState *ms)
kvm_eventfds_allowed = kvm_eventfds_allowed =
(kvm_check_extension(s, KVM_CAP_IOEVENTFD) > 0); (kvm_check_extension(s, KVM_CAP_IOEVENTFD) > 0);
kvm_irqfds_allowed =
(kvm_check_extension(s, KVM_CAP_IRQFD) > 0);
kvm_resamplefds_allowed =
(kvm_check_extension(s, KVM_CAP_IRQFD_RESAMPLE) > 0);
ret = kvm_arch_init(s); ret = kvm_arch_init(s);
if (ret < 0) { if (ret < 0) {
goto err; goto err;

1
target-i386/kvm.c
View File

@ -2563,7 +2563,6 @@ void kvm_arch_init_irq_routing(KVMState *s)
* irqchip, so we can use irqfds, and on x86 we know * irqchip, so we can use irqfds, and on x86 we know
* we can use msi via irqfd and GSI routing. * we can use msi via irqfd and GSI routing.
*/ */
kvm_irqfds_allowed = true;
kvm_msi_via_irqfd_allowed = true; kvm_msi_via_irqfd_allowed = true;
kvm_gsi_routing_allowed = true; kvm_gsi_routing_allowed = true;
} }

1
target-s390x/kvm.c
View File

@ -1294,7 +1294,6 @@ void kvm_arch_init_irq_routing(KVMState *s)
* have to override the common code kvm_halt_in_kernel_allowed setting. * have to override the common code kvm_halt_in_kernel_allowed setting.
*/ */
if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) {
kvm_irqfds_allowed = true;
kvm_gsi_routing_allowed = true; kvm_gsi_routing_allowed = true;
kvm_halt_in_kernel_allowed = false; kvm_halt_in_kernel_allowed = false;
} }