From patchwork Thu Feb 25 00:59:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12103047 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08ABDC433E0 for ; Thu, 25 Feb 2021 01:03:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B36C664EC4 for ; Thu, 25 Feb 2021 01:03:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236720AbhBYBDb (ORCPT ); Wed, 24 Feb 2021 20:03:31 -0500 Received: from foss.arm.com ([217.140.110.172]:58502 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235735AbhBYBCW (ORCPT ); Wed, 24 Feb 2021 20:02:22 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 898CA1480; Wed, 24 Feb 2021 17:00:52 -0800 (PST) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3F6F63F73B; Wed, 24 Feb 2021 17:00:51 -0800 (PST) From: Andre Przywara To: Will Deacon , Julien Thierry Cc: Alexandru Elisei , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, Marc Zyngier , Sami Mujawar Subject: [PATCH kvmtool v2 17/22] virtio: Switch trap handling to use MMIO handler Date: Thu, 25 Feb 2021 00:59:10 +0000 Message-Id: <20210225005915.26423-18-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210225005915.26423-1-andre.przywara@arm.com> References: <20210225005915.26423-1-andre.przywara@arm.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org With the planned retirement of the special ioport emulation code, we need to provide an emulation function compatible with the MMIO prototype. Adjust the existing MMIO callback routine to automatically determine the region this trap came through, and call the existing I/O handlers. Register the ioport region using the new registration function. Signed-off-by: Andre Przywara Reviewed-by: Alexandru Elisei --- virtio/pci.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/virtio/pci.c b/virtio/pci.c index 6eea6c68..eb91f512 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -178,15 +178,6 @@ static bool virtio_pci__data_in(struct kvm_cpu *vcpu, struct virtio_device *vdev return ret; } -static bool virtio_pci__io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - struct virtio_device *vdev = ioport->priv; - struct virtio_pci *vpci = vdev->virtio; - unsigned long offset = port - virtio_pci__port_addr(vpci); - - return virtio_pci__data_in(vcpu, vdev, offset, data, size); -} - static void update_msix_map(struct virtio_pci *vpci, struct msix_table *msix_entry, u32 vecnum) { @@ -334,20 +325,6 @@ static bool virtio_pci__data_out(struct kvm_cpu *vcpu, struct virtio_device *vde return ret; } -static bool virtio_pci__io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - struct virtio_device *vdev = ioport->priv; - struct virtio_pci *vpci = vdev->virtio; - unsigned long offset = port - virtio_pci__port_addr(vpci); - - return virtio_pci__data_out(vcpu, vdev, offset, data, size); -} - -static struct ioport_operations virtio_pci__io_ops = { - .io_in = virtio_pci__io_in, - .io_out = virtio_pci__io_out, -}; - static void virtio_pci__msix_mmio_callback(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr) @@ -455,12 +432,19 @@ static void virtio_pci__io_mmio_callback(struct kvm_cpu *vcpu, { struct virtio_device *vdev = ptr; struct virtio_pci *vpci = vdev->virtio; - u32 mmio_addr = virtio_pci__mmio_addr(vpci); + u32 ioport_addr = virtio_pci__port_addr(vpci); + u32 base_addr; + + if (addr >= ioport_addr && + addr < ioport_addr + pci__bar_size(&vpci->pci_hdr, 0)) + base_addr = ioport_addr; + else + base_addr = virtio_pci__mmio_addr(vpci); if (!is_write) - virtio_pci__data_in(vcpu, vdev, addr - mmio_addr, data, len); + virtio_pci__data_in(vcpu, vdev, addr - base_addr, data, len); else - virtio_pci__data_out(vcpu, vdev, addr - mmio_addr, data, len); + virtio_pci__data_out(vcpu, vdev, addr - base_addr, data, len); } static int virtio_pci__bar_activate(struct kvm *kvm, @@ -478,10 +462,8 @@ static int virtio_pci__bar_activate(struct kvm *kvm, switch (bar_num) { case 0: - r = ioport__register(kvm, bar_addr, &virtio_pci__io_ops, - bar_size, vdev); - if (r > 0) - r = 0; + r = kvm__register_pio(kvm, bar_addr, bar_size, + virtio_pci__io_mmio_callback, vdev); break; case 1: r = kvm__register_mmio(kvm, bar_addr, bar_size, false, @@ -510,7 +492,7 @@ static int virtio_pci__bar_deactivate(struct kvm *kvm, switch (bar_num) { case 0: - r = ioport__unregister(kvm, bar_addr); + r = kvm__deregister_pio(kvm, bar_addr); break; case 1: case 2: @@ -625,7 +607,7 @@ int virtio_pci__exit(struct kvm *kvm, struct virtio_device *vdev) virtio_pci__reset(kvm, vdev); kvm__deregister_mmio(kvm, virtio_pci__mmio_addr(vpci)); kvm__deregister_mmio(kvm, virtio_pci__msix_io_addr(vpci)); - ioport__unregister(kvm, virtio_pci__port_addr(vpci)); + kvm__deregister_pio(kvm, virtio_pci__port_addr(vpci)); return 0; }