From patchwork Mon Jul 20 13:02:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 6827411 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 723FFC05AC for ; Mon, 20 Jul 2015 13:02:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8240C20684 for ; Mon, 20 Jul 2015 13:02:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FC9420670 for ; Mon, 20 Jul 2015 13:02:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755949AbbGTNCf (ORCPT ); Mon, 20 Jul 2015 09:02:35 -0400 Received: from foss.arm.com ([217.140.101.70]:55614 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755973AbbGTNCe (ORCPT ); Mon, 20 Jul 2015 09:02:34 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3519B619; Mon, 20 Jul 2015 06:02:50 -0700 (PDT) Received: from e104803-lin.lan (unknown [10.1.203.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0A4EF3F21A; Mon, 20 Jul 2015 06:02:32 -0700 (PDT) From: Andre Przywara To: will.deacon@arm.com, marc.zyngier@arm.com Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, eric.auger@linaro.org, Pavel Fedin Subject: [PATCH 14/14] extend GSI IRQ routing to take a device ID Date: Mon, 20 Jul 2015 14:02:16 +0100 Message-Id: <1437397336-21385-15-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1437397336-21385-1-git-send-email-andre.przywara@arm.com> References: <1437397336-21385-1-git-send-email-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.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 For ITS emulation we need the device ID along with the MSI payload and doorbell address to identify an MSI, so we need to put it in the GSI IRQ routing table too. There is a per-VM capability by which the kernel signals the need for a device ID, so check this and put the device ID into the routing table if needed. For PCI devices we take the bus/device/function triplet and and that to the routing setup call. Signed-off-by: Andre Przywara --- hw/pci-shmem.c | 3 ++- include/kvm/irq.h | 2 +- irq.c | 24 ++++++++++++++++++++++-- virtio/pci.c | 6 ++++-- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/hw/pci-shmem.c b/hw/pci-shmem.c index 7ce98cb..512b5b0 100644 --- a/hw/pci-shmem.c +++ b/hw/pci-shmem.c @@ -135,7 +135,8 @@ int pci_shmem__get_local_irqfd(struct kvm *kvm) return fd; if (pci_shmem_pci_device.msix.ctrl & cpu_to_le16(PCI_MSIX_FLAGS_ENABLE)) { - gsi = irq__add_msix_route(kvm, &msix_table[0].msg); + gsi = irq__add_msix_route(kvm, &msix_table[0].msg, + pci_shmem_device.dev_num << 3); if (gsi < 0) return gsi; } else { diff --git a/include/kvm/irq.h b/include/kvm/irq.h index f35eb7e..ee059e3 100644 --- a/include/kvm/irq.h +++ b/include/kvm/irq.h @@ -20,7 +20,7 @@ int irq__init(struct kvm *kvm); int irq__exit(struct kvm *kvm); int irq__allocate_routing_entry(void); -int irq__add_msix_route(struct kvm *kvm, struct msi_msg *msg); +int irq__add_msix_route(struct kvm *kvm, struct msi_msg *msg, u32 device_id); void irq__update_msix_route(struct kvm *kvm, u32 gsi, struct msi_msg *msg); #endif diff --git a/irq.c b/irq.c index 25ac8d7..ea365de 100644 --- a/irq.c +++ b/irq.c @@ -62,7 +62,21 @@ static bool check_for_irq_routing(struct kvm *kvm) return has_irq_routing > 0; } -int irq__add_msix_route(struct kvm *kvm, struct msi_msg *msg) +static bool check_for_msi_devid(struct kvm *kvm) +{ + static int needs_devid = 0; + + if (needs_devid == 0) { + if (kvm__supports_vm_extension(kvm, KVM_CAP_MSI_DEVID)) + needs_devid = 1; + else + needs_devid = -1; + } + + return needs_devid > 0; +} + +int irq__add_msix_route(struct kvm *kvm, struct msi_msg *msg, u32 device_id) { int r; @@ -73,7 +87,7 @@ int irq__add_msix_route(struct kvm *kvm, struct msi_msg *msg) if (r) return r; - irq_routing->entries[irq_routing->nr++] = + irq_routing->entries[irq_routing->nr] = (struct kvm_irq_routing_entry) { .gsi = next_gsi, .type = KVM_IRQ_ROUTING_MSI, @@ -82,6 +96,12 @@ int irq__add_msix_route(struct kvm *kvm, struct msi_msg *msg) .u.msi.data = msg->data, }; + if (check_for_msi_devid(kvm)) { + irq_routing->entries[irq_routing->nr].flags = KVM_MSI_VALID_DEVID; + irq_routing->entries[irq_routing->nr].u.msi.devid = device_id; + } + irq_routing->nr++; + r = ioctl(kvm->vm_fd, KVM_SET_GSI_ROUTING, irq_routing); if (r) return r; diff --git a/virtio/pci.c b/virtio/pci.c index e92a2df..f12773f 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -191,7 +191,8 @@ static bool virtio_pci__specific_io_out(struct kvm *kvm, struct virtio_device *v break; gsi = irq__add_msix_route(kvm, - &vpci->msix_table[vec].msg); + &vpci->msix_table[vec].msg, + vpci->dev_hdr.dev_num << 3); if (gsi >= 0) vpci->config_gsi = gsi; break; @@ -203,7 +204,8 @@ static bool virtio_pci__specific_io_out(struct kvm *kvm, struct virtio_device *v break; gsi = irq__add_msix_route(kvm, - &vpci->msix_table[vec].msg); + &vpci->msix_table[vec].msg, + vpci->dev_hdr.dev_num << 3); if (gsi < 0) break; vpci->gsis[vpci->queue_selector] = gsi;