History

Merge tag 'iommu-fixes-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull iommu fixes from Joerg Roedel: - fix device setup failures in the Intel VT-d driver when the PASID table is shared - fix Intel VT-d device hot-add failure due to wrong device notifier order - remove the old IOMMU mailing list from the MAINTAINERS file now that it has been retired * tag 'iommu-fixes-v5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: MAINTAINERS: Remove iommu@lists.linux-foundation.org iommu/vt-d: Fix RID2PASID setup/teardown failure iommu/vt-d: Fix PCI bus rescan device hot add

Linus Torvalds committed 4 years ago

Commit f5645ed2 parents 2b93fe6 c51b8f86 files · +4 −106Browse files

Unified · Split

6 files
  1. MAINTAINERS +0 −11
  2. drivers/iommu/intel/dmar.c +1 −1
  3. drivers/iommu/intel/iommu.c +0 −24
  4. drivers/iommu/intel/pasid.c +3 −66
  5. drivers/iommu/intel/pasid.h +0 −1
  6. include/linux/intel-iommu.h +0 −3
MAINTAINERS+0−11
@@ -426,7 +426,6 @@ F: drivers/acpi/*thermal* · 425 unmodified lines
426ACPI VIOT DRIVER426ACPI VIOT DRIVER
427M: Jean-Philippe Brucker <jean-philippe@linaro.org>427M: Jean-Philippe Brucker <jean-philippe@linaro.org>
428L: linux-acpi@vger.kernel.org428L: linux-acpi@vger.kernel.org
429L: iommu@lists.linux-foundation.org
430L: iommu@lists.linux.dev429L: iommu@lists.linux.dev
431S: Maintained430S: Maintained
432F: drivers/acpi/viot.c431F: drivers/acpi/viot.c
@@ -960,7 +959,6 @@ F: drivers/video/fbdev/geode/ · 527 unmodified lines
960AMD IOMMU (AMD-VI)959AMD IOMMU (AMD-VI)
961M: Joerg Roedel <joro@8bytes.org>960M: Joerg Roedel <joro@8bytes.org>
962R: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>961R: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
963L: iommu@lists.linux-foundation.org
964L: iommu@lists.linux.dev962L: iommu@lists.linux.dev
965S: Maintained963S: Maintained
966T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git964T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@ -6055,7 +6053,6 @@ DMA MAPPING HELPERS · 5088 unmodified lines
6055M: Christoph Hellwig <hch@lst.de>6053M: Christoph Hellwig <hch@lst.de>
6056M: Marek Szyprowski <m.szyprowski@samsung.com>6054M: Marek Szyprowski <m.szyprowski@samsung.com>
6057R: Robin Murphy <robin.murphy@arm.com>6055R: Robin Murphy <robin.murphy@arm.com>
6058L: iommu@lists.linux-foundation.org
6059L: iommu@lists.linux.dev6056L: iommu@lists.linux.dev
6060S: Supported6057S: Supported
6061W: http://git.infradead.org/users/hch/dma-mapping.git6058W: http://git.infradead.org/users/hch/dma-mapping.git
@@ -6068,7 +6065,6 @@ F: kernel/dma/ · 6 unmodified lines
6068 6065
6069DMA MAPPING BENCHMARK6066DMA MAPPING BENCHMARK
6070M: Xiang Chen <chenxiang66@hisilicon.com>6067M: Xiang Chen <chenxiang66@hisilicon.com>
6071L: iommu@lists.linux-foundation.org
6072L: iommu@lists.linux.dev6068L: iommu@lists.linux.dev
6073F: kernel/dma/map_benchmark.c6069F: kernel/dma/map_benchmark.c
6074F: tools/testing/selftests/dma/6070F: tools/testing/selftests/dma/
@@ -7653,7 +7649,6 @@ F: drivers/gpu/drm/exynos/exynos_dp* · 1578 unmodified lines
7653 7649
7654EXYNOS SYSMMU (IOMMU) driver7650EXYNOS SYSMMU (IOMMU) driver
7655M: Marek Szyprowski <m.szyprowski@samsung.com>7651M: Marek Szyprowski <m.szyprowski@samsung.com>
7656L: iommu@lists.linux-foundation.org
7657L: iommu@lists.linux.dev7652L: iommu@lists.linux.dev
7658S: Maintained7653S: Maintained
7659F: drivers/iommu/exynos-iommu.c7654F: drivers/iommu/exynos-iommu.c
@@ -10078,7 +10073,6 @@ F: drivers/hid/intel-ish-hid/ · 2418 unmodified lines
10078INTEL IOMMU (VT-d)10073INTEL IOMMU (VT-d)
10079M: David Woodhouse <dwmw2@infradead.org>10074M: David Woodhouse <dwmw2@infradead.org>
10080M: Lu Baolu <baolu.lu@linux.intel.com>10075M: Lu Baolu <baolu.lu@linux.intel.com>
10081L: iommu@lists.linux-foundation.org
10082L: iommu@lists.linux.dev10076L: iommu@lists.linux.dev
10083S: Supported10077S: Supported
10084T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git10078T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@ -10458,7 +10452,6 @@ F: include/linux/iomap.h · 373 unmodified lines
10458IOMMU DRIVERS10452IOMMU DRIVERS
10459M: Joerg Roedel <joro@8bytes.org>10453M: Joerg Roedel <joro@8bytes.org>
10460M: Will Deacon <will@kernel.org>10454M: Will Deacon <will@kernel.org>
10461L: iommu@lists.linux-foundation.org
10462L: iommu@lists.linux.dev10455L: iommu@lists.linux.dev
10463S: Maintained10456S: Maintained
10464T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git10457T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
@@ -12618,7 +12611,6 @@ F: drivers/i2c/busses/i2c-mt65xx.c · 2153 unmodified lines
12618 12611
12619MEDIATEK IOMMU DRIVER12612MEDIATEK IOMMU DRIVER
12620M: Yong Wu <yong.wu@mediatek.com>12613M: Yong Wu <yong.wu@mediatek.com>
12621L: iommu@lists.linux-foundation.org
12622L: iommu@lists.linux.dev12614L: iommu@lists.linux.dev
12623L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)12615L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
12624S: Supported12616S: Supported
@@ -16670,7 +16662,6 @@ F: drivers/i2c/busses/i2c-qcom-cci.c · 4045 unmodified lines
16670 16662
16671QUALCOMM IOMMU16663QUALCOMM IOMMU
16672M: Rob Clark <robdclark@gmail.com>16664M: Rob Clark <robdclark@gmail.com>
16673L: iommu@lists.linux-foundation.org
16674L: iommu@lists.linux.dev16665L: iommu@lists.linux.dev
16675L: linux-arm-msm@vger.kernel.org16666L: linux-arm-msm@vger.kernel.org
16676S: Maintained16667S: Maintained
@@ -19299,7 +19290,6 @@ F: arch/x86/boot/video* · 2622 unmodified lines
19299 19290
19300SWIOTLB SUBSYSTEM19291SWIOTLB SUBSYSTEM
19301M: Christoph Hellwig <hch@infradead.org>19292M: Christoph Hellwig <hch@infradead.org>
19302L: iommu@lists.linux-foundation.org
19303L: iommu@lists.linux.dev19293L: iommu@lists.linux.dev
19304S: Supported19294S: Supported
19305W: http://git.infradead.org/users/hch/dma-mapping.git19295W: http://git.infradead.org/users/hch/dma-mapping.git
@@ -21975,7 +21965,6 @@ XEN SWIOTLB SUBSYSTEM · 2669 unmodified lines
21975M: Juergen Gross <jgross@suse.com>21965M: Juergen Gross <jgross@suse.com>
21976M: Stefano Stabellini <sstabellini@kernel.org>21966M: Stefano Stabellini <sstabellini@kernel.org>
21977L: xen-devel@lists.xenproject.org (moderated for non-subscribers)21967L: xen-devel@lists.xenproject.org (moderated for non-subscribers)
21978L: iommu@lists.linux-foundation.org
21979L: iommu@lists.linux.dev21968L: iommu@lists.linux.dev
21980S: Supported21969S: Supported
21981F: arch/x86/xen/*swiotlb*21970F: arch/x86/xen/*swiotlb*
drivers/iommu/intel/dmar.c+1−1
@@ -382,7 +382,7 @@ static int dmar_pci_bus_notifier(struct notifier_block *nb, · 381 unmodified lines
382 382
383static struct notifier_block dmar_pci_bus_nb = {383static struct notifier_block dmar_pci_bus_nb = {
384 .notifier_call = dmar_pci_bus_notifier,384 .notifier_call = dmar_pci_bus_notifier,
385 .priority = INT_MIN,385 .priority = 1,
386};386};
387 387
388static struct dmar_drhd_unit *388static struct dmar_drhd_unit *
drivers/iommu/intel/iommu.c+0−24
@@ -320,30 +320,6 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped); · 319 unmodified lines
320DEFINE_SPINLOCK(device_domain_lock);320DEFINE_SPINLOCK(device_domain_lock);
321static LIST_HEAD(device_domain_list);321static LIST_HEAD(device_domain_list);
322 322
323/*
324 * Iterate over elements in device_domain_list and call the specified
325 * callback @fn against each element.
326 */
327int for_each_device_domain(int (*fn)(struct device_domain_info *info,
328 void *data), void *data)
329{
330 int ret = 0;
331 unsigned long flags;
332 struct device_domain_info *info;
333
334 spin_lock_irqsave(&device_domain_lock, flags);
335 list_for_each_entry(info, &device_domain_list, global) {
336 ret = fn(info, data);
337 if (ret) {
338 spin_unlock_irqrestore(&device_domain_lock, flags);
339 return ret;
340 }
341 }
342 spin_unlock_irqrestore(&device_domain_lock, flags);
343
344 return 0;
345}
346
347const struct iommu_ops intel_iommu_ops;323const struct iommu_ops intel_iommu_ops;
348 324
349static bool translation_pre_enabled(struct intel_iommu *iommu)325static bool translation_pre_enabled(struct intel_iommu *iommu)
drivers/iommu/intel/pasid.c+3−66
@@ -86,54 +86,6 @@ void vcmd_free_pasid(struct intel_iommu *iommu, u32 pasid) · 85 unmodified lines
86/*86/*
87 * Per device pasid table management:87 * Per device pasid table management:
88 */88 */
89static inline void
90device_attach_pasid_table(struct device_domain_info *info,
91 struct pasid_table *pasid_table)
92{
93 info->pasid_table = pasid_table;
94 list_add(&info->table, &pasid_table->dev);
95}
96
97static inline void
98device_detach_pasid_table(struct device_domain_info *info,
99 struct pasid_table *pasid_table)
100{
101 info->pasid_table = NULL;
102 list_del(&info->table);
103}
104
105struct pasid_table_opaque {
106 struct pasid_table **pasid_table;
107 int segment;
108 int bus;
109 int devfn;
110};
111
112static int search_pasid_table(struct device_domain_info *info, void *opaque)
113{
114 struct pasid_table_opaque *data = opaque;
115
116 if (info->iommu->segment == data->segment &&
117 info->bus == data->bus &&
118 info->devfn == data->devfn &&
119 info->pasid_table) {
120 *data->pasid_table = info->pasid_table;
121 return 1;
122 }
123
124 return 0;
125}
126
127static int get_alias_pasid_table(struct pci_dev *pdev, u16 alias, void *opaque)
128{
129 struct pasid_table_opaque *data = opaque;
130
131 data->segment = pci_domain_nr(pdev->bus);
132 data->bus = PCI_BUS_NUM(alias);
133 data->devfn = alias & 0xff;
134
135 return for_each_device_domain(&search_pasid_table, data);
136}
137 89
138/*90/*
139 * Allocate a pasid table for @dev. It should be called in a91 * Allocate a pasid table for @dev. It should be called in a
@@ -143,28 +95,18 @@ int intel_pasid_alloc_table(struct device *dev) · 3 unmodified lines
143{95{
144 struct device_domain_info *info;96 struct device_domain_info *info;
145 struct pasid_table *pasid_table;97 struct pasid_table *pasid_table;
146 struct pasid_table_opaque data;
147 struct page *pages;98 struct page *pages;
148 u32 max_pasid = 0;99 u32 max_pasid = 0;
149 int ret, order;100 int order, size;
150 int size;
151 101
152 might_sleep();102 might_sleep();
153 info = dev_iommu_priv_get(dev);103 info = dev_iommu_priv_get(dev);
154 if (WARN_ON(!info || !dev_is_pci(dev) || info->pasid_table))104 if (WARN_ON(!info || !dev_is_pci(dev) || info->pasid_table))
155 return -EINVAL;105 return -EINVAL;
156 106
157 /* DMA alias device already has a pasid table, use it: */
158 data.pasid_table = &pasid_table;
159 ret = pci_for_each_dma_alias(to_pci_dev(dev),
160 &get_alias_pasid_table, &data);
161 if (ret)
162 goto attach_out;
163
164 pasid_table = kzalloc(sizeof(*pasid_table), GFP_KERNEL);107 pasid_table = kzalloc(sizeof(*pasid_table), GFP_KERNEL);
165 if (!pasid_table)108 if (!pasid_table)
166 return -ENOMEM;109 return -ENOMEM;
167 INIT_LIST_HEAD(&pasid_table->dev);
168 110
169 if (info->pasid_supported)111 if (info->pasid_supported)
170 max_pasid = min_t(u32, pci_max_pasids(to_pci_dev(dev)),112 max_pasid = min_t(u32, pci_max_pasids(to_pci_dev(dev)),
@@ -182,9 +124,7 @@ int intel_pasid_alloc_table(struct device *dev) · 11 unmodified lines
182 pasid_table->table = page_address(pages);124 pasid_table->table = page_address(pages);
183 pasid_table->order = order;125 pasid_table->order = order;
184 pasid_table->max_pasid = 1 << (order + PAGE_SHIFT + 3);126 pasid_table->max_pasid = 1 << (order + PAGE_SHIFT + 3);
185 127 info->pasid_table = pasid_table;
186attach_out:
187 device_attach_pasid_table(info, pasid_table);
188 128
189 return 0;129 return 0;
190}130}
@@ -202,10 +142,7 @@ void intel_pasid_free_table(struct device *dev) · 11 unmodified lines
202 return;142 return;
203 143
204 pasid_table = info->pasid_table;144 pasid_table = info->pasid_table;
205 device_detach_pasid_table(info, pasid_table);145 info->pasid_table = NULL;
206
207 if (!list_empty(&pasid_table->dev))
208 return;
209 146
210 /* Free scalable mode PASID directory tables: */147 /* Free scalable mode PASID directory tables: */
211 dir = pasid_table->table;148 dir = pasid_table->table;
drivers/iommu/intel/pasid.h+0−1
@@ -74,7 +74,6 @@ struct pasid_table { · 73 unmodified lines
74 void *table; /* pasid table pointer */74 void *table; /* pasid table pointer */
75 int order; /* page order of pasid table */75 int order; /* page order of pasid table */
76 u32 max_pasid; /* max pasid */76 u32 max_pasid; /* max pasid */
77 struct list_head dev; /* device list */
78};77};
79 78
80/* Get PRESENT bit of a PASID directory entry. */79/* Get PRESENT bit of a PASID directory entry. */
include/linux/intel-iommu.h+0−3
@@ -612,7 +612,6 @@ struct intel_iommu { · 611 unmodified lines
612struct device_domain_info {612struct device_domain_info {
613 struct list_head link; /* link to domain siblings */613 struct list_head link; /* link to domain siblings */
614 struct list_head global; /* link to global list */614 struct list_head global; /* link to global list */
615 struct list_head table; /* link to pasid table */
616 u32 segment; /* PCI segment number */615 u32 segment; /* PCI segment number */
617 u8 bus; /* PCI bus number */616 u8 bus; /* PCI bus number */
618 u8 devfn; /* PCI devfn number */617 u8 devfn; /* PCI devfn number */
@@ -729,8 +728,6 @@ extern int dmar_ir_support(void); · 110 unmodified lines
729void *alloc_pgtable_page(int node);728void *alloc_pgtable_page(int node);
730void free_pgtable_page(void *vaddr);729void free_pgtable_page(void *vaddr);
731struct intel_iommu *domain_get_iommu(struct dmar_domain *domain);730struct intel_iommu *domain_get_iommu(struct dmar_domain *domain);
732int for_each_device_domain(int (*fn)(struct device_domain_info *info,
733 void *data), void *data);
734void iommu_flush_write_buffer(struct intel_iommu *iommu);731void iommu_flush_write_buffer(struct intel_iommu *iommu);
735int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);732int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);
736struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn);733struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn);