From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuPAB-0000ps-0I for qemu-devel@nongnu.org; Thu, 26 Jul 2012 10:35:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SuPA1-0005Fh-Ey for qemu-devel@nongnu.org; Thu, 26 Jul 2012 10:35:38 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:35648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuPA1-0005EA-74 for qemu-devel@nongnu.org; Thu, 26 Jul 2012 10:35:29 -0400 From: Peter Maydell Date: Thu, 26 Jul 2012 15:35:15 +0100 Message-Id: <1343313317-27087-6-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1343313317-27087-1-git-send-email-peter.maydell@linaro.org> References: <1343313317-27087-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 5/7] kvm: Decouple 'MSI routing via irqfds' from 'kernel irqchip' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf , Marcelo Tosatti , Jan Kiszka , Avi Kivity , patches@linaro.org Decouple another x86-specific assumption about what irqchips imply. Signed-off-by: Peter Maydell --- hw/virtio-pci.c | 4 ++-- kvm-all.c | 1 + kvm-stub.c | 1 + kvm.h | 11 +++++++++++ target-i386/kvm.c | 4 +++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 4e03f0b..98e02ef 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -627,7 +627,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, bool assign) int r, n; /* Must unset vector notifier while guest notifier is still assigned */ - if (kvm_irqchip_in_kernel() && !assign) { + if (kvm_msi_via_irqfd_enabled() && !assign) { msix_unset_vector_notifiers(&proxy->pci_dev); g_free(proxy->vector_irqfd); proxy->vector_irqfd = NULL; @@ -645,7 +645,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, bool assign) } /* Must set vector notifier after guest notifier has been assigned */ - if (kvm_irqchip_in_kernel() && assign) { + if (kvm_msi_via_irqfd_enabled() && assign) { proxy->vector_irqfd = g_malloc0(sizeof(*proxy->vector_irqfd) * msix_nr_vectors_allocated(&proxy->pci_dev)); diff --git a/kvm-all.c b/kvm-all.c index 3a69e53..cdacd74 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -102,6 +102,7 @@ KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; bool kvm_irqfds_allowed; +bool kvm_msi_via_irqfd_allowed; static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_INFO(USER_MEMORY), diff --git a/kvm-stub.c b/kvm-stub.c index 02e7fe0..158bb7b 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -21,6 +21,7 @@ KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; bool kvm_irqfds_allowed; +bool kvm_msi_via_irqfd_allowed; int kvm_init_vcpu(CPUArchState *env) { diff --git a/kvm.h b/kvm.h index 21436ef..34d32c7 100644 --- a/kvm.h +++ b/kvm.h @@ -26,6 +26,7 @@ extern int kvm_allowed; extern bool kvm_kernel_irqchip; extern bool kvm_async_interrupts_allowed; extern bool kvm_irqfds_allowed; +extern bool kvm_msi_via_irqfd_allowed; #if defined CONFIG_KVM || !defined NEED_CPU_H #define kvm_enabled() (kvm_allowed) @@ -50,11 +51,21 @@ extern bool kvm_irqfds_allowed; */ #define kvm_irqfds_enabled() (kvm_irqfds_allowed) +/** + * kvm_msi_via_irqfd_enabled: + * + * Returns: true if we can route a PCI MSI (Message Signaled Interrupt) + * to a KVM CPU via an irqfd. This requires that the kernel supports + * this and that we're running in a configuration that permits it. + */ +#define kvm_msi_via_irqfd_enabled() (kvm_msi_via_irqfd_allowed) + #else #define kvm_enabled() (0) #define kvm_irqchip_in_kernel() (false) #define kvm_async_interrupts_enabled() (false) #define kvm_irqfds_enabled() (false) +#define kvm_msi_via_irqfd_enabled() (false) #endif struct kvm_run; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 5cb33a2..46ee906 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2046,7 +2046,9 @@ void kvm_arch_init_irq_routing(KVMState *s) no_hpet = 1; } /* We know at this point that we're using the in-kernel - * irqchip, so we can use irqfds. + * irqchip, so we can use irqfds, and on x86 we know + * we can use msi via irqfd. */ kvm_irqfds_allowed = true; + kvm_msi_via_irqfd_allowed = true; } -- 1.7.5.4