From patchwork Fri Oct 31 13:38:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 39889 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8F6E8202FE for ; Fri, 31 Oct 2014 13:38:41 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id gq15sf4133272lab.10 for ; Fri, 31 Oct 2014 06:38:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=+mtPtbpA8bTlUrikRbr39rVUpx2lT9z5+b0t71AIeUU=; b=ZOIM4dLJ75i7Ru7FyPPTzkscVkJ/Uj3/pMCeOyhjJ3YQZMmHShs5C8reFrsUAqO9KR Jg8/I/2O7e+TzhFtNqrNFuPXBd+evcvrsyzSrVet4ds9On+i0A0LtW7Df3Zl0JXnN80x 1EWEFGmwCgG/qXp/c6kJvTHX/RgeunxGjt33o/fqjb/Biq8iHboyzqZwGbbyFDkxMGqZ CeaUG4yfrYtLSiPccsx3nrigLfe1Drf6XZ9AQpy1UyjsYiKE/ararznqwpAPhwo0j/fK 2mnd/FITxh37bBATYkA8Mq7A+Y3SYWkPnaMco/t6FF8sE98hKB0N40HhccROe4Z8XLz4 cgWg== X-Gm-Message-State: ALoCoQlytD8zM83GKYqCbJookOimv8ait0MrY/4pXCp1+m0i+axByp0nxNdObDNCuJapGFQQfAch X-Received: by 10.112.38.101 with SMTP id f5mr4062746lbk.7.1414762720351; Fri, 31 Oct 2014 06:38:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.7 with SMTP id f7ls425950laa.56.gmail; Fri, 31 Oct 2014 06:38:40 -0700 (PDT) X-Received: by 10.152.27.38 with SMTP id q6mr18826901lag.92.1414762720212; Fri, 31 Oct 2014 06:38:40 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id ri5si16688184lbb.115.2014.10.31.06.38.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 06:38:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id pn19so856070lab.18 for ; Fri, 31 Oct 2014 06:38:40 -0700 (PDT) X-Received: by 10.112.77.74 with SMTP id q10mr26098654lbw.66.1414762719990; Fri, 31 Oct 2014 06:38:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.84.229 with SMTP id c5csp203348lbz; Fri, 31 Oct 2014 06:38:39 -0700 (PDT) X-Received: by 10.194.246.167 with SMTP id xx7mr2859260wjc.118.1414762719298; Fri, 31 Oct 2014 06:38:39 -0700 (PDT) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com. [74.125.82.51]) by mx.google.com with ESMTPS id ej9si26594794wid.58.2014.10.31.06.38.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 06:38:39 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.51 as permitted sender) client-ip=74.125.82.51; Received: by mail-wg0-f51.google.com with SMTP id l18so7993846wgh.10 for ; Fri, 31 Oct 2014 06:38:38 -0700 (PDT) X-Received: by 10.180.102.135 with SMTP id fo7mr4003114wib.79.1414762718883; Fri, 31 Oct 2014 06:38:38 -0700 (PDT) Received: from midway01-04-00.lavalab ([88.98.47.97]) by mx.google.com with ESMTPSA id fv2sm12459458wib.2.2014.10.31.06.38.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 06:38:38 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, agraf@suse.de, pbonzini@redhat.com, aik@ozlabs.ru, bsd@redhat.com, mtosatti@redhat.com, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, rth@twiddle.net, thuth@linux.vnet.ibm.com, afaerber@suse.de, qemu-ppc@nongnu.org Cc: eric.auger@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com, peter.maydell@linaro.org Subject: [PATCH v3 1/2] KVM_CAP_IRQFD and KVM_CAP_IRQFD_RESAMPLE checks Date: Fri, 31 Oct 2014 13:38:18 +0000 Message-Id: <1414762699-4700-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1414762699-4700-1-git-send-email-eric.auger@linaro.org> References: <1414762699-4700-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Reviewed-by: Cornelia Huck Tested-by: Cornelia Huck --- v2->v3: - changed the commit message only --- hw/intc/openpic_kvm.c | 1 - hw/intc/xics_kvm.c | 1 - include/sysemu/kvm.h | 10 ++++++++++ kvm-all.c | 7 +++++++ target-i386/kvm.c | 1 - target-s390x/kvm.c | 1 - 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index e3bce04..6cef3b1 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -229,7 +229,6 @@ static void kvm_openpic_realize(DeviceState *dev, Error **errp) kvm_irqchip_add_irq_route(kvm_state, i, 0, i); } - kvm_irqfds_allowed = true; kvm_msi_via_irqfd_allowed = true; kvm_gsi_routing_allowed = true; diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 20b19e9..c15453f 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -448,7 +448,6 @@ static void xics_kvm_realize(DeviceState *dev, Error **errp) } kvm_kernel_irqchip = true; - kvm_irqfds_allowed = true; kvm_msi_via_irqfd_allowed = true; kvm_gsi_direct_mapping = true; diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index b0cd657..a23ddab 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -45,6 +45,7 @@ extern bool kvm_async_interrupts_allowed; extern bool kvm_halt_in_kernel_allowed; extern bool kvm_eventfds_allowed; extern bool kvm_irqfds_allowed; +extern bool kvm_resamplefds_allowed; extern bool kvm_msi_via_irqfd_allowed; extern bool kvm_gsi_routing_allowed; extern bool kvm_gsi_direct_mapping; @@ -102,6 +103,15 @@ extern bool kvm_readonly_mem_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: * * Returns: true if we can route a PCI MSI (Message Signaled Interrupt) diff --git a/kvm-all.c b/kvm-all.c index 44a5e72..0a3139f 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -120,6 +120,7 @@ bool kvm_async_interrupts_allowed; bool kvm_halt_in_kernel_allowed; bool kvm_eventfds_allowed; bool kvm_irqfds_allowed; +bool kvm_resamplefds_allowed; bool kvm_msi_via_irqfd_allowed; bool kvm_gsi_routing_allowed; bool kvm_gsi_direct_mapping; @@ -1566,6 +1567,12 @@ static int kvm_init(MachineState *ms) kvm_eventfds_allowed = (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); if (ret < 0) { goto err; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index ccf36e8..3a3dfc4 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -2563,7 +2563,6 @@ void kvm_arch_init_irq_routing(KVMState *s) * irqchip, so we can use irqfds, and on x86 we know * we can use msi via irqfd and GSI routing. */ - kvm_irqfds_allowed = true; kvm_msi_via_irqfd_allowed = true; kvm_gsi_routing_allowed = true; } diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 5b10a25..9ae1958 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -1294,7 +1294,6 @@ void kvm_arch_init_irq_routing(KVMState *s) * have to override the common code kvm_halt_in_kernel_allowed setting. */ if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { - kvm_irqfds_allowed = true; kvm_gsi_routing_allowed = true; kvm_halt_in_kernel_allowed = false; }