Commit 4b22ef04 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson
Browse files

vfio: Add vfio_file_is_group() 



This replaces uses of vfio_file_iommu_group() which were only detecting if
the file is a VFIO file with no interest in the actual group.

The only remaning user of vfio_file_iommu_group() is in KVM for the SPAPR
stuff. It passes the iommu_group into the arch code through kvm for some
reason.

Tested-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Tested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Tested-by: default avatarEric Farman <farman@linux.ibm.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/1-v2-15417f29324e+1c-vfio_group_disassociate_jgg@nvidia.com


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

drivers/vfio/pci/vfio_pci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1313,7 +1313,7 @@ static int vfio_pci_ioctl_pci_hot_reset(struct vfio_pci_core_device *vdev, 
		}



		/* Ensure the FD is a vfio group FD.*/

		if (!vfio_file_iommu_group(file)) {

		if (!vfio_file_is_group(file)) {

			fput(file);

			ret = -EINVAL;

			break;

drivers/vfio/vfio_main.c

+15 −1
Original line number Diff line number Diff line
@@ -1553,17 +1553,31 @@ static const struct file_operations vfio_device_fops = { 
 * @file: VFIO group file

 *

 * The returned iommu_group is valid as long as a ref is held on the file.

 * This function is deprecated, only the SPAPR path in kvm should call it.

 */

struct iommu_group *vfio_file_iommu_group(struct file *file)

{

	struct vfio_group *group = file->private_data;



	if (file->f_op != &vfio_group_fops)

	if (!IS_ENABLED(CONFIG_SPAPR_TCE_IOMMU))

		return NULL;



	if (!vfio_file_is_group(file))

		return NULL;

	return group->iommu_group;

}

EXPORT_SYMBOL_GPL(vfio_file_iommu_group);



/**

 * vfio_file_is_group - True if the file is usable with VFIO aPIS

 * @file: VFIO group file

 */

bool vfio_file_is_group(struct file *file)

{

	return file->f_op == &vfio_group_fops;

}

EXPORT_SYMBOL_GPL(vfio_file_is_group);



/**

 * vfio_file_enforced_coherent - True if the DMA associated with the VFIO file

 *        is always CPU cache coherent

include/linux/vfio.h

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ int vfio_mig_get_next_state(struct vfio_device *device, 
 * External user API

 */

struct iommu_group *vfio_file_iommu_group(struct file *file);

bool vfio_file_is_group(struct file *file);

bool vfio_file_enforced_coherent(struct file *file);

void vfio_file_set_kvm(struct file *file, struct kvm *kvm);

bool vfio_file_has_dev(struct file *file, struct vfio_device *device);

virt/kvm/vfio.c

+18 −2
Original line number Diff line number Diff line
@@ -61,6 +61,23 @@ static bool kvm_vfio_file_enforced_coherent(struct file *file) 
	return ret;

}



static bool kvm_vfio_file_is_group(struct file *file)

{

	bool (*fn)(struct file *file);

	bool ret;



	fn = symbol_get(vfio_file_is_group);

	if (!fn)

		return false;



	ret = fn(file);



	symbol_put(vfio_file_is_group);



	return ret;

}



#ifdef CONFIG_SPAPR_TCE_IOMMU

static struct iommu_group *kvm_vfio_file_iommu_group(struct file *file)

{

	struct iommu_group *(*fn)(struct file *file);
@@ -77,7 +94,6 @@ static struct iommu_group *kvm_vfio_file_iommu_group(struct file *file) 
	return ret;

}



#ifdef CONFIG_SPAPR_TCE_IOMMU

static void kvm_spapr_tce_release_vfio_group(struct kvm *kvm,

					     struct kvm_vfio_group *kvg)

{
@@ -136,7 +152,7 @@ static int kvm_vfio_group_add(struct kvm_device *dev, unsigned int fd) 
		return -EBADF;



	/* Ensure the FD is a vfio group FD.*/

	if (!kvm_vfio_file_iommu_group(filp)) {

	if (!kvm_vfio_file_is_group(filp)) {

		ret = -EINVAL;

		goto err_fput;

	}