From: Roger Pau Monne Date: Tue, 20 Nov 2018 15:19:43 +0000 (+0100) Subject: amd/iommu: skip bridge devices when updating IOMMU page tables X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0082b06399a35cd87dc4c840fd10e5da26500854;p=people%2Froyger%2Fxen.git amd/iommu: skip bridge devices when updating IOMMU page tables Bridges are not behind an IOMMU, and are already special cased and skipped in amd_iommu_add_device. Apply the same special casing when updating page tables. This is required or else update_paging_mode will fail and return an error to the caller (amd_iommu_{un}map_page) which will destroy the domain. Signed-off-by: Roger Pau Monné --- Cc: Suravee Suthikulpanit Cc: Brian Woods --- Changes since v5: - Remove the hardware domain check. Changes since v4: - Invert condition order so they match the order in amd_iommu_add_device. - Expand commit message to spell out why this is required. --- diff --git a/xen/drivers/passthrough/amd/iommu_map.c b/xen/drivers/passthrough/amd/iommu_map.c index c1daba8422..e4904bb3c5 100644 --- a/xen/drivers/passthrough/amd/iommu_map.c +++ b/xen/drivers/passthrough/amd/iommu_map.c @@ -612,6 +612,9 @@ static int update_paging_mode(struct domain *d, unsigned long dfn) /* Update device table entries using new root table and paging mode */ for_each_pdev( d, pdev ) { + if ( pdev->type == DEV_TYPE_PCI_HOST_BRIDGE ) + continue; + bdf = PCI_BDF2(pdev->bus, pdev->devfn); iommu = find_iommu_for_device(pdev->seg, bdf); if ( !iommu )