From patchwork Mon Aug 3 15:31:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6930711 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A34A59F358 for ; Mon, 3 Aug 2015 15:33:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE8492055D for ; Mon, 3 Aug 2015 15:33:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B716E201CD for ; Mon, 3 Aug 2015 15:33:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754275AbbHCPc7 (ORCPT ); Mon, 3 Aug 2015 11:32:59 -0400 Received: from mail-wi0-f182.google.com ([209.85.212.182]:33435 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754161AbbHCPca (ORCPT ); Mon, 3 Aug 2015 11:32:30 -0400 Received: by wicmv11 with SMTP id mv11so140550260wic.0 for ; Mon, 03 Aug 2015 08:32:29 -0700 (PDT) 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=Kn3onDhfOrcPuvHyWrpsruzkymUebn1wRICh9FVvsMM=; b=VlkBLqp8uxo9KmSwkuy5kIdNUGe4WjjvYQQ1iS3pUasR0pUMpAY2h1Xa8qTdvnnXYF Ip6ss7el0BBIaxH5uKEbZK/aLydDuouPThlTVL9+TXxftCSUzmpE/HewZimI2G/2DupX HkoXcD4BuXsT6RY8JVtjoX77NXcuXAVFkwgEY02qXAGGhbtAyV+1SOYpHOwmBKqSfjmD o2kXSn3Khk0YDIQ1kH5vGPwrr4FjyUcpSIa+qShGxoBpB7kD5h25t7zDSnuhYcyvsPrU Gb2wdIR1YOCPe73micCawgOVy0BqJvNFOPWmyA36+UxrC5hSmww3QJmx3c3Miin6XZhl 9XGQ== X-Gm-Message-State: ALoCoQl/TISD7ZmQsWhxTa7n7GrWbpwnZVM+smV+6EasXbVzUUF5jkh1w6mSxIhaefvR3pP0OusA X-Received: by 10.180.80.138 with SMTP id r10mr32985475wix.18.1438615949370; Mon, 03 Aug 2015 08:32:29 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id ny7sm14134420wic.11.2015.08.03.08.32.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 08:32:28 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, christoffer.dall@linaro.org, marc.zyngier@arm.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org, pbonzini@redhat.com, andre.przywara@arm.com, p.fedin@samsung.com Subject: [PATCH v3 6/7] KVM: arm/arm64: enable MSI routing Date: Mon, 3 Aug 2015 17:31:28 +0200 Message-Id: <1438615889-10892-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438615889-10892-1-git-send-email-eric.auger@linaro.org> References: <1438615889-10892-1-git-send-email-eric.auger@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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.c | 8 ++++++++ virt/kvm/irqchip.c | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt index b6913c9..4f15347 100644 --- a/Documentation/virtual/kvm/api.txt +++ b/Documentation/virtual/kvm/api.txt @@ -2352,6 +2352,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 b784465..d00a113 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -995,6 +995,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.c b/virt/kvm/arm/vgic.c index 1b092e3..0165f34 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -2260,6 +2260,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 e1559d4..48ebc4d 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -217,7 +217,7 @@ int kvm_set_irq_routing(struct kvm *kvm, goto out; r = -EINVAL; - if (ue->flags) + if (ue->flags & ~KVM_MSI_VALID_DEVID) goto out; r = setup_routing_entry(new, e, ue); if (r)