Commit 3f901389 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Williamson
Browse files

vfio/iommu_type1: remove IS_IOMMU_CAP_DOMAIN_IN_CONTAINER 



IS_IOMMU_CAP_DOMAIN_IN_CONTAINER just obsfucated the checks being
performed, so open code it in the callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20210924155705.4258-16-hch@lst.de


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 296e505b

drivers/vfio/vfio_iommu_type1.c

+5 −8
Original line number Diff line number Diff line
@@ -139,9 +139,6 @@ struct vfio_regions { 
	size_t len;

};



#define IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu)	\

					(!list_empty(&iommu->domain_list))



#define DIRTY_BITMAP_BYTES(n)	(ALIGN(n, BITS_PER_TYPE(u64)) / BITS_PER_BYTE)



/*
@@ -879,7 +876,7 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data, 
	 * already pinned and accounted. Accounting should be done if there is no

	 * iommu capable domain in the container.

	 */

	do_accounting = !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu);

	do_accounting = list_empty(&iommu->domain_list);



	for (i = 0; i < npage; i++) {

		struct vfio_pfn *vpfn;
@@ -968,7 +965,7 @@ static int vfio_iommu_type1_unpin_pages(void *iommu_data, 


	mutex_lock(&iommu->lock);



	do_accounting = !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu);

	do_accounting = list_empty(&iommu->domain_list);

	for (i = 0; i < npage; i++) {

		struct vfio_dma *dma;

		dma_addr_t iova;
@@ -1089,7 +1086,7 @@ static long vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma, 
	if (!dma->size)

		return 0;



	if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu))

	if (list_empty(&iommu->domain_list))

		return 0;



	/*
@@ -1666,7 +1663,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu, 
	vfio_link_dma(iommu, dma);



	/* Don't pin and map if container doesn't contain IOMMU capable domain*/

	if (!IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu))

	if (list_empty(&iommu->domain_list))

		dma->size = size;

	else

		ret = vfio_pin_map_dma(iommu, dma, size);
@@ -2472,7 +2469,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data, 
		kfree(group);



		if (list_empty(&iommu->emulated_iommu_groups) &&

		    !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu)) {

		    list_empty(&iommu->domain_list)) {

			WARN_ON(iommu->notifier.head);

			vfio_iommu_unmap_unpin_all(iommu);

		}