Commit 44abdd16 authored by Nicolin Chen's avatar Nicolin Chen Committed by Alex Williamson
Browse files

vfio: Pass in starting IOVA to vfio_pin/unpin_pages API 



The vfio_pin/unpin_pages() so far accepted arrays of PFNs of user IOVA.
Among all three callers, there was only one caller possibly passing in
a non-contiguous PFN list, which is now ensured to have contiguous PFN
inputs too.

Pass in the starting address with "iova" alone to simplify things, so
callers no longer need to maintain a PFN list or to pin/unpin one page
at a time. This also allows VFIO to use more efficient implementations
of pin/unpin_pages.

For now, also update vfio_iommu_type1 to fit this new parameter too,
while keeping its input intact (being user_iova) since we don't want
to spend too much effort swapping its parameters and local variables
at that level.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKirti Wankhede <kwankhede@nvidia.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarTony Krowiak <akrowiak@linux.ibm.com>
Acked-by: default avatarEric Farman <farman@linux.ibm.com>
Tested-by: default avatarTerrence Xu <terrence.xu@intel.com>
Tested-by: default avatarEric Farman <farman@linux.ibm.com>
Signed-off-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Link: https://lore.kernel.org/r/20220723020256.30081-6-nicolinc@nvidia.com


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

Documentation/driver-api/vfio-mediated-device.rst

+2 −2
Original line number Diff line number Diff line
@@ -262,10 +262,10 @@ Translation APIs for Mediated Devices 
The following APIs are provided for translating user pfn to host pfn in a VFIO

driver::



	int vfio_pin_pages(struct vfio_device *device, unsigned long *user_pfn,

	int vfio_pin_pages(struct vfio_device *device, dma_addr_t iova,

				  int npage, int prot, unsigned long *phys_pfn);



	void vfio_unpin_pages(struct vfio_device *device, unsigned long *user_pfn,

	void vfio_unpin_pages(struct vfio_device *device, dma_addr_t iova,

				    int npage);



These functions call back into the back-end IOMMU module by using the pin_pages

drivers/gpu/drm/i915/gvt/kvmgt.c

+6 −12
Original line number Diff line number Diff line
@@ -231,14 +231,8 @@ static void intel_gvt_cleanup_vgpu_type_groups(struct intel_gvt *gvt) 
static void gvt_unpin_guest_page(struct intel_vgpu *vgpu, unsigned long gfn,

		unsigned long size)

{

	int total_pages = DIV_ROUND_UP(size, PAGE_SIZE);

	int npage;



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

		unsigned long cur_gfn = gfn + npage;



		vfio_unpin_pages(&vgpu->vfio_device, &cur_gfn, 1);

	}

	vfio_unpin_pages(&vgpu->vfio_device, gfn << PAGE_SHIFT,

			 DIV_ROUND_UP(size, PAGE_SIZE));

}



/* Pin a normal or compound guest page for dma. */
@@ -255,14 +249,14 @@ static int gvt_pin_guest_page(struct intel_vgpu *vgpu, unsigned long gfn, 
	 * on stack to hold pfns.

	 */

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

		unsigned long cur_gfn = gfn + npage;

		dma_addr_t cur_iova = (gfn + npage) << PAGE_SHIFT;

		unsigned long pfn;



		ret = vfio_pin_pages(&vgpu->vfio_device, &cur_gfn, 1,

		ret = vfio_pin_pages(&vgpu->vfio_device, cur_iova, 1,

				     IOMMU_READ | IOMMU_WRITE, &pfn);

		if (ret != 1) {

			gvt_vgpu_err("vfio_pin_pages failed for gfn 0x%lx, ret %d\n",

				     cur_gfn, ret);

			gvt_vgpu_err("vfio_pin_pages failed for iova %pad, ret %d\n",

				     &cur_iova, ret);

			goto err;

		}

drivers/s390/cio/vfio_ccw_cp.c

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static void pfn_array_unpin(struct pfn_array *pa, 
			continue;

		}



		vfio_unpin_pages(vdev, first, npage);

		vfio_unpin_pages(vdev, *first << PAGE_SHIFT, npage);

		unpinned += npage;

		npage = 1;

	}
@@ -146,7 +146,7 @@ static int pfn_array_pin(struct pfn_array *pa, struct vfio_device *vdev) 
			continue;

		}



		ret = vfio_pin_pages(vdev, first, npage,

		ret = vfio_pin_pages(vdev, *first << PAGE_SHIFT, npage,

				     IOMMU_READ | IOMMU_WRITE,

				     &pa->pa_pfn[pinned]);

		if (ret < 0) {

drivers/s390/crypto/vfio_ap_ops.c

+4 −5
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void vfio_ap_free_aqic_resources(struct vfio_ap_queue *q) 
		q->saved_isc = VFIO_AP_ISC_INVALID;

	}

	if (q->saved_pfn && !WARN_ON(!q->matrix_mdev)) {

		vfio_unpin_pages(&q->matrix_mdev->vdev, &q->saved_pfn, 1);

		vfio_unpin_pages(&q->matrix_mdev->vdev, q->saved_pfn << PAGE_SHIFT, 1);

		q->saved_pfn = 0;

	}

}
@@ -258,7 +258,7 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q, 
		return status;

	}



	ret = vfio_pin_pages(&q->matrix_mdev->vdev, &g_pfn, 1,

	ret = vfio_pin_pages(&q->matrix_mdev->vdev, g_pfn << PAGE_SHIFT, 1,

			     IOMMU_READ | IOMMU_WRITE, &h_pfn);

	switch (ret) {

	case 1:
@@ -301,7 +301,7 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q, 
		break;

	case AP_RESPONSE_OTHERWISE_CHANGED:

		/* We could not modify IRQ setings: clear new configuration */

		vfio_unpin_pages(&q->matrix_mdev->vdev, &g_pfn, 1);

		vfio_unpin_pages(&q->matrix_mdev->vdev, g_pfn << PAGE_SHIFT, 1);

		kvm_s390_gisc_unregister(kvm, isc);

		break;

	default:
@@ -1232,9 +1232,8 @@ static void vfio_ap_mdev_dma_unmap(struct vfio_device *vdev, u64 iova, 
{

	struct ap_matrix_mdev *matrix_mdev =

		container_of(vdev, struct ap_matrix_mdev, vdev);

	unsigned long g_pfn = iova >> PAGE_SHIFT;



	vfio_unpin_pages(&matrix_mdev->vdev, &g_pfn, 1);

	vfio_unpin_pages(&matrix_mdev->vdev, iova, 1);

}



/**

drivers/vfio/vfio.c

+12 −15
Original line number Diff line number Diff line
@@ -1934,17 +1934,17 @@ int vfio_set_irqs_validate_and_prepare(struct vfio_irq_set *hdr, int num_irqs, 
EXPORT_SYMBOL(vfio_set_irqs_validate_and_prepare);



/*

 * Pin a set of guest PFNs and return their associated host PFNs for local

 * Pin contiguous user pages and return their associated host pages for local

 * domain only.

 * @device [in]  : device

 * @user_pfn [in]: array of user/guest PFNs to be pinned.

 * @npage [in]   : count of elements in user_pfn array.  This count should not

 *		   be greater VFIO_PIN_PAGES_MAX_ENTRIES.

 * @iova [in]    : starting IOVA of user pages to be pinned.

 * @npage [in]   : count of pages to be pinned.  This count should not

 *		   be greater than VFIO_PIN_PAGES_MAX_ENTRIES.

 * @prot [in]    : protection flags

 * @phys_pfn[out]: array of host PFNs

 * Return error or number of pages pinned.

 */

int vfio_pin_pages(struct vfio_device *device, unsigned long *user_pfn,

int vfio_pin_pages(struct vfio_device *device, dma_addr_t iova,

		   int npage, int prot, unsigned long *phys_pfn)

{

	struct vfio_container *container;
@@ -1952,8 +1952,7 @@ int vfio_pin_pages(struct vfio_device *device, unsigned long *user_pfn, 
	struct vfio_iommu_driver *driver;

	int ret;



	if (!user_pfn || !phys_pfn || !npage ||

	    !vfio_assert_device_open(device))

	if (!phys_pfn || !npage || !vfio_assert_device_open(device))

		return -EINVAL;



	if (npage > VFIO_PIN_PAGES_MAX_ENTRIES)
@@ -1967,7 +1966,7 @@ int vfio_pin_pages(struct vfio_device *device, unsigned long *user_pfn, 
	driver = container->iommu_driver;

	if (likely(driver && driver->ops->pin_pages))

		ret = driver->ops->pin_pages(container->iommu_data,

					     group->iommu_group, user_pfn,

					     group->iommu_group, iova,

					     npage, prot, phys_pfn);

	else

		ret = -ENOTTY;
@@ -1977,15 +1976,13 @@ int vfio_pin_pages(struct vfio_device *device, unsigned long *user_pfn, 
EXPORT_SYMBOL(vfio_pin_pages);



/*

 * Unpin set of host PFNs for local domain only.

 * Unpin contiguous host pages for local domain only.

 * @device [in]  : device

 * @user_pfn [in]: array of user/guest PFNs to be unpinned. Number of user/guest

 *		   PFNs should not be greater than VFIO_PIN_PAGES_MAX_ENTRIES.

 * @npage [in]   : count of elements in user_pfn array.  This count should not

 * @iova [in]    : starting address of user pages to be unpinned.

 * @npage [in]   : count of pages to be unpinned.  This count should not

 *                 be greater than VFIO_PIN_PAGES_MAX_ENTRIES.

 */

void vfio_unpin_pages(struct vfio_device *device, unsigned long *user_pfn,

		      int npage)

void vfio_unpin_pages(struct vfio_device *device, dma_addr_t iova, int npage)

{

	struct vfio_container *container;

	struct vfio_iommu_driver *driver;
@@ -2000,7 +1997,7 @@ void vfio_unpin_pages(struct vfio_device *device, unsigned long *user_pfn, 
	container = device->group->container;

	driver = container->iommu_driver;



	driver->ops->unpin_pages(container->iommu_data, user_pfn, npage);

	driver->ops->unpin_pages(container->iommu_data, iova, npage);

}

EXPORT_SYMBOL(vfio_unpin_pages);