iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/arm-smmu-v3: Make SVA allocate a normal arm_smmu_domain

Browse Source 
Currently the SVA domain is a naked struct iommu_domain, allocate a struct
arm_smmu_domain instead.

This is necessary to be able to use the struct arm_master_domain
mechanism.

Tested-by: Nicolin Chen <nicolinc@nvidia.com>
Tested-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Michael Shavit <mshavit@google.com>
Reviewed-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/8-v9-5cd718286059+79186-smmuv3_newapi_p2b_jgg@nvidia.com
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Jason Gunthorpe 2024-06-25 09:37:39 -03:00 committed by Will Deacon
parent 1d5f34f000
commit d7b2d2ba1b
3 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
View File

@ -639,7 +639,7 @@ static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain,
} }
arm_smmu_make_sva_cd(&target, master, mm, bond->smmu_mn->cd->asid); arm_smmu_make_sva_cd(&target, master, mm, bond->smmu_mn->cd->asid);
ret = arm_smmu_set_pasid(master, NULL, id, &target); ret = arm_smmu_set_pasid(master, to_smmu_domain(domain), id, &target);
if (ret) { if (ret) {
list_del(&bond->list); list_del(&bond->list);
arm_smmu_mmu_notifier_put(bond->smmu_mn); arm_smmu_mmu_notifier_put(bond->smmu_mn);
@ -653,7 +653,7 @@ static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain,
static void arm_smmu_sva_domain_free(struct iommu_domain *domain) static void arm_smmu_sva_domain_free(struct iommu_domain *domain)
{ {
kfree(domain); kfree(to_smmu_domain(domain));
} }
static const struct iommu_domain_ops arm_smmu_sva_domain_ops = { static const struct iommu_domain_ops arm_smmu_sva_domain_ops = {
@ -664,13 +664,16 @@ static const struct iommu_domain_ops arm_smmu_sva_domain_ops = {
struct iommu_domain *arm_smmu_sva_domain_alloc(struct device *dev, struct iommu_domain *arm_smmu_sva_domain_alloc(struct device *dev,
struct mm_struct *mm) struct mm_struct *mm)
{ {
struct iommu_domain *domain; struct arm_smmu_master *master = dev_iommu_priv_get(dev);
struct arm_smmu_device *smmu = master->smmu;
struct arm_smmu_domain *smmu_domain;
domain = kzalloc(sizeof(*domain), GFP_KERNEL); smmu_domain = arm_smmu_domain_alloc();
if (!domain) if (IS_ERR(smmu_domain))
return ERR_PTR(-ENOMEM); return ERR_CAST(smmu_domain);
domain->type = IOMMU_DOMAIN_SVA; smmu_domain->domain.type = IOMMU_DOMAIN_SVA;
domain->ops = &arm_smmu_sva_domain_ops; smmu_domain->domain.ops = &arm_smmu_sva_domain_ops;
smmu_domain->smmu = smmu;
return domain; return &smmu_domain->domain;
} }

31
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
View File

@ -2272,6 +2272,22 @@ static bool arm_smmu_capable(struct device *dev, enum iommu_cap cap)
} }
} }
struct arm_smmu_domain *arm_smmu_domain_alloc(void)
{
struct arm_smmu_domain *smmu_domain;
smmu_domain = kzalloc(sizeof(*smmu_domain), GFP_KERNEL);
if (!smmu_domain)
return ERR_PTR(-ENOMEM);
mutex_init(&smmu_domain->init_mutex);
INIT_LIST_HEAD(&smmu_domain->devices);
spin_lock_init(&smmu_domain->devices_lock);
INIT_LIST_HEAD(&smmu_domain->mmu_notifiers);
return smmu_domain;
}
static struct iommu_domain *arm_smmu_domain_alloc_paging(struct device *dev) static struct iommu_domain *arm_smmu_domain_alloc_paging(struct device *dev)
{ {
struct arm_smmu_domain *smmu_domain; struct arm_smmu_domain *smmu_domain;
@ -2281,14 +2297,9 @@ static struct iommu_domain *arm_smmu_domain_alloc_paging(struct device *dev)
* We can't really do anything meaningful until we've added a * We can't really do anything meaningful until we've added a
* master. * master.
*/ */
smmu_domain = kzalloc(sizeof(*smmu_domain), GFP_KERNEL); smmu_domain = arm_smmu_domain_alloc();
if (!smmu_domain) if (IS_ERR(smmu_domain))
return ERR_PTR(-ENOMEM); return ERR_CAST(smmu_domain);
mutex_init(&smmu_domain->init_mutex);
INIT_LIST_HEAD(&smmu_domain->devices);
spin_lock_init(&smmu_domain->devices_lock);
INIT_LIST_HEAD(&smmu_domain->mmu_notifiers);
if (dev) { if (dev) {
struct arm_smmu_master *master = dev_iommu_priv_get(dev); struct arm_smmu_master *master = dev_iommu_priv_get(dev);
@ -2303,7 +2314,7 @@ static struct iommu_domain *arm_smmu_domain_alloc_paging(struct device *dev)
return &smmu_domain->domain; return &smmu_domain->domain;
} }
static void arm_smmu_domain_free(struct iommu_domain *domain) static void arm_smmu_domain_free_paging(struct iommu_domain *domain)
{ {
struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
struct arm_smmu_device *smmu = smmu_domain->smmu; struct arm_smmu_device *smmu = smmu_domain->smmu;
@ -3305,7 +3316,7 @@ static struct iommu_ops arm_smmu_ops = {
.iotlb_sync = arm_smmu_iotlb_sync, .iotlb_sync = arm_smmu_iotlb_sync,
.iova_to_phys = arm_smmu_iova_to_phys, .iova_to_phys = arm_smmu_iova_to_phys,
.enable_nesting = arm_smmu_enable_nesting, .enable_nesting = arm_smmu_enable_nesting,
.free = arm_smmu_domain_free, .free = arm_smmu_domain_free_paging,
} }
}; };

2
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
View File

@ -790,6 +790,8 @@ static inline struct arm_smmu_domain *to_smmu_domain(struct iommu_domain *dom)
extern struct xarray arm_smmu_asid_xa; extern struct xarray arm_smmu_asid_xa;
extern struct mutex arm_smmu_asid_lock; extern struct mutex arm_smmu_asid_lock;
struct arm_smmu_domain *arm_smmu_domain_alloc(void);
void arm_smmu_clear_cd(struct arm_smmu_master *master, ioasid_t ssid); void arm_smmu_clear_cd(struct arm_smmu_master *master, ioasid_t ssid);
struct arm_smmu_cd *arm_smmu_get_cd_ptr(struct arm_smmu_master *master, struct arm_smmu_cd *arm_smmu_get_cd_ptr(struct arm_smmu_master *master,
u32 ssid); u32 ssid);