From patchwork Fri May 21 00:27:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wright X-Patchwork-Id: 101276 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4L0RKWd013625 for ; Fri, 21 May 2010 00:27:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755289Ab0EUA1S (ORCPT ); Thu, 20 May 2010 20:27:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17357 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755263Ab0EUA1R (ORCPT ); Thu, 20 May 2010 20:27:17 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4L0RHQw006109 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 20 May 2010 20:27:17 -0400 Received: from x200.localdomain (vpn-226-24.phx2.redhat.com [10.3.226.24]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o4L0RFsU027523; Thu, 20 May 2010 20:27:15 -0400 Date: Thu, 20 May 2010 17:27:15 -0700 From: Chris Wright To: kvm@vger.kernel.org Cc: Chris Wright , Alex Williamson Subject: [PATCH qemu-kvm 2/2] device-assignment: Don't use libpci Message-ID: <20100521002715.GB13880@x200.localdomain> References: <20100520135537.18663.70947.stgit@virtlab9.virt.bos.redhat.com> <20100520220608.GX13880@x200.localdomain> <20100521002323.GZ13880@x200.localdomain> <20100521002541.GA13880@x200.localdomain> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100521002541.GA13880@x200.localdomain> User-Agent: Mutt/1.5.20 (2009-08-17) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 21 May 2010 00:27:20 +0000 (UTC) diff --git a/configure b/configure index ed8e17b..8ca9e1e 100755 --- a/configure +++ b/configure @@ -1623,20 +1623,20 @@ EOF fi ########################################## -# libpci probe for kvm_cap_device_assignment +# libpci header probe for kvm_cap_device_assignment if test $kvm_cap_device_assignment = "yes" ; then cat > $TMPC << EOF -#include +#include #ifndef PCI_VENDOR_ID -#error NO LIBPCI +#error NO LIBPCI HEADER #endif -int main(void) { struct pci_access a; pci_init(&a); return 0; } +int main(void) { return 0; } EOF - if compile_prog "" "-lpci -lz" ; then - libs_softmmu="-lpci -lz $libs_softmmu" + if compile_prog "" "" ; then + kvm_cap_device_assignment=yes else echo - echo "Error: libpci check failed" + echo "Error: libpci header check failed" echo "Disable KVM Device Assignment capability." echo kvm_cap_device_assignment=no diff --git a/hw/device-assignment.c b/hw/device-assignment.c index fd09ec3..d8e7cb4 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -37,7 +37,7 @@ #include "console.h" #include "device-assignment.h" #include "loader.h" -#include +#include /* From linux/ioport.h */ #define IORESOURCE_IO 0x00000100 /* Resource type */ @@ -335,24 +335,61 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, (r_dev->v_addrs + region_num)); } -static uint8_t pci_find_cap_offset(struct pci_dev *pci_dev, uint8_t cap) +static uint32_t assigned_dev_pci_read(PCIDevice *d, int pos, int len) +{ + AssignedDevice *pci_dev = container_of(d, AssignedDevice, dev); + uint32_t val; + ssize_t ret; + int fd = pci_dev->real_device.config_fd; + +again: + ret = pread(fd, &val, len, pos); + if (ret != len) { + if ((ret < 0) && (errno == EINTR || errno == EAGAIN)) + goto again; + + fprintf(stderr, "%s: pread failed, ret = %zd errno = %d\n", + __func__, ret, errno); + + exit(1); + } + + return val; +} + +static uint8_t assigned_dev_pci_read_byte(PCIDevice *d, int pos) +{ + return (uint8_t)assigned_dev_pci_read(d, pos, 1); +} + +static uint16_t assigned_dev_pci_read_word(PCIDevice *d, int pos) +{ + return (uint16_t)assigned_dev_pci_read(d, pos, 2); +} + +static uint32_t assigned_dev_pci_read_long(PCIDevice *d, int pos) +{ + return assigned_dev_pci_read(d, pos, 4); +} + +static uint8_t pci_find_cap_offset(PCIDevice *d, uint8_t cap) { int id; int max_cap = 48; int pos = PCI_CAPABILITY_LIST; int status; - status = pci_read_byte(pci_dev, PCI_STATUS); + status = assigned_dev_pci_read_byte(d, PCI_STATUS); if ((status & PCI_STATUS_CAP_LIST) == 0) return 0; while (max_cap--) { - pos = pci_read_byte(pci_dev, pos); + pos = assigned_dev_pci_read_byte(d, pos); if (pos < 0x40) break; pos &= ~3; - id = pci_read_byte(pci_dev, pos + PCI_CAP_LIST_ID); + id = assigned_dev_pci_read_byte(d, pos + PCI_CAP_LIST_ID); if (id == 0xff) break; @@ -858,7 +895,7 @@ static int assign_irq(AssignedDevice *dev) int irq, r = 0; /* Interrupt PIN 0 means don't use INTx */ - if (pci_read_byte(dev->pdev, PCI_INTERRUPT_PIN) == 0) + if (assigned_dev_pci_read_byte(&dev->dev, PCI_INTERRUPT_PIN) == 0) return 0; irq = pci_map_irq(&dev->dev, dev->intpin); @@ -1196,7 +1233,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) #ifdef KVM_CAP_DEVICE_MSI /* Expose MSI capability * MSI capability is the 1st capability in capability config */ - if (pci_find_cap_offset(dev->pdev, PCI_CAP_ID_MSI)) { + if (pci_find_cap_offset(pci_dev, PCI_CAP_ID_MSI)) { dev->cap.available |= ASSIGNED_DEVICE_CAP_MSI; memset(&pci_dev->config[pci_dev->cap.start + pci_dev->cap.length], 0, PCI_CAPABILITY_CONFIG_MSI_LENGTH); @@ -1208,23 +1245,25 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) #endif #ifdef KVM_CAP_DEVICE_MSIX /* Expose MSI-X capability */ - if (pci_find_cap_offset(dev->pdev, PCI_CAP_ID_MSIX)) { + if (pci_find_cap_offset(pci_dev, PCI_CAP_ID_MSIX)) { int pos, entry_nr, bar_nr; uint32_t msix_table_entry; dev->cap.available |= ASSIGNED_DEVICE_CAP_MSIX; memset(&pci_dev->config[pci_dev->cap.start + pci_dev->cap.length], 0, PCI_CAPABILITY_CONFIG_MSIX_LENGTH); - pos = pci_find_cap_offset(dev->pdev, PCI_CAP_ID_MSIX); - entry_nr = pci_read_word(dev->pdev, pos + 2) & PCI_MSIX_TABSIZE; + pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_MSIX); + entry_nr = assigned_dev_pci_read_word(pci_dev, pos + 2) & + PCI_MSIX_TABSIZE; pci_dev->config[pci_dev->cap.start + pci_dev->cap.length] = 0x11; pci_dev->config[pci_dev->cap.start + pci_dev->cap.length + 2] = entry_nr; - msix_table_entry = pci_read_long(dev->pdev, pos + PCI_MSIX_TABLE); + msix_table_entry = assigned_dev_pci_read_long(pci_dev, + pos + PCI_MSIX_TABLE); *(uint32_t *)(pci_dev->config + pci_dev->cap.start + pci_dev->cap.length + PCI_MSIX_TABLE) = msix_table_entry; *(uint32_t *)(pci_dev->config + pci_dev->cap.start + pci_dev->cap.length + PCI_MSIX_PBA) = - pci_read_long(dev->pdev, pos + PCI_MSIX_PBA); + assigned_dev_pci_read_byte(pci_dev, pos + PCI_MSIX_PBA); bar_nr = msix_table_entry & PCI_MSIX_BIR; msix_table_entry &= ~PCI_MSIX_BIR; dev->msix_table_addr = pci_region[bar_nr].base_addr + msix_table_entry; @@ -1319,7 +1358,6 @@ static int assigned_dev_register_msix_mmio(AssignedDevice *dev) static int assigned_initfn(struct PCIDevice *pci_dev) { AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); - struct pci_access *pacc; uint8_t e_device, e_intx; int r; @@ -1351,10 +1389,6 @@ static int assigned_initfn(struct PCIDevice *pci_dev) dev->h_busnr = dev->host.bus; dev->h_devfn = PCI_DEVFN(dev->host.dev, dev->host.func); - pacc = pci_alloc(); - pci_init(pacc); - dev->pdev = pci_get_dev(pacc, dev->host.seg, dev->host.bus, dev->host.dev, dev->host.func); - if (pci_enable_capability_support(pci_dev, 0, NULL, assigned_device_pci_cap_write_config, assigned_device_pci_cap_init) < 0) diff --git a/hw/device-assignment.h b/hw/device-assignment.h index d561112..3accdcd 100644 --- a/hw/device-assignment.h +++ b/hw/device-assignment.h @@ -88,7 +88,6 @@ typedef struct AssignedDevice { unsigned int h_devfn; int irq_requested_type; int bound; - struct pci_dev *pdev; struct { #define ASSIGNED_DEVICE_CAP_MSI (1 << 0) #define ASSIGNED_DEVICE_CAP_MSIX (1 << 1)