From patchwork Tue Apr 14 14:39:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487933 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 31E3D112C for ; Tue, 14 Apr 2020 14:40:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2361A2064A for ; Tue, 14 Apr 2020 14:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391042AbgDNOkC (ORCPT ); Tue, 14 Apr 2020 10:40:02 -0400 Received: from foss.arm.com ([217.140.110.172]:57102 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391034AbgDNOj7 (ORCPT ); Tue, 14 Apr 2020 10:39:59 -0400 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 A51C831B; Tue, 14 Apr 2020 07:39:58 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B5FCB3F73D; Tue, 14 Apr 2020 07:39:57 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 01/18] Makefile: Use correct objcopy binary when cross-compiling for x86_64 Date: Tue, 14 Apr 2020 15:39:29 +0100 Message-Id: <20200414143946.1521-2-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use the compiler toolchain version of objcopy instead of the native one when cross-compiling for the x86_64 architecture. Reviewed-by: Andre Przywara Tested-by: Andre Przywara Signed-off-by: Alexandru Elisei --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3862112c5ec6..f72f163101c3 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ CC := $(CROSS_COMPILE)gcc CFLAGS := LD := $(CROSS_COMPILE)ld LDFLAGS := +OBJCOPY := $(CROSS_COMPILE)objcopy FIND := find CSCOPE := cscope @@ -480,7 +481,7 @@ x86/bios/bios.bin.elf: x86/bios/entry.S x86/bios/e820.c x86/bios/int10.c x86/bio x86/bios/bios.bin: x86/bios/bios.bin.elf $(E) " OBJCOPY " $@ - $(Q) objcopy -O binary -j .text x86/bios/bios.bin.elf x86/bios/bios.bin + $(Q) $(OBJCOPY) -O binary -j .text x86/bios/bios.bin.elf x86/bios/bios.bin x86/bios/bios-rom.o: x86/bios/bios-rom.S x86/bios/bios.bin x86/bios/bios-rom.h $(E) " CC " $@ From patchwork Tue Apr 14 14:39:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487959 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DD68112C for ; Tue, 14 Apr 2020 14:43:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 86955208E0 for ; Tue, 14 Apr 2020 14:43:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391060AbgDNOkI (ORCPT ); Tue, 14 Apr 2020 10:40:08 -0400 Received: from foss.arm.com ([217.140.110.172]:57110 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391035AbgDNOkA (ORCPT ); Tue, 14 Apr 2020 10:40:00 -0400 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 C2DEDC14; Tue, 14 Apr 2020 07:39:59 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DACC93F73D; Tue, 14 Apr 2020 07:39:58 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 02/18] hw/i8042: Compile only for x86 Date: Tue, 14 Apr 2020 15:39:30 +0100 Message-Id: <20200414143946.1521-3-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The initialization function for the i8042 emulated device does exactly nothing for all architectures, except for x86. As a result, the device is usable only for x86, so let's make the file an architecture specific object file. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- Makefile | 2 +- hw/i8042.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f72f163101c3..9dfb21b56c41 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,6 @@ OBJS += hw/pci-shmem.o OBJS += kvm-ipc.o OBJS += builtin-sandbox.o OBJS += virtio/mmio.o -OBJS += hw/i8042.o # Translate uname -m into ARCH string ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc.*/powerpc/ \ @@ -124,6 +123,7 @@ endif #x86 ifeq ($(ARCH),x86) DEFINES += -DCONFIG_X86 + OBJS += hw/i8042.o OBJS += x86/boot.o OBJS += x86/cpuid.o OBJS += x86/interrupt.o diff --git a/hw/i8042.c b/hw/i8042.c index 288b7d1108ac..2d8c96e9c7e6 100644 --- a/hw/i8042.c +++ b/hw/i8042.c @@ -349,10 +349,6 @@ static struct ioport_operations kbd_ops = { int kbd__init(struct kvm *kvm) { -#ifndef CONFIG_X86 - return 0; -#endif - kbd_reset(); state.kvm = kvm; ioport__register(kvm, I8042_DATA_REG, &kbd_ops, 2, NULL); From patchwork Tue Apr 14 14:39:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487975 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3775912 for ; Tue, 14 Apr 2020 14:44:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E68A5208FE for ; Tue, 14 Apr 2020 14:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404316AbgDNOoP (ORCPT ); Tue, 14 Apr 2020 10:44:15 -0400 Received: from foss.arm.com ([217.140.110.172]:57116 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391037AbgDNOkB (ORCPT ); Tue, 14 Apr 2020 10:40:01 -0400 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 05DAB30E; Tue, 14 Apr 2020 07:40:01 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0413F3F73D; Tue, 14 Apr 2020 07:39:59 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com, Julien Thierry Subject: [PATCH kvmtool 03/18] pci: Fix BAR resource sizing arbitration Date: Tue, 14 Apr 2020 15:39:31 +0100 Message-Id: <20200414143946.1521-4-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Sami Mujawar According to the 'PCI Local Bus Specification, Revision 3.0, February 3, 2004, Section 6.2.5.1, Implementation Notes, page 227' "Software saves the original value of the Base Address register, writes 0 FFFF FFFFh to the register, then reads it back. Size calculation can be done from the 32-bit value read by first clearing encoding information bits (bit 0 for I/O, bits 0-3 for memory), inverting all 32 bits (logical NOT), then incrementing by 1. The resultant 32-bit value is the memory/I/O range size decoded by the register. Note that the upper 16 bits of the result is ignored if the Base Address register is for I/O and bits 16-31 returned zero upon read." kvmtool was returning the actual BAR resource size which would be incorrect as the software software drivers would invert all 32 bits (logical NOT), then incrementing by 1. This ends up with a very large resource size (in some cases more than 4GB) due to which drivers assert/fail to work. e.g if the BAR resource size was 0x1000, kvmtool would return 0x1000 instead of 0xFFFFF00x. Fixed pci__config_wr() to return the size of the BAR in accordance with the PCI Local Bus specification, Implementation Notes. Reviewed-by: Andre Przywara Signed-off-by: Sami Mujawar Signed-off-by: Julien Thierry [Reworked algorithm, removed power-of-two check] Signed-off-by: Alexandru Elisei --- pci.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/pci.c b/pci.c index 689869cb79a3..3198732935eb 100644 --- a/pci.c +++ b/pci.c @@ -149,6 +149,8 @@ void pci__config_wr(struct kvm *kvm, union pci_config_address addr, void *data, u8 bar, offset; struct pci_device_header *pci_hdr; u8 dev_num = addr.device_number; + u32 value = 0; + u32 mask; if (!pci_device_exists(addr.bus_number, dev_num, 0)) return; @@ -169,13 +171,41 @@ void pci__config_wr(struct kvm *kvm, union pci_config_address addr, void *data, bar = (offset - PCI_BAR_OFFSET(0)) / sizeof(u32); /* - * If the kernel masks the BAR it would expect to find the size of the - * BAR there next time it reads from it. When the kernel got the size it - * would write the address back. + * If the kernel masks the BAR, it will expect to find the size of the + * BAR there next time it reads from it. After the kernel reads the + * size, it will write the address back. */ - if (bar < 6 && ioport__read32(data) == 0xFFFFFFFF) { - u32 sz = pci_hdr->bar_size[bar]; - memcpy(base + offset, &sz, sizeof(sz)); + if (bar < 6) { + if (pci_hdr->bar[bar] & PCI_BASE_ADDRESS_SPACE_IO) + mask = (u32)PCI_BASE_ADDRESS_IO_MASK; + else + mask = (u32)PCI_BASE_ADDRESS_MEM_MASK; + /* + * According to the PCI local bus specification REV 3.0: + * The number of upper bits that a device actually implements + * depends on how much of the address space the device will + * respond to. A device that wants a 1 MB memory address space + * (using a 32-bit base address register) would build the top + * 12 bits of the address register, hardwiring the other bits + * to 0. + * + * Furthermore, software can determine how much address space + * the device requires by writing a value of all 1's to the + * register and then reading the value back. The device will + * return 0's in all don't-care address bits, effectively + * specifying the address space required. + * + * Software computes the size of the address space with the + * formula S = ~B + 1, where S is the memory size and B is the + * value read from the BAR. This means that the BAR value that + * kvmtool should return is B = ~(S - 1). + */ + memcpy(&value, data, size); + if (value == 0xffffffff) + value = ~(pci_hdr->bar_size[bar] - 1); + /* Preserve the special bits. */ + value = (value & mask) | (pci_hdr->bar[bar] & ~mask); + memcpy(base + offset, &value, size); } else { memcpy(base + offset, data, size); } From patchwork Tue Apr 14 14:39:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487935 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F149112C for ; Tue, 14 Apr 2020 14:40:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 163F42064A for ; Tue, 14 Apr 2020 14:40:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391082AbgDNOk1 (ORCPT ); Tue, 14 Apr 2020 10:40:27 -0400 Received: from foss.arm.com ([217.140.110.172]:57126 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391041AbgDNOkC (ORCPT ); Tue, 14 Apr 2020 10:40:02 -0400 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 2184C31B; Tue, 14 Apr 2020 07:40:02 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 39B2B3F73D; Tue, 14 Apr 2020 07:40:01 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 04/18] Remove pci-shmem device Date: Tue, 14 Apr 2020 15:39:32 +0100 Message-Id: <20200414143946.1521-5-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The pci-shmem emulated device ("ivshmem") was created by QEMU for cross-VM data sharing. The only Linux driver that uses this device is the Android Virtual System on a Chip staging driver, which also mentions a character device driver implemented on top of shmem, which was removed from Linux. On the kvmtool side, the only commits touching the pci-shmem device since it was introduced in 2012 were made when refactoring various kvmtool subsystems. Let's remove the maintenance burden on the kvmtool maintainers and remove this unused device. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- Makefile | 1 - builtin-run.c | 5 - hw/pci-shmem.c | 400 ---------------------------------------- include/kvm/pci-shmem.h | 32 ---- 4 files changed, 438 deletions(-) delete mode 100644 hw/pci-shmem.c delete mode 100644 include/kvm/pci-shmem.h diff --git a/Makefile b/Makefile index 9dfb21b56c41..d5449b45c457 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,6 @@ OBJS += util/read-write.o OBJS += util/util.o OBJS += virtio/9p.o OBJS += virtio/9p-pdu.o -OBJS += hw/pci-shmem.o OBJS += kvm-ipc.o OBJS += builtin-sandbox.o OBJS += virtio/mmio.o diff --git a/builtin-run.c b/builtin-run.c index f8dc6c7229b0..9cb8c75300eb 100644 --- a/builtin-run.c +++ b/builtin-run.c @@ -31,7 +31,6 @@ #include "kvm/sdl.h" #include "kvm/vnc.h" #include "kvm/guest_compat.h" -#include "kvm/pci-shmem.h" #include "kvm/kvm-ipc.h" #include "kvm/builtin-debug.h" @@ -99,10 +98,6 @@ void kvm_run_set_wrapper_sandbox(void) OPT_INTEGER('c', "cpus", &(cfg)->nrcpus, "Number of CPUs"), \ OPT_U64('m', "mem", &(cfg)->ram_size, "Virtual machine memory" \ " size in MiB."), \ - OPT_CALLBACK('\0', "shmem", NULL, \ - "[pci:]:[:handle=][:create]", \ - "Share host shmem with guest via pci device", \ - shmem_parser, NULL), \ OPT_CALLBACK('d', "disk", kvm, "image or rootfs_dir", "Disk " \ " image or rootfs directory", img_name_parser, \ kvm), \ diff --git a/hw/pci-shmem.c b/hw/pci-shmem.c deleted file mode 100644 index f92bc75544d7..000000000000 --- a/hw/pci-shmem.c +++ /dev/null @@ -1,400 +0,0 @@ -#include "kvm/devices.h" -#include "kvm/pci-shmem.h" -#include "kvm/virtio-pci-dev.h" -#include "kvm/irq.h" -#include "kvm/kvm.h" -#include "kvm/pci.h" -#include "kvm/util.h" -#include "kvm/ioport.h" -#include "kvm/ioeventfd.h" - -#include -#include -#include -#include -#include - -#define MB_SHIFT (20) -#define KB_SHIFT (10) -#define GB_SHIFT (30) - -static struct pci_device_header pci_shmem_pci_device = { - .vendor_id = cpu_to_le16(PCI_VENDOR_ID_REDHAT_QUMRANET), - .device_id = cpu_to_le16(0x1110), - .header_type = PCI_HEADER_TYPE_NORMAL, - .class[2] = 0xFF, /* misc pci device */ - .status = cpu_to_le16(PCI_STATUS_CAP_LIST), - .capabilities = (void *)&pci_shmem_pci_device.msix - (void *)&pci_shmem_pci_device, - .msix.cap = PCI_CAP_ID_MSIX, - .msix.ctrl = cpu_to_le16(1), - .msix.table_offset = cpu_to_le32(1), /* Use BAR 1 */ - .msix.pba_offset = cpu_to_le32(0x1001), /* Use BAR 1 */ -}; - -static struct device_header pci_shmem_device = { - .bus_type = DEVICE_BUS_PCI, - .data = &pci_shmem_pci_device, -}; - -/* registers for the Inter-VM shared memory device */ -enum ivshmem_registers { - INTRMASK = 0, - INTRSTATUS = 4, - IVPOSITION = 8, - DOORBELL = 12, -}; - -static struct shmem_info *shmem_region; -static u16 ivshmem_registers; -static int local_fd; -static u32 local_id; -static u64 msix_block; -static u64 msix_pba; -static struct msix_table msix_table[2]; - -int pci_shmem__register_mem(struct shmem_info *si) -{ - if (!shmem_region) { - shmem_region = si; - } else { - pr_warning("only single shmem currently avail. ignoring.\n"); - free(si); - } - return 0; -} - -static bool shmem_pci__io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - u16 offset = port - ivshmem_registers; - - switch (offset) { - case INTRMASK: - break; - case INTRSTATUS: - break; - case IVPOSITION: - ioport__write32(data, local_id); - break; - case DOORBELL: - break; - }; - - return true; -} - -static bool shmem_pci__io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) -{ - u16 offset = port - ivshmem_registers; - - switch (offset) { - case INTRMASK: - break; - case INTRSTATUS: - break; - case IVPOSITION: - break; - case DOORBELL: - break; - }; - - return true; -} - -static struct ioport_operations shmem_pci__io_ops = { - .io_in = shmem_pci__io_in, - .io_out = shmem_pci__io_out, -}; - -static void callback_mmio_msix(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr) -{ - void *mem; - - if (addr - msix_block < 0x1000) - mem = &msix_table; - else - mem = &msix_pba; - - if (is_write) - memcpy(mem + addr - msix_block, data, len); - else - memcpy(data, mem + addr - msix_block, len); -} - -/* - * Return an irqfd which can be used by other guests to signal this guest - * whenever they need to poke it - */ -int pci_shmem__get_local_irqfd(struct kvm *kvm) -{ - int fd, gsi, r; - - if (local_fd == 0) { - fd = eventfd(0, 0); - if (fd < 0) - 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, - pci_shmem_device.dev_num << 3); - if (gsi < 0) - return gsi; - } else { - gsi = pci_shmem_pci_device.irq_line; - } - - r = irq__add_irqfd(kvm, gsi, fd, -1); - if (r < 0) - return r; - - local_fd = fd; - } - - return local_fd; -} - -/* - * Connect a new client to ivshmem by adding the appropriate datamatch - * to the DOORBELL - */ -int pci_shmem__add_client(struct kvm *kvm, u32 id, int fd) -{ - struct kvm_ioeventfd ioevent; - - ioevent = (struct kvm_ioeventfd) { - .addr = ivshmem_registers + DOORBELL, - .len = sizeof(u32), - .datamatch = id, - .fd = fd, - .flags = KVM_IOEVENTFD_FLAG_PIO | KVM_IOEVENTFD_FLAG_DATAMATCH, - }; - - return ioctl(kvm->vm_fd, KVM_IOEVENTFD, &ioevent); -} - -/* - * Remove a client connected to ivshmem by removing the appropriate datamatch - * from the DOORBELL - */ -int pci_shmem__remove_client(struct kvm *kvm, u32 id) -{ - struct kvm_ioeventfd ioevent; - - ioevent = (struct kvm_ioeventfd) { - .addr = ivshmem_registers + DOORBELL, - .len = sizeof(u32), - .datamatch = id, - .flags = KVM_IOEVENTFD_FLAG_PIO - | KVM_IOEVENTFD_FLAG_DATAMATCH - | KVM_IOEVENTFD_FLAG_DEASSIGN, - }; - - return ioctl(kvm->vm_fd, KVM_IOEVENTFD, &ioevent); -} - -static void *setup_shmem(const char *key, size_t len, int creating) -{ - int fd; - int rtn; - void *mem; - int flag = O_RDWR; - - if (creating) - flag |= O_CREAT; - - fd = shm_open(key, flag, S_IRUSR | S_IWUSR); - if (fd < 0) { - pr_warning("Failed to open shared memory file %s\n", key); - return NULL; - } - - if (creating) { - rtn = ftruncate(fd, (off_t) len); - if (rtn < 0) - pr_warning("Can't ftruncate(fd,%zu)\n", len); - } - mem = mmap(NULL, len, - PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NORESERVE, fd, 0); - if (mem == MAP_FAILED) { - pr_warning("Failed to mmap shared memory file"); - mem = NULL; - } - close(fd); - - return mem; -} - -int shmem_parser(const struct option *opt, const char *arg, int unset) -{ - const u64 default_size = SHMEM_DEFAULT_SIZE; - const u64 default_phys_addr = SHMEM_DEFAULT_ADDR; - const char *default_handle = SHMEM_DEFAULT_HANDLE; - struct shmem_info *si = malloc(sizeof(struct shmem_info)); - u64 phys_addr; - u64 size; - char *handle = NULL; - int create = 0; - const char *p = arg; - char *next; - int base = 10; - int verbose = 0; - - const int skip_pci = strlen("pci:"); - if (verbose) - pr_info("shmem_parser(%p,%s,%d)", opt, arg, unset); - /* parse out optional addr family */ - if (strcasestr(p, "pci:")) { - p += skip_pci; - } else if (strcasestr(p, "mem:")) { - die("I can't add to E820 map yet.\n"); - } - /* parse out physical addr */ - base = 10; - if (strcasestr(p, "0x")) - base = 16; - phys_addr = strtoll(p, &next, base); - if (next == p && phys_addr == 0) { - pr_info("shmem: no physical addr specified, using default."); - phys_addr = default_phys_addr; - } - if (*next != ':' && *next != '\0') - die("shmem: unexpected chars after phys addr.\n"); - if (*next == '\0') - p = next; - else - p = next + 1; - /* parse out size */ - base = 10; - if (strcasestr(p, "0x")) - base = 16; - size = strtoll(p, &next, base); - if (next == p && size == 0) { - pr_info("shmem: no size specified, using default."); - size = default_size; - } - /* look for [KMGkmg][Bb]* uses base 2. */ - int skip_B = 0; - if (strspn(next, "KMGkmg")) { /* might have a prefix */ - if (*(next + 1) == 'B' || *(next + 1) == 'b') - skip_B = 1; - switch (*next) { - case 'K': - case 'k': - size = size << KB_SHIFT; - break; - case 'M': - case 'm': - size = size << MB_SHIFT; - break; - case 'G': - case 'g': - size = size << GB_SHIFT; - break; - default: - die("shmem: bug in detecting size prefix."); - break; - } - next += 1 + skip_B; - } - if (*next != ':' && *next != '\0') { - die("shmem: unexpected chars after phys size. <%c><%c>\n", - *next, *p); - } - if (*next == '\0') - p = next; - else - p = next + 1; - /* parse out optional shmem handle */ - const int skip_handle = strlen("handle="); - next = strcasestr(p, "handle="); - if (*p && next) { - if (p != next) - die("unexpected chars before handle\n"); - p += skip_handle; - next = strchrnul(p, ':'); - if (next - p) { - handle = malloc(next - p + 1); - strncpy(handle, p, next - p); - handle[next - p] = '\0'; /* just in case. */ - } - if (*next == '\0') - p = next; - else - p = next + 1; - } - /* parse optional create flag to see if we should create shm seg. */ - if (*p && strcasestr(p, "create")) { - create = 1; - p += strlen("create"); - } - if (*p != '\0') - die("shmem: unexpected trailing chars\n"); - if (handle == NULL) { - handle = malloc(strlen(default_handle) + 1); - strcpy(handle, default_handle); - } - if (verbose) { - pr_info("shmem: phys_addr = %llx", - (unsigned long long)phys_addr); - pr_info("shmem: size = %llx", (unsigned long long)size); - pr_info("shmem: handle = %s", handle); - pr_info("shmem: create = %d", create); - } - - si->phys_addr = phys_addr; - si->size = size; - si->handle = handle; - si->create = create; - pci_shmem__register_mem(si); /* ownership of si, etc. passed on. */ - return 0; -} - -int pci_shmem__init(struct kvm *kvm) -{ - char *mem; - int r; - - if (shmem_region == NULL) - return 0; - - /* Register MMIO space for MSI-X */ - r = ioport__register(kvm, IOPORT_EMPTY, &shmem_pci__io_ops, IOPORT_SIZE, NULL); - if (r < 0) - return r; - ivshmem_registers = (u16)r; - - msix_block = pci_get_io_space_block(0x1010); - kvm__register_mmio(kvm, msix_block, 0x1010, false, callback_mmio_msix, NULL); - - /* - * This registers 3 BARs: - * - * 0 - ivshmem registers - * 1 - MSI-X MMIO space - * 2 - Shared memory block - */ - pci_shmem_pci_device.bar[0] = cpu_to_le32(ivshmem_registers | PCI_BASE_ADDRESS_SPACE_IO); - pci_shmem_pci_device.bar_size[0] = shmem_region->size; - pci_shmem_pci_device.bar[1] = cpu_to_le32(msix_block | PCI_BASE_ADDRESS_SPACE_MEMORY); - pci_shmem_pci_device.bar_size[1] = 0x1010; - pci_shmem_pci_device.bar[2] = cpu_to_le32(shmem_region->phys_addr | PCI_BASE_ADDRESS_SPACE_MEMORY); - pci_shmem_pci_device.bar_size[2] = shmem_region->size; - - device__register(&pci_shmem_device); - - /* Open shared memory and plug it into the guest */ - mem = setup_shmem(shmem_region->handle, shmem_region->size, - shmem_region->create); - if (mem == NULL) - return -EINVAL; - - kvm__register_dev_mem(kvm, shmem_region->phys_addr, shmem_region->size, - mem); - return 0; -} -dev_init(pci_shmem__init); - -int pci_shmem__exit(struct kvm *kvm) -{ - return 0; -} -dev_exit(pci_shmem__exit); diff --git a/include/kvm/pci-shmem.h b/include/kvm/pci-shmem.h deleted file mode 100644 index 6cff2b85bfd3..000000000000 --- a/include/kvm/pci-shmem.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef KVM__PCI_SHMEM_H -#define KVM__PCI_SHMEM_H - -#include -#include - -#include "kvm/parse-options.h" - -#define SHMEM_DEFAULT_SIZE (16 << MB_SHIFT) -#define SHMEM_DEFAULT_ADDR (0xc8000000) -#define SHMEM_DEFAULT_HANDLE "/kvm_shmem" - -struct kvm; -struct shmem_info; - -struct shmem_info { - u64 phys_addr; - u64 size; - char *handle; - int create; -}; - -int pci_shmem__init(struct kvm *kvm); -int pci_shmem__exit(struct kvm *kvm); -int pci_shmem__register_mem(struct shmem_info *si); -int shmem_parser(const struct option *opt, const char *arg, int unset); - -int pci_shmem__get_local_irqfd(struct kvm *kvm); -int pci_shmem__add_client(struct kvm *kvm, u32 id, int fd); -int pci_shmem__remove_client(struct kvm *kvm, u32 id); - -#endif From patchwork Tue Apr 14 14:39:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487965 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB2C5112C for ; Tue, 14 Apr 2020 14:44:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC76E208FE for ; Tue, 14 Apr 2020 14:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391051AbgDNOoJ (ORCPT ); Tue, 14 Apr 2020 10:44:09 -0400 Received: from foss.arm.com ([217.140.110.172]:57136 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391043AbgDNOkD (ORCPT ); Tue, 14 Apr 2020 10:40:03 -0400 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 3EFBB30E; Tue, 14 Apr 2020 07:40:03 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 57DFB3F73D; Tue, 14 Apr 2020 07:40:02 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 05/18] Check that a PCI device's memory size is power of two Date: Tue, 14 Apr 2020 15:39:33 +0100 Message-Id: <20200414143946.1521-6-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org According to the PCI local bus specification [1], a device's memory size must be a power of two. This is also implicit in the mechanism that a CPU uses to get the memory size requirement for a PCI device. The vesa device requests a memory size that isn't a power of two. According to the same spec [1], a device is allowed to consume more memory than it actually requires. As a result, the amount of memory that the vesa device now reserves has been increased. To prevent slip-ups in the future, a few BUILD_BUG_ON statements were added in places where the memory size is known at compile time. [1] PCI Local Bus Specification Revision 3.0, section 6.2.5.1 Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- hw/vesa.c | 3 +++ include/kvm/util.h | 2 ++ include/kvm/vesa.h | 6 +++++- virtio/pci.c | 3 +++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/vesa.c b/hw/vesa.c index f3c5114cf4fe..d75b4b316a1e 100644 --- a/hw/vesa.c +++ b/hw/vesa.c @@ -58,6 +58,9 @@ struct framebuffer *vesa__init(struct kvm *kvm) char *mem; int r; + BUILD_BUG_ON(!is_power_of_two(VESA_MEM_SIZE)); + BUILD_BUG_ON(VESA_MEM_SIZE < VESA_BPP/8 * VESA_WIDTH * VESA_HEIGHT); + if (!kvm->cfg.vnc && !kvm->cfg.sdl && !kvm->cfg.gtk) return NULL; diff --git a/include/kvm/util.h b/include/kvm/util.h index 4ca7aa9392b6..199724c4018c 100644 --- a/include/kvm/util.h +++ b/include/kvm/util.h @@ -104,6 +104,8 @@ static inline unsigned long roundup_pow_of_two(unsigned long x) return x ? 1UL << fls_long(x - 1) : 0; } +#define is_power_of_two(x) ((x) > 0 ? ((x) & ((x) - 1)) == 0 : 0) + struct kvm; void *mmap_hugetlbfs(struct kvm *kvm, const char *htlbfs_path, u64 size); void *mmap_anon_or_hugetlbfs(struct kvm *kvm, const char *hugetlbfs_path, u64 size); diff --git a/include/kvm/vesa.h b/include/kvm/vesa.h index 0fac11ab5a9f..e7d971343642 100644 --- a/include/kvm/vesa.h +++ b/include/kvm/vesa.h @@ -5,8 +5,12 @@ #define VESA_HEIGHT 480 #define VESA_MEM_ADDR 0xd0000000 -#define VESA_MEM_SIZE (4*VESA_WIDTH*VESA_HEIGHT) #define VESA_BPP 32 +/* + * We actually only need VESA_BPP/8*VESA_WIDTH*VESA_HEIGHT bytes. But the memory + * size must be a power of 2, so we round up. + */ +#define VESA_MEM_SIZE (1 << 21) struct kvm; struct biosregs; diff --git a/virtio/pci.c b/virtio/pci.c index 99653cad2c0f..04e801827df9 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -435,6 +435,9 @@ int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, vpci->kvm = kvm; vpci->dev = dev; + BUILD_BUG_ON(!is_power_of_two(IOPORT_SIZE)); + BUILD_BUG_ON(!is_power_of_two(PCI_IO_SIZE)); + r = ioport__register(kvm, IOPORT_EMPTY, &virtio_pci__io_ops, IOPORT_SIZE, vdev); if (r < 0) return r; From patchwork Tue Apr 14 14:39:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487937 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0C9792C for ; Tue, 14 Apr 2020 14:40:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A216C2075E for ; Tue, 14 Apr 2020 14:40:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391074AbgDNOkc (ORCPT ); Tue, 14 Apr 2020 10:40:32 -0400 Received: from foss.arm.com ([217.140.110.172]:57142 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391045AbgDNOkE (ORCPT ); Tue, 14 Apr 2020 10:40:04 -0400 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 6566DC14; Tue, 14 Apr 2020 07:40:04 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 76D363F73D; Tue, 14 Apr 2020 07:40:03 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 06/18] arm/pci: Advertise only PCI bus 0 in the DT Date: Tue, 14 Apr 2020 15:39:34 +0100 Message-Id: <20200414143946.1521-7-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The "bus-range" property encodes the PCI bus number of the PCI controller and the largest bus number of any PCI buses that are subordinate to this node [1]. kvmtool emulates only PCI bus 0. Advertise this in the PCI DT node by setting "bus-range" to <0,0>. [1] IEEE Std 1275-1994, Section 3 "Bus Nodes Properties and Methods" Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- arm/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/pci.c b/arm/pci.c index 557cfa98938d..ed325fa4a811 100644 --- a/arm/pci.c +++ b/arm/pci.c @@ -30,7 +30,7 @@ void pci__generate_fdt_nodes(void *fdt) struct of_interrupt_map_entry irq_map[OF_PCI_IRQ_MAP_MAX]; unsigned nentries = 0; /* Bus range */ - u32 bus_range[] = { cpu_to_fdt32(0), cpu_to_fdt32(1), }; + u32 bus_range[] = { cpu_to_fdt32(0), cpu_to_fdt32(0), }; /* Configuration Space */ u64 cfg_reg_prop[] = { cpu_to_fdt64(KVM_PCI_CFG_AREA), cpu_to_fdt64(ARM_PCI_CFG_SIZE), }; From patchwork Tue Apr 14 14:39:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487963 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1C51112C for ; Tue, 14 Apr 2020 14:44:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F1042078B for ; Tue, 14 Apr 2020 14:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404216AbgDNOoG (ORCPT ); Tue, 14 Apr 2020 10:44:06 -0400 Received: from foss.arm.com ([217.140.110.172]:57148 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391048AbgDNOkG (ORCPT ); Tue, 14 Apr 2020 10:40:06 -0400 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 A1ABA31B; Tue, 14 Apr 2020 07:40:05 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9CD3B3F73D; Tue, 14 Apr 2020 07:40:04 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com, Julien Thierry Subject: [PATCH kvmtool 07/18] ioport: pci: Move port allocations to PCI devices Date: Tue, 14 Apr 2020 15:39:35 +0100 Message-Id: <20200414143946.1521-8-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Julien Thierry The dynamic ioport allocation with IOPORT_EMPTY is currently only used by PCI devices. Other devices use fixed ports for which they request registration to the ioport API. PCI ports need to be in the PCI IO space and there is no reason ioport API should know a PCI port is being allocated and needs to be placed in PCI IO space. This currently just happens to be the case. Move the responsability of dynamic allocation of ioports from the ioport API to PCI. In the future, if other types of devices also need dynamic ioport allocation, they'll have to figure out the range of ports they are allowed to use. Reviewed-by: Andre Przywara Signed-off-by: Julien Thierry [Renamed functions for clarity] Signed-off-by: Alexandru Elisei --- hw/vesa.c | 4 ++-- include/kvm/ioport.h | 3 --- include/kvm/pci.h | 4 +++- ioport.c | 18 ------------------ pci.c | 17 +++++++++++++---- powerpc/include/kvm/kvm-arch.h | 2 +- vfio/core.c | 6 ++++-- vfio/pci.c | 4 ++-- virtio/pci.c | 7 ++++--- x86/include/kvm/kvm-arch.h | 2 +- 10 files changed, 30 insertions(+), 37 deletions(-) diff --git a/hw/vesa.c b/hw/vesa.c index d75b4b316a1e..24fb46faad3b 100644 --- a/hw/vesa.c +++ b/hw/vesa.c @@ -63,8 +63,8 @@ struct framebuffer *vesa__init(struct kvm *kvm) if (!kvm->cfg.vnc && !kvm->cfg.sdl && !kvm->cfg.gtk) return NULL; - - r = ioport__register(kvm, IOPORT_EMPTY, &vesa_io_ops, IOPORT_SIZE, NULL); + r = pci_get_io_port_block(IOPORT_SIZE); + r = ioport__register(kvm, r, &vesa_io_ops, IOPORT_SIZE, NULL); if (r < 0) return ERR_PTR(r); diff --git a/include/kvm/ioport.h b/include/kvm/ioport.h index db52a479742b..b10fcd5b4412 100644 --- a/include/kvm/ioport.h +++ b/include/kvm/ioport.h @@ -14,11 +14,8 @@ /* some ports we reserve for own use */ #define IOPORT_DBG 0xe0 -#define IOPORT_START 0x6200 #define IOPORT_SIZE 0x400 -#define IOPORT_EMPTY USHRT_MAX - struct kvm; struct ioport { diff --git a/include/kvm/pci.h b/include/kvm/pci.h index a86c15a70e6d..ccb155e3e8fe 100644 --- a/include/kvm/pci.h +++ b/include/kvm/pci.h @@ -19,6 +19,7 @@ #define PCI_CONFIG_DATA 0xcfc #define PCI_CONFIG_BUS_FORWARD 0xcfa #define PCI_IO_SIZE 0x100 +#define PCI_IOPORT_START 0x6200 #define PCI_CFG_SIZE (1ULL << 24) struct kvm; @@ -152,7 +153,8 @@ struct pci_device_header { int pci__init(struct kvm *kvm); int pci__exit(struct kvm *kvm); struct pci_device_header *pci__find_dev(u8 dev_num); -u32 pci_get_io_space_block(u32 size); +u32 pci_get_mmio_block(u32 size); +u16 pci_get_io_port_block(u32 size); void pci__assign_irq(struct device_header *dev_hdr); void pci__config_wr(struct kvm *kvm, union pci_config_address addr, void *data, int size); void pci__config_rd(struct kvm *kvm, union pci_config_address addr, void *data, int size); diff --git a/ioport.c b/ioport.c index a6dc65e3e6c6..a72e4035881a 100644 --- a/ioport.c +++ b/ioport.c @@ -16,24 +16,8 @@ #define ioport_node(n) rb_entry(n, struct ioport, node) -DEFINE_MUTEX(ioport_mutex); - -static u16 free_io_port_idx; /* protected by ioport_mutex */ - static struct rb_root ioport_tree = RB_ROOT; -static u16 ioport__find_free_port(void) -{ - u16 free_port; - - mutex_lock(&ioport_mutex); - free_port = IOPORT_START + free_io_port_idx * IOPORT_SIZE; - free_io_port_idx++; - mutex_unlock(&ioport_mutex); - - return free_port; -} - static struct ioport *ioport_search(struct rb_root *root, u64 addr) { struct rb_int_node *node; @@ -85,8 +69,6 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i int r; br_write_lock(kvm); - if (port == IOPORT_EMPTY) - port = ioport__find_free_port(); entry = ioport_search(&ioport_tree, port); if (entry) { diff --git a/pci.c b/pci.c index 3198732935eb..80b5c5d3d7f3 100644 --- a/pci.c +++ b/pci.c @@ -15,15 +15,24 @@ static u32 pci_config_address_bits; * (That's why it can still 32bit even with 64bit guests-- 64bit * PCI isn't currently supported.) */ -static u32 io_space_blocks = KVM_PCI_MMIO_AREA; +static u32 mmio_blocks = KVM_PCI_MMIO_AREA; +static u16 io_port_blocks = PCI_IOPORT_START; + +u16 pci_get_io_port_block(u32 size) +{ + u16 port = ALIGN(io_port_blocks, IOPORT_SIZE); + + io_port_blocks = port + size; + return port; +} /* * BARs must be naturally aligned, so enforce this in the allocator. */ -u32 pci_get_io_space_block(u32 size) +u32 pci_get_mmio_block(u32 size) { - u32 block = ALIGN(io_space_blocks, size); - io_space_blocks = block + size; + u32 block = ALIGN(mmio_blocks, size); + mmio_blocks = block + size; return block; } diff --git a/powerpc/include/kvm/kvm-arch.h b/powerpc/include/kvm/kvm-arch.h index 8126b96cb66a..26d440b22bdd 100644 --- a/powerpc/include/kvm/kvm-arch.h +++ b/powerpc/include/kvm/kvm-arch.h @@ -34,7 +34,7 @@ #define KVM_MMIO_START PPC_MMIO_START /* - * This is the address that pci_get_io_space_block() starts allocating + * This is the address that pci_get_io_port_block() starts allocating * from. Note that this is a PCI bus address. */ #define KVM_IOPORT_AREA 0x0 diff --git a/vfio/core.c b/vfio/core.c index 17b5b0cfc9ac..0ed1e6fee6bf 100644 --- a/vfio/core.c +++ b/vfio/core.c @@ -202,8 +202,10 @@ static int vfio_setup_trap_region(struct kvm *kvm, struct vfio_device *vdev, struct vfio_region *region) { if (region->is_ioport) { - int port = ioport__register(kvm, IOPORT_EMPTY, &vfio_ioport_ops, - region->info.size, region); + int port = pci_get_io_port_block(region->info.size); + + port = ioport__register(kvm, port, &vfio_ioport_ops, + region->info.size, region); if (port < 0) return port; diff --git a/vfio/pci.c b/vfio/pci.c index 76e24c156906..8e5d8572bc0c 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -750,7 +750,7 @@ static int vfio_pci_create_msix_table(struct kvm *kvm, * powers of two. */ mmio_size = roundup_pow_of_two(table->size + pba->size); - table->guest_phys_addr = pci_get_io_space_block(mmio_size); + table->guest_phys_addr = pci_get_mmio_block(mmio_size); if (!table->guest_phys_addr) { pr_err("cannot allocate IO space"); ret = -ENOMEM; @@ -846,7 +846,7 @@ static int vfio_pci_configure_bar(struct kvm *kvm, struct vfio_device *vdev, if (!region->is_ioport) { /* Grab some MMIO space in the guest */ map_size = ALIGN(region->info.size, PAGE_SIZE); - region->guest_phys_addr = pci_get_io_space_block(map_size); + region->guest_phys_addr = pci_get_mmio_block(map_size); } /* Map the BARs into the guest or setup a trap region. */ diff --git a/virtio/pci.c b/virtio/pci.c index 04e801827df9..d73414abde05 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -438,18 +438,19 @@ int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, BUILD_BUG_ON(!is_power_of_two(IOPORT_SIZE)); BUILD_BUG_ON(!is_power_of_two(PCI_IO_SIZE)); - r = ioport__register(kvm, IOPORT_EMPTY, &virtio_pci__io_ops, IOPORT_SIZE, vdev); + r = pci_get_io_port_block(IOPORT_SIZE); + r = ioport__register(kvm, r, &virtio_pci__io_ops, IOPORT_SIZE, vdev); if (r < 0) return r; vpci->port_addr = (u16)r; - vpci->mmio_addr = pci_get_io_space_block(IOPORT_SIZE); + vpci->mmio_addr = pci_get_mmio_block(IOPORT_SIZE); r = kvm__register_mmio(kvm, vpci->mmio_addr, IOPORT_SIZE, false, virtio_pci__io_mmio_callback, vpci); if (r < 0) goto free_ioport; - vpci->msix_io_block = pci_get_io_space_block(PCI_IO_SIZE * 2); + vpci->msix_io_block = pci_get_mmio_block(PCI_IO_SIZE * 2); r = kvm__register_mmio(kvm, vpci->msix_io_block, PCI_IO_SIZE * 2, false, virtio_pci__msix_mmio_callback, vpci); if (r < 0) diff --git a/x86/include/kvm/kvm-arch.h b/x86/include/kvm/kvm-arch.h index bfdd3438a9de..85cd336c7577 100644 --- a/x86/include/kvm/kvm-arch.h +++ b/x86/include/kvm/kvm-arch.h @@ -16,7 +16,7 @@ #define KVM_MMIO_START KVM_32BIT_GAP_START -/* This is the address that pci_get_io_space_block() starts allocating +/* This is the address that pci_get_io_port_block() starts allocating * from. Note that this is a PCI bus address (though same on x86). */ #define KVM_IOPORT_AREA 0x0 From patchwork Tue Apr 14 14:39:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487961 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CCB3992C for ; Tue, 14 Apr 2020 14:44:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF249208E0 for ; Tue, 14 Apr 2020 14:44:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404209AbgDNOoC (ORCPT ); Tue, 14 Apr 2020 10:44:02 -0400 Received: from foss.arm.com ([217.140.110.172]:57136 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391053AbgDNOkI (ORCPT ); Tue, 14 Apr 2020 10:40:08 -0400 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 DBE1730E; Tue, 14 Apr 2020 07:40:06 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D86A33F73D; Tue, 14 Apr 2020 07:40:05 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com, Julien Thierry Subject: [PATCH kvmtool 08/18] pci: Fix ioport allocation size Date: Tue, 14 Apr 2020 15:39:36 +0100 Message-Id: <20200414143946.1521-9-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Julien Thierry The PCI Local Bus Specification, Rev. 3.0, Section 6.2.5.1. "Address Maps" states: "Devices that map control functions into I/O Space must not consume more than 256 bytes per I/O Base Address register." Yet all the PCI devices allocate IO ports of IOPORT_SIZE (= 1024 bytes). Fix this by having PCI devices use 256 bytes ports for IO BARs. There is no hard requirement on the size of the memory region described by memory BARs. Since BAR 1 is supposed to offer the same functionality as IO ports, let's make its size match BAR 0. Reviewed-by: Andre Przywara Signed-off-by: Julien Thierry [Added rationale for changing BAR1 size to PCI_IO_SIZE] Signed-off-by: Alexandru Elisei --- hw/vesa.c | 4 ++-- include/kvm/ioport.h | 1 - pci.c | 2 +- virtio/pci.c | 15 +++++++-------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/hw/vesa.c b/hw/vesa.c index 24fb46faad3b..d8d91aa9c873 100644 --- a/hw/vesa.c +++ b/hw/vesa.c @@ -63,8 +63,8 @@ struct framebuffer *vesa__init(struct kvm *kvm) if (!kvm->cfg.vnc && !kvm->cfg.sdl && !kvm->cfg.gtk) return NULL; - r = pci_get_io_port_block(IOPORT_SIZE); - r = ioport__register(kvm, r, &vesa_io_ops, IOPORT_SIZE, NULL); + r = pci_get_io_port_block(PCI_IO_SIZE); + r = ioport__register(kvm, r, &vesa_io_ops, PCI_IO_SIZE, NULL); if (r < 0) return ERR_PTR(r); diff --git a/include/kvm/ioport.h b/include/kvm/ioport.h index b10fcd5b4412..8c86b7151f25 100644 --- a/include/kvm/ioport.h +++ b/include/kvm/ioport.h @@ -14,7 +14,6 @@ /* some ports we reserve for own use */ #define IOPORT_DBG 0xe0 -#define IOPORT_SIZE 0x400 struct kvm; diff --git a/pci.c b/pci.c index 80b5c5d3d7f3..b6892d974c08 100644 --- a/pci.c +++ b/pci.c @@ -20,7 +20,7 @@ static u16 io_port_blocks = PCI_IOPORT_START; u16 pci_get_io_port_block(u32 size) { - u16 port = ALIGN(io_port_blocks, IOPORT_SIZE); + u16 port = ALIGN(io_port_blocks, PCI_IO_SIZE); io_port_blocks = port + size; return port; diff --git a/virtio/pci.c b/virtio/pci.c index d73414abde05..eeb5b5efa6e1 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -421,7 +421,7 @@ static void virtio_pci__io_mmio_callback(struct kvm_cpu *vcpu, { struct virtio_pci *vpci = ptr; int direction = is_write ? KVM_EXIT_IO_OUT : KVM_EXIT_IO_IN; - u16 port = vpci->port_addr + (addr & (IOPORT_SIZE - 1)); + u16 port = vpci->port_addr + (addr & (PCI_IO_SIZE - 1)); kvm__emulate_io(vcpu, port, data, direction, len, 1); } @@ -435,17 +435,16 @@ int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, vpci->kvm = kvm; vpci->dev = dev; - BUILD_BUG_ON(!is_power_of_two(IOPORT_SIZE)); BUILD_BUG_ON(!is_power_of_two(PCI_IO_SIZE)); - r = pci_get_io_port_block(IOPORT_SIZE); - r = ioport__register(kvm, r, &virtio_pci__io_ops, IOPORT_SIZE, vdev); + r = pci_get_io_port_block(PCI_IO_SIZE); + r = ioport__register(kvm, r, &virtio_pci__io_ops, PCI_IO_SIZE, vdev); if (r < 0) return r; vpci->port_addr = (u16)r; - vpci->mmio_addr = pci_get_mmio_block(IOPORT_SIZE); - r = kvm__register_mmio(kvm, vpci->mmio_addr, IOPORT_SIZE, false, + vpci->mmio_addr = pci_get_mmio_block(PCI_IO_SIZE); + r = kvm__register_mmio(kvm, vpci->mmio_addr, PCI_IO_SIZE, false, virtio_pci__io_mmio_callback, vpci); if (r < 0) goto free_ioport; @@ -475,8 +474,8 @@ int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, | PCI_BASE_ADDRESS_SPACE_MEMORY), .status = cpu_to_le16(PCI_STATUS_CAP_LIST), .capabilities = (void *)&vpci->pci_hdr.msix - (void *)&vpci->pci_hdr, - .bar_size[0] = cpu_to_le32(IOPORT_SIZE), - .bar_size[1] = cpu_to_le32(IOPORT_SIZE), + .bar_size[0] = cpu_to_le32(PCI_IO_SIZE), + .bar_size[1] = cpu_to_le32(PCI_IO_SIZE), .bar_size[2] = cpu_to_le32(PCI_IO_SIZE*2), }; From patchwork Tue Apr 14 14:39:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487945 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5703112C for ; Tue, 14 Apr 2020 14:41:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B83662075E for ; Tue, 14 Apr 2020 14:41:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391087AbgDNOkg (ORCPT ); Tue, 14 Apr 2020 10:40:36 -0400 Received: from foss.arm.com ([217.140.110.172]:57158 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391059AbgDNOkJ (ORCPT ); Tue, 14 Apr 2020 10:40:09 -0400 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 25B51101E; Tue, 14 Apr 2020 07:40:08 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1E3A23F73D; Tue, 14 Apr 2020 07:40:07 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com, Julien Thierry Subject: [PATCH kvmtool 09/18] virtio/pci: Make memory and IO BARs independent Date: Tue, 14 Apr 2020 15:39:37 +0100 Message-Id: <20200414143946.1521-10-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Julien Thierry Currently, callbacks for memory BAR 1 call the IO port emulation. This means that the memory BAR needs I/O Space to be enabled whenever Memory Space is enabled. Refactor the code so the two type of BARs are independent. Also, unify ioport/mmio callback arguments so that they all receive a virtio_device. Reviewed-by: Andre Przywara Signed-off-by: Julien Thierry [Cosmetic changes wrt to where local variables are initialized] Signed-off-by: Alexandru Elisei --- virtio/pci.c | 63 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 23 deletions(-) diff --git a/virtio/pci.c b/virtio/pci.c index eeb5b5efa6e1..281c31817598 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -87,8 +87,8 @@ static inline bool virtio_pci__msix_enabled(struct virtio_pci *vpci) return vpci->pci_hdr.msix.ctrl & cpu_to_le16(PCI_MSIX_FLAGS_ENABLE); } -static bool virtio_pci__specific_io_in(struct kvm *kvm, struct virtio_device *vdev, u16 port, - void *data, int size, int offset) +static bool virtio_pci__specific_data_in(struct kvm *kvm, struct virtio_device *vdev, + void *data, int size, unsigned long offset) { u32 config_offset; struct virtio_pci *vpci = vdev->virtio; @@ -117,20 +117,17 @@ static bool virtio_pci__specific_io_in(struct kvm *kvm, struct virtio_device *vd return false; } -static bool virtio_pci__io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static bool virtio_pci__data_in(struct kvm_cpu *vcpu, struct virtio_device *vdev, + unsigned long offset, void *data, int size) { - unsigned long offset; bool ret = true; - struct virtio_device *vdev; struct virtio_pci *vpci; struct virt_queue *vq; struct kvm *kvm; u32 val; kvm = vcpu->kvm; - vdev = ioport->priv; vpci = vdev->virtio; - offset = port - vpci->port_addr; switch (offset) { case VIRTIO_PCI_HOST_FEATURES: @@ -154,13 +151,22 @@ static bool virtio_pci__io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 p vpci->isr = VIRTIO_IRQ_LOW; break; default: - ret = virtio_pci__specific_io_in(kvm, vdev, port, data, size, offset); + ret = virtio_pci__specific_data_in(kvm, vdev, data, size, offset); break; }; 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 - vpci->port_addr; + + 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) { @@ -185,8 +191,8 @@ static void update_msix_map(struct virtio_pci *vpci, irq__update_msix_route(vpci->kvm, gsi, &msix_entry->msg); } -static bool virtio_pci__specific_io_out(struct kvm *kvm, struct virtio_device *vdev, u16 port, - void *data, int size, int offset) +static bool virtio_pci__specific_data_out(struct kvm *kvm, struct virtio_device *vdev, + void *data, int size, unsigned long offset) { struct virtio_pci *vpci = vdev->virtio; u32 config_offset, vec; @@ -259,19 +265,16 @@ static bool virtio_pci__specific_io_out(struct kvm *kvm, struct virtio_device *v return false; } -static bool virtio_pci__io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) +static bool virtio_pci__data_out(struct kvm_cpu *vcpu, struct virtio_device *vdev, + unsigned long offset, void *data, int size) { - unsigned long offset; bool ret = true; - struct virtio_device *vdev; struct virtio_pci *vpci; struct kvm *kvm; u32 val; kvm = vcpu->kvm; - vdev = ioport->priv; vpci = vdev->virtio; - offset = port - vpci->port_addr; switch (offset) { case VIRTIO_PCI_GUEST_FEATURES: @@ -304,13 +307,22 @@ static bool virtio_pci__io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 virtio_notify_status(kvm, vdev, vpci->dev, vpci->status); break; default: - ret = virtio_pci__specific_io_out(kvm, vdev, port, data, size, offset); + ret = virtio_pci__specific_data_out(kvm, vdev, data, size, offset); break; }; 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 - vpci->port_addr; + + 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, @@ -320,7 +332,8 @@ static void virtio_pci__msix_mmio_callback(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr) { - struct virtio_pci *vpci = ptr; + struct virtio_device *vdev = ptr; + struct virtio_pci *vpci = vdev->virtio; struct msix_table *table; int vecnum; size_t offset; @@ -419,11 +432,15 @@ static void virtio_pci__io_mmio_callback(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr) { - struct virtio_pci *vpci = ptr; - int direction = is_write ? KVM_EXIT_IO_OUT : KVM_EXIT_IO_IN; - u16 port = vpci->port_addr + (addr & (PCI_IO_SIZE - 1)); + struct virtio_device *vdev = ptr; + struct virtio_pci *vpci = vdev->virtio; - kvm__emulate_io(vcpu, port, data, direction, len, 1); + if (!is_write) + virtio_pci__data_in(vcpu, vdev, addr - vpci->mmio_addr, + data, len); + else + virtio_pci__data_out(vcpu, vdev, addr - vpci->mmio_addr, + data, len); } int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, @@ -445,13 +462,13 @@ int virtio_pci__init(struct kvm *kvm, void *dev, struct virtio_device *vdev, vpci->mmio_addr = pci_get_mmio_block(PCI_IO_SIZE); r = kvm__register_mmio(kvm, vpci->mmio_addr, PCI_IO_SIZE, false, - virtio_pci__io_mmio_callback, vpci); + virtio_pci__io_mmio_callback, vdev); if (r < 0) goto free_ioport; vpci->msix_io_block = pci_get_mmio_block(PCI_IO_SIZE * 2); r = kvm__register_mmio(kvm, vpci->msix_io_block, PCI_IO_SIZE * 2, false, - virtio_pci__msix_mmio_callback, vpci); + virtio_pci__msix_mmio_callback, vdev); if (r < 0) goto free_mmio; From patchwork Tue Apr 14 14:39:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487957 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F981112C for ; Tue, 14 Apr 2020 14:43:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C4632064A for ; Tue, 14 Apr 2020 14:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403870AbgDNOnF (ORCPT ); Tue, 14 Apr 2020 10:43:05 -0400 Received: from foss.arm.com ([217.140.110.172]:57142 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391061AbgDNOkK (ORCPT ); Tue, 14 Apr 2020 10:40:10 -0400 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 41F0E113E; Tue, 14 Apr 2020 07:40:09 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 5B98E3F73D; Tue, 14 Apr 2020 07:40:08 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 10/18] vfio/pci: Allocate correct size for MSIX table and PBA BARs Date: Tue, 14 Apr 2020 15:39:38 +0100 Message-Id: <20200414143946.1521-11-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org kvmtool assumes that the BAR that holds the address for the MSIX table and PBA structure has a size which is equal to their total size and it allocates memory from MMIO space accordingly. However, when initializing the BARs, the BAR size is set to the region size reported by VFIO. When the physical BAR size is greater than the mmio space that kvmtool allocates, we can have a situation where the BAR overlaps with another BAR, in which case kvmtool will fail to map the memory. This was found when trying to do PCI passthrough with a PCIe Realtek r8168 NIC, when the guest was also using virtio-block and virtio-net devices: [..] [ 0.197926] PCI: OF: PROBE_ONLY enabled [ 0.198454] pci-host-generic 40000000.pci: host bridge /pci ranges: [ 0.199291] pci-host-generic 40000000.pci: IO 0x00007000..0x0000ffff -> 0x00007000 [ 0.200331] pci-host-generic 40000000.pci: MEM 0x41000000..0x7fffffff -> 0x41000000 [ 0.201480] pci-host-generic 40000000.pci: ECAM at [mem 0x40000000-0x40ffffff] for [bus 00] [ 0.202635] pci-host-generic 40000000.pci: PCI host bridge to bus 0000:00 [ 0.203535] pci_bus 0000:00: root bus resource [bus 00] [ 0.204227] pci_bus 0000:00: root bus resource [io 0x0000-0x8fff] (bus address [0x7000-0xffff]) [ 0.205483] pci_bus 0000:00: root bus resource [mem 0x41000000-0x7fffffff] [ 0.206456] pci 0000:00:00.0: [10ec:8168] type 00 class 0x020000 [ 0.207399] pci 0000:00:00.0: reg 0x10: [io 0x0000-0x00ff] [ 0.208252] pci 0000:00:00.0: reg 0x18: [mem 0x41002000-0x41002fff] [ 0.209233] pci 0000:00:00.0: reg 0x20: [mem 0x41000000-0x41003fff] [ 0.210481] pci 0000:00:01.0: [1af4:1000] type 00 class 0x020000 [ 0.211349] pci 0000:00:01.0: reg 0x10: [io 0x0100-0x01ff] [ 0.212118] pci 0000:00:01.0: reg 0x14: [mem 0x41003000-0x410030ff] [ 0.212982] pci 0000:00:01.0: reg 0x18: [mem 0x41003200-0x410033ff] [ 0.214247] pci 0000:00:02.0: [1af4:1001] type 00 class 0x018000 [ 0.215096] pci 0000:00:02.0: reg 0x10: [io 0x0200-0x02ff] [ 0.215863] pci 0000:00:02.0: reg 0x14: [mem 0x41003400-0x410034ff] [ 0.216723] pci 0000:00:02.0: reg 0x18: [mem 0x41003600-0x410037ff] [ 0.218105] pci 0000:00:00.0: can't claim BAR 4 [mem 0x41000000-0x41003fff]: address conflict with 0000:00:00.0 [mem 0x41002000-0x41002fff] [..] Guest output of lspci -vv: 00:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 06) Subsystem: TP-LINK Technologies Co., Ltd. TG-3468 Gigabit PCI Express Network Adapter Control: I/O+ Mem+ BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- Signed-off-by: Alexandru Elisei --- vfio/pci.c | 68 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/vfio/pci.c b/vfio/pci.c index 8e5d8572bc0c..bbb8469c8d93 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -715,17 +715,44 @@ static int vfio_pci_fixup_cfg_space(struct vfio_device *vdev) return 0; } -static int vfio_pci_create_msix_table(struct kvm *kvm, - struct vfio_pci_device *pdev) +static int vfio_pci_get_region_info(struct vfio_device *vdev, u32 index, + struct vfio_region_info *info) +{ + int ret; + + *info = (struct vfio_region_info) { + .argsz = sizeof(*info), + .index = index, + }; + + ret = ioctl(vdev->fd, VFIO_DEVICE_GET_REGION_INFO, info); + if (ret) { + ret = -errno; + vfio_dev_err(vdev, "cannot get info for BAR %u", index); + return ret; + } + + if (info->size && !is_power_of_two(info->size)) { + vfio_dev_err(vdev, "region is not power of two: 0x%llx", + info->size); + return -EINVAL; + } + + return 0; +} + +static int vfio_pci_create_msix_table(struct kvm *kvm, struct vfio_device *vdev) { int ret; size_t i; - size_t mmio_size; + size_t map_size; size_t nr_entries; struct vfio_pci_msi_entry *entries; + struct vfio_pci_device *pdev = &vdev->pci; struct vfio_pci_msix_pba *pba = &pdev->msix_pba; struct vfio_pci_msix_table *table = &pdev->msix_table; struct msix_cap *msix = PCI_CAP(&pdev->hdr, pdev->msix.pos); + struct vfio_region_info info; table->bar = msix->table_offset & PCI_MSIX_TABLE_BIR; pba->bar = msix->pba_offset & PCI_MSIX_TABLE_BIR; @@ -744,15 +771,31 @@ static int vfio_pci_create_msix_table(struct kvm *kvm, for (i = 0; i < nr_entries; i++) entries[i].config.ctrl = PCI_MSIX_ENTRY_CTRL_MASKBIT; + ret = vfio_pci_get_region_info(vdev, table->bar, &info); + if (ret) + return ret; + if (!info.size) + return -EINVAL; + map_size = info.size; + + if (table->bar != pba->bar) { + ret = vfio_pci_get_region_info(vdev, pba->bar, &info); + if (ret) + return ret; + if (!info.size) + return -EINVAL; + map_size += info.size; + } + /* * To ease MSI-X cap configuration in case they share the same BAR, * collapse table and pending array. The size of the BAR regions must be * powers of two. */ - mmio_size = roundup_pow_of_two(table->size + pba->size); - table->guest_phys_addr = pci_get_mmio_block(mmio_size); + map_size = ALIGN(map_size, PAGE_SIZE); + table->guest_phys_addr = pci_get_mmio_block(map_size); if (!table->guest_phys_addr) { - pr_err("cannot allocate IO space"); + pr_err("cannot allocate MMIO space"); ret = -ENOMEM; goto out_free; } @@ -816,17 +859,10 @@ static int vfio_pci_configure_bar(struct kvm *kvm, struct vfio_device *vdev, region->vdev = vdev; region->is_ioport = !!(bar & PCI_BASE_ADDRESS_SPACE_IO); - region->info = (struct vfio_region_info) { - .argsz = sizeof(region->info), - .index = nr, - }; - ret = ioctl(vdev->fd, VFIO_DEVICE_GET_REGION_INFO, ®ion->info); - if (ret) { - ret = -errno; - vfio_dev_err(vdev, "cannot get info for BAR %zu", nr); + ret = vfio_pci_get_region_info(vdev, nr, ®ion->info); + if (ret) return ret; - } /* Ignore invalid or unimplemented regions */ if (!region->info.size) @@ -871,7 +907,7 @@ static int vfio_pci_configure_dev_regions(struct kvm *kvm, return ret; if (pdev->irq_modes & VFIO_PCI_IRQ_MODE_MSIX) { - ret = vfio_pci_create_msix_table(kvm, pdev); + ret = vfio_pci_create_msix_table(kvm, vdev); if (ret) return ret; } From patchwork Tue Apr 14 14:39:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487955 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED32C92C for ; Tue, 14 Apr 2020 14:43:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD60120787 for ; Tue, 14 Apr 2020 14:43:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403853AbgDNOnC (ORCPT ); Tue, 14 Apr 2020 10:43:02 -0400 Received: from foss.arm.com ([217.140.110.172]:57174 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391063AbgDNOkK (ORCPT ); Tue, 14 Apr 2020 10:40:10 -0400 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 6652EC14; Tue, 14 Apr 2020 07:40:10 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 784863F73D; Tue, 14 Apr 2020 07:40:09 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 11/18] vfio/pci: Don't assume that only even numbered BARs are 64bit Date: Tue, 14 Apr 2020 15:39:39 +0100 Message-Id: <20200414143946.1521-12-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Not all devices have the bottom 32 bits of a 64 bit BAR in an even numbered BAR. For example, on an NVIDIA Quadro P400, BARs 1 and 3 are 64bit. Remove this assumption. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- vfio/pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vfio/pci.c b/vfio/pci.c index bbb8469c8d93..1bdc20038411 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -920,8 +920,10 @@ static int vfio_pci_configure_dev_regions(struct kvm *kvm, for (i = VFIO_PCI_BAR0_REGION_INDEX; i <= VFIO_PCI_BAR5_REGION_INDEX; ++i) { /* Ignore top half of 64-bit BAR */ - if (i % 2 && is_64bit) + if (is_64bit) { + is_64bit = false; continue; + } ret = vfio_pci_configure_bar(kvm, vdev, i); if (ret) From patchwork Tue Apr 14 14:39:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487953 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B01D792C for ; Tue, 14 Apr 2020 14:42:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97B7420775 for ; Tue, 14 Apr 2020 14:42:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391102AbgDNOmq (ORCPT ); Tue, 14 Apr 2020 10:42:46 -0400 Received: from foss.arm.com ([217.140.110.172]:57180 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391067AbgDNOkM (ORCPT ); Tue, 14 Apr 2020 10:40:12 -0400 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 83BE711B3; Tue, 14 Apr 2020 07:40:11 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9C60C3F73D; Tue, 14 Apr 2020 07:40:10 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 12/18] vfio/pci: Ignore expansion ROM BAR writes Date: Tue, 14 Apr 2020 15:39:40 +0100 Message-Id: <20200414143946.1521-13-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org To get the size of the expansion ROM, software writes 0xfffff800 to the expansion ROM BAR in the PCI configuration space. PCI emulation executes the optional configuration space write callback that a device can implement before emulating this write. kvmtool's implementation of VFIO doesn't have support for emulating expansion ROMs. However, the callback writes the guest value to the hardware BAR, and then it reads it back to the emulated BAR to make sure the write has completed successfully. After this, we return to regular PCI emulation and because the BAR is no longer 0, we write back to the BAR the value that the guest used to get the size. As a result, the guest will think that the ROM size is 0x800 after the subsequent read and we end up unintentionally exposing to the guest a BAR which we don't emulate. Let's fix this by ignoring writes to the expansion ROM BAR. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- vfio/pci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vfio/pci.c b/vfio/pci.c index 1bdc20038411..1f38f90c3ae9 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -472,6 +472,9 @@ static void vfio_pci_cfg_write(struct kvm *kvm, struct pci_device_header *pci_hd struct vfio_device *vdev; void *base = pci_hdr; + if (offset == PCI_ROM_ADDRESS) + return; + pdev = container_of(pci_hdr, struct vfio_pci_device, hdr); vdev = container_of(pdev, struct vfio_device, pci); info = &vdev->regions[VFIO_PCI_CONFIG_REGION_INDEX].info; From patchwork Tue Apr 14 14:39:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487951 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4761192C for ; Tue, 14 Apr 2020 14:42:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F0E52076B for ; Tue, 14 Apr 2020 14:42:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391078AbgDNOmi (ORCPT ); Tue, 14 Apr 2020 10:42:38 -0400 Received: from foss.arm.com ([217.140.110.172]:57148 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391069AbgDNOkS (ORCPT ); Tue, 14 Apr 2020 10:40:18 -0400 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 A44E231B; Tue, 14 Apr 2020 07:40:12 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BB9A73F73D; Tue, 14 Apr 2020 07:40:11 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 13/18] vfio/pci: Don't access unallocated regions Date: Tue, 14 Apr 2020 15:39:41 +0100 Message-Id: <20200414143946.1521-14-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Don't try to configure a BAR if there is no region associated with it. Also move the variable declarations from inside the loop to the start of the function for consistency. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- vfio/pci.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vfio/pci.c b/vfio/pci.c index 1f38f90c3ae9..4412c6d7a862 100644 --- a/vfio/pci.c +++ b/vfio/pci.c @@ -645,16 +645,19 @@ static int vfio_pci_parse_cfg_space(struct vfio_device *vdev) static int vfio_pci_fixup_cfg_space(struct vfio_device *vdev) { int i; + u64 base; ssize_t hdr_sz; struct msix_cap *msix; struct vfio_region_info *info; struct vfio_pci_device *pdev = &vdev->pci; + struct vfio_region *region; /* Initialise the BARs */ for (i = VFIO_PCI_BAR0_REGION_INDEX; i <= VFIO_PCI_BAR5_REGION_INDEX; ++i) { - u64 base; - struct vfio_region *region = &vdev->regions[i]; + if ((u32)i == vdev->info.num_regions) + break; + region = &vdev->regions[i]; /* Construct a fake reg to match what we've mapped. */ if (region->is_ioport) { base = (region->port_base & PCI_BASE_ADDRESS_IO_MASK) | @@ -853,11 +856,12 @@ static int vfio_pci_configure_bar(struct kvm *kvm, struct vfio_device *vdev, u32 bar; size_t map_size; struct vfio_pci_device *pdev = &vdev->pci; - struct vfio_region *region = &vdev->regions[nr]; + struct vfio_region *region; if (nr >= vdev->info.num_regions) return 0; + region = &vdev->regions[nr]; bar = pdev->hdr.bar[nr]; region->vdev = vdev; From patchwork Tue Apr 14 14:39:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487939 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7AA99112C for ; Tue, 14 Apr 2020 14:40:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E8162064A for ; Tue, 14 Apr 2020 14:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391097AbgDNOks (ORCPT ); Tue, 14 Apr 2020 10:40:48 -0400 Received: from foss.arm.com ([217.140.110.172]:57190 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391070AbgDNOk0 (ORCPT ); Tue, 14 Apr 2020 10:40:26 -0400 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 C420211D4; Tue, 14 Apr 2020 07:40:13 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DBB733F73D; Tue, 14 Apr 2020 07:40:12 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 14/18] virtio: Don't ignore initialization failures Date: Tue, 14 Apr 2020 15:39:42 +0100 Message-Id: <20200414143946.1521-15-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Don't ignore an error in the bus specific initialization function in virtio_init; don't ignore the result of virtio_init; and don't return 0 in virtio_blk__init and virtio_scsi__init when we encounter an error. Hopefully this will save some developer's time debugging faulty virtio devices in a guest. To take advantage of the cleanup function virtio_blk__exit, move appending the new device to the list before the call to virtio_init. Change virtio_net__exit to free all allocated net_dev devices on exit, and matching what virtio_blk__exit does. To safeguard against this in the future, virtio_init has been annoted with the compiler attribute warn_unused_result. Signed-off-by: Alexandru Elisei Reviewed-by: Andre Przywara --- hw/vesa.c | 2 +- include/kvm/kvm.h | 1 + include/kvm/virtio.h | 7 ++++--- include/linux/compiler.h | 2 +- virtio/9p.c | 9 +++++--- virtio/balloon.c | 10 ++++++--- virtio/blk.c | 14 ++++++++----- virtio/console.c | 11 +++++++--- virtio/core.c | 9 ++++---- virtio/net.c | 45 ++++++++++++++++++++++++---------------- virtio/scsi.c | 14 ++++++++----- 11 files changed, 78 insertions(+), 46 deletions(-) diff --git a/hw/vesa.c b/hw/vesa.c index d8d91aa9c873..ce3d43c38356 100644 --- a/hw/vesa.c +++ b/hw/vesa.c @@ -74,7 +74,7 @@ struct framebuffer *vesa__init(struct kvm *kvm) mem = mmap(NULL, VESA_MEM_SIZE, PROT_RW, MAP_ANON_NORESERVE, -1, 0); if (mem == MAP_FAILED) - ERR_PTR(-errno); + return ERR_PTR(-errno); kvm__register_dev_mem(kvm, VESA_MEM_ADDR, VESA_MEM_SIZE, mem); diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h index 7a738183d67a..c6dc6ef72d11 100644 --- a/include/kvm/kvm.h +++ b/include/kvm/kvm.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/include/kvm/virtio.h b/include/kvm/virtio.h index 19b913732cd5..3a311f54f2a5 100644 --- a/include/kvm/virtio.h +++ b/include/kvm/virtio.h @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -204,9 +205,9 @@ struct virtio_ops { int (*reset)(struct kvm *kvm, struct virtio_device *vdev); }; -int virtio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, - struct virtio_ops *ops, enum virtio_trans trans, - int device_id, int subsys_id, int class); +int __must_check virtio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, + struct virtio_ops *ops, enum virtio_trans trans, + int device_id, int subsys_id, int class); int virtio_compat_add_message(const char *device, const char *config); const char* virtio_trans_name(enum virtio_trans trans); diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 898420b81aec..a662ba0a5c68 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -14,7 +14,7 @@ #define __packed __attribute__((packed)) #define __iomem #define __force -#define __must_check +#define __must_check __attribute__((warn_unused_result)) #define unlikely #endif diff --git a/virtio/9p.c b/virtio/9p.c index ac70dbc31207..b78f2b3f0e09 100644 --- a/virtio/9p.c +++ b/virtio/9p.c @@ -1551,11 +1551,14 @@ int virtio_9p_img_name_parser(const struct option *opt, const char *arg, int uns int virtio_9p__init(struct kvm *kvm) { struct p9_dev *p9dev; + int r; list_for_each_entry(p9dev, &devs, list) { - virtio_init(kvm, p9dev, &p9dev->vdev, &p9_dev_virtio_ops, - VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_9P, - VIRTIO_ID_9P, PCI_CLASS_9P); + r = virtio_init(kvm, p9dev, &p9dev->vdev, &p9_dev_virtio_ops, + VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_9P, + VIRTIO_ID_9P, PCI_CLASS_9P); + if (r < 0) + return r; } return 0; diff --git a/virtio/balloon.c b/virtio/balloon.c index 0bd16703dfee..8e8803fed607 100644 --- a/virtio/balloon.c +++ b/virtio/balloon.c @@ -264,6 +264,8 @@ struct virtio_ops bln_dev_virtio_ops = { int virtio_bln__init(struct kvm *kvm) { + int r; + if (!kvm->cfg.balloon) return 0; @@ -273,9 +275,11 @@ int virtio_bln__init(struct kvm *kvm) bdev.stat_waitfd = eventfd(0, 0); memset(&bdev.config, 0, sizeof(struct virtio_balloon_config)); - virtio_init(kvm, &bdev, &bdev.vdev, &bln_dev_virtio_ops, - VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_BLN, - VIRTIO_ID_BALLOON, PCI_CLASS_BLN); + r = virtio_init(kvm, &bdev, &bdev.vdev, &bln_dev_virtio_ops, + VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_BLN, + VIRTIO_ID_BALLOON, PCI_CLASS_BLN); + if (r < 0) + return r; if (compat_id == -1) compat_id = virtio_compat_add_message("virtio-balloon", "CONFIG_VIRTIO_BALLOON"); diff --git a/virtio/blk.c b/virtio/blk.c index f267be1563dc..4d02d101af81 100644 --- a/virtio/blk.c +++ b/virtio/blk.c @@ -306,6 +306,7 @@ static struct virtio_ops blk_dev_virtio_ops = { static int virtio_blk__init_one(struct kvm *kvm, struct disk_image *disk) { struct blk_dev *bdev; + int r; if (!disk) return -EINVAL; @@ -323,12 +324,14 @@ static int virtio_blk__init_one(struct kvm *kvm, struct disk_image *disk) .kvm = kvm, }; - virtio_init(kvm, bdev, &bdev->vdev, &blk_dev_virtio_ops, - VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_BLK, - VIRTIO_ID_BLOCK, PCI_CLASS_BLK); - list_add_tail(&bdev->list, &bdevs); + r = virtio_init(kvm, bdev, &bdev->vdev, &blk_dev_virtio_ops, + VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_BLK, + VIRTIO_ID_BLOCK, PCI_CLASS_BLK); + if (r < 0) + return r; + disk_image__set_callback(bdev->disk, virtio_blk_complete); if (compat_id == -1) @@ -359,7 +362,8 @@ int virtio_blk__init(struct kvm *kvm) return 0; cleanup: - return virtio_blk__exit(kvm); + virtio_blk__exit(kvm); + return r; } virtio_dev_init(virtio_blk__init); diff --git a/virtio/console.c b/virtio/console.c index f1be02549222..e0b98df37965 100644 --- a/virtio/console.c +++ b/virtio/console.c @@ -230,12 +230,17 @@ static struct virtio_ops con_dev_virtio_ops = { int virtio_console__init(struct kvm *kvm) { + int r; + if (kvm->cfg.active_console != CONSOLE_VIRTIO) return 0; - virtio_init(kvm, &cdev, &cdev.vdev, &con_dev_virtio_ops, - VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_CONSOLE, - VIRTIO_ID_CONSOLE, PCI_CLASS_CONSOLE); + r = virtio_init(kvm, &cdev, &cdev.vdev, &con_dev_virtio_ops, + VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_CONSOLE, + VIRTIO_ID_CONSOLE, PCI_CLASS_CONSOLE); + if (r < 0) + return r; + if (compat_id == -1) compat_id = virtio_compat_add_message("virtio-console", "CONFIG_VIRTIO_CONSOLE"); diff --git a/virtio/core.c b/virtio/core.c index e10ec362e1ea..f5b3c07fc100 100644 --- a/virtio/core.c +++ b/virtio/core.c @@ -259,6 +259,7 @@ int virtio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, int device_id, int subsys_id, int class) { void *virtio; + int r; switch (trans) { case VIRTIO_PCI: @@ -272,7 +273,7 @@ int virtio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, vdev->ops->init = virtio_pci__init; vdev->ops->exit = virtio_pci__exit; vdev->ops->reset = virtio_pci__reset; - vdev->ops->init(kvm, dev, vdev, device_id, subsys_id, class); + r = vdev->ops->init(kvm, dev, vdev, device_id, subsys_id, class); break; case VIRTIO_MMIO: virtio = calloc(sizeof(struct virtio_mmio), 1); @@ -285,13 +286,13 @@ int virtio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, vdev->ops->init = virtio_mmio_init; vdev->ops->exit = virtio_mmio_exit; vdev->ops->reset = virtio_mmio_reset; - vdev->ops->init(kvm, dev, vdev, device_id, subsys_id, class); + r = vdev->ops->init(kvm, dev, vdev, device_id, subsys_id, class); break; default: - return -1; + r = -1; }; - return 0; + return r; } int virtio_compat_add_message(const char *device, const char *config) diff --git a/virtio/net.c b/virtio/net.c index 091406912a24..1ee3c19eee87 100644 --- a/virtio/net.c +++ b/virtio/net.c @@ -910,7 +910,7 @@ done: static int virtio_net__init_one(struct virtio_net_params *params) { - int i, err; + int i, r; struct net_dev *ndev; struct virtio_ops *ops; enum virtio_trans trans = VIRTIO_DEFAULT_TRANS(params->kvm); @@ -919,14 +919,12 @@ static int virtio_net__init_one(struct virtio_net_params *params) if (ndev == NULL) return -ENOMEM; - ops = malloc(sizeof(*ops)); - if (ops == NULL) { - err = -ENOMEM; - goto err_free_ndev; - } - list_add_tail(&ndev->list, &ndevs); + ops = malloc(sizeof(*ops)); + if (ops == NULL) + return -ENOMEM; + ndev->kvm = params->kvm; ndev->params = params; @@ -969,8 +967,12 @@ static int virtio_net__init_one(struct virtio_net_params *params) virtio_trans_name(trans)); } - virtio_init(params->kvm, ndev, &ndev->vdev, ops, trans, - PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET, PCI_CLASS_NET); + r = virtio_init(params->kvm, ndev, &ndev->vdev, ops, trans, + PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET, PCI_CLASS_NET); + if (r < 0) { + free(ops); + return r; + } if (params->vhost) virtio_net__vhost_init(params->kvm, ndev); @@ -979,19 +981,17 @@ static int virtio_net__init_one(struct virtio_net_params *params) compat_id = virtio_compat_add_message("virtio-net", "CONFIG_VIRTIO_NET"); return 0; - -err_free_ndev: - free(ndev); - return err; } int virtio_net__init(struct kvm *kvm) { - int i; + int i, r; for (i = 0; i < kvm->cfg.num_net_devices; i++) { kvm->cfg.net_params[i].kvm = kvm; - virtio_net__init_one(&kvm->cfg.net_params[i]); + r = virtio_net__init_one(&kvm->cfg.net_params[i]); + if (r < 0) + goto cleanup; } if (kvm->cfg.num_net_devices == 0 && kvm->cfg.no_net == 0) { @@ -1007,10 +1007,16 @@ int virtio_net__init(struct kvm *kvm) str_to_mac(kvm->cfg.guest_mac, net_params.guest_mac); str_to_mac(kvm->cfg.host_mac, net_params.host_mac); - virtio_net__init_one(&net_params); + r = virtio_net__init_one(&net_params); + if (r < 0) + goto cleanup; } return 0; + +cleanup: + virtio_net__exit(kvm); + return r; } virtio_dev_init(virtio_net__init); @@ -1018,15 +1024,18 @@ int virtio_net__exit(struct kvm *kvm) { struct virtio_net_params *params; struct net_dev *ndev; - struct list_head *ptr; + struct list_head *ptr, *n; - list_for_each(ptr, &ndevs) { + list_for_each_safe(ptr, n, &ndevs) { ndev = list_entry(ptr, struct net_dev, list); params = ndev->params; /* Cleanup any tap device which attached to bridge */ if (ndev->mode == NET_MODE_TAP && strcmp(params->downscript, "none")) virtio_net_exec_script(params->downscript, ndev->tap_name); + + list_del(&ndev->list); + free(ndev); } return 0; } diff --git a/virtio/scsi.c b/virtio/scsi.c index 1ec78fe0945a..16a86cb7e0e6 100644 --- a/virtio/scsi.c +++ b/virtio/scsi.c @@ -234,6 +234,7 @@ static void virtio_scsi_vhost_init(struct kvm *kvm, struct scsi_dev *sdev) static int virtio_scsi_init_one(struct kvm *kvm, struct disk_image *disk) { struct scsi_dev *sdev; + int r; if (!disk) return -EINVAL; @@ -260,12 +261,14 @@ static int virtio_scsi_init_one(struct kvm *kvm, struct disk_image *disk) strlcpy((char *)&sdev->target.vhost_wwpn, disk->wwpn, sizeof(sdev->target.vhost_wwpn)); sdev->target.vhost_tpgt = strtol(disk->tpgt, NULL, 0); - virtio_init(kvm, sdev, &sdev->vdev, &scsi_dev_virtio_ops, - VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_SCSI, - VIRTIO_ID_SCSI, PCI_CLASS_BLK); - list_add_tail(&sdev->list, &sdevs); + r = virtio_init(kvm, sdev, &sdev->vdev, &scsi_dev_virtio_ops, + VIRTIO_DEFAULT_TRANS(kvm), PCI_DEVICE_ID_VIRTIO_SCSI, + VIRTIO_ID_SCSI, PCI_CLASS_BLK); + if (r < 0) + return r; + virtio_scsi_vhost_init(kvm, sdev); if (compat_id == -1) @@ -302,7 +305,8 @@ int virtio_scsi_init(struct kvm *kvm) return 0; cleanup: - return virtio_scsi_exit(kvm); + virtio_scsi_exit(kvm); + return r; } virtio_dev_init(virtio_scsi_init); From patchwork Tue Apr 14 14:39:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487943 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F3BE3112C for ; Tue, 14 Apr 2020 14:41:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC3902064A for ; Tue, 14 Apr 2020 14:41:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391100AbgDNOkm (ORCPT ); Tue, 14 Apr 2020 10:40:42 -0400 Received: from foss.arm.com ([217.140.110.172]:57196 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391071AbgDNOk0 (ORCPT ); Tue, 14 Apr 2020 10:40:26 -0400 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 E4B3B1396; Tue, 14 Apr 2020 07:40:14 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0715E3F73D; Tue, 14 Apr 2020 07:40:13 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 15/18] Don't ignore errors registering a device, ioport or mmio emulation Date: Tue, 14 Apr 2020 15:39:43 +0100 Message-Id: <20200414143946.1521-16-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org An error returned by device__register, kvm__register_mmio and ioport__register means that the device will not be emulated properly. Annotate the functions with __must_check, so we get a compiler warning when this error is ignored. And fix several instances where the caller returns 0 even if the function failed. Also make sure the ioport emulation code uses ioport_remove consistently. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- arm/ioport.c | 3 +- hw/i8042.c | 12 ++++++-- hw/vesa.c | 4 ++- include/kvm/devices.h | 3 +- include/kvm/ioport.h | 6 ++-- include/kvm/kvm.h | 6 ++-- ioport.c | 25 ++++++++-------- mips/kvm.c | 3 +- powerpc/ioport.c | 3 +- virtio/mmio.c | 13 +++++++-- x86/ioport.c | 66 ++++++++++++++++++++++++++++++++----------- 11 files changed, 101 insertions(+), 43 deletions(-) diff --git a/arm/ioport.c b/arm/ioport.c index bdd30b6fe812..2f0feb9ab69f 100644 --- a/arm/ioport.c +++ b/arm/ioport.c @@ -1,8 +1,9 @@ #include "kvm/ioport.h" #include "kvm/irq.h" -void ioport__setup_arch(struct kvm *kvm) +int ioport__setup_arch(struct kvm *kvm) { + return 0; } void ioport__map_irq(u8 *irq) diff --git a/hw/i8042.c b/hw/i8042.c index 2d8c96e9c7e6..37a99a2dc6b8 100644 --- a/hw/i8042.c +++ b/hw/i8042.c @@ -349,10 +349,18 @@ static struct ioport_operations kbd_ops = { int kbd__init(struct kvm *kvm) { + int r; + kbd_reset(); state.kvm = kvm; - ioport__register(kvm, I8042_DATA_REG, &kbd_ops, 2, NULL); - ioport__register(kvm, I8042_COMMAND_REG, &kbd_ops, 2, NULL); + r = ioport__register(kvm, I8042_DATA_REG, &kbd_ops, 2, NULL); + if (r < 0) + return r; + r = ioport__register(kvm, I8042_COMMAND_REG, &kbd_ops, 2, NULL); + if (r < 0) { + ioport__unregister(kvm, I8042_DATA_REG); + return r; + } return 0; } diff --git a/hw/vesa.c b/hw/vesa.c index ce3d43c38356..5646a5af9672 100644 --- a/hw/vesa.c +++ b/hw/vesa.c @@ -70,7 +70,9 @@ struct framebuffer *vesa__init(struct kvm *kvm) vesa_base_addr = (u16)r; vesa_pci_device.bar[0] = cpu_to_le32(vesa_base_addr | PCI_BASE_ADDRESS_SPACE_IO); - device__register(&vesa_device); + r = device__register(&vesa_device); + if (r < 0) + return ERR_PTR(r); mem = mmap(NULL, VESA_MEM_SIZE, PROT_RW, MAP_ANON_NORESERVE, -1, 0); if (mem == MAP_FAILED) diff --git a/include/kvm/devices.h b/include/kvm/devices.h index 405f19521977..e445db6f56b1 100644 --- a/include/kvm/devices.h +++ b/include/kvm/devices.h @@ -3,6 +3,7 @@ #include #include +#include enum device_bus_type { DEVICE_BUS_PCI, @@ -18,7 +19,7 @@ struct device_header { struct rb_node node; }; -int device__register(struct device_header *dev); +int __must_check device__register(struct device_header *dev); void device__unregister(struct device_header *dev); struct device_header *device__find_dev(enum device_bus_type bus_type, u8 dev_num); diff --git a/include/kvm/ioport.h b/include/kvm/ioport.h index 8c86b7151f25..62a719327e3f 100644 --- a/include/kvm/ioport.h +++ b/include/kvm/ioport.h @@ -33,11 +33,11 @@ struct ioport_operations { enum irq_type)); }; -void ioport__setup_arch(struct kvm *kvm); +int ioport__setup_arch(struct kvm *kvm); void ioport__map_irq(u8 *irq); -int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, - int count, void *param); +int __must_check ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, + int count, void *param); int ioport__unregister(struct kvm *kvm, u16 port); int ioport__init(struct kvm *kvm); int ioport__exit(struct kvm *kvm); diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h index c6dc6ef72d11..50119a8672eb 100644 --- a/include/kvm/kvm.h +++ b/include/kvm/kvm.h @@ -128,9 +128,9 @@ static inline int kvm__reserve_mem(struct kvm *kvm, u64 guest_phys, u64 size) KVM_MEM_TYPE_RESERVED); } -int kvm__register_mmio(struct kvm *kvm, u64 phys_addr, u64 phys_addr_len, bool coalesce, - void (*mmio_fn)(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr), - void *ptr); +int __must_check kvm__register_mmio(struct kvm *kvm, u64 phys_addr, u64 phys_addr_len, bool coalesce, + void (*mmio_fn)(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, u8 is_write, void *ptr), + void *ptr); bool kvm__deregister_mmio(struct kvm *kvm, u64 phys_addr); void kvm__reboot(struct kvm *kvm); void kvm__pause(struct kvm *kvm); diff --git a/ioport.c b/ioport.c index a72e4035881a..cb778ed8d757 100644 --- a/ioport.c +++ b/ioport.c @@ -73,7 +73,7 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i entry = ioport_search(&ioport_tree, port); if (entry) { pr_warning("ioport re-registered: %x", port); - rb_int_erase(&ioport_tree, &entry->node); + ioport_remove(&ioport_tree, entry); } entry = malloc(sizeof(*entry)); @@ -91,16 +91,21 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i }; r = ioport_insert(&ioport_tree, entry); - if (r < 0) { - free(entry); - br_write_unlock(kvm); - return r; - } - - device__register(&entry->dev_hdr); + if (r < 0) + goto out_free; + r = device__register(&entry->dev_hdr); + if (r < 0) + goto out_remove; br_write_unlock(kvm); return port; + +out_remove: + ioport_remove(&ioport_tree, entry); +out_free: + free(entry); + br_write_unlock(kvm); + return r; } int ioport__unregister(struct kvm *kvm, u16 port) @@ -196,9 +201,7 @@ out: int ioport__init(struct kvm *kvm) { - ioport__setup_arch(kvm); - - return 0; + return ioport__setup_arch(kvm); } dev_base_init(ioport__init); diff --git a/mips/kvm.c b/mips/kvm.c index 211770da0d85..26355930d3b6 100644 --- a/mips/kvm.c +++ b/mips/kvm.c @@ -100,8 +100,9 @@ void kvm__irq_trigger(struct kvm *kvm, int irq) die_perror("KVM_IRQ_LINE ioctl"); } -void ioport__setup_arch(struct kvm *kvm) +int ioport__setup_arch(struct kvm *kvm) { + return 0; } bool kvm__arch_cpu_supports_vm(void) diff --git a/powerpc/ioport.c b/powerpc/ioport.c index 58dc625c54fe..0c188b61a51a 100644 --- a/powerpc/ioport.c +++ b/powerpc/ioport.c @@ -12,9 +12,10 @@ #include -void ioport__setup_arch(struct kvm *kvm) +int ioport__setup_arch(struct kvm *kvm) { /* PPC has no legacy ioports to set up */ + return 0; } void ioport__map_irq(u8 *irq) diff --git a/virtio/mmio.c b/virtio/mmio.c index 03cecc366292..5537c39367d6 100644 --- a/virtio/mmio.c +++ b/virtio/mmio.c @@ -292,13 +292,16 @@ int virtio_mmio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, int device_id, int subsys_id, int class) { struct virtio_mmio *vmmio = vdev->virtio; + int r; vmmio->addr = virtio_mmio_get_io_space_block(VIRTIO_MMIO_IO_SIZE); vmmio->kvm = kvm; vmmio->dev = dev; - kvm__register_mmio(kvm, vmmio->addr, VIRTIO_MMIO_IO_SIZE, - false, virtio_mmio_mmio_callback, vdev); + r = kvm__register_mmio(kvm, vmmio->addr, VIRTIO_MMIO_IO_SIZE, + false, virtio_mmio_mmio_callback, vdev); + if (r < 0) + return r; vmmio->hdr = (struct virtio_mmio_hdr) { .magic = {'v', 'i', 'r', 't'}, @@ -313,7 +316,11 @@ int virtio_mmio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev, .data = generate_virtio_mmio_fdt_node, }; - device__register(&vmmio->dev_hdr); + r = device__register(&vmmio->dev_hdr); + if (r < 0) { + kvm__deregister_mmio(kvm, vmmio->addr); + return r; + } /* * Instantiate guest virtio-mmio devices using kernel command line diff --git a/x86/ioport.c b/x86/ioport.c index 8572c758ed4f..7ad7b8f3f497 100644 --- a/x86/ioport.c +++ b/x86/ioport.c @@ -69,50 +69,84 @@ void ioport__map_irq(u8 *irq) { } -void ioport__setup_arch(struct kvm *kvm) +int ioport__setup_arch(struct kvm *kvm) { + int r; + /* Legacy ioport setup */ /* 0000 - 001F - DMA1 controller */ - ioport__register(kvm, 0x0000, &dummy_read_write_ioport_ops, 32, NULL); + r = ioport__register(kvm, 0x0000, &dummy_read_write_ioport_ops, 32, NULL); + if (r < 0) + return r; /* 0x0020 - 0x003F - 8259A PIC 1 */ - ioport__register(kvm, 0x0020, &dummy_read_write_ioport_ops, 2, NULL); + r = ioport__register(kvm, 0x0020, &dummy_read_write_ioport_ops, 2, NULL); + if (r < 0) + return r; /* PORT 0040-005F - PIT - PROGRAMMABLE INTERVAL TIMER (8253, 8254) */ - ioport__register(kvm, 0x0040, &dummy_read_write_ioport_ops, 4, NULL); + r = ioport__register(kvm, 0x0040, &dummy_read_write_ioport_ops, 4, NULL); + if (r < 0) + return r; /* 0092 - PS/2 system control port A */ - ioport__register(kvm, 0x0092, &ps2_control_a_ops, 1, NULL); + r = ioport__register(kvm, 0x0092, &ps2_control_a_ops, 1, NULL); + if (r < 0) + return r; /* 0x00A0 - 0x00AF - 8259A PIC 2 */ - ioport__register(kvm, 0x00A0, &dummy_read_write_ioport_ops, 2, NULL); + r = ioport__register(kvm, 0x00A0, &dummy_read_write_ioport_ops, 2, NULL); + if (r < 0) + return r; /* 00C0 - 001F - DMA2 controller */ - ioport__register(kvm, 0x00C0, &dummy_read_write_ioport_ops, 32, NULL); + r = ioport__register(kvm, 0x00C0, &dummy_read_write_ioport_ops, 32, NULL); + if (r < 0) + return r; /* PORT 00E0-00EF are 'motherboard specific' so we use them for our internal debugging purposes. */ - ioport__register(kvm, IOPORT_DBG, &debug_ops, 1, NULL); + r = ioport__register(kvm, IOPORT_DBG, &debug_ops, 1, NULL); + if (r < 0) + return r; /* PORT 00ED - DUMMY PORT FOR DELAY??? */ - ioport__register(kvm, 0x00ED, &dummy_write_only_ioport_ops, 1, NULL); + r = ioport__register(kvm, 0x00ED, &dummy_write_only_ioport_ops, 1, NULL); + if (r < 0) + return r; /* 0x00F0 - 0x00FF - Math co-processor */ - ioport__register(kvm, 0x00F0, &dummy_write_only_ioport_ops, 2, NULL); + r = ioport__register(kvm, 0x00F0, &dummy_write_only_ioport_ops, 2, NULL); + if (r < 0) + return r; /* PORT 0278-027A - PARALLEL PRINTER PORT (usually LPT1, sometimes LPT2) */ - ioport__register(kvm, 0x0278, &dummy_read_write_ioport_ops, 3, NULL); + r = ioport__register(kvm, 0x0278, &dummy_read_write_ioport_ops, 3, NULL); + if (r < 0) + return r; /* PORT 0378-037A - PARALLEL PRINTER PORT (usually LPT2, sometimes LPT3) */ - ioport__register(kvm, 0x0378, &dummy_read_write_ioport_ops, 3, NULL); + r = ioport__register(kvm, 0x0378, &dummy_read_write_ioport_ops, 3, NULL); + if (r < 0) + return r; /* PORT 03D4-03D5 - COLOR VIDEO - CRT CONTROL REGISTERS */ - ioport__register(kvm, 0x03D4, &dummy_read_write_ioport_ops, 1, NULL); - ioport__register(kvm, 0x03D5, &dummy_write_only_ioport_ops, 1, NULL); + r = ioport__register(kvm, 0x03D4, &dummy_read_write_ioport_ops, 1, NULL); + if (r < 0) + return r; + r = ioport__register(kvm, 0x03D5, &dummy_write_only_ioport_ops, 1, NULL); + if (r < 0) + return r; - ioport__register(kvm, 0x402, &seabios_debug_ops, 1, NULL); + r = ioport__register(kvm, 0x402, &seabios_debug_ops, 1, NULL); + if (r < 0) + return r; /* 0510 - QEMU BIOS configuration register */ - ioport__register(kvm, 0x510, &dummy_read_write_ioport_ops, 2, NULL); + r = ioport__register(kvm, 0x510, &dummy_read_write_ioport_ops, 2, NULL); + if (r < 0) + return r; + + return 0; } From patchwork Tue Apr 14 14:39:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487941 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F29B092C for ; Tue, 14 Apr 2020 14:40:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D94882075E for ; Tue, 14 Apr 2020 14:40:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391118AbgDNOkx (ORCPT ); Tue, 14 Apr 2020 10:40:53 -0400 Received: from foss.arm.com ([217.140.110.172]:57202 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391072AbgDNOkZ (ORCPT ); Tue, 14 Apr 2020 10:40:25 -0400 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 0C22D139F; Tue, 14 Apr 2020 07:40:16 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 246893F73D; Tue, 14 Apr 2020 07:40:15 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 16/18] hw/vesa: Don't ignore fatal errors Date: Tue, 14 Apr 2020 15:39:44 +0100 Message-Id: <20200414143946.1521-17-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Failling an mmap call or creating a memslot means that device emulation will not work, don't ignore it. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- hw/vesa.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/hw/vesa.c b/hw/vesa.c index 5646a5af9672..ad09373ea2ff 100644 --- a/hw/vesa.c +++ b/hw/vesa.c @@ -63,22 +63,25 @@ struct framebuffer *vesa__init(struct kvm *kvm) if (!kvm->cfg.vnc && !kvm->cfg.sdl && !kvm->cfg.gtk) return NULL; - r = pci_get_io_port_block(PCI_IO_SIZE); - r = ioport__register(kvm, r, &vesa_io_ops, PCI_IO_SIZE, NULL); + vesa_base_addr = pci_get_io_port_block(PCI_IO_SIZE); + r = ioport__register(kvm, vesa_base_addr, &vesa_io_ops, PCI_IO_SIZE, NULL); if (r < 0) - return ERR_PTR(r); + goto out_error; - vesa_base_addr = (u16)r; vesa_pci_device.bar[0] = cpu_to_le32(vesa_base_addr | PCI_BASE_ADDRESS_SPACE_IO); r = device__register(&vesa_device); if (r < 0) - return ERR_PTR(r); + goto unregister_ioport; mem = mmap(NULL, VESA_MEM_SIZE, PROT_RW, MAP_ANON_NORESERVE, -1, 0); - if (mem == MAP_FAILED) - return ERR_PTR(-errno); + if (mem == MAP_FAILED) { + r = -errno; + goto unregister_device; + } - kvm__register_dev_mem(kvm, VESA_MEM_ADDR, VESA_MEM_SIZE, mem); + r = kvm__register_dev_mem(kvm, VESA_MEM_ADDR, VESA_MEM_SIZE, mem); + if (r < 0) + goto unmap_dev; vesafb = (struct framebuffer) { .width = VESA_WIDTH, @@ -90,4 +93,13 @@ struct framebuffer *vesa__init(struct kvm *kvm) .kvm = kvm, }; return fb__register(&vesafb); + +unmap_dev: + munmap(mem, VESA_MEM_SIZE); +unregister_device: + device__unregister(&vesa_device); +unregister_ioport: + ioport__unregister(kvm, vesa_base_addr); +out_error: + return ERR_PTR(r); } From patchwork Tue Apr 14 14:39:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487947 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA43B92C for ; Tue, 14 Apr 2020 14:41:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CCA892076B for ; Tue, 14 Apr 2020 14:41:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391089AbgDNOlx (ORCPT ); Tue, 14 Apr 2020 10:41:53 -0400 Received: from foss.arm.com ([217.140.110.172]:57208 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391073AbgDNOkZ (ORCPT ); Tue, 14 Apr 2020 10:40:25 -0400 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 2F9F413A1; Tue, 14 Apr 2020 07:40:17 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 412F83F73D; Tue, 14 Apr 2020 07:40:16 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 17/18] hw/vesa: Set the size for BAR 0 Date: Tue, 14 Apr 2020 15:39:45 +0100 Message-Id: <20200414143946.1521-18-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Implemented BARs have an non-zero address and a size. Let's set the size for BAR 0. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- hw/vesa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/vesa.c b/hw/vesa.c index ad09373ea2ff..dd59a112330b 100644 --- a/hw/vesa.c +++ b/hw/vesa.c @@ -69,6 +69,7 @@ struct framebuffer *vesa__init(struct kvm *kvm) goto out_error; vesa_pci_device.bar[0] = cpu_to_le32(vesa_base_addr | PCI_BASE_ADDRESS_SPACE_IO); + vesa_pci_device.bar_size[0] = PCI_IO_SIZE; r = device__register(&vesa_device); if (r < 0) goto unregister_ioport; From patchwork Tue Apr 14 14:39:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru Elisei X-Patchwork-Id: 11487949 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CADD292C for ; Tue, 14 Apr 2020 14:42:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B27632076B for ; Tue, 14 Apr 2020 14:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391103AbgDNOmA (ORCPT ); Tue, 14 Apr 2020 10:42:00 -0400 Received: from foss.arm.com ([217.140.110.172]:57136 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391075AbgDNOkZ (ORCPT ); Tue, 14 Apr 2020 10:40:25 -0400 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 4EE4613FD; Tue, 14 Apr 2020 07:40:18 -0700 (PDT) Received: from e123195-lin.cambridge.arm.com (e123195-lin.cambridge.arm.com [10.1.196.63]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6720A3F73D; Tue, 14 Apr 2020 07:40:17 -0700 (PDT) From: Alexandru Elisei To: kvm@vger.kernel.org Cc: will@kernel.org, julien.thierry.kdev@gmail.com, andre.przywara@arm.com, sami.mujawar@arm.com, lorenzo.pieralisi@arm.com Subject: [PATCH kvmtool 18/18] ioport: Fail when registering overlapping ports Date: Tue, 14 Apr 2020 15:39:46 +0100 Message-Id: <20200414143946.1521-19-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200414143946.1521-1-alexandru.elisei@arm.com> References: <20200414143946.1521-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org If we try to register a range of ports which overlaps with another, already registered, I/O ports region then device emulation for that region will not work anymore. There's nothing sane that the ioport emulation layer can do in this case so refuse to allocate the port. This matches the behavior of kvm__register_mmio. There's no need to protect allocating a new ioport struct with a lock, so move the lock to protect the actual ioport insertion in the tree. Reviewed-by: Andre Przywara Signed-off-by: Alexandru Elisei --- ioport.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ioport.c b/ioport.c index cb778ed8d757..d9f2e8ea3c3b 100644 --- a/ioport.c +++ b/ioport.c @@ -68,14 +68,6 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i struct ioport *entry; int r; - br_write_lock(kvm); - - entry = ioport_search(&ioport_tree, port); - if (entry) { - pr_warning("ioport re-registered: %x", port); - ioport_remove(&ioport_tree, entry); - } - entry = malloc(sizeof(*entry)); if (entry == NULL) return -ENOMEM; @@ -90,6 +82,7 @@ int ioport__register(struct kvm *kvm, u16 port, struct ioport_operations *ops, i }, }; + br_write_lock(kvm); r = ioport_insert(&ioport_tree, entry); if (r < 0) goto out_free;