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/vt-d: Add nested domain allocation

Browse source 
This adds the support for IOMMU_HWPT_DATA_VTD_S1 type. And 'nested_parent'
is added to mark the nested parent domain to sanitize the input parent domain.

Link: https://lore.kernel.org/r/20231026044216.64964-8-yi.l.liu@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
This commit is contained in:
Lu Baolu 2023-10-25 21:42:15 -07:00 • committed by Jason Gunthorpe
parent 9838f2bb6b
commit b41e38e225
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/iommu/intel/iommu.c
View file

@ -4077,38 +4077,39 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags,
struct iommu_domain *parent, struct iommu_domain *parent,
const struct iommu_user_data *user_data) const struct iommu_user_data *user_data)
{ {
struct device_domain_info *info = dev_iommu_priv_get(dev);
bool dirty_tracking = flags & IOMMU_HWPT_ALLOC_DIRTY_TRACKING;
bool nested_parent = flags & IOMMU_HWPT_ALLOC_NEST_PARENT;
struct intel_iommu *iommu = info->iommu;
struct iommu_domain *domain; struct iommu_domain *domain;
struct intel_iommu *iommu;
bool dirty_tracking; /* Must be NESTING domain */
if (parent) {
if (!nested_supported(iommu) || flags)
return ERR_PTR(-EOPNOTSUPP);
return intel_nested_domain_alloc(parent, user_data);
}
if (flags & if (flags &
(~(IOMMU_HWPT_ALLOC_NEST_PARENT | IOMMU_HWPT_ALLOC_DIRTY_TRACKING))) (~(IOMMU_HWPT_ALLOC_NEST_PARENT | IOMMU_HWPT_ALLOC_DIRTY_TRACKING)))
return ERR_PTR(-EOPNOTSUPP); return ERR_PTR(-EOPNOTSUPP);
if (nested_parent && !nested_supported(iommu))
if (parent || user_data)
return ERR_PTR(-EOPNOTSUPP); return ERR_PTR(-EOPNOTSUPP);
if (user_data || (dirty_tracking && !ssads_supported(iommu)))
iommu = device_to_iommu(dev, NULL, NULL);
if (!iommu)
return ERR_PTR(-ENODEV);
if ((flags & IOMMU_HWPT_ALLOC_NEST_PARENT) && !nested_supported(iommu))
return ERR_PTR(-EOPNOTSUPP);
dirty_tracking = (flags & IOMMU_HWPT_ALLOC_DIRTY_TRACKING);
if (dirty_tracking && !ssads_supported(iommu))
return ERR_PTR(-EOPNOTSUPP); return ERR_PTR(-EOPNOTSUPP);
/* /*
* domain_alloc_user op needs to fully initialize a domain * domain_alloc_user op needs to fully initialize a domain before
* before return, so uses iommu_domain_alloc() here for * return, so uses iommu_domain_alloc() here for simple.
* simple.
*/ */
domain = iommu_domain_alloc(dev->bus); domain = iommu_domain_alloc(dev->bus);
if (!domain) if (!domain)
domain = ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (!IS_ERR(domain) && dirty_tracking) { if (nested_parent)
to_dmar_domain(domain)->nested_parent = true;
if (dirty_tracking) {
if (to_dmar_domain(domain)->use_first_level) { if (to_dmar_domain(domain)->use_first_level) {
iommu_domain_free(domain); iommu_domain_free(domain);
return ERR_PTR(-EOPNOTSUPP); return ERR_PTR(-EOPNOTSUPP);

1
drivers/iommu/intel/iommu.h
View file

@ -601,6 +601,7 @@ struct dmar_domain {
* level. * level.
*/ */
u8 dirty_tracking:1; /* Dirty tracking is enabled */ u8 dirty_tracking:1; /* Dirty tracking is enabled */
u8 nested_parent:1; /* Has other domains nested on it */
spinlock_t lock; /* Protect device tracking lists */ spinlock_t lock; /* Protect device tracking lists */
struct list_head devices; /* all devices' list */ struct list_head devices; /* all devices' list */

3
drivers/iommu/intel/nested.c
View file

@ -89,7 +89,8 @@ struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *parent,
/* Must be nested domain */ /* Must be nested domain */
if (user_data->type != IOMMU_HWPT_DATA_VTD_S1) if (user_data->type != IOMMU_HWPT_DATA_VTD_S1)
return ERR_PTR(-EOPNOTSUPP); return ERR_PTR(-EOPNOTSUPP);
if (parent->ops != intel_iommu_ops.default_domain_ops) if (parent->ops != intel_iommu_ops.default_domain_ops ||
!s2_domain->nested_parent)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
ret = iommu_copy_struct_from_user(&vtd, user_data, ret = iommu_copy_struct_from_user(&vtd, user_data,