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

Commit 9a2e4a01 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Greg Kroah-Hartman
Browse files

vfio/spapr: Use IOMMU pageshift rather than pagesize 



commit 1463edca6734d42ab4406fa2896e20b45478ea36 upstream.

The size is always equal to 1 page so let's use this. Later on this will
be used for other checks which use page shifts to check the granularity
of access.

This should cause no behavioral change.

Cc: stable@vger.kernel.org # v4.12+
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5b8eae5

drivers/vfio/vfio_iommu_spapr_tce.c

+4 −4
Original line number Diff line number Diff line
@@ -457,13 +457,13 @@ static void tce_iommu_unuse_page(struct tce_container *container, 
}



static int tce_iommu_prereg_ua_to_hpa(struct tce_container *container,

		unsigned long tce, unsigned long size,

		unsigned long tce, unsigned long shift,

		unsigned long *phpa, struct mm_iommu_table_group_mem_t **pmem)

{

	long ret = 0;

	struct mm_iommu_table_group_mem_t *mem;



	mem = mm_iommu_lookup(container->mm, tce, size);

	mem = mm_iommu_lookup(container->mm, tce, 1ULL << shift);

	if (!mem)

		return -EINVAL;
@@ -487,7 +487,7 @@ static void tce_iommu_unuse_page_v2(struct tce_container *container, 
	if (!pua)

		return;



	ret = tce_iommu_prereg_ua_to_hpa(container, *pua, IOMMU_PAGE_SIZE(tbl),

	ret = tce_iommu_prereg_ua_to_hpa(container, *pua, tbl->it_page_shift,

			&hpa, &mem);

	if (ret)

		pr_debug("%s: tce %lx at #%lx was not cached, ret=%d\n",
@@ -609,7 +609,7 @@ static long tce_iommu_build_v2(struct tce_container *container, 
				entry + i);



		ret = tce_iommu_prereg_ua_to_hpa(container,

				tce, IOMMU_PAGE_SIZE(tbl), &hpa, &mem);

				tce, tbl->it_page_shift, &hpa, &mem);

		if (ret)

			break;