From patchwork Wed Jul 25 13:24:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10233 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 6DE5A23E02 for ; Wed, 25 Jul 2012 13:24:38 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0D87BA18C86 for ; Wed, 25 Jul 2012 13:24:37 +0000 (UTC) Received: by yenq6 with SMTP id q6so683518yen.11 for ; Wed, 25 Jul 2012 06:24:37 -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=LH2foaqHgEsuKqokgroB1d0K21xo4GOofPa14u1aoJ4=; b=KiZ4BK3xYT03cHT4UzjqhA9v047NpJd52CWq2D1W4NQT9py0sailOcRq6dW/GvaF/l iA5QSpuAFyCamWSUbRNkdezHoxQDD2x72P1WGftEvMm4taGsvRiqHU3NsI7Vftlv0er3 l4161jvqIiCKsqygEQbfMJsx/3MbAAiQvEK3MvHPlm1tAe6GEENYv+MyY6cifW2ufHYf YWu2KF+UB+m2KZ9gvRn+4rUjz/3mucgl9yVU06UNstC7hZez6iyKLnrweu/ol2LvEcoH mqzsW79tpd6F8wXAGn4FhcCftkQwC7Q/S/lBbImrNjaA3QePSkYHCJ5z7wqPWWcIPtYL YKWA== Received: by 10.42.165.68 with SMTP id j4mr13624281icy.24.1343222677439; Wed, 25 Jul 2012 06:24:37 -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.231.153.7 with SMTP id i7csp90861ibw; Wed, 25 Jul 2012 06:24:36 -0700 (PDT) Received: by 10.216.68.2 with SMTP id k2mr6392422wed.69.1343222675839; Wed, 25 Jul 2012 06:24:35 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id v61si24421790wek.98.2012.07.25.06.24.35 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jul 2012 06:24:35 -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 1Su1Zo-0006ar-Ef; Wed, 25 Jul 2012 14:24:32 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Avi Kivity , Marcelo Tosatti , Jan Kiszka , Alexander Graf Subject: [PATCH 5/6] kvm: Don't assume irqchip implies MSI routing via irqfds Date: Wed, 25 Jul 2012 14:24:31 +0100 Message-Id: <1343222672-25312-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1343222672-25312-1-git-send-email-peter.maydell@linaro.org> References: <1343222672-25312-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQmh+1+0ADBw6PpTOqwx1sPljEENBMLpDtZOmhLq4mtVaAIfKLDeatEBEOaRN2BLPtAwUyZR Decouple another x86-specific assumption about what irqchips imply. Signed-off-by: Peter Maydell --- hw/virtio-pci.c | 4 ++-- kvm-all.c | 3 ++- kvm-stub.c | 1 + kvm.h | 12 ++++++++++++ target-i386/kvm.c | 4 +++- 5 files changed, 20 insertions(+), 4 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 a88b8ad..c624137 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -102,6 +102,7 @@ KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupt_injection; bool kvm_irqfds_allowed; +bool kvm_msi_via_irqfd_allowed; static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_INFO(USER_MEMORY), @@ -1098,7 +1099,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) struct kvm_irq_routing_entry kroute; int virq; - if (!kvm_irqchip_in_kernel()) { + if (!kvm_msi_via_irqfd_enabled()) { return -ENOSYS; } diff --git a/kvm-stub.c b/kvm-stub.c index 179e5de..6cdeb1c 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -21,6 +21,7 @@ KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupt_injection; 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 2337eb0..1449795 100644 --- a/kvm.h +++ b/kvm.h @@ -26,6 +26,7 @@ extern int kvm_allowed; extern bool kvm_kernel_irqchip; extern bool kvm_async_interrupt_injection; 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) @@ -47,11 +48,22 @@ extern bool kvm_irqfds_allowed; * with a configuration where it is meaningful to use them). */ #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. + * This should be checked before calling MSI related functions such as + * kvm_irqchip_add_msi_route. + */ +#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_interrupt_injection() (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 8e19a4d..03db818 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; }