Commit 15a49b9a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio 

Pull vfio updates from Alex Williamson:
 "Largely hugepage support for vfio/type1 iommu and surrounding cleanups
  and fixes"

* tag 'vfio-v3.11' of git://github.com/awilliam/linux-vfio:
  vfio/type1: Fix leak on error path
  vfio: Limit group opens
  vfio/type1: Fix missed frees and zero sized removes
  vfio: fix documentation
  vfio: Provide module option to disable vfio_iommu_type1 hugepage support
  vfio: hugepage support for vfio_iommu_type1
  vfio: Convert type1 iommu to use rbtree
parents 8d10aae2 8d38ef19

Documentation/vfio.txt

+3 −3
Original line number Diff line number Diff line
@@ -172,12 +172,12 @@ group and can access them as follows: 
	struct vfio_device_info device_info = { .argsz = sizeof(device_info) };



	/* Create a new container */

	container = open("/dev/vfio/vfio, O_RDWR);

	container = open("/dev/vfio/vfio", O_RDWR);



	if (ioctl(container, VFIO_GET_API_VERSION) != VFIO_API_VERSION)

		/* Unknown API version */



	if (!ioctl(container, VFIO_CHECK_EXTENSION, VFIO_X86_IOMMU))

	if (!ioctl(container, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU))

		/* Doesn't support the IOMMU driver we want. */



	/* Open the group */
@@ -193,7 +193,7 @@ group and can access them as follows: 
	ioctl(group, VFIO_GROUP_SET_CONTAINER, &container);



	/* Enable the IOMMU model we want */

	ioctl(container, VFIO_SET_IOMMU, VFIO_X86_IOMMU)

	ioctl(container, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU)



	/* Get addition IOMMU info */

	ioctl(container, VFIO_IOMMU_GET_INFO, &iommu_info);

drivers/vfio/vfio.c

+14 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct vfio_group { 
	struct notifier_block		nb;

	struct list_head		vfio_next;

	struct list_head		container_next;

	atomic_t			opened;

};



struct vfio_device {
@@ -206,6 +207,7 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group) 
	INIT_LIST_HEAD(&group->device_list);

	mutex_init(&group->device_lock);

	atomic_set(&group->container_users, 0);

	atomic_set(&group->opened, 0);

	group->iommu_group = iommu_group;



	group->nb.notifier_call = vfio_iommu_group_notifier;
@@ -1236,12 +1238,22 @@ static long vfio_group_fops_compat_ioctl(struct file *filep, 
static int vfio_group_fops_open(struct inode *inode, struct file *filep)

{

	struct vfio_group *group;

	int opened;



	group = vfio_group_get_from_minor(iminor(inode));

	if (!group)

		return -ENODEV;



	/* Do we need multiple instances of the group open?  Seems not. */

	opened = atomic_cmpxchg(&group->opened, 0, 1);

	if (opened) {

		vfio_group_put(group);

		return -EBUSY;

	}



	/* Is something still in use from a previous open? */

	if (group->container) {

		atomic_dec(&group->opened);

		vfio_group_put(group);

		return -EBUSY;

	}
@@ -1259,6 +1271,8 @@ static int vfio_group_fops_release(struct inode *inode, struct file *filep) 


	vfio_group_try_dissolve_container(group);



	atomic_dec(&group->opened);



	vfio_group_put(group);



	return 0;

drivers/vfio/vfio_iommu_type1.c

+401 −225

File changed.

Preview size limit exceeded, changes collapsed.

include/uapi/linux/vfio.h

+6 −2
Original line number Diff line number Diff line
@@ -362,10 +362,14 @@ struct vfio_iommu_type1_dma_map { 
#define VFIO_IOMMU_MAP_DMA _IO(VFIO_TYPE, VFIO_BASE + 13)



/**

 * VFIO_IOMMU_UNMAP_DMA - _IOW(VFIO_TYPE, VFIO_BASE + 14, struct vfio_dma_unmap)

 * VFIO_IOMMU_UNMAP_DMA - _IOWR(VFIO_TYPE, VFIO_BASE + 14,

 *							struct vfio_dma_unmap)

 *

 * Unmap IO virtual addresses using the provided struct vfio_dma_unmap.

 * Caller sets argsz.

 * Caller sets argsz.  The actual unmapped size is returned in the size

 * field.  No guarantee is made to the user that arbitrary unmaps of iova

 * or size different from those used in the original mapping call will

 * succeed.

 */

struct vfio_iommu_type1_dma_unmap {

	__u32	argsz;

CRA Git | Maintained and supported by SUSTech CRA and CCSE