From: Wei Wang2 Subject: [PATCH] AMD IOMMU: (2nd try) Handle sibling device assignment correctly Date: Wed, 7 May 2008 14:00:31 +0200 Message-ID: <1210161631.2841.118.camel@gran.amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-6o655qzSBffMDc6bLSsl" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Keir Fraser Cc: xen-devel List-Id: xen-devel@lists.xenproject.org --=-6o655qzSBffMDc6bLSsl Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Updated version, please comment! Thanks, Wei Devices on AMD IOMMU system share a same set of IO page tables if they are indexed by a same device ID in device table. To prevent these sibling devices from being assigned to different domains, a successful device assignment requires all sibling devices are owned by either pciback or the target domain. This is a trial patch with minor modifications in the common interface to handle this situation correctly. VTD code has also been slightly touched please let me know if it breaks any VTD functionality. Thanks! Signed-off-by: Wei Wang --=20 AMD Saxony, Dresden, Germany Operating System Research Center Legal Information: AMD Saxony Limited Liability Company & Co. KG Sitz (Gesch=C3=A4ftsanschrift): Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland Registergericht Dresden: HRA 4896 vertretungsberechtigter Komplement=C3=A4r: AMD Saxony LLC (Sitz Wilmington, Delaware, USA) Gesch=C3=A4ftsf=C3=BChrer der AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy=20 --=-6o655qzSBffMDc6bLSsl Content-Disposition: attachment; filename="device_assignment.patch" Content-Type: text/x-patch; name="device_assignment.patch"; charset="UTF-8" Content-Transfer-Encoding: 7bit diff -r 0bc934366127 xen/arch/x86/domctl.c --- a/xen/arch/x86/domctl.c Wed May 07 09:45:55 2008 +0100 +++ b/xen/arch/x86/domctl.c Wed May 07 13:51:55 2008 +0200 @@ -529,15 +529,19 @@ long arch_do_domctl( case XEN_DOMCTL_test_assign_device: { u8 bus, devfn; + struct domain *d; ret = -EINVAL; if ( !iommu_enabled ) + break; + + if ( unlikely((d = rcu_lock_domain_by_id(domctl->domain)) == NULL) ) break; bus = (domctl->u.assign_device.machine_bdf >> 16) & 0xff; devfn = (domctl->u.assign_device.machine_bdf >> 8) & 0xff; - if ( device_assigned(bus, devfn) ) + if ( device_assigned(d, bus, devfn) ) { gdprintk(XENLOG_ERR, "XEN_DOMCTL_test_assign_device: " "%x:%x:%x already assigned, or non-existent\n", @@ -545,6 +549,7 @@ long arch_do_domctl( break; } ret = 0; + rcu_unlock_domain(d); } break; @@ -566,7 +571,7 @@ long arch_do_domctl( bus = (domctl->u.assign_device.machine_bdf >> 16) & 0xff; devfn = (domctl->u.assign_device.machine_bdf >> 8) & 0xff; - if ( device_assigned(bus, devfn) ) + if ( device_assigned(d, bus, devfn) ) { gdprintk(XENLOG_ERR, "XEN_DOMCTL_assign_device: " "%x:%x:%x already assigned, or non-existent\n", @@ -599,7 +604,7 @@ long arch_do_domctl( bus = (domctl->u.assign_device.machine_bdf >> 16) & 0xff; devfn = (domctl->u.assign_device.machine_bdf >> 8) & 0xff; - if ( !device_assigned(bus, devfn) ) + if ( !device_assigned(d, bus, devfn) ) break; deassign_device(d, bus, devfn); diff -r 0bc934366127 xen/arch/x86/setup.c --- a/xen/arch/x86/setup.c Wed May 07 09:45:55 2008 +0100 +++ b/xen/arch/x86/setup.c Wed May 07 13:51:55 2008 +0200 @@ -38,6 +38,7 @@ #include #include #include +#include #if defined(CONFIG_X86_64) #define BOOTSTRAP_DIRECTMAP_END (1UL << 32) /* 4GB */ @@ -1041,6 +1042,8 @@ void __init __start_xen(unsigned long mb cmdline) != 0) panic("Could not set up DOM0 guest OS\n"); + iommu_setup_devices(dom0, cmdline); + /* Scrub RAM that is still free and so may go to an unprivileged domain. */ scrub_heap_pages(); diff -r 0bc934366127 xen/drivers/passthrough/amd/pci_amd_iommu.c --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c Wed May 07 09:45:55 2008 +0100 +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c Wed May 07 13:51:55 2008 +0200 @@ -292,9 +292,8 @@ static void amd_iommu_setup_domain_devic static void amd_iommu_setup_dom0_devices(struct domain *d) { - struct hvm_iommu *hd = domain_hvm_iommu(d); + struct amd_iommu *iommu; - struct pci_dev *pdev; int bus, dev, func; u32 l; int bdf; @@ -311,15 +310,10 @@ static void amd_iommu_setup_dom0_devices (l == 0x0000ffff) || (l == 0xffff0000) ) continue; - pdev = xmalloc(struct pci_dev); - pdev->bus = bus; - pdev->devfn = PCI_DEVFN(dev, func); - list_add_tail(&pdev->list, &hd->pdev_list); - - bdf = (bus << 8) | pdev->devfn; + bdf = (bus << 8) | PCI_DEVFN(dev, func); /* supported device? */ iommu = (bdf < ivrs_bdf_entries) ? - find_iommu_for_device(bus, pdev->devfn) : NULL; + find_iommu_for_device(bus, PCI_DEVFN(dev, func)) : NULL; if ( iommu ) amd_iommu_setup_domain_device(d, iommu, bdf); @@ -555,6 +549,54 @@ static int amd_iommu_assign_device(struc pdev_flr(bus, devfn); return reassign_device(dom0, d, bus, devfn); +} + +static int amd_iommu_device_assigned(struct domain *d, u8 bus, u8 devfn) +{ + struct pci_dev *pdev; + int i; + int bdf = ((int)bus << 8) | devfn; + int req_id = ivrs_mappings[bdf].dte_requestor_id; + + /* self-check */ + for_each_pdev( dom0, pdev ) + if ( (pdev->bus == bus ) && (pdev->devfn == devfn) ) + goto siblings_check; + + return 1; + +siblings_check: + + for ( i = 0; i < ivrs_bdf_entries; i++ ) + { + int bus = (i >> 8) & 0xff; + int devfn = i & 0xff; + + if ( ivrs_mappings[i].dte_requestor_id != req_id ) + continue; + + if ( i == bdf ) + continue; + + /* Check if this sibling device has been assigned to d. */ + for_each_pdev( d, pdev ) + if ( (pdev->bus == bus ) && (pdev->devfn == devfn) ) + goto check_next; + + /* Check if this sibling device is still owned by pciback, + otherwise it has been assigned to another passthru domain.*/ + for_each_pdev( dom0, pdev ) + if ( (pdev->bus == bus ) && (pdev->devfn == devfn) ) + goto check_next; + + /* Found! */ + return 1; + +check_next: + continue; + } + /* no sibling devices found */ + return 0; } static void release_domain_devices(struct domain *d) @@ -642,4 +684,5 @@ struct iommu_ops amd_iommu_ops = { .map_page = amd_iommu_map_page, .unmap_page = amd_iommu_unmap_page, .reassign_device = amd_iommu_return_device, + .test_assigned = amd_iommu_device_assigned, }; diff -r 0bc934366127 xen/drivers/passthrough/iommu.c --- a/xen/drivers/passthrough/iommu.c Wed May 07 09:45:55 2008 +0100 +++ b/xen/drivers/passthrough/iommu.c Wed May 07 13:51:55 2008 +0200 @@ -163,4 +163,55 @@ static int iommu_setup(void) printk("I/O virtualisation %sabled\n", iommu_enabled ? "en" : "dis"); return rc; } + +int device_assigned(struct domain* d, u8 bus, u8 devfn) +{ + struct hvm_iommu *hd = domain_hvm_iommu(d); + + if ( !iommu_enabled || !hd->platform_ops ) + return 0; + + return hd->platform_ops->test_assigned(d, bus, devfn); +} + +void iommu_setup_devices(struct domain *domain, char *cmdline) +{ + char *pos; + int dm, bus, dev, func, parsed; + struct pci_dev *pdev; + int err = 0; + struct hvm_iommu *hd = domain_hvm_iommu(domain); + + if ( !iommu_enabled ) + return; + + if ( boot_cpu_data.x86_vendor != X86_VENDOR_AMD ) + return; + + pos = strstr(cmdline, "pciback.hide="); + pos += strlen("pciback.hide="); + + do { + err = sscanf(pos, " (%x:%x:%x.%x) %n", + &dm, &bus, &dev, &func, &parsed); + if ( err != 4 ) + { + dm = 0; + err = sscanf(pos, " (%x:%x.%x) %n", + &bus, &dev, &func, &parsed); + if ( err != 3 ) + goto parse_error; + + pdev = xmalloc(struct pci_dev); + pdev->bus = bus; + pdev->devfn = PCI_DEVFN(dev, func); + list_add_tail(&pdev->list, &hd->pdev_list); + + pos += parsed; + } + } while (parsed > 0); + +parse_error: + return; +} __initcall(iommu_setup); diff -r 0bc934366127 xen/drivers/passthrough/vtd/iommu.c --- a/xen/drivers/passthrough/vtd/iommu.c Wed May 07 09:45:55 2008 +0100 +++ b/xen/drivers/passthrough/vtd/iommu.c Wed May 07 13:51:55 2008 +0200 @@ -1789,7 +1789,7 @@ int intel_vtd_setup(void) * If the device isn't owned by dom0, it means it already * has been assigned to other domain, or it's not exist. */ -int device_assigned(u8 bus, u8 devfn) +static int intel_iommu_device_assigned(struct domain *d, u8 bus, u8 devfn) { struct pci_dev *pdev; @@ -1915,6 +1915,7 @@ struct iommu_ops intel_iommu_ops = { .map_page = intel_iommu_map_page, .unmap_page = intel_iommu_unmap_page, .reassign_device = reassign_device_ownership, + .test_assigned = intel_iommu_device_assigned, }; /* diff -r 0bc934366127 xen/include/xen/iommu.h --- a/xen/include/xen/iommu.h Wed May 07 09:45:55 2008 +0100 +++ b/xen/include/xen/iommu.h Wed May 07 13:51:55 2008 +0200 @@ -53,9 +53,10 @@ struct iommu { struct intel_iommu *intel; }; +void iommu_setup_devices(struct domain *domain, char *cmdline); int iommu_domain_init(struct domain *d); void iommu_domain_destroy(struct domain *d); -int device_assigned(u8 bus, u8 devfn); +int device_assigned(struct domain*d, u8 bus, u8 devfn); int assign_device(struct domain *d, u8 bus, u8 devfn); void deassign_device(struct domain *d, u8 bus, u8 devfn); void reassign_device_ownership(struct domain *source, @@ -94,6 +95,7 @@ struct iommu_ops { int (*unmap_page)(struct domain *d, unsigned long gfn); void (*reassign_device)(struct domain *s, struct domain *t, u8 bus, u8 devfn); + int (*test_assigned)(struct domain *d, u8 bus, u8 devfn); }; #endif /* _IOMMU_H_ */ --=-6o655qzSBffMDc6bLSsl Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=-6o655qzSBffMDc6bLSsl--