From patchwork Thu Nov 19 14:54:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 57013 Delivered-To: patches@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp3227319lbb; Thu, 19 Nov 2015 06:54:49 -0800 (PST) X-Received: by 10.194.95.65 with SMTP id di1mr8516712wjb.134.1447944872671; Thu, 19 Nov 2015 06:54:32 -0800 (PST) Return-Path: Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com. [2a00:1450:400c:c09::22a]) by mx.google.com with ESMTPS id z65si44933846wmb.58.2015.11.19.06.54.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Nov 2015 06:54:32 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22a as permitted sender) client-ip=2a00:1450:400c:c09::22a; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22a as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro-org.20150623.gappssmtp.com Received: by wmww144 with SMTP id w144so119960277wmw.0 for ; Thu, 19 Nov 2015 06:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zPQMzlGXSxRD6YUdso/rRZEw9g5me1BMRFc8x1qFCR4=; b=lUxn8B+mOjxadMsSbEy0y2v4cFvBCli6tKHwHZaWkILXIerfWTeydg5FB5mT50iOjQ sV7dlciF4dkuZzTWh0miw6Wjx3FQe6Eg0GFFLaBMpfPSsXQr40REqxif8GRGY6sGBkXJ /qWYgtN5GY++yEmImHFjs6NwBTyEbAPXO372a+pvXIVB3Dn4cs98z5LjoiP+16P2sSM7 Dv7HUIzusiE9CtJc/NttnQdK6tR65FaLwpnm45/Axpw4hL4SRmvaIbql/ojhoyqxFxs9 lXhw/jHTNLtBztfAYBp0kgwvmwwIYSPdd6Dmmm3a2bws/IOOBGBfm5JCAWwFvAMplcnq 9vwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zPQMzlGXSxRD6YUdso/rRZEw9g5me1BMRFc8x1qFCR4=; b=JzcU14spbdDlFt9CrfciOUZEHE4htWyBck64T0QTfkaLGPZxVOGAcsauKQF/yHrbBo DbFGq/iqMb7KuZ9gMICkwSqJY2F/dZ1PjGk7gC79hFLWMZDZb6JsDJ2f/qpH/cyQH4Ti eFp2157MQz+UHPIpBS6XnAzukzE9Saeik/4oFB3x1h0XrM8ejNkJBuupEOE50+X95Ri4 HwRs3FohEqE7CDlUbj/7MlL8KizQgoSq0ZxsIb4eBlDliajKyMi/nmc2OR1kaDac9viz wTDd6Nzrlu8pSoohFmUfoD53DAIGR/tra0ZbBw/IADviDCAfNjCyHnWbqQrCMBUap8cH eBqg== X-Gm-Message-State: ALoCoQmfnPk8Qs6PIieGjGZn4VE71A4FV8ubjrsKDjI9T4VROF5bBz4dF/i0GllDCPxTQivqnPEM X-Received: by 10.194.120.194 with SMTP id le2mr8747758wjb.74.1447944872480; Thu, 19 Nov 2015 06:54:32 -0800 (PST) Return-Path: Received: from new-host-3.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id h67sm34493865wmf.17.2015.11.19.06.54.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 06:54:31 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, b.reynal@virtualopensystems.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: andre.przywara@arm.com, linux-kernel@vger.kernel.org, patches@linaro.org Subject: [PATCH v4 13/13] KVM: arm/arm64: implement IRQ bypass consumer functions Date: Thu, 19 Nov 2015 14:54:03 +0000 Message-Id: <1447944843-17731-14-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447944843-17731-1-git-send-email-eric.auger@linaro.org> References: <1447944843-17731-1-git-send-email-eric.auger@linaro.org> Implement IRQ bypass callbacks for arm/arm64 IRQ forwarding: - kvm_arch_irq_bypass_add_producer: perform VGIC/irqchip settings for forwarding - kvm_arch_irq_bypass_del_producer: same for inverse operation - kvm_arch_irq_bypass_stop: halt guest execution - kvm_arch_irq_bypass_start: resume guest execution and set CONFIG_HAVE_KVM_IRQ_BYPASS for arm/arm64. Signed-off-by: Eric Auger --- v3 -> v4: - kvm_set/unset_forward now takes the virtual IRQ ID as a parameter v2 -> v3: - kvm_arch_irq_bypass_resume renamed into kvm_arch_irq_bypass_start - kvm_vgic_unset_forward does not take the active bool param anymore - kvm_arch_irq_bypass_add_producer now returns an error value - remove kvm_arch_irq_bypass_update v1 -> v2: - struct kvm_kernel_irqfd is retrieved with container_of - function names changed --- arch/arm/kvm/Kconfig | 1 + arch/arm/kvm/arm.c | 37 +++++++++++++++++++++++++++++++++++++ arch/arm64/kvm/Kconfig | 1 + 3 files changed, 39 insertions(+) -- 1.9.1 diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 73d7201..4c9a95e 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -34,6 +34,7 @@ config KVM select HAVE_KVM_EVENTFD select HAVE_KVM_IRQFD select IRQ_BYPASS_MANAGER + select HAVE_KVM_IRQ_BYPASS depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER ---help--- Support hosting virtualized guest machines. diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index eab83b2..99517bd 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include #define CREATE_TRACE_POINTS @@ -1165,6 +1167,41 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr) return NULL; } +int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons, + struct irq_bypass_producer *prod) +{ + struct kvm_kernel_irqfd *irqfd = + container_of(cons, struct kvm_kernel_irqfd, consumer); + + return kvm_vgic_set_forward(irqfd->kvm, prod->irq, + irqfd->gsi + VGIC_NR_PRIVATE_IRQS); +} +void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons, + struct irq_bypass_producer *prod) +{ + struct kvm_kernel_irqfd *irqfd = + container_of(cons, struct kvm_kernel_irqfd, consumer); + + kvm_vgic_unset_forward(irqfd->kvm, prod->irq, + irqfd->gsi + VGIC_NR_PRIVATE_IRQS); +} + +void kvm_arch_irq_bypass_stop(struct irq_bypass_consumer *cons) +{ + struct kvm_kernel_irqfd *irqfd = + container_of(cons, struct kvm_kernel_irqfd, consumer); + + kvm_arm_halt_guest(irqfd->kvm); +} + +void kvm_arch_irq_bypass_start(struct irq_bypass_consumer *cons) +{ + struct kvm_kernel_irqfd *irqfd = + container_of(cons, struct kvm_kernel_irqfd, consumer); + + kvm_arm_resume_guest(irqfd->kvm); +} + /** * Initialize Hyp-mode and memory mappings on all CPUs. */ diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index 64f460d..f6829af 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -38,6 +38,7 @@ config KVM select HAVE_KVM_IRQFD select KVM_ARM_VGIC_V3 select IRQ_BYPASS_MANAGER + select HAVE_KVM_IRQ_BYPASS ---help--- Support hosting virtualized guest machines. We don't support KVM with 16K page tables yet, due to the multiple