When user requests kernel to change the default domain type of a group through sysfs, kernel has to make sure if it's ok to change the domain type of every device in the group to the requested domain (every device may not support both the domain types i.e. DMA and identity). Hence, add a call back function that could be implemented per architecture that performs the above check.
For intel_iommu, this is already done by device_def_domain_type(), but every call back function in intel_iommu_ops starts with intel_iommu prefix, hence modify device_def_domain_type() so that it follows the same semantics. Cc: Christoph Hellwig <[email protected]> Cc: Joerg Roedel <[email protected]> Cc: Ashok Raj <[email protected]> Cc: Will Deacon <[email protected]> Cc: Lu Baolu <[email protected]> Cc: Sohil Mehta <[email protected]> Cc: Robin Murphy <[email protected]> Cc: Jacob Pan <[email protected]> Signed-off-by: Sai Praneeth Prakhya <[email protected]> --- drivers/iommu/intel-iommu.c | 9 ++++++--- include/linux/iommu.h | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 54e82415e396..0c991eb5034a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2874,7 +2874,7 @@ static bool device_is_rmrr_locked(struct device *dev) * - IOMMU_DOMAIN_IDENTITY: device requires an identical mapping domain * - 0: both identity and dynamic domains work for this device */ -static int device_def_domain_type(struct device *dev, bool startup) +static int intel_iommu_device_def_domain_type(struct device *dev, bool startup) { if (dev_is_pci(dev)) { struct pci_dev *pdev = to_pci_dev(dev); @@ -5286,7 +5286,8 @@ static int intel_iommu_add_device(struct device *dev) domain = iommu_get_domain_for_dev(dev); dmar_domain = to_dmar_domain(domain); if (domain->type == IOMMU_DOMAIN_DMA) { - if (device_def_domain_type(dev, true) == IOMMU_DOMAIN_IDENTITY) { + if (intel_iommu_device_def_domain_type(dev, true) == + IOMMU_DOMAIN_IDENTITY) { ret = iommu_request_dm_for_dev(dev); if (ret) { dmar_domain->flags |= DOMAIN_FLAG_LOSE_CHILDREN; @@ -5296,7 +5297,8 @@ static int intel_iommu_add_device(struct device *dev) } } } else { - if (device_def_domain_type(dev, true) == IOMMU_DOMAIN_DMA) { + if (intel_iommu_device_def_domain_type(dev, true) == + IOMMU_DOMAIN_DMA) { ret = iommu_request_dma_domain_for_dev(dev); if (ret) { dmar_domain->flags |= DOMAIN_FLAG_LOSE_CHILDREN; @@ -5637,6 +5639,7 @@ const struct iommu_ops intel_iommu_ops = { .dev_enable_feat = intel_iommu_dev_enable_feat, .dev_disable_feat = intel_iommu_dev_disable_feat, .is_attach_deferred = intel_iommu_is_attach_deferred, + .device_def_domain_type = intel_iommu_device_def_domain_type, .pgsize_bitmap = INTEL_IOMMU_PGSIZES, }; diff --git a/include/linux/iommu.h b/include/linux/iommu.h index fdc355ccc570..2d172c02be05 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -228,6 +228,7 @@ struct iommu_sva_ops { * @sva_unbind: Unbind process address space from device * @sva_get_pasid: Get PASID associated to a SVA handle * @page_response: handle page request response + * @device_def_domain_type: Return the required default domain type for a device * @pgsize_bitmap: bitmap of all possible supported page sizes */ struct iommu_ops { @@ -292,6 +293,8 @@ struct iommu_ops { struct iommu_fault_event *evt, struct iommu_page_response *msg); + int (*device_def_domain_type)(struct device *dev, bool startup); + unsigned long pgsize_bitmap; }; -- 2.19.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
