Commit a80e1de9 authored by Yi Liu's avatar Yi Liu Committed by Alex Williamson
Browse files

vfio: Add helper to search vfio_device in a dev_set 



There are drivers that need to search vfio_device within a given dev_set.
e.g. vfio-pci. So add a helper.

vfio_pci_is_device_in_set() now returns -EBUSY in commit a882c16a
("vfio/pci: Change vfio_pci_try_bus_reset() to use the dev_set") where
it was trying to preserve the return of vfio_pci_try_zap_and_vma_lock_cb().
However, it makes more sense to return -ENODEV.

Suggested-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Tested-by: default avatarYanting Jiang <yanting.jiang@intel.com>
Tested-by: default avatarTerrence Xu <terrence.xu@intel.com>
Tested-by: default avatarZhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20230718105542.4138-8-yi.l.liu@intel.com


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

drivers/vfio/pci/vfio_pci_core.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -2377,12 +2377,8 @@ static bool vfio_dev_in_groups(struct vfio_pci_core_device *vdev, 
static int vfio_pci_is_device_in_set(struct pci_dev *pdev, void *data)

static int vfio_pci_is_device_in_set(struct pci_dev *pdev, void *data)

{

{

	struct vfio_device_set *dev_set = data;

	struct vfio_device_set *dev_set = data;

	struct vfio_device *cur;





	list_for_each_entry(cur, &dev_set->device_list, dev_set_list)

	return vfio_find_device_in_devset(dev_set, &pdev->dev) ? 0 : -ENODEV;

		if (cur->dev == &pdev->dev)

			return 0;

	return -EBUSY;

}

}





/*

/*

drivers/vfio/vfio_main.c

+15 −0
Original line number Original line Diff line number Diff line
@@ -141,6 +141,21 @@ unsigned int vfio_device_set_open_count(struct vfio_device_set *dev_set) 
}

}

EXPORT_SYMBOL_GPL(vfio_device_set_open_count);

EXPORT_SYMBOL_GPL(vfio_device_set_open_count);





struct vfio_device *

vfio_find_device_in_devset(struct vfio_device_set *dev_set,

			   struct device *dev)

{

	struct vfio_device *cur;



	lockdep_assert_held(&dev_set->lock);



	list_for_each_entry(cur, &dev_set->device_list, dev_set_list)

		if (cur->dev == dev)

			return cur;

	return NULL;

}

EXPORT_SYMBOL_GPL(vfio_find_device_in_devset);



/*

/*

 * Device objects - create, release, get, put, search

 * Device objects - create, release, get, put, search

 */

 */

include/linux/vfio.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -244,6 +244,9 @@ void vfio_unregister_group_dev(struct vfio_device *device); 




int vfio_assign_device_set(struct vfio_device *device, void *set_id);

int vfio_assign_device_set(struct vfio_device *device, void *set_id);

unsigned int vfio_device_set_open_count(struct vfio_device_set *dev_set);

unsigned int vfio_device_set_open_count(struct vfio_device_set *dev_set);

struct vfio_device *

vfio_find_device_in_devset(struct vfio_device_set *dev_set,

			   struct device *dev);





int vfio_mig_get_next_state(struct vfio_device *device,

int vfio_mig_get_next_state(struct vfio_device *device,

			    enum vfio_device_mig_state cur_fsm,

			    enum vfio_device_mig_state cur_fsm,