mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
vfio/platform: Make vfio cdev pre-openable by passing a file handle
This gives management tools like libvirt a chance to open the vfio cdev with privilege and pass FD to qemu. This way qemu never needs to have privilege to open a VFIO or iommu cdev node. Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Tested-by: Nicolin Chen <nicolinc@nvidia.com> Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
a6c50e1c3f
commit
3016e60f8f
1 changed files with 24 additions and 8 deletions
|
@ -531,14 +531,13 @@ static VFIODeviceOps vfio_platform_ops = {
|
||||||
*/
|
*/
|
||||||
static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
|
static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
|
||||||
{
|
{
|
||||||
struct stat st;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* @sysfsdev takes precedence over @host */
|
/* @fd takes precedence over @sysfsdev which takes precedence over @host */
|
||||||
if (vbasedev->sysfsdev) {
|
if (vbasedev->fd < 0 && vbasedev->sysfsdev) {
|
||||||
g_free(vbasedev->name);
|
g_free(vbasedev->name);
|
||||||
vbasedev->name = g_path_get_basename(vbasedev->sysfsdev);
|
vbasedev->name = g_path_get_basename(vbasedev->sysfsdev);
|
||||||
} else {
|
} else if (vbasedev->fd < 0) {
|
||||||
if (!vbasedev->name || strchr(vbasedev->name, '/')) {
|
if (!vbasedev->name || strchr(vbasedev->name, '/')) {
|
||||||
error_setg(errp, "wrong host device name");
|
error_setg(errp, "wrong host device name");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -548,10 +547,9 @@ static int vfio_base_device_init(VFIODevice *vbasedev, Error **errp)
|
||||||
vbasedev->name);
|
vbasedev->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stat(vbasedev->sysfsdev, &st) < 0) {
|
ret = vfio_device_get_name(vbasedev, errp);
|
||||||
error_setg_errno(errp, errno,
|
if (ret) {
|
||||||
"failed to get the sysfs host device file status");
|
return ret;
|
||||||
return -errno;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = vfio_attach_device(vbasedev->name, vbasedev,
|
ret = vfio_attach_device(vbasedev->name, vbasedev,
|
||||||
|
@ -658,6 +656,20 @@ static Property vfio_platform_dev_properties[] = {
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void vfio_platform_instance_init(Object *obj)
|
||||||
|
{
|
||||||
|
VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(obj);
|
||||||
|
|
||||||
|
vdev->vbasedev.fd = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_IOMMUFD
|
||||||
|
static void vfio_platform_set_fd(Object *obj, const char *str, Error **errp)
|
||||||
|
{
|
||||||
|
vfio_device_set_fd(&VFIO_PLATFORM_DEVICE(obj)->vbasedev, str, errp);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void vfio_platform_class_init(ObjectClass *klass, void *data)
|
static void vfio_platform_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||||
|
@ -665,6 +677,9 @@ static void vfio_platform_class_init(ObjectClass *klass, void *data)
|
||||||
|
|
||||||
dc->realize = vfio_platform_realize;
|
dc->realize = vfio_platform_realize;
|
||||||
device_class_set_props(dc, vfio_platform_dev_properties);
|
device_class_set_props(dc, vfio_platform_dev_properties);
|
||||||
|
#ifdef CONFIG_IOMMUFD
|
||||||
|
object_class_property_add_str(klass, "fd", NULL, vfio_platform_set_fd);
|
||||||
|
#endif
|
||||||
dc->vmsd = &vfio_platform_vmstate;
|
dc->vmsd = &vfio_platform_vmstate;
|
||||||
dc->desc = "VFIO-based platform device assignment";
|
dc->desc = "VFIO-based platform device assignment";
|
||||||
sbc->connect_irq_notifier = vfio_start_irqfd_injection;
|
sbc->connect_irq_notifier = vfio_start_irqfd_injection;
|
||||||
|
@ -677,6 +692,7 @@ static const TypeInfo vfio_platform_dev_info = {
|
||||||
.name = TYPE_VFIO_PLATFORM,
|
.name = TYPE_VFIO_PLATFORM,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(VFIOPlatformDevice),
|
.instance_size = sizeof(VFIOPlatformDevice),
|
||||||
|
.instance_init = vfio_platform_instance_init,
|
||||||
.class_init = vfio_platform_class_init,
|
.class_init = vfio_platform_class_init,
|
||||||
.class_size = sizeof(VFIOPlatformDeviceClass),
|
.class_size = sizeof(VFIOPlatformDeviceClass),
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue