Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00663d4e authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Michael Ellerman
Browse files

vfio: powerpc/spapr: Use it_page_size 



This makes use of the it_page_size from the iommu_table struct
as page size can differ.

This replaces missing IOMMU_PAGE_SHIFT macro in commented debug code
as recently introduced IOMMU_PAGE_XXX macros do not include
IOMMU_PAGE_SHIFT.

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
[aw: for the vfio related changes]
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Reviewed-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e432bc7e

drivers/vfio/vfio_iommu_spapr_tce.c

+13 −13
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int tce_iommu_enable(struct tce_container *container) 
	 * enforcing the limit based on the max that the guest can map.

	 */

	down_write(&current->mm->mmap_sem);

	npages = (tbl->it_size << IOMMU_PAGE_SHIFT_4K) >> PAGE_SHIFT;

	npages = (tbl->it_size << tbl->it_page_shift) >> PAGE_SHIFT;

	locked = current->mm->locked_vm + npages;

	lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;

	if (locked > lock_limit && !capable(CAP_IPC_LOCK)) {
@@ -120,7 +120,7 @@ static void tce_iommu_disable(struct tce_container *container) 


	down_write(&current->mm->mmap_sem);

	current->mm->locked_vm -= (container->tbl->it_size <<

			IOMMU_PAGE_SHIFT_4K) >> PAGE_SHIFT;

			container->tbl->it_page_shift) >> PAGE_SHIFT;

	up_write(&current->mm->mmap_sem);

}
@@ -215,7 +215,7 @@ static long tce_iommu_build(struct tce_container *container, 
					tce, ret);

			break;

		}

		tce += IOMMU_PAGE_SIZE_4K;

		tce += IOMMU_PAGE_SIZE(tbl);

	}



	if (ret)
@@ -260,8 +260,8 @@ static long tce_iommu_ioctl(void *iommu_data, 
		if (info.argsz < minsz)

			return -EINVAL;



		info.dma32_window_start = tbl->it_offset << IOMMU_PAGE_SHIFT_4K;

		info.dma32_window_size = tbl->it_size << IOMMU_PAGE_SHIFT_4K;

		info.dma32_window_start = tbl->it_offset << tbl->it_page_shift;

		info.dma32_window_size = tbl->it_size << tbl->it_page_shift;

		info.flags = 0;



		if (copy_to_user((void __user *)arg, &info, minsz))
@@ -291,8 +291,8 @@ static long tce_iommu_ioctl(void *iommu_data, 
				VFIO_DMA_MAP_FLAG_WRITE))

			return -EINVAL;



		if ((param.size & ~IOMMU_PAGE_MASK_4K) ||

				(param.vaddr & ~IOMMU_PAGE_MASK_4K))

		if ((param.size & ~IOMMU_PAGE_MASK(tbl)) ||

				(param.vaddr & ~IOMMU_PAGE_MASK(tbl)))

			return -EINVAL;



		/* iova is checked by the IOMMU API */
@@ -307,8 +307,8 @@ static long tce_iommu_ioctl(void *iommu_data, 
			return ret;



		ret = tce_iommu_build(container, tbl,

				param.iova >> IOMMU_PAGE_SHIFT_4K,

				tce, param.size >> IOMMU_PAGE_SHIFT_4K);

				param.iova >> tbl->it_page_shift,

				tce, param.size >> tbl->it_page_shift);



		iommu_flush_tce(tbl);
@@ -334,17 +334,17 @@ static long tce_iommu_ioctl(void *iommu_data, 
		if (param.flags)

			return -EINVAL;



		if (param.size & ~IOMMU_PAGE_MASK_4K)

		if (param.size & ~IOMMU_PAGE_MASK(tbl))

			return -EINVAL;



		ret = iommu_tce_clear_param_check(tbl, param.iova, 0,

				param.size >> IOMMU_PAGE_SHIFT_4K);

				param.size >> tbl->it_page_shift);

		if (ret)

			return ret;



		ret = tce_iommu_clear(container, tbl,

				param.iova >> IOMMU_PAGE_SHIFT_4K,

				param.size >> IOMMU_PAGE_SHIFT_4K);

				param.iova >> tbl->it_page_shift,

				param.size >> tbl->it_page_shift);

		iommu_flush_tce(tbl);



		return ret;