niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

iommu: Validate that devices match domains

Browse source 
Before we can allow drivers to coexist, we need to make sure that one
driver's domain ops can't misinterpret another driver's dev_iommu_priv
data. To that end, add a token to the domain so we can remember how it
was allocated - for now this may as well be the device ops, since they
still correlate 1:1 with drivers. We can trust ourselves for internal
default domain attachment, so add checks to cover all the public attach
interfaces.

Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/097c6f30480e4efe12195d00ba0e84ea4837fb4c.1700589539.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Robin Murphy 2023-11-21 18:03:59 +00:00 • committed by Joerg Roedel
parent 1d8d43bb98
commit a9c362db39
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/iommu/iommu.c
View file

@ -2117,6 +2117,7 @@ static struct iommu_domain *__iommu_domain_alloc(const struct iommu_ops *ops,
return NULL; return NULL;
domain->type = type; domain->type = type;
domain->owner = ops;
/* /*
* If not already set, assume all sizes by default; the driver * If not already set, assume all sizes by default; the driver
* may override this later * may override this later
@ -2282,10 +2283,16 @@ struct iommu_domain *iommu_get_dma_domain(struct device *dev)
static int __iommu_attach_group(struct iommu_domain *domain, static int __iommu_attach_group(struct iommu_domain *domain,
struct iommu_group *group) struct iommu_group *group)
{ {
struct device *dev;
if (group->domain && group->domain != group->default_domain && if (group->domain && group->domain != group->default_domain &&
group->domain != group->blocking_domain) group->domain != group->blocking_domain)
return -EBUSY; return -EBUSY;
dev = iommu_group_first_dev(group);
if (!dev_has_iommu(dev) || dev_iommu_ops(dev) != domain->owner)
return -EINVAL;
return __iommu_group_set_domain(group, domain); return __iommu_group_set_domain(group, domain);
} }
@ -3477,6 +3484,9 @@ int iommu_attach_device_pasid(struct iommu_domain *domain,
if (!group) if (!group)
return -ENODEV; return -ENODEV;
if (!dev_has_iommu(dev) || dev_iommu_ops(dev) != domain->owner)
return -EINVAL;
mutex_lock(&group->mutex); mutex_lock(&group->mutex);
curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain, GFP_KERNEL); curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain, GFP_KERNEL);
if (curr) { if (curr) {

2
drivers/iommu/iommufd/hw_pagetable.c
View file

@ -135,6 +135,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
hwpt->domain = NULL; hwpt->domain = NULL;
goto out_abort; goto out_abort;
} }
hwpt->domain->owner = ops;
} else { } else {
hwpt->domain = iommu_domain_alloc(idev->dev->bus); hwpt->domain = iommu_domain_alloc(idev->dev->bus);
if (!hwpt->domain) { if (!hwpt->domain) {
@ -233,6 +234,7 @@ iommufd_hwpt_nested_alloc(struct iommufd_ctx *ictx,
hwpt->domain = NULL; hwpt->domain = NULL;
goto out_abort; goto out_abort;
} }
hwpt->domain->owner = ops;
if (WARN_ON_ONCE(hwpt->domain->type != IOMMU_DOMAIN_NESTED)) { if (WARN_ON_ONCE(hwpt->domain->type != IOMMU_DOMAIN_NESTED)) {
rc = -EINVAL; rc = -EINVAL;

2
include/linux/iommu.h
View file

@ -106,7 +106,7 @@ struct iommu_domain {
unsigned type; unsigned type;
const struct iommu_domain_ops *ops; const struct iommu_domain_ops *ops;
const struct iommu_dirty_ops *dirty_ops; const struct iommu_dirty_ops *dirty_ops;
const struct iommu_ops *owner; /* Whose domain_alloc we came from */
unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */ unsigned long pgsize_bitmap; /* Bitmap of page sizes in use */
struct iommu_domain_geometry geometry; struct iommu_domain_geometry geometry;
struct iommu_dma_cookie *iova_cookie; struct iommu_dma_cookie *iova_cookie;