Commit 62558685 authored by Vasant Hegde's avatar Vasant Hegde Committed by Joerg Roedel
Browse files

iommu/amd: Consolidate protection domain free code 



Consolidate protection domain free code inside amd_iommu_domain_free()
and remove protection_domain_free() function.

Signed-off-by: default avatarVasant Hegde <vasant.hegde@amd.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20250227162320.5805-8-vasant.hegde@amd.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 5536e19e

drivers/iommu/amd/amd_iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ extern unsigned long amd_iommu_pgsize_bitmap; 
/* Protection domain ops */

void amd_iommu_init_identity_domain(void);

struct protection_domain *protection_domain_alloc(void);

void protection_domain_free(struct protection_domain *domain);

struct iommu_domain *amd_iommu_domain_alloc_sva(struct device *dev,

						struct mm_struct *mm);

void amd_iommu_domain_free(struct iommu_domain *dom);

drivers/iommu/amd/iommu.c

+5 −10
Original line number Diff line number Diff line
@@ -2434,15 +2434,6 @@ static struct iommu_group *amd_iommu_device_group(struct device *dev) 
 *

 *****************************************************************************/



void protection_domain_free(struct protection_domain *domain)

{

	WARN_ON(!list_empty(&domain->dev_list));

	if (domain->domain.type & __IOMMU_DOMAIN_PAGING)

		free_io_pgtable_ops(&domain->iop.pgtbl.ops);

	pdom_id_free(domain->id);

	kfree(domain);

}



static void protection_domain_init(struct protection_domain *domain)

{

	spin_lock_init(&domain->lock);
@@ -2580,7 +2571,11 @@ void amd_iommu_domain_free(struct iommu_domain *dom) 
{

	struct protection_domain *domain = to_pdomain(dom);



	protection_domain_free(domain);

	WARN_ON(!list_empty(&domain->dev_list));

	if (domain->domain.type & __IOMMU_DOMAIN_PAGING)

		free_io_pgtable_ops(&domain->iop.pgtbl.ops);

	pdom_id_free(domain->id);

	kfree(domain);

}



static int blocked_domain_attach_device(struct iommu_domain *domain,

drivers/iommu/amd/pasid.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ struct iommu_domain *amd_iommu_domain_alloc_sva(struct device *dev, 


	ret = mmu_notifier_register(&pdom->mn, mm);

	if (ret) {

		protection_domain_free(pdom);

		amd_iommu_domain_free(&pdom->domain);

		return ERR_PTR(ret);

	}