From patchwork Mon Apr 4 08:47:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 64976 Delivered-To: patches@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1064318lbc; Mon, 4 Apr 2016 01:49:11 -0700 (PDT) X-Received: by 10.112.64.5 with SMTP id k5mr1537833lbs.133.1459759751906; Mon, 04 Apr 2016 01:49:11 -0700 (PDT) Return-Path: Received: from mail-lf0-x236.google.com (mail-lf0-x236.google.com. [2a00:1450:4010:c07::236]) by mx.google.com with ESMTPS id i19si15334548lfb.171.2016.04.04.01.49.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Apr 2016 01:49:11 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) client-ip=2a00:1450:4010:c07::236; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x236.google.com with SMTP id p188so131781864lfd.0 for ; Mon, 04 Apr 2016 01:49:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GALl6PiIgAKA511xYr0XU0zVT81XQ16EYCxrGBRwqyk=; b=eioIrb2LIdDsZS/WFLRG4pc904zGGsjAOgnDmG1qAgI6eYKJdFo3j2htHtw8KxTlTp UZKftsjrytyW/G28auRAGq60ySr14hAkvtRxJXG48/4+2JJ6R/nDGrmNkDW0Ryiaal5a biiRaDNl3S4qcEiA0Gt+0uo3etQRr7EmZKXco= 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=GALl6PiIgAKA511xYr0XU0zVT81XQ16EYCxrGBRwqyk=; b=O/T1YU6XDB+UTP9TR6zOqL4GTrEkL3HkjUQfWTello4X7006SdMnnXUqRVI1NDGk/U T9xXCZBsJKEDMnx1in3ngIhDcuZt/z/UvVN9r+EMEx9klxRFb3hfYbJMTICUCV04Wd3H WbcLm0f8nogEoVj4MUfe4Q5d3zlpjRduwaBrLqWFQhs5ChSs7WQXCDXlyyT2FX+xl0ri EGXjM4oQv6E4Mb5BzNlVa1cS4Ry93/fO+qzAYcHO3IZcmmmnda5rY6Wxx/bdwLyH8edb HjHkKjj5Rcp6m0xoTNadeqqVhkE9ZlH33j/9xPTxixm5561alEz3BlUCXe41WNj//VLz M0sA== X-Gm-Message-State: AD7BkJKlE5UW91tLT9+CiB/Oq/Bx+pSt8bzzmiA0UfBRRr70CPD0jRJSznSxSa2w9jx4DmFhXnY= X-Received: by 10.194.242.202 with SMTP id ws10mr12563308wjc.3.1459759751705; Mon, 04 Apr 2016 01:49:11 -0700 (PDT) Return-Path: Received: from gnx2579.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id kj9sm27921384wjb.14.2016.04.04.01.49.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Apr 2016 01:49:10 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, andre.przywara@arm.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: patches@linaro.org, pbonzini@redhat.com, p.fedin@samsung.com, Manish.Jaggi@caviumnetworks.com Subject: [PATCH v4 6/7] KVM: arm/arm64: enable MSI routing Date: Mon, 4 Apr 2016 10:47:36 +0200 Message-Id: <1459759657-7402-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459759657-7402-1-git-send-email-eric.auger@linaro.org> References: <1459759657-7402-1-git-send-email-eric.auger@linaro.org> Up to now, only irqchip routing entries could be set. This patch adds the capability to insert MSI routing entries. For ARM64, let's also increase KVM_MAX_IRQ_ROUTES to 4096: this include SPI irqchip routes plus MSI routes. In the future this might be extended. Signed-off-by: Eric Auger --- v2 -> v3: - remove any reference to KVM_IRQ_ROUTING_EXTENDED_MSI type - unconditionnaly uapi flags and devid downto the kernel routing entry struct - handle KVM_MSI_VALID_DEVID flag in kvm_set_irq_routing - note about KVM_CAP_MSI_DEVID moved in the first patch file of the series v1 -> v2: - adapt to new routing entry types RFC -> PATCH: - move api MSI routing updates into that patch file - use new devid field of user api struct --- Documentation/virtual/kvm/api.txt | 5 +++++ include/linux/kvm_host.h | 2 ++ virt/kvm/arm/vgic/vgic_irqfd.c | 8 ++++++++ virt/kvm/irqchip.c | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index 61f8f27..217b460 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -2368,6 +2368,11 @@ On arm/arm64, gsi routing being supported, the following can happen: - in case no routing entry is associated to this gsi, injection fails - in case the gsi is associated to an irqchip routing entry, irqchip.pin + 32 corresponds to the injected SPI ID. +- in case the gsi is associated to an MSI routing entry, + * without GICv3 ITS in-kernel emulation, MSI data matches the SPI ID + of the injected SPI + * with GICv3 ITS in-kernel emulation, the MSI message and device ID + are translated into an LPI. 4.76 KVM_PPC_ALLOCATE_HTAB diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 461e480..f25613d 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1021,6 +1021,8 @@ static inline int mmu_notifier_retry(struct kvm *kvm, unsigned long mmu_seq) #ifdef CONFIG_S390 #define KVM_MAX_IRQ_ROUTES 4096 //FIXME: we can have more than that... +#elif defined(CONFIG_ARM64) +#define KVM_MAX_IRQ_ROUTES 4096 #else #define KVM_MAX_IRQ_ROUTES 1024 #endif diff --git a/virt/kvm/arm/vgic/vgic_irqfd.c b/virt/kvm/arm/vgic/vgic_irqfd.c index a76994f..a3a7f02 100644 --- a/virt/kvm/arm/vgic/vgic_irqfd.c +++ b/virt/kvm/arm/vgic/vgic_irqfd.c @@ -64,6 +64,14 @@ int kvm_set_routing_entry(struct kvm_kernel_irq_routing_entry *e, (e->irqchip.irqchip >= KVM_NR_IRQCHIPS)) goto out; break; + case KVM_IRQ_ROUTING_MSI: + e->set = kvm_set_msi; + e->msi.address_lo = ue->u.msi.address_lo; + e->msi.address_hi = ue->u.msi.address_hi; + e->msi.data = ue->u.msi.data; + e->flags = ue->flags; + e->devid = ue->u.msi.devid; + break; default: goto out; } diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index b4222d6..269d949 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -211,7 +211,7 @@ int kvm_set_irq_routing(struct kvm *kvm, goto out; r = -EINVAL; - if (ue->flags) { + if (ue->flags & ~KVM_MSI_VALID_DEVID) { kfree(e); goto out; }