From patchwork Thu Jul 26 14:35:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10277 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AC19C24039 for ; Thu, 26 Jul 2012 14:35:23 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 7C867A18F39 for ; Thu, 26 Jul 2012 14:35:23 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so2030536ggn.11 for ; Thu, 26 Jul 2012 07:35:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=epbg0b29d9b8z6eUgZlvt/1bYzAk9IFKYXMlfgmsfMw=; b=GO08YSv3qZeTo+WOZLHXrtofEKhz/2mqI6lmpgxmnc/BN+f2c8syEdyuStzleQRMWh 7uvBk9zoQcneCrxjdMPAqtC0TOJWRD5lSp51bVLXpLgjRTumipUc50hZviO3xLjd5EXG 49cKXKqfm2M1ROtbQATOpPTpuI7kfHfS50LVMOvrW6TILp7GSepFlR86Tyv7Af3Bg3Wm pirl3xigKkC6KkLNhnKx5cmU/dglvMz1+hKajwxt1bL/a9lH5U9xQ8WtsoICCCBRZNcj ZYQ+OeuH+vz1F189kDHXdU4vfyxclmnIEtuAw7hvvrnxiy2I0vb7bQZX+xoFXSE4OZ0A O+aw== Received: by 10.50.149.170 with SMTP id ub10mr1820750igb.38.1343313322945; Thu, 26 Jul 2012 07:35:22 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.43.93.3 with SMTP id bs3csp142940icc; Thu, 26 Jul 2012 07:35:22 -0700 (PDT) Received: by 10.236.139.233 with SMTP id c69mr2086892yhj.9.1343313322041; Thu, 26 Jul 2012 07:35:22 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id l9si2943678anm.99.2012.07.26.07.35.21 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 07:35:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SuP9q-00073U-61; Thu, 26 Jul 2012 15:35:18 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Avi Kivity , Marcelo Tosatti , Jan Kiszka , Alexander Graf Subject: [PATCH v2 5/7] kvm: Decouple 'MSI routing via irqfds' from 'kernel irqchip' Date: Thu, 26 Jul 2012 15:35:15 +0100 Message-Id: <1343313317-27087-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1343313317-27087-1-git-send-email-peter.maydell@linaro.org> References: <1343313317-27087-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQnWsIpGTQNfVb797xOE9jYs2zNgv7Y4QtlwdIqUkc20iis40QxKQenyK1i4YbPjdkiSQgz9 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; }