Skip to content

Commit

Permalink
Merge tag 'iommu-fixes-v5.19-rc5' of git://git.kernel.org/pub/scm/lin…
Browse files Browse the repository at this point in the history 
…ux/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 [email protected]
  iommu/vt-d: Fix RID2PASID setup/teardown failure
  iommu/vt-d: Fix PCI bus rescan device hot add
  • Loading branch information
@torvalds
torvalds committed Jul 8, 2022
2 parents 2b93fe6 + c51b8f8 commit f5645ed
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 106 deletions.
11 changes: 0 additions & 11 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,6 @@ F: drivers/acpi/*thermal*
ACPI VIOT DRIVER
M: Jean-Philippe Brucker <[email protected]>
L: [email protected]
L: [email protected]
L: [email protected]
S: Maintained
F: drivers/acpi/viot.c
Expand Down Expand Up @@ -960,7 +959,6 @@ F: drivers/video/fbdev/geode/
AMD IOMMU (AMD-VI)
M: Joerg Roedel <[email protected]>
R: Suravee Suthikulpanit <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
Expand Down Expand Up @@ -6055,7 +6053,6 @@ DMA MAPPING HELPERS
M: Christoph Hellwig <[email protected]>
M: Marek Szyprowski <[email protected]>
R: Robin Murphy <[email protected]>
L: [email protected]
L: [email protected]
S: Supported
W: http://git.infradead.org/users/hch/dma-mapping.git
Expand All @@ -6068,7 +6065,6 @@ F: kernel/dma/

DMA MAPPING BENCHMARK
M: Xiang Chen <[email protected]>
L: [email protected]
L: [email protected]
F: kernel/dma/map_benchmark.c
F: tools/testing/selftests/dma/
Expand Down Expand Up @@ -7653,7 +7649,6 @@ F: drivers/gpu/drm/exynos/exynos_dp*

EXYNOS SYSMMU (IOMMU) driver
M: Marek Szyprowski <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
F: drivers/iommu/exynos-iommu.c
Expand Down Expand Up @@ -10078,7 +10073,6 @@ F: drivers/hid/intel-ish-hid/
INTEL IOMMU (VT-d)
M: David Woodhouse <[email protected]>
M: Lu Baolu <[email protected]>
L: [email protected]
L: [email protected]
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
Expand Down Expand Up @@ -10458,7 +10452,6 @@ F: include/linux/iomap.h
IOMMU DRIVERS
M: Joerg Roedel <[email protected]>
M: Will Deacon <[email protected]>
L: [email protected]
L: [email protected]
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
Expand Down Expand Up @@ -12618,7 +12611,6 @@ F: drivers/i2c/busses/i2c-mt65xx.c

MEDIATEK IOMMU DRIVER
M: Yong Wu <[email protected]>
L: [email protected]
L: [email protected]
L: [email protected] (moderated for non-subscribers)
S: Supported
Expand Down Expand Up @@ -16670,7 +16662,6 @@ F: drivers/i2c/busses/i2c-qcom-cci.c

QUALCOMM IOMMU
M: Rob Clark <[email protected]>
L: [email protected]
L: [email protected]
L: [email protected]
S: Maintained
Expand Down Expand Up @@ -19299,7 +19290,6 @@ F: arch/x86/boot/video*

SWIOTLB SUBSYSTEM
M: Christoph Hellwig <[email protected]>
L: [email protected]
L: [email protected]
S: Supported
W: http://git.infradead.org/users/hch/dma-mapping.git
Expand Down Expand Up @@ -21975,7 +21965,6 @@ XEN SWIOTLB SUBSYSTEM
M: Juergen Gross <[email protected]>
M: Stefano Stabellini <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected]
L: [email protected]
S: Supported
F: arch/x86/xen/*swiotlb*
Expand Down
2 changes: 1 addition & 1 deletion drivers/iommu/intel/dmar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ static int dmar_pci_bus_notifier(struct notifier_block *nb,

static struct notifier_block dmar_pci_bus_nb = {
.notifier_call = dmar_pci_bus_notifier,
.priority = INT_MIN,
.priority = 1,
};

static struct dmar_drhd_unit *
Expand Down
24 changes: 0 additions & 24 deletions drivers/iommu/intel/iommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,30 +320,6 @@ EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
DEFINE_SPINLOCK(device_domain_lock);
static LIST_HEAD(device_domain_list);

/*
* Iterate over elements in device_domain_list and call the specified
* callback @fn against each element.
*/
int for_each_device_domain(int (*fn)(struct device_domain_info *info,
void *data), void *data)
{
int ret = 0;
unsigned long flags;
struct device_domain_info *info;

spin_lock_irqsave(&device_domain_lock, flags);
list_for_each_entry(info, &device_domain_list, global) {
ret = fn(info, data);
if (ret) {
spin_unlock_irqrestore(&device_domain_lock, flags);
return ret;
}
}
spin_unlock_irqrestore(&device_domain_lock, flags);

return 0;
}

const struct iommu_ops intel_iommu_ops;

static bool translation_pre_enabled(struct intel_iommu *iommu)
Expand Down
69 changes: 3 additions & 66 deletions drivers/iommu/intel/pasid.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,54 +86,6 @@ void vcmd_free_pasid(struct intel_iommu *iommu, u32 pasid)
/*
* Per device pasid table management:
*/
static inline void
device_attach_pasid_table(struct device_domain_info *info,
struct pasid_table *pasid_table)
{
info->pasid_table = pasid_table;
list_add(&info->table, &pasid_table->dev);
}

static inline void
device_detach_pasid_table(struct device_domain_info *info,
struct pasid_table *pasid_table)
{
info->pasid_table = NULL;
list_del(&info->table);
}

struct pasid_table_opaque {
struct pasid_table **pasid_table;
int segment;
int bus;
int devfn;
};

static int search_pasid_table(struct device_domain_info *info, void *opaque)
{
struct pasid_table_opaque *data = opaque;

if (info->iommu->segment == data->segment &&
info->bus == data->bus &&
info->devfn == data->devfn &&
info->pasid_table) {
*data->pasid_table = info->pasid_table;
return 1;
}

return 0;
}

static int get_alias_pasid_table(struct pci_dev *pdev, u16 alias, void *opaque)
{
struct pasid_table_opaque *data = opaque;

data->segment = pci_domain_nr(pdev->bus);
data->bus = PCI_BUS_NUM(alias);
data->devfn = alias & 0xff;

return for_each_device_domain(&search_pasid_table, data);
}

/*
* Allocate a pasid table for @dev. It should be called in a
Expand All @@ -143,28 +95,18 @@ int intel_pasid_alloc_table(struct device *dev)
{
struct device_domain_info *info;
struct pasid_table *pasid_table;
struct pasid_table_opaque data;
struct page *pages;
u32 max_pasid = 0;
int ret, order;
int size;
int order, size;

might_sleep();
info = dev_iommu_priv_get(dev);
if (WARN_ON(!info || !dev_is_pci(dev) || info->pasid_table))
return -EINVAL;

/* DMA alias device already has a pasid table, use it: */
data.pasid_table = &pasid_table;
ret = pci_for_each_dma_alias(to_pci_dev(dev),
&get_alias_pasid_table, &data);
if (ret)
goto attach_out;

pasid_table = kzalloc(sizeof(*pasid_table), GFP_KERNEL);
if (!pasid_table)
return -ENOMEM;
INIT_LIST_HEAD(&pasid_table->dev);

if (info->pasid_supported)
max_pasid = min_t(u32, pci_max_pasids(to_pci_dev(dev)),
Expand All @@ -182,9 +124,7 @@ int intel_pasid_alloc_table(struct device *dev)
pasid_table->table = page_address(pages);
pasid_table->order = order;
pasid_table->max_pasid = 1 << (order + PAGE_SHIFT + 3);

attach_out:
device_attach_pasid_table(info, pasid_table);
info->pasid_table = pasid_table;

return 0;
}
Expand All @@ -202,10 +142,7 @@ void intel_pasid_free_table(struct device *dev)
return;

pasid_table = info->pasid_table;
device_detach_pasid_table(info, pasid_table);

if (!list_empty(&pasid_table->dev))
return;
info->pasid_table = NULL;

/* Free scalable mode PASID directory tables: */
dir = pasid_table->table;
Expand Down
1 change: 0 additions & 1 deletion drivers/iommu/intel/pasid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ struct pasid_table {
void *table; /* pasid table pointer */
int order; /* page order of pasid table */
u32 max_pasid; /* max pasid */
struct list_head dev; /* device list */
};

/* Get PRESENT bit of a PASID directory entry. */
Expand Down
3 changes: 0 additions & 3 deletions include/linux/intel-iommu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,6 @@ struct intel_iommu {
struct device_domain_info {
struct list_head link; /* link to domain siblings */
struct list_head global; /* link to global list */
struct list_head table; /* link to pasid table */
u32 segment; /* PCI segment number */
u8 bus; /* PCI bus number */
u8 devfn; /* PCI devfn number */
Expand Down Expand Up @@ -729,8 +728,6 @@ extern int dmar_ir_support(void);
void *alloc_pgtable_page(int node);
void free_pgtable_page(void *vaddr);
struct intel_iommu *domain_get_iommu(struct dmar_domain *domain);
int for_each_device_domain(int (*fn)(struct device_domain_info *info,
void *data), void *data);
void iommu_flush_write_buffer(struct intel_iommu *iommu);
int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct device *dev);
struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn);
Expand Down

0 comments on commit f5645ed

Please sign in to comment.