mdev based hardware virtio offloading support
Subsystems (16)
v7 cover mdev based hardware virtio offloading support
Hi all:
There are hardwares that can do virtio datapath offloading while having its own control path. This path tries to implement a mdev based unified API to support using kernel virtio driver to drive those devices. This is done by introducing a new mdev transport for virtio (virtio_mdev) and register itself as a new kind of mdev driver. Then it provides a unified way for kernel virtio driver to talk with mdev device implementation.
Though the series only contains kernel driver support, the goal is to make the transport generic enough to support userspace drivers. This means vhost-mdev[1] could be built on top as well by resuing the transport.
A sample driver is also implemented which simulate a virito-net loopback ethernet device on top of vringh + workqueue. This could be used as a reference implementation for real hardware driver.
Also a real ICF VF driver was also posted here[2] which is a good reference for vendors who is interested in their own virtio datapath offloading product.
Consider mdev framework only support VFIO device and driver right now, this series also extend it to support other types. This is done through introducing class id to the device and pairing it with id_talbe claimed by the driver. On top, this seris also decouple device specific parents ops out of the common ones.
Pktgen test was done with virito-net + mvnet loop back device.
Please review.
[1] https://lkml.org/lkml/2019/10/31/440
[2] https://lkml.org/lkml/2019/10/15/1226
Changes from V5:
- use dev_warn() instead of WARN(1) when class id is not set
- validate id_table before trying to do matching between device and driver
- add wildcard for modpost script
- use unique name for id_table
- move get_mdev_features() to be the first member of virtio_device_ops and more comments for it
- typo fixes for the comments above virtio_mdev_ops
Changes from V4:
- keep mdev_set_class() for the device that doesn't use device ops
- use union for device ops pointer in mdev_device
- introduce class specific helper for getting is device ops
- use WARN_ON instead of BUG_ON in mdev_set_virtio_ops
- explain details of get_mdev_features() and get_vendor_id()
- distinguish the optional virito device ops from mandatory ones and make get_generation() optional
- rename vfio_mdev.h to vfio_mdev_ops.h, rename virito_mdev.h to virtio_mdev_ops.h
- don't abuse version fileds in virtio_mdev structure, use features instead
- fix warning during device remove
- style & docs tweaks and typo fixes
Changes from V3:
- document that class id (device ops) must be specified in create()
- add WARN() when trying to set class_id when it has already set
- add WARN() when class_id is not specified in create() and correctly return an error in this case
- correct the prototype of mdev_set_class() in the doc
- add documention of mdev_set_class()
- remove the unnecessary "class_id_fail" label when class id is not specified in create()
- convert id_table in vfio_mdev to const
- move mdev_set_class and its friends after mdev_uuid()
- suqash the patch of bus uevent into patch of introducing class id
- tweak the words in the docs per Cornelia suggestion
- tie class_id and device ops through class specific initialization routine like mdev_set_vfio_ops()
- typos fixes in the docs of virtio-mdev callbacks
- document the usage of virtqueues in struct virtio_mdev_device
- remove the useless vqs array in struct virtio_mdev_device
- rename MDEV_ID_XXX to MDEV_CLASS_ID_XXX
Changes from V2:
- fail when class_id is not specified
- drop the vringh patch
- match the doc to the code
- tweak the commit log
- move device_ops from parent to mdev device
- remove the unused MDEV_ID_VHOST
Changes from V1:
- move virtio_mdev.c to drivers/virtio
- store class_id in mdev_device instead of mdev_parent
- store device_ops in mdev_device instead of mdev_parent
- reorder the patch, vringh fix comes first
- really silent compiling warnings
- really switch to use u16 for class_id
- uevent and modpost support for mdev class_id
- vraious tweaks per comments from Parav
Changes from RFC-V2:
- silent compile warnings on some specific configuration
- use u16 instead u8 for class id
- reseve MDEV_ID_VHOST for future vhost-mdev work
- introduce "virtio" type for mvnet and make "vhost" type for future work
- add entries in MAINTAINER
- tweak and typos fixes in commit log
Changes from RFC-V1:
- rename device id to class id
- add docs for class id and device specific ops (device_ops)
- split device_ops into seperate headers
- drop the mdev_set_dma_ops()
- use device_ops to implement the transport API, then it's not a part of UAPI any more
- use GFP_ATOMIC in mvnet sample device and other tweaks
- set_vring_base/get_vring_base support for mvnet device
Jason Wang (6):
mdev: class id support
modpost: add support for mdev class id
mdev: introduce device specific ops
mdev: introduce virtio device and its device ops
virtio: introduce a mdev based transport
docs: sample driver to demonstrate how to implement virtio-mdev
framework
.../driver-api/vfio-mediated-device.rst | 38 +- MAINTAINERS | 2 + drivers/gpu/drm/i915/gvt/kvmgt.c | 17 +- drivers/s390/cio/vfio_ccw_ops.c | 17 +- drivers/s390/crypto/vfio_ap_ops.c | 13 +- drivers/vfio/mdev/mdev_core.c | 57 ++ drivers/vfio/mdev/mdev_driver.c | 25 + drivers/vfio/mdev/mdev_private.h | 8 + drivers/vfio/mdev/vfio_mdev.c | 45 +- drivers/virtio/Kconfig | 7 + drivers/virtio/Makefile | 1 + drivers/virtio/virtio_mdev.c | 413 +++++++++++ include/linux/mdev.h | 57 +- include/linux/mdev_vfio_ops.h | 52 ++ include/linux/mdev_virtio_ops.h | 166 +++++ include/linux/mod_devicetable.h | 8 + samples/Kconfig | 7 + samples/vfio-mdev/Makefile | 1 + samples/vfio-mdev/mbochs.c | 19 +- samples/vfio-mdev/mdpy.c | 19 +- samples/vfio-mdev/mtty.c | 17 +- samples/vfio-mdev/mvnet.c | 691 ++++++++++++++++++ scripts/mod/devicetable-offsets.c | 3 + scripts/mod/file2alias.c | 11 + 24 files changed, 1603 insertions(+), 91 deletions(-) create mode 100644 drivers/virtio/virtio_mdev.c create mode 100644 include/linux/mdev_vfio_ops.h create mode 100644 include/linux/mdev_virtio_ops.h create mode 100644 samples/vfio-mdev/mvnet.c
Signature · 1 line
2.19.1
PATCH v7 1/6 mdev: class id support
Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.
So this patch adds id_table to mdev_driver and class_id for mdev device with the match method for mdev bus.
--- .../driver-api/vfio-mediated-device.rst | 5 ++++ drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + drivers/s390/cio/vfio_ccw_ops.c | 1 + drivers/s390/crypto/vfio_ap_ops.c | 1 + drivers/vfio/mdev/mdev_core.c | 16 ++++++++++++ drivers/vfio/mdev/mdev_driver.c | 25 +++++++++++++++++++ drivers/vfio/mdev/mdev_private.h | 1 + drivers/vfio/mdev/vfio_mdev.c | 6 +++++ include/linux/mdev.h | 8 ++++++ include/linux/mod_devicetable.h | 8 ++++++ samples/vfio-mdev/mbochs.c | 1 + samples/vfio-mdev/mdpy.c | 1 + samples/vfio-mdev/mtty.c | 1 + 13 files changed, 75 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
@@ -102,12 +102,14 @@ structure to represent a mediated device's driver:: * @probe: called when new device created * @remove: called when device removed * @driver: device driver structure + * @id_table: the ids serviced by this driver */ struct mdev_driver { const char *name; int (*probe) (struct device *dev); void (*remove) (struct device *dev); struct device_driver driver; + const struct mdev_class_id *id_table; }; A mediated bus driver for mdev should use this structure in the function calls
@@ -170,6 +172,9 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); +It is also required to specify the class_id in create() callback through:: + + int mdev_set_class(struct mdev_device *mdev, u16 id); Mediated Device Management Interface Through sysfs ==================================================
drivers/gpu/drm/i915/gvt/kvmgt.c +1 -0
@@ -678,6 +678,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); out:return ret; }
drivers/s390/cio/vfio_ccw_ops.c +1 -0
@@ -129,6 +129,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
drivers/s390/crypto/vfio_ap_ops.c +1 -0
@@ -343,6 +343,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
drivers/vfio/mdev/mdev_core.c +16 -0
@@ -45,6 +45,16 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during +* create() callback. +*/ +void mdev_set_class (struct mdev_device *mdev,u16 id) +{ +WARN_ON (mdev->class_id); + mdev->class_id = id; +} +EXPORT_SYMBOL (mdev_set_class); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;
@@ -324,6 +334,12 @@ int mdev_device_create(struct kobject *kobj,if (ret) goto ops_create_fail; +if (!mdev->class_id) { + ret = -EINVAL ; +dev_warn (dev,"mdev vendor driver failed to specify device class\n" ); + goto add_fail; + } + ret =device_add (&mdev->dev);if (ret) goto add_fail;
drivers/vfio/mdev/mdev_driver.c +25 -0
@@ -69,8 +69,33 @@ static int mdev_remove(struct device *dev)return 0 ; } +static int mdev_match (struct device *dev,struct device_driver *drv) +{ +unsigned int i; +struct mdev_device *mdev =to_mdev_device (dev); +struct mdev_driver *mdrv =to_mdev_driver (drv); +const struct mdev_class_id *ids = mdrv->id_table; + +if (!ids) +return 0 ; + +for (i =0 ; ids[i].id; i++) +if (ids[i].id == mdev->class_id) +return 1 ; +return 0 ; +} + +static int mdev_uevent (struct device *dev,struct kobj_uevent_env *env) +{ +struct mdev_device *mdev =to_mdev_device (dev); + +return add_uevent_var (env,"MODALIAS=mdev:c%02X" , mdev->class_id); +} +struct bus_type mdev_bus_type = { .name ="mdev" , + .match = mdev_match, + .uevent = mdev_uevent, .probe = mdev_probe, .remove = mdev_remove, };
drivers/vfio/mdev/mdev_private.h +1 -0
@@ -33,6 +33,7 @@ struct mdev_device {struct kobject *type_kobj;struct device *iommu_device;bool active; +u16 class_id; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)
drivers/vfio/mdev/vfio_mdev.c +6 -0
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)vfio_del_group_dev (dev); } +static const struct mdev_class_id vfio_id_table[] = { + {MDEV_CLASS_ID_VFIO }, + {0 }, +}; +static struct mdev_driver vfio_mdev_driver = { .name ="vfio_mdev" , .probe = vfio_mdev_probe, .remove = vfio_mdev_remove, + .id_table = vfio_id_table, };static int __init vfio_mdev_init (void )
include/linux/mdev.h +8 -0
@@ -118,6 +118,7 @@ struct mdev_type_attribute mdev_type_attr_##_name = \* @probe: called when new device created * @remove: called when device removed * @driver: device driver structure +* @id_table: the ids serviced by this driver * **/ struct mdev_driver {
@@ -125,6 +126,7 @@ struct mdev_driver {int (*probe)(struct device *dev);void (*remove)(struct device *dev);struct device_driver driver; +const struct mdev_class_id *id_table; };#define to_mdev_driver (drv) container_of(drv, struct mdev_driver, driver)
@@ -132,6 +134,7 @@ struct mdev_driver {void *mdev_get_drvdata (struct mdev_device *mdev);void mdev_set_drvdata (struct mdev_device *mdev,void *data);const guid_t *mdev_uuid (struct mdev_device *mdev); +void mdev_set_class (struct mdev_device *mdev,u16 id);extern struct bus_type mdev_bus_type;
@@ -145,4 +148,9 @@ struct device *mdev_parent_dev(struct mdev_device *mdev);struct device *mdev_dev (struct mdev_device *mdev);struct mdev_device *mdev_from_dev (struct device *dev); +enum { +MDEV_CLASS_ID_VFIO =1 , +/* New entries must be added here */ +}; +#endif /* MDEV_H */
include/linux/mod_devicetable.h +8 -0
@@ -821,4 +821,12 @@ struct wmi_device_id { const void *context; }; +/** +* struct mdev_class_id - MDEV device class identifier +* @id: Used to identify a specific class of device, e.g vfio-mdev device. +*/ +struct mdev_class_id { +__u16 id; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */
samples/vfio-mdev/mbochs.c +1 -0
@@ -561,6 +561,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; err_mem:
samples/vfio-mdev/mdpy.c +1 -0
@@ -269,6 +269,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
samples/vfio-mdev/mtty.c +1 -0
@@ -755,6 +755,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
Signature · 1 line
2.19.1
Re: [PATCH V7 1/6] mdev: class id support
Quoted 97 lines · On Mon, 4 Nov 2019 20:39:47 +0800 Jason Wang <[email protected]> wrote:
Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.
So this patch adds
id_tabletomdev_driverandclass_idfor mdev device with the match method for mdev bus.Reviewed-by Parav Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>--- .../driver-api/vfio-mediated-device.rst | 5 ++++ drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + drivers/s390/cio/vfio_ccw_ops.c | 1 + drivers/s390/crypto/vfio_ap_ops.c | 1 + drivers/vfio/mdev/mdev_core.c | 16 ++++++++++++ drivers/vfio/mdev/mdev_driver.c | 25 +++++++++++++++++++ drivers/vfio/mdev/mdev_private.h | 1 + drivers/vfio/mdev/vfio_mdev.c | 6 +++++ include/linux/mdev.h | 8 ++++++ include/linux/mod_devicetable.h | 8 ++++++ samples/vfio-mdev/mbochs.c | 1 + samples/vfio-mdev/mdpy.c | 1 + samples/vfio-mdev/mtty.c | 1 + 13 files changed, 75 insertions(+)Documentation/driver-api/vfio-mediated-device.rst +5
-0@@ -102,12 +102,14 @@ structure to represent a mediated device's driver:: * @probe: called when new device created * @remove: called when device removed * @driver: device driver structure + * @id_table: the ids serviced by this driver */ struct mdev_driver { const char *name; int (*probe) (struct device *dev); void (*remove) (struct device *dev); struct device_driver driver; + const struct mdev_class_id *id_table; }; A mediated bus driver for mdev should use this structure in the function calls@@ -170,6 +172,9 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); +It is also required to specify the class_id in create() callback through:: + + int mdev_set_class(struct mdev_device *mdev, u16 id); Mediated Device Management Interface Through sysfs ==================================================drivers/gpu/drm/i915/gvt/kvmgt.c +1
-0@@ -678,6 +678,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); out:return ret; }drivers/s390/cio/vfio_ccw_ops.c +1
-0@@ -129,6 +129,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/s390/crypto/vfio_ap_ops.c +1
-0@@ -343,6 +343,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/vfio/mdev/mdev_core.c +0
-0
drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 50
Quoted 6 lines
drivers/vfio/mdev/mdev_core.c +3
-0@@ -45,6 +45,16 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during +* create() callback. +*/
Standard non-networking multi-line comment style please, ie.
/*
* Multi-
* line
* comment
*/
Thanks,
Alex
Quoted 185 lines
drivers/vfio/mdev/mdev_core.c +13
-0+void mdev_set_class (struct mdev_device *mdev,u16 id) +{ +WARN_ON (mdev->class_id); + mdev->class_id = id; +} +EXPORT_SYMBOL (mdev_set_class); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;@@ -324,6 +334,12 @@ int mdev_device_create(struct kobject *kobj,if (ret) goto ops_create_fail; +if (!mdev->class_id) { + ret = -EINVAL ; +dev_warn (dev,"mdev vendor driver failed to specify device class\n" ); + goto add_fail; + } + ret =device_add (&mdev->dev);if (ret) goto add_fail;drivers/vfio/mdev/mdev_driver.c +25
-0@@ -69,8 +69,33 @@ static int mdev_remove(struct device *dev)return 0 ; } +static int mdev_match (struct device *dev,struct device_driver *drv) +{ +unsigned int i; +struct mdev_device *mdev =to_mdev_device (dev); +struct mdev_driver *mdrv =to_mdev_driver (drv); +const struct mdev_class_id *ids = mdrv->id_table; + +if (!ids) +return 0 ; + +for (i =0 ; ids[i].id; i++) +if (ids[i].id == mdev->class_id) +return 1 ; +return 0 ; +} + +static int mdev_uevent (struct device *dev,struct kobj_uevent_env *env) +{ +struct mdev_device *mdev =to_mdev_device (dev); + +return add_uevent_var (env,"MODALIAS=mdev:c%02X" , mdev->class_id); +} +struct bus_type mdev_bus_type = { .name ="mdev" , + .match = mdev_match, + .uevent = mdev_uevent, .probe = mdev_probe, .remove = mdev_remove, };drivers/vfio/mdev/mdev_private.h +1
-0@@ -33,6 +33,7 @@ struct mdev_device {struct kobject *type_kobj;struct device *iommu_device;bool active; +u16 class_id; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)drivers/vfio/mdev/vfio_mdev.c +6
-0@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)vfio_del_group_dev (dev); } +static const struct mdev_class_id vfio_id_table[] = { + {MDEV_CLASS_ID_VFIO }, + {0 }, +}; +static struct mdev_driver vfio_mdev_driver = { .name ="vfio_mdev" , .probe = vfio_mdev_probe, .remove = vfio_mdev_remove, + .id_table = vfio_id_table, };static int __init vfio_mdev_init (void )include/linux/mdev.h +8
-0@@ -118,6 +118,7 @@ struct mdev_type_attribute mdev_type_attr_##_name = \* @probe: called when new device created * @remove: called when device removed * @driver: device driver structure +* @id_table: the ids serviced by this driver * **/ struct mdev_driver {@@ -125,6 +126,7 @@ struct mdev_driver {int (*probe)(struct device *dev);void (*remove)(struct device *dev);struct device_driver driver; +const struct mdev_class_id *id_table; };#define to_mdev_driver (drv) container_of(drv, struct mdev_driver, driver)@@ -132,6 +134,7 @@ struct mdev_driver {void *mdev_get_drvdata (struct mdev_device *mdev);void mdev_set_drvdata (struct mdev_device *mdev,void *data);const guid_t *mdev_uuid (struct mdev_device *mdev); +void mdev_set_class (struct mdev_device *mdev,u16 id);extern struct bus_type mdev_bus_type;@@ -145,4 +148,9 @@ struct device *mdev_parent_dev(struct mdev_device *mdev);struct device *mdev_dev (struct mdev_device *mdev);struct mdev_device *mdev_from_dev (struct device *dev); +enum { +MDEV_CLASS_ID_VFIO =1 , +/* New entries must be added here */ +}; +#endif /* MDEV_H */ include/linux/mod_devicetable.h +8
-0@@ -821,4 +821,12 @@ struct wmi_device_id { const void *context; }; +/** +* struct mdev_class_id - MDEV device class identifier +* @id: Used to identify a specific class of device, e.g vfio-mdev device. +*/ +struct mdev_class_id { +__u16 id; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */ samples/vfio-mdev/mbochs.c +1
-0@@ -561,6 +561,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; err_mem:samples/vfio-mdev/mdpy.c +1
-0@@ -269,6 +269,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }samples/vfio-mdev/mtty.c +1
-0@@ -755,6 +755,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
Re: [PATCH V7 1/6] mdev: class id support
Quoted 108 lines · Alex Williamson
Quoted 97 lines · On Mon, 4 Nov 2019 20:39:47 +0800 Jason Wang<[email protected]> wrote:
Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.
So this patch adds
id_tabletomdev_driverandclass_idfor mdev device with the match method for mdev bus.Reviewed-by Parav Pandit<[email protected]>Signed-off-by Jason Wang<[email protected]>--- .../driver-api/vfio-mediated-device.rst | 5 ++++ drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + drivers/s390/cio/vfio_ccw_ops.c | 1 + drivers/s390/crypto/vfio_ap_ops.c | 1 + drivers/vfio/mdev/mdev_core.c | 16 ++++++++++++ drivers/vfio/mdev/mdev_driver.c | 25 +++++++++++++++++++ drivers/vfio/mdev/mdev_private.h | 1 + drivers/vfio/mdev/vfio_mdev.c | 6 +++++ include/linux/mdev.h | 8 ++++++ include/linux/mod_devicetable.h | 8 ++++++ samples/vfio-mdev/mbochs.c | 1 + samples/vfio-mdev/mdpy.c | 1 + samples/vfio-mdev/mtty.c | 1 + 13 files changed, 75 insertions(+)Documentation/driver-api/vfio-mediated-device.rst +5
-0@@ -102,12 +102,14 @@ structure to represent a mediated device's driver:: * @probe: called when new device created * @remove: called when device removed * @driver: device driver structure + * @id_table: the ids serviced by this driver */ struct mdev_driver { const char *name; int (*probe) (struct device *dev); void (*remove) (struct device *dev); struct device_driver driver; + const struct mdev_class_id *id_table; }; A mediated bus driver for mdev should use this structure in the function calls@@ -170,6 +172,9 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); +It is also required to specify the class_id in create() callback through:: + + int mdev_set_class(struct mdev_device *mdev, u16 id); Mediated Device Management Interface Through sysfs ==================================================drivers/gpu/drm/i915/gvt/kvmgt.c +1
-0@@ -678,6 +678,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); out:return ret; }drivers/s390/cio/vfio_ccw_ops.c +1
-0@@ -129,6 +129,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/s390/crypto/vfio_ap_ops.c +1
-0@@ -343,6 +343,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/vfio/mdev/mdev_core.c +0
-0drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 50
Quoted 6 lines
drivers/vfio/mdev/mdev_core.c +3
-0@@ -45,6 +45,16 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during +* create() callback. +*/ Standard non-networking multi-line comment style please, ie.
Quoted 9 lines
/*
* Multi-
* line
* comment
*/Thanks,
Alex
Will fix.
Thanks
Re: [PATCH V7 1/6] mdev: class id support
In reply to Alex WilliamsonQuoted 108 lines · Alex Williamson
Quoted 97 lines · On Mon, 4 Nov 2019 20:39:47 +0800 Jason Wang<[email protected]> wrote:
Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.
So this patch adds
id_tabletomdev_driverandclass_idfor mdev device with the match method for mdev bus.Reviewed-by Parav Pandit<[email protected]>Signed-off-by Jason Wang<[email protected]>--- .../driver-api/vfio-mediated-device.rst | 5 ++++ drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + drivers/s390/cio/vfio_ccw_ops.c | 1 + drivers/s390/crypto/vfio_ap_ops.c | 1 + drivers/vfio/mdev/mdev_core.c | 16 ++++++++++++ drivers/vfio/mdev/mdev_driver.c | 25 +++++++++++++++++++ drivers/vfio/mdev/mdev_private.h | 1 + drivers/vfio/mdev/vfio_mdev.c | 6 +++++ include/linux/mdev.h | 8 ++++++ include/linux/mod_devicetable.h | 8 ++++++ samples/vfio-mdev/mbochs.c | 1 + samples/vfio-mdev/mdpy.c | 1 + samples/vfio-mdev/mtty.c | 1 + 13 files changed, 75 insertions(+)Documentation/driver-api/vfio-mediated-device.rst +5
-0@@ -102,12 +102,14 @@ structure to represent a mediated device's driver:: * @probe: called when new device created * @remove: called when device removed * @driver: device driver structure + * @id_table: the ids serviced by this driver */ struct mdev_driver { const char *name; int (*probe) (struct device *dev); void (*remove) (struct device *dev); struct device_driver driver; + const struct mdev_class_id *id_table; }; A mediated bus driver for mdev should use this structure in the function calls@@ -170,6 +172,9 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); +It is also required to specify the class_id in create() callback through:: + + int mdev_set_class(struct mdev_device *mdev, u16 id); Mediated Device Management Interface Through sysfs ==================================================drivers/gpu/drm/i915/gvt/kvmgt.c +1
-0@@ -678,6 +678,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); out:return ret; }drivers/s390/cio/vfio_ccw_ops.c +1
-0@@ -129,6 +129,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/s390/crypto/vfio_ap_ops.c +1
-0@@ -343,6 +343,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/vfio/mdev/mdev_core.c +0
-0drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 50
Quoted 6 lines
drivers/vfio/mdev/mdev_core.c +3
-0@@ -45,6 +45,16 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during +* create() callback. +*/ Standard non-networking multi-line comment style please, ie.
Quoted 9 lines
/*
* Multi-
* line
* comment
*/Thanks,
Alex
Will fix.
Thanks
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH V7 1/6] mdev: class id support
In reply to Jason WangQuoted 97 lines · On Mon, 4 Nov 2019 20:39:47 +0800 Jason Wang <[email protected]> wrote:
Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.
So this patch adds
id_tabletomdev_driverandclass_idfor mdev device with the match method for mdev bus.Reviewed-by Parav Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>--- .../driver-api/vfio-mediated-device.rst | 5 ++++ drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + drivers/s390/cio/vfio_ccw_ops.c | 1 + drivers/s390/crypto/vfio_ap_ops.c | 1 + drivers/vfio/mdev/mdev_core.c | 16 ++++++++++++ drivers/vfio/mdev/mdev_driver.c | 25 +++++++++++++++++++ drivers/vfio/mdev/mdev_private.h | 1 + drivers/vfio/mdev/vfio_mdev.c | 6 +++++ include/linux/mdev.h | 8 ++++++ include/linux/mod_devicetable.h | 8 ++++++ samples/vfio-mdev/mbochs.c | 1 + samples/vfio-mdev/mdpy.c | 1 + samples/vfio-mdev/mtty.c | 1 + 13 files changed, 75 insertions(+)Documentation/driver-api/vfio-mediated-device.rst +5
-0@@ -102,12 +102,14 @@ structure to represent a mediated device's driver:: * @probe: called when new device created * @remove: called when device removed * @driver: device driver structure + * @id_table: the ids serviced by this driver */ struct mdev_driver { const char *name; int (*probe) (struct device *dev); void (*remove) (struct device *dev); struct device_driver driver; + const struct mdev_class_id *id_table; }; A mediated bus driver for mdev should use this structure in the function calls@@ -170,6 +172,9 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); +It is also required to specify the class_id in create() callback through:: + + int mdev_set_class(struct mdev_device *mdev, u16 id); Mediated Device Management Interface Through sysfs ==================================================drivers/gpu/drm/i915/gvt/kvmgt.c +1
-0@@ -678,6 +678,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); out:return ret; }drivers/s390/cio/vfio_ccw_ops.c +1
-0@@ -129,6 +129,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/s390/crypto/vfio_ap_ops.c +1
-0@@ -343,6 +343,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }drivers/vfio/mdev/mdev_core.c +0
-0
drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 50
Quoted 6 lines
drivers/vfio/mdev/mdev_core.c +3
-0@@ -45,6 +45,16 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during +* create() callback. +*/
Standard non-networking multi-line comment style please, ie.
/*
* Multi-
* line
* comment
*/
Thanks,
Alex
Quoted 185 lines
drivers/vfio/mdev/mdev_core.c +13
-0+void mdev_set_class (struct mdev_device *mdev,u16 id) +{ +WARN_ON (mdev->class_id); + mdev->class_id = id; +} +EXPORT_SYMBOL (mdev_set_class); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;@@ -324,6 +334,12 @@ int mdev_device_create(struct kobject *kobj,if (ret) goto ops_create_fail; +if (!mdev->class_id) { + ret = -EINVAL ; +dev_warn (dev,"mdev vendor driver failed to specify device class\n" ); + goto add_fail; + } + ret =device_add (&mdev->dev);if (ret) goto add_fail;drivers/vfio/mdev/mdev_driver.c +25
-0@@ -69,8 +69,33 @@ static int mdev_remove(struct device *dev)return 0 ; } +static int mdev_match (struct device *dev,struct device_driver *drv) +{ +unsigned int i; +struct mdev_device *mdev =to_mdev_device (dev); +struct mdev_driver *mdrv =to_mdev_driver (drv); +const struct mdev_class_id *ids = mdrv->id_table; + +if (!ids) +return 0 ; + +for (i =0 ; ids[i].id; i++) +if (ids[i].id == mdev->class_id) +return 1 ; +return 0 ; +} + +static int mdev_uevent (struct device *dev,struct kobj_uevent_env *env) +{ +struct mdev_device *mdev =to_mdev_device (dev); + +return add_uevent_var (env,"MODALIAS=mdev:c%02X" , mdev->class_id); +} +struct bus_type mdev_bus_type = { .name ="mdev" , + .match = mdev_match, + .uevent = mdev_uevent, .probe = mdev_probe, .remove = mdev_remove, };drivers/vfio/mdev/mdev_private.h +1
-0@@ -33,6 +33,7 @@ struct mdev_device {struct kobject *type_kobj;struct device *iommu_device;bool active; +u16 class_id; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)drivers/vfio/mdev/vfio_mdev.c +6
-0@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)vfio_del_group_dev (dev); } +static const struct mdev_class_id vfio_id_table[] = { + {MDEV_CLASS_ID_VFIO }, + {0 }, +}; +static struct mdev_driver vfio_mdev_driver = { .name ="vfio_mdev" , .probe = vfio_mdev_probe, .remove = vfio_mdev_remove, + .id_table = vfio_id_table, };static int __init vfio_mdev_init (void )include/linux/mdev.h +8
-0@@ -118,6 +118,7 @@ struct mdev_type_attribute mdev_type_attr_##_name = \* @probe: called when new device created * @remove: called when device removed * @driver: device driver structure +* @id_table: the ids serviced by this driver * **/ struct mdev_driver {@@ -125,6 +126,7 @@ struct mdev_driver {int (*probe)(struct device *dev);void (*remove)(struct device *dev);struct device_driver driver; +const struct mdev_class_id *id_table; };#define to_mdev_driver (drv) container_of(drv, struct mdev_driver, driver)@@ -132,6 +134,7 @@ struct mdev_driver {void *mdev_get_drvdata (struct mdev_device *mdev);void mdev_set_drvdata (struct mdev_device *mdev,void *data);const guid_t *mdev_uuid (struct mdev_device *mdev); +void mdev_set_class (struct mdev_device *mdev,u16 id);extern struct bus_type mdev_bus_type;@@ -145,4 +148,9 @@ struct device *mdev_parent_dev(struct mdev_device *mdev);struct device *mdev_dev (struct mdev_device *mdev);struct mdev_device *mdev_from_dev (struct device *dev); +enum { +MDEV_CLASS_ID_VFIO =1 , +/* New entries must be added here */ +}; +#endif /* MDEV_H */ include/linux/mod_devicetable.h +8
-0@@ -821,4 +821,12 @@ struct wmi_device_id { const void *context; }; +/** +* struct mdev_class_id - MDEV device class identifier +* @id: Used to identify a specific class of device, e.g vfio-mdev device. +*/ +struct mdev_class_id { +__u16 id; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */ samples/vfio-mdev/mbochs.c +1
-0@@ -561,6 +561,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; err_mem:samples/vfio-mdev/mdpy.c +1
-0@@ -269,6 +269,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }samples/vfio-mdev/mtty.c +1
-0@@ -755,6 +755,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
PATCH v7 1/6 mdev: class id support
In reply to Jason WangMdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.
So this patch adds id_table to mdev_driver and class_id for mdev device with the match method for mdev bus.
--- .../driver-api/vfio-mediated-device.rst | 5 ++++ drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + drivers/s390/cio/vfio_ccw_ops.c | 1 + drivers/s390/crypto/vfio_ap_ops.c | 1 + drivers/vfio/mdev/mdev_core.c | 16 ++++++++++++ drivers/vfio/mdev/mdev_driver.c | 25 +++++++++++++++++++ drivers/vfio/mdev/mdev_private.h | 1 + drivers/vfio/mdev/vfio_mdev.c | 6 +++++ include/linux/mdev.h | 8 ++++++ include/linux/mod_devicetable.h | 8 ++++++ samples/vfio-mdev/mbochs.c | 1 + samples/vfio-mdev/mdpy.c | 1 + samples/vfio-mdev/mtty.c | 1 + 13 files changed, 75 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
@@ -102,12 +102,14 @@ structure to represent a mediated device's driver:: * @probe: called when new device created * @remove: called when device removed * @driver: device driver structure + * @id_table: the ids serviced by this driver */ struct mdev_driver { const char *name; int (*probe) (struct device *dev); void (*remove) (struct device *dev); struct device_driver driver; + const struct mdev_class_id *id_table; }; A mediated bus driver for mdev should use this structure in the function calls
@@ -170,6 +172,9 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); +It is also required to specify the class_id in create() callback through:: + + int mdev_set_class(struct mdev_device *mdev, u16 id); Mediated Device Management Interface Through sysfs ==================================================
drivers/gpu/drm/i915/gvt/kvmgt.c +1 -0
@@ -678,6 +678,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); out:return ret; }
drivers/s390/cio/vfio_ccw_ops.c +1 -0
@@ -129,6 +129,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
drivers/s390/crypto/vfio_ap_ops.c +1 -0
@@ -343,6 +343,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
drivers/vfio/mdev/mdev_core.c +16 -0
@@ -45,6 +45,16 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during +* create() callback. +*/ +void mdev_set_class (struct mdev_device *mdev,u16 id) +{ +WARN_ON (mdev->class_id); + mdev->class_id = id; +} +EXPORT_SYMBOL (mdev_set_class); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;
@@ -324,6 +334,12 @@ int mdev_device_create(struct kobject *kobj,if (ret) goto ops_create_fail; +if (!mdev->class_id) { + ret = -EINVAL ; +dev_warn (dev,"mdev vendor driver failed to specify device class\n" ); + goto add_fail; + } + ret =device_add (&mdev->dev);if (ret) goto add_fail;
drivers/vfio/mdev/mdev_driver.c +25 -0
@@ -69,8 +69,33 @@ static int mdev_remove(struct device *dev)return 0 ; } +static int mdev_match (struct device *dev,struct device_driver *drv) +{ +unsigned int i; +struct mdev_device *mdev =to_mdev_device (dev); +struct mdev_driver *mdrv =to_mdev_driver (drv); +const struct mdev_class_id *ids = mdrv->id_table; + +if (!ids) +return 0 ; + +for (i =0 ; ids[i].id; i++) +if (ids[i].id == mdev->class_id) +return 1 ; +return 0 ; +} + +static int mdev_uevent (struct device *dev,struct kobj_uevent_env *env) +{ +struct mdev_device *mdev =to_mdev_device (dev); + +return add_uevent_var (env,"MODALIAS=mdev:c%02X" , mdev->class_id); +} +struct bus_type mdev_bus_type = { .name ="mdev" , + .match = mdev_match, + .uevent = mdev_uevent, .probe = mdev_probe, .remove = mdev_remove, };
drivers/vfio/mdev/mdev_private.h +1 -0
@@ -33,6 +33,7 @@ struct mdev_device {struct kobject *type_kobj;struct device *iommu_device;bool active; +u16 class_id; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)
drivers/vfio/mdev/vfio_mdev.c +6 -0
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)vfio_del_group_dev (dev); } +static const struct mdev_class_id vfio_id_table[] = { + {MDEV_CLASS_ID_VFIO }, + {0 }, +}; +static struct mdev_driver vfio_mdev_driver = { .name ="vfio_mdev" , .probe = vfio_mdev_probe, .remove = vfio_mdev_remove, + .id_table = vfio_id_table, };static int __init vfio_mdev_init (void )
include/linux/mdev.h +8 -0
@@ -118,6 +118,7 @@ struct mdev_type_attribute mdev_type_attr_##_name = \* @probe: called when new device created * @remove: called when device removed * @driver: device driver structure +* @id_table: the ids serviced by this driver * **/ struct mdev_driver {
@@ -125,6 +126,7 @@ struct mdev_driver {int (*probe)(struct device *dev);void (*remove)(struct device *dev);struct device_driver driver; +const struct mdev_class_id *id_table; };#define to_mdev_driver (drv) container_of(drv, struct mdev_driver, driver)
@@ -132,6 +134,7 @@ struct mdev_driver {void *mdev_get_drvdata (struct mdev_device *mdev);void mdev_set_drvdata (struct mdev_device *mdev,void *data);const guid_t *mdev_uuid (struct mdev_device *mdev); +void mdev_set_class (struct mdev_device *mdev,u16 id);extern struct bus_type mdev_bus_type;
@@ -145,4 +148,9 @@ struct device *mdev_parent_dev(struct mdev_device *mdev);struct device *mdev_dev (struct mdev_device *mdev);struct mdev_device *mdev_from_dev (struct device *dev); +enum { +MDEV_CLASS_ID_VFIO =1 , +/* New entries must be added here */ +}; +#endif /* MDEV_H */
include/linux/mod_devicetable.h +8 -0
@@ -821,4 +821,12 @@ struct wmi_device_id { const void *context; }; +/** +* struct mdev_class_id - MDEV device class identifier +* @id: Used to identify a specific class of device, e.g vfio-mdev device. +*/ +struct mdev_class_id { +__u16 id; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */
samples/vfio-mdev/mbochs.c +1 -0
@@ -561,6 +561,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; err_mem:
samples/vfio-mdev/mdpy.c +1 -0
@@ -269,6 +269,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
samples/vfio-mdev/mtty.c +1 -0
@@ -755,6 +755,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO );return 0 ; }
Signature · 1 line
2.19.1
PATCH v7 2/6 modpost: add support for mdev class id
In reply to Jason WangAdd support to parse mdev class id table.
--- drivers/vfio/mdev/vfio_mdev.c | 2 ++ scripts/mod/devicetable-offsets.c | 3 +++ scripts/mod/file2alias.c | 11 +++++++++++ 3 files changed, 16 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id vfio_id_table[] = { { 0 }, }; +MODULE_DEVICE_TABLE (mdev, vfio_id_table); +static struct mdev_driver vfio_mdev_driver = { .name ="vfio_mdev" , .probe = vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
@@ -231,5 +231,8 @@ int main(void)DEVID (wmi_device_id);DEVID_FIELD (wmi_device_id, guid_string); +DEVID (mdev_class_id); +DEVID_FIELD (mdev_class_id, id); +return 0 ; }
scripts/mod/file2alias.c +11 -0
@@ -1335,6 +1335,16 @@ static int do_wmi_entry(const char *filename, void *symval, char *alias)return 1 ; } +/* looks like: "mdev:cN" */ +static int do_mdev_entry (const char *filename,void *symval,char *alias) +{ +DEF_FIELD (symval, mdev_class_id, id); + +sprintf (alias,"mdev:c%02X" , id); +add_wildcard (alias); +return 1 ; +} +/* Does namelen bytes of name exactly match the symbol? */ static bool sym_is (const char *name,unsigned namelen,const char *symbol) {
@@ -1407,6 +1417,7 @@ static const struct devtable devtable[] = { {"typec", SIZE_typec_device_id, do_typec_entry}, {"tee", SIZE_tee_client_device_id, do_tee_entry}, {"wmi", SIZE_wmi_device_id, do_wmi_entry}, + {"mdev", SIZE_mdev_class_id, do_mdev_entry}, };/* Create MODULE_ALIAS() statements.
Signature · 1 line
2.19.1
PATCH v7 2/6 modpost: add support for mdev class id
In reply to Jason WangAdd support to parse mdev class id table.
--- drivers/vfio/mdev/vfio_mdev.c | 2 ++ scripts/mod/devicetable-offsets.c | 3 +++ scripts/mod/file2alias.c | 11 +++++++++++ 3 files changed, 16 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id vfio_id_table[] = { { 0 }, }; +MODULE_DEVICE_TABLE (mdev, vfio_id_table); +static struct mdev_driver vfio_mdev_driver = { .name ="vfio_mdev" , .probe = vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
@@ -231,5 +231,8 @@ int main(void)DEVID (wmi_device_id);DEVID_FIELD (wmi_device_id, guid_string); +DEVID (mdev_class_id); +DEVID_FIELD (mdev_class_id, id); +return 0 ; }
scripts/mod/file2alias.c +11 -0
@@ -1335,6 +1335,16 @@ static int do_wmi_entry(const char *filename, void *symval, char *alias)return 1 ; } +/* looks like: "mdev:cN" */ +static int do_mdev_entry (const char *filename,void *symval,char *alias) +{ +DEF_FIELD (symval, mdev_class_id, id); + +sprintf (alias,"mdev:c%02X" , id); +add_wildcard (alias); +return 1 ; +} +/* Does namelen bytes of name exactly match the symbol? */ static bool sym_is (const char *name,unsigned namelen,const char *symbol) {
@@ -1407,6 +1417,7 @@ static const struct devtable devtable[] = { {"typec", SIZE_typec_device_id, do_typec_entry}, {"tee", SIZE_tee_client_device_id, do_tee_entry}, {"wmi", SIZE_wmi_device_id, do_wmi_entry}, + {"mdev", SIZE_mdev_class_id, do_mdev_entry}, };/* Create MODULE_ALIAS() statements.
Signature · 1 line
2.19.1
PATCH v7 3/6 mdev: introduce device specific ops
In reply to Jason WangCurrently, except for the create and remove, the rest of mdev_parent_ops is designed for vfio-mdev driver only and may not help for kernel mdev driver. With the help of class id, this patch introduces device specific callbacks inside mdev_device structure. This allows different set of callback to be used by vfio-mdev and virtio-mdev.
--- .../driver-api/vfio-mediated-device.rst | 35 +++++++++---- MAINTAINERS | 1 + drivers/gpu/drm/i915/gvt/kvmgt.c | 18 ++++--- drivers/s390/cio/vfio_ccw_ops.c | 18 ++++--- drivers/s390/crypto/vfio_ap_ops.c | 14 +++-- drivers/vfio/mdev/mdev_core.c | 25 ++++++++- drivers/vfio/mdev/mdev_private.h | 5 ++ drivers/vfio/mdev/vfio_mdev.c | 37 ++++++------- include/linux/mdev.h | 43 ++++----------- include/linux/mdev_vfio_ops.h | 52 +++++++++++++++++++ samples/vfio-mdev/mbochs.c | 20 ++++--- samples/vfio-mdev/mdpy.c | 20 ++++--- samples/vfio-mdev/mtty.c | 18 ++++--- 13 files changed, 206 insertions(+), 100 deletions(-) create mode 100644 include/linux/mdev_vfio_ops.h
Documentation/driver-api/vfio-mediated-device.rst +25 -10
@@ -152,15 +152,6 @@ callbacks per mdev parent device, per mdev type, or any other categorization. Vendor drivers are expected to be fully asynchronous in this respect or provide their own internal resource protection.) -The callbacks in the mdev_parent_ops structure are as follows: - -* open: open callback of mediated device -* close: close callback of mediated device -* ioctl: ioctl callback of mediated device -* read : read emulation callback -* write: write emulation callback -* mmap: mmap emulation callback - A driver should use the mdev_parent_ops structure in the function call to register itself with the mdev core driver::
@@ -172,10 +163,34 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); -It is also required to specify the class_id in create() callback through:: +As multiple types of mediated devices may be supported, class id needs +to be specified in the create callback(). This could be done +explicitly for the device that does not use on mdev bus for its +operation through: int mdev_set_class(struct mdev_device *mdev, u16 id); +For the device that uses on the mdev bus for its operation, the class +should provide helper function to set class id and device specific +ops. E.g for vfio-mdev devices, the function to be called is:: + + int mdev_set_vfio_ops(struct mdev_device *mdev, + const struct mdev_vfio_device_ops *vfio_ops); + +The class id (set by this function to MDEV_CLASS_ID_VFIO) is used to +match a device with an mdev driver via its id table. The device +specific callbacks (specified in *vfio_ops) are obtainable via +mdev_get_vfio_ops() (for use by the mdev bus driver). A vfio-mdev +device (class id MDEV_CLASS_ID_VFIO) uses the following +device-specific ops: + +* open: open callback of vfio mediated device +* close: close callback of vfio mediated device +* ioctl: ioctl callback of vfio mediated device +* read : read emulation callback +* write: write emulation callback +* mmap: mmap emulation callback + Mediated Device Management Interface Through sysfs ==================================================
MAINTAINERS +1 -0
@@ -17121,6 +17121,7 @@ S: Maintained F: Documentation/driver-api/vfio-mediated-device.rst F: drivers/vfio/mdev/ F: include/linux/mdev.h +F: include/linux/mdev_vfio_ops.h F: samples/vfio-mdev/ VFIO PLATFORM DRIVER
drivers/gpu/drm/i915/gvt/kvmgt.c +11 -7
@@ -42,6 +42,7 @@#include <linux/kvm_host.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/debugfs.h> #include <linux/nospec.h>
@@ -643,6 +644,8 @@ static void kvmgt_put_vfio_device(void *vgpu)vfio_device_put (((struct intel_vgpu *)vgpu)->vdev.vfio_device); } +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops; +static int intel_vgpu_create (struct kobject *kobj,struct mdev_device *mdev) {struct intel_vgpu *vgpu =NULL ;
@@ -678,7 +681,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &intel_vfio_vgpu_dev_ops); out:return ret; }
@@ -1599,20 +1602,21 @@ static const struct attribute_group *intel_vgpu_groups[] = { NULL, }; -static struct mdev_parent_ops intel_vgpu_ops = { - .mdev_attr_groups = intel_vgpu_groups, - .create = intel_vgpu_create, - .remove = intel_vgpu_remove, - +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops = { .open = intel_vgpu_open, .release = intel_vgpu_release, - .read = intel_vgpu_read, .write = intel_vgpu_write, .mmap = intel_vgpu_mmap, .ioctl = intel_vgpu_ioctl, }; +static struct mdev_parent_ops intel_vgpu_ops = { + .mdev_attr_groups = intel_vgpu_groups, + .create = intel_vgpu_create, + .remove = intel_vgpu_remove, +}; +static int kvmgt_host_init (struct device *dev,void *gvt,const void *ops) {struct attribute **kvm_type_attrs;
drivers/s390/cio/vfio_ccw_ops.c +12 -6
@@ -12,6 +12,7 @@#include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/nospec.h> #include <linux/slab.h>
@@ -110,6 +111,8 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ccw_mdev_create (struct kobject *kobj,struct mdev_device *mdev) { struct vfio_ccw_private *private =
@@ -129,7 +132,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }
@@ -575,11 +578,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev, } } -static const struct mdev_parent_ops vfio_ccw_mdev_ops = { - .owner =THIS_MODULE , - .supported_type_groups = mdev_type_groups, - .create = vfio_ccw_mdev_create, - .remove = vfio_ccw_mdev_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = vfio_ccw_mdev_open, .release = vfio_ccw_mdev_release, .read = vfio_ccw_mdev_read,
@@ -587,6 +586,13 @@ static const struct mdev_parent_ops vfio_ccw_mdev_ops = { .ioctl = vfio_ccw_mdev_ioctl, }; +static const struct mdev_parent_ops vfio_ccw_mdev_ops = { + .owner =THIS_MODULE , + .supported_type_groups = mdev_type_groups, + .create = vfio_ccw_mdev_create, + .remove = vfio_ccw_mdev_remove, +}; +int vfio_ccw_mdev_reg (struct subchannel *sch) {return mdev_register_device (&sch->dev, &vfio_ccw_mdev_ops);
drivers/s390/crypto/vfio_ap_ops.c +10 -4
@@ -16,6 +16,7 @@#include <linux/bitops.h> #include <linux/kvm_host.h> #include <linux/module.h> +#include <linux/mdev_vfio_ops.h> #include <asm/kvm.h> #include <asm/zcrypt.h>
@@ -321,6 +322,8 @@ static void vfio_ap_matrix_init(struct ap_config_info *info, matrix->adm_max = info->apxa ? info->Nd :15 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ap_mdev_create (struct kobject *kobj,struct mdev_device *mdev) {struct ap_matrix_mdev *matrix_mdev;
@@ -343,7 +346,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }
@@ -1281,15 +1284,18 @@ static ssize_t vfio_ap_mdev_ioctl(struct mdev_device *mdev,return ret; } +static const struct mdev_vfio_device_ops mdev_vfio_ops = { + .open = vfio_ap_mdev_open, + .release = vfio_ap_mdev_release, + .ioctl = vfio_ap_mdev_ioctl, +}; +static const struct mdev_parent_ops vfio_ap_matrix_ops = { .owner =THIS_MODULE , .supported_type_groups = vfio_ap_mdev_type_groups, .mdev_attr_groups = vfio_ap_mdev_attr_groups, .create = vfio_ap_mdev_create, .remove = vfio_ap_mdev_remove, - .open = vfio_ap_mdev_open, - .release = vfio_ap_mdev_release, - .ioctl = vfio_ap_mdev_ioctl, };int vfio_ap_mdev_register (void )
drivers/vfio/mdev/mdev_core.c +23 -2
@@ -45,9 +45,10 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during -* create() callback. -*/ +* create() callback explicitly or implicity through the helpers +* provided by each class. */ void mdev_set_class (struct mdev_device *mdev,u16 id) {WARN_ON (mdev->class_id);
@@ -55,6 +56,26 @@ void mdev_set_class(struct mdev_device *mdev, u16 id) }EXPORT_SYMBOL (mdev_set_class); +/* Specify the mdev device to be a VFIO mdev device, and set VFIO +* device ops for it. This must be called from the create() callback +* for VFIO mdev device. +*/ +void mdev_set_vfio_ops (struct mdev_device *mdev, +const struct mdev_vfio_device_ops *vfio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); + mdev->vfio_ops = vfio_ops; +} +EXPORT_SYMBOL (mdev_set_vfio_ops); + +/* Get the VFIO device ops for the mdev device. */ +const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VFIO ); +return mdev->vfio_ops; +} +EXPORT_SYMBOL (mdev_get_vfio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;
drivers/vfio/mdev/mdev_private.h +5 -0
@@ -10,6 +10,8 @@#ifndef MDEV_PRIVATE_H #define MDEV_PRIVATE_H +#include <linux/mdev_vfio_ops.h> +int mdev_bus_register (void );void mdev_bus_unregister (void );
@@ -34,6 +36,9 @@ struct mdev_device {struct device *iommu_device;bool active;u16 class_id; +union { +const struct mdev_vfio_device_ops *vfio_ops; + }; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)
drivers/vfio/mdev/vfio_mdev.c +19 -18
@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include "mdev_private.h"
@@ -24,16 +25,16 @@static int vfio_mdev_open (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev);int ret; -if (unlikely (!parent->ops->open)) +if (unlikely (!ops->open))return -EINVAL ;if (!try_module_get (THIS_MODULE ))return -ENODEV ; - ret = parent->ops->open (mdev); + ret = ops->open (mdev);if (ret)module_put (THIS_MODULE );
@@ -43,10 +44,10 @@ static int vfio_mdev_open(void *device_data)static void vfio_mdev_release (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (likely (parent->ops->release)) - parent->ops->release (mdev); +if (likely (ops->release)) + ops->release (mdev);module_put (THIS_MODULE ); }
@@ -55,47 +56,47 @@ static long vfio_mdev_unlocked_ioctl(void *device_data, unsigned int cmd, unsigned long arg) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->ioctl)) +if (unlikely (!ops->ioctl))return -EINVAL ; -return parent->ops->ioctl (mdev, cmd, arg); +return ops->ioctl (mdev, cmd, arg); }static ssize_t vfio_mdev_read (void *device_data,char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->read)) +if (unlikely (!ops->read))return -EINVAL ; -return parent->ops->read (mdev, buf, count, ppos); +return ops->read (mdev, buf, count, ppos); }static ssize_t vfio_mdev_write (void *device_data,const char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->write)) +if (unlikely (!ops->write))return -EINVAL ; -return parent->ops->write (mdev, buf, count, ppos); +return ops->write (mdev, buf, count, ppos); }static int vfio_mdev_mmap (void *device_data,struct vm_area_struct *vma) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->mmap)) +if (unlikely (!ops->mmap))return -EINVAL ; -return parent->ops->mmap (mdev, vma); +return ops->mmap (mdev, vma); }static const struct vfio_device_ops vfio_mdev_dev_ops = {
include/linux/mdev.h +10 -33
68 lines not on this page · raw message
include/linux/mdev_vfio_ops.h new file +52 -0
52 lines not on this page · raw message
samples/vfio-mdev/mbochs.c +13 -7
@@ -30,6 +30,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/dma-buf.h> #include <linux/highmem.h>
@@ -516,6 +517,8 @@ static int mbochs_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mbochs_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mbochs_type *type =mbochs_find_type (kobj);
@@ -561,7 +564,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; err_mem:
@@ -1419,12 +1422,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mbochs_create, - .remove = mbochs_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mbochs_open, .release = mbochs_close, .read = mbochs_read,
@@ -1433,6 +1431,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mbochs_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mbochs_create, + .remove = mbochs_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };
samples/vfio-mdev/mdpy.c +13 -7
@@ -26,6 +26,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <drm/drm_fourcc.h> #include "mdpy-defs.h"
@@ -226,6 +227,8 @@ static int mdpy_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mdpy_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mdpy_type *type =mdpy_find_type (kobj);
@@ -269,7 +272,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }
@@ -726,12 +729,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mdpy_create, - .remove = mdpy_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mdpy_open, .release = mdpy_close, .read = mdpy_read,
@@ -740,6 +738,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mdpy_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mdpy_create, + .remove = mdpy_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };
samples/vfio-mdev/mtty.c +12 -6
@@ -27,6 +27,7 @@#include <linux/ctype.h> #include <linux/file.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/serial.h> #include <uapi/linux/serial_reg.h>
@@ -708,6 +709,8 @@ static ssize_t mdev_access(struct mdev_device *mdev, u8 *buf, size_t count,return ret; } +static const struct mdev_vfio_device_ops vfio_dev_ops; +static int mtty_create (struct kobject *kobj,struct mdev_device *mdev) {struct mdev_state *mdev_state;
@@ -755,7 +758,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &vfio_dev_ops);return 0 ; }
@@ -1388,6 +1391,14 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops vfio_dev_ops = { + .open = mtty_open, + .release = mtty_close, + .read = mtty_read, + .write = mtty_write, + .ioctl = mtty_ioctl, +}; +static const struct mdev_parent_ops mdev_fops = { .owner =THIS_MODULE , .dev_attr_groups = mtty_dev_groups,
@@ -1395,11 +1406,6 @@ static const struct mdev_parent_ops mdev_fops = { .supported_type_groups = mdev_type_groups, .create = mtty_create, .remove = mtty_remove, - .open = mtty_open, - .release = mtty_close, - .read = mtty_read, - .write = mtty_write, - .ioctl = mtty_ioctl, };static void mtty_device_release (struct device *dev)
Signature · 1 line
2.19.1
Re: [PATCH V7 3/6] mdev: introduce device specific ops
Quoted 266 lines · On Mon, 4 Nov 2019 20:39:49 +0800 Jason Wang <[email protected]> wrote:
Currently, except for the create and remove, the rest of
mdev_parent_opsis designed for vfio-mdev driver only and may not help for kernel mdev driver. With the help of class id, this patch introduces device specific callbacks insidemdev_devicestructure. This allows different set of callback to be used by vfio-mdev and virtio-mdev.Reviewed-by Parav Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>--- .../driver-api/vfio-mediated-device.rst | 35 +++++++++---- MAINTAINERS | 1 + drivers/gpu/drm/i915/gvt/kvmgt.c | 18 ++++--- drivers/s390/cio/vfio_ccw_ops.c | 18 ++++--- drivers/s390/crypto/vfio_ap_ops.c | 14 +++-- drivers/vfio/mdev/mdev_core.c | 25 ++++++++- drivers/vfio/mdev/mdev_private.h | 5 ++ drivers/vfio/mdev/vfio_mdev.c | 37 ++++++------- include/linux/mdev.h | 43 ++++----------- include/linux/mdev_vfio_ops.h | 52 +++++++++++++++++++ samples/vfio-mdev/mbochs.c | 20 ++++--- samples/vfio-mdev/mdpy.c | 20 ++++--- samples/vfio-mdev/mtty.c | 18 ++++--- 13 files changed, 206 insertions(+), 100 deletions(-) create mode 100644 include/linux/mdev_vfio_ops.hDocumentation/driver-api/vfio-mediated-device.rst +25
-10@@ -152,15 +152,6 @@ callbacks per mdev parent device, per mdev type, or any other categorization. Vendor drivers are expected to be fully asynchronous in this respect or provide their own internal resource protection.) -The callbacks in the mdev_parent_ops structure are as follows: - -* open: open callback of mediated device -* close: close callback of mediated device -* ioctl: ioctl callback of mediated device -* read : read emulation callback -* write: write emulation callback -* mmap: mmap emulation callback - A driver should use the mdev_parent_ops structure in the function call to register itself with the mdev core driver::@@ -172,10 +163,34 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); -It is also required to specify the class_id in create() callback through:: +As multiple types of mediated devices may be supported, class id needs +to be specified in the create callback(). This could be done +explicitly for the device that does not use on mdev bus for its +operation through: int mdev_set_class(struct mdev_device *mdev, u16 id); +For the device that uses on the mdev bus for its operation, the class +should provide helper function to set class id and device specific +ops. E.g for vfio-mdev devices, the function to be called is:: + + int mdev_set_vfio_ops(struct mdev_device *mdev, + const struct mdev_vfio_device_ops *vfio_ops); + +The class id (set by this function to MDEV_CLASS_ID_VFIO) is used to +match a device with an mdev driver via its id table. The device +specific callbacks (specified in *vfio_ops) are obtainable via +mdev_get_vfio_ops() (for use by the mdev bus driver). A vfio-mdev +device (class id MDEV_CLASS_ID_VFIO) uses the following +device-specific ops: + +* open: open callback of vfio mediated device +* close: close callback of vfio mediated device +* ioctl: ioctl callback of vfio mediated device +* read : read emulation callback +* write: write emulation callback +* mmap: mmap emulation callback + Mediated Device Management Interface Through sysfs ==================================================MAINTAINERS +1
-0@@ -17121,6 +17121,7 @@ S: Maintained F: Documentation/driver-api/vfio-mediated-device.rst F: drivers/vfio/mdev/ F: include/linux/mdev.h +F: include/linux/mdev_vfio_ops.h F: samples/vfio-mdev/ VFIO PLATFORM DRIVERdrivers/gpu/drm/i915/gvt/kvmgt.c +11
-7@@ -42,6 +42,7 @@#include <linux/kvm_host.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/debugfs.h> #include <linux/nospec.h> @@ -643,6 +644,8 @@ static void kvmgt_put_vfio_device(void *vgpu)vfio_device_put (((struct intel_vgpu *)vgpu)->vdev.vfio_device); } +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops; +static int intel_vgpu_create (struct kobject *kobj,struct mdev_device *mdev) {struct intel_vgpu *vgpu =NULL ;@@ -678,7 +681,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &intel_vfio_vgpu_dev_ops); out:return ret; }@@ -1599,20 +1602,21 @@ static const struct attribute_group *intel_vgpu_groups[] = { NULL, }; -static struct mdev_parent_ops intel_vgpu_ops = { - .mdev_attr_groups = intel_vgpu_groups, - .create = intel_vgpu_create, - .remove = intel_vgpu_remove, - +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops = { .open = intel_vgpu_open, .release = intel_vgpu_release, - .read = intel_vgpu_read, .write = intel_vgpu_write, .mmap = intel_vgpu_mmap, .ioctl = intel_vgpu_ioctl, }; +static struct mdev_parent_ops intel_vgpu_ops = { + .mdev_attr_groups = intel_vgpu_groups, + .create = intel_vgpu_create, + .remove = intel_vgpu_remove, +}; +static int kvmgt_host_init (struct device *dev,void *gvt,const void *ops) {struct attribute **kvm_type_attrs;drivers/s390/cio/vfio_ccw_ops.c +12
-6@@ -12,6 +12,7 @@#include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/nospec.h> #include <linux/slab.h> @@ -110,6 +111,8 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ccw_mdev_create (struct kobject *kobj,struct mdev_device *mdev) { struct vfio_ccw_private *private =@@ -129,7 +132,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }@@ -575,11 +578,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev, } } -static const struct mdev_parent_ops vfio_ccw_mdev_ops = { - .owner =THIS_MODULE , - .supported_type_groups = mdev_type_groups, - .create = vfio_ccw_mdev_create, - .remove = vfio_ccw_mdev_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = vfio_ccw_mdev_open, .release = vfio_ccw_mdev_release, .read = vfio_ccw_mdev_read,@@ -587,6 +586,13 @@ static const struct mdev_parent_ops vfio_ccw_mdev_ops = { .ioctl = vfio_ccw_mdev_ioctl, }; +static const struct mdev_parent_ops vfio_ccw_mdev_ops = { + .owner =THIS_MODULE , + .supported_type_groups = mdev_type_groups, + .create = vfio_ccw_mdev_create, + .remove = vfio_ccw_mdev_remove, +}; +int vfio_ccw_mdev_reg (struct subchannel *sch) {return mdev_register_device (&sch->dev, &vfio_ccw_mdev_ops);drivers/s390/crypto/vfio_ap_ops.c +10
-4@@ -16,6 +16,7 @@#include <linux/bitops.h> #include <linux/kvm_host.h> #include <linux/module.h> +#include <linux/mdev_vfio_ops.h> #include <asm/kvm.h> #include <asm/zcrypt.h> @@ -321,6 +322,8 @@ static void vfio_ap_matrix_init(struct ap_config_info *info, matrix->adm_max = info->apxa ? info->Nd :15 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ap_mdev_create (struct kobject *kobj,struct mdev_device *mdev) {struct ap_matrix_mdev *matrix_mdev;@@ -343,7 +346,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }@@ -1281,15 +1284,18 @@ static ssize_t vfio_ap_mdev_ioctl(struct mdev_device *mdev,return ret; } +static const struct mdev_vfio_device_ops mdev_vfio_ops = { + .open = vfio_ap_mdev_open, + .release = vfio_ap_mdev_release, + .ioctl = vfio_ap_mdev_ioctl, +}; +static const struct mdev_parent_ops vfio_ap_matrix_ops = { .owner =THIS_MODULE , .supported_type_groups = vfio_ap_mdev_type_groups, .mdev_attr_groups = vfio_ap_mdev_attr_groups, .create = vfio_ap_mdev_create, .remove = vfio_ap_mdev_remove, - .open = vfio_ap_mdev_open, - .release = vfio_ap_mdev_release, - .ioctl = vfio_ap_mdev_ioctl, };int vfio_ap_mdev_register (void )drivers/vfio/mdev/mdev_core.c +0
-0
drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 48
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +1
-0@@ -45,9 +45,10 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +
Extra whitespace
drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 50
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +1
-2/* Specify the class for the mdev device, this must be called during -* create() callback. -*/ +* create() callback explicitly or implicity through the helpers
s/implicity/implicitly/
drivers/vfio/mdev/mdev_core.c void mdev_set_class(struct mdev_device *mdev, u16 id) · line 62
Quoted 12 lines
drivers/vfio/mdev/mdev_core.c +5
-0+* provided by each class. */ void mdev_set_class (struct mdev_device *mdev,u16 id) {WARN_ON (mdev->class_id);@@ -55,6 +56,26 @@ void mdev_set_class(struct mdev_device *mdev, u16 id) }EXPORT_SYMBOL (mdev_set_class); +/* Specify the mdev device to be a VFIO mdev device, and set VFIO +* device ops for it. This must be called from the create() callback +* for VFIO mdev device. +*/
Comment style. Thanks,
Alex
Quoted 447 lines
drivers/vfio/mdev/mdev_core.c +16
-0+void mdev_set_vfio_ops (struct mdev_device *mdev, +const struct mdev_vfio_device_ops *vfio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); + mdev->vfio_ops = vfio_ops; +} +EXPORT_SYMBOL (mdev_set_vfio_ops); + +/* Get the VFIO device ops for the mdev device. */ +const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VFIO ); +return mdev->vfio_ops; +} +EXPORT_SYMBOL (mdev_get_vfio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +5
-0@@ -10,6 +10,8 @@#ifndef MDEV_PRIVATE_H #define MDEV_PRIVATE_H +#include <linux/mdev_vfio_ops.h> +int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -34,6 +36,9 @@ struct mdev_device {struct device *iommu_device;bool active;u16 class_id; +union { +const struct mdev_vfio_device_ops *vfio_ops; + }; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)drivers/vfio/mdev/vfio_mdev.c +19
-18@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include "mdev_private.h" @@ -24,16 +25,16 @@static int vfio_mdev_open (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev);int ret; -if (unlikely (!parent->ops->open)) +if (unlikely (!ops->open))return -EINVAL ;if (!try_module_get (THIS_MODULE ))return -ENODEV ; - ret = parent->ops->open (mdev); + ret = ops->open (mdev);if (ret)module_put (THIS_MODULE );@@ -43,10 +44,10 @@ static int vfio_mdev_open(void *device_data)static void vfio_mdev_release (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (likely (parent->ops->release)) - parent->ops->release (mdev); +if (likely (ops->release)) + ops->release (mdev);module_put (THIS_MODULE ); }@@ -55,47 +56,47 @@ static long vfio_mdev_unlocked_ioctl(void *device_data, unsigned int cmd, unsigned long arg) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->ioctl)) +if (unlikely (!ops->ioctl))return -EINVAL ; -return parent->ops->ioctl (mdev, cmd, arg); +return ops->ioctl (mdev, cmd, arg); }static ssize_t vfio_mdev_read (void *device_data,char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->read)) +if (unlikely (!ops->read))return -EINVAL ; -return parent->ops->read (mdev, buf, count, ppos); +return ops->read (mdev, buf, count, ppos); }static ssize_t vfio_mdev_write (void *device_data,const char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->write)) +if (unlikely (!ops->write))return -EINVAL ; -return parent->ops->write (mdev, buf, count, ppos); +return ops->write (mdev, buf, count, ppos); }static int vfio_mdev_mmap (void *device_data,struct vm_area_struct *vma) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->mmap)) +if (unlikely (!ops->mmap))return -EINVAL ; -return parent->ops->mmap (mdev, vma); +return ops->mmap (mdev, vma); }static const struct vfio_device_ops vfio_mdev_dev_ops = {include/linux/mdev.h +10
-33@@ -10,7 +10,13 @@#ifndef MDEV_H #define MDEV_H +#include <linux/types.h> +#include <linux/device.h> +#include <linux/mdev.h> +#include <uapi/linux/uuid.h> +struct mdev_device ; +struct mdev_vfio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -48,30 +54,7 @@ struct device *mdev_get_iommu_device(struct device *dev);* @mdev: mdev_device device structure which is being * destroyed * Returns integer: success (0) or error (< 0) -* @open: Open mediated device. -* @mdev: mediated device. -* Returns integer: success (0) or error (< 0) -* @release: release mediated device -* @mdev: mediated device. -* @read: Read emulation callback -* @mdev: mediated device structure -* @buf: read buffer -* @count: number of bytes to read -* @ppos: address. -* Retuns number on bytes read on success or error. -* @write: Write emulation callback -* @mdev: mediated device structure -* @buf: write buffer -* @count: number of bytes to be written -* @ppos: address. -* Retuns number on bytes written on success or error. -* @ioctl: IOCTL callback -* @mdev: mediated device structure -* @cmd: ioctl command -* @arg: arguments to ioctl -* @mmap: mmap callback -* @mdev: mediated device structure -* @vma: vma structure +* * Parent device that support mediated device should be registered with mdev * module with mdev_parent_ops structure. **/ @@ -83,15 +66,6 @@ struct mdev_parent_ops {int (*create)(struct kobject *kobj,struct mdev_device *mdev);int (*remove)(struct mdev_device *mdev); -int (*open)(struct mdev_device *mdev); -void (*release)(struct mdev_device *mdev); -ssize_t (*read)(struct mdev_device *mdev,char __user *buf, -size_t count,loff_t *ppos); -ssize_t (*write)(struct mdev_device *mdev,const char __user *buf, -size_t count,loff_t *ppos); -long (*ioctl)(struct mdev_device *mdev,unsigned int cmd, -unsigned long arg); -int (*mmap)(struct mdev_device *mdev,struct vm_area_struct *vma); };/* interface for exporting mdev supported type attributes */ @@ -135,6 +109,9 @@ void *mdev_get_drvdata(struct mdev_device *mdev);void mdev_set_drvdata (struct mdev_device *mdev,void *data);const guid_t *mdev_uuid (struct mdev_device *mdev);void mdev_set_class (struct mdev_device *mdev,u16 id); +void mdev_set_vfio_ops (struct mdev_device *mdev, +const struct mdev_vfio_device_ops *vfio_ops); +const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;include/linux/mdev_vfio_ops.h new file +52
-0@@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* VFIO Mediated device definition +*/ + +#ifndef MDEV_VFIO_OPS_H +#define MDEV_VFIO_OPS_H + +#include <linux/mdev.h> + +/** +* struct mdev_vfio_device_ops - Structure to be registered for each +* mdev device to register the device to vfio-mdev module. +* +* @open: Open mediated device. +* @mdev: mediated device. +* Returns integer: success (0) or error (< 0) +* @release: release mediated device +* @mdev: mediated device. +* @read: Read emulation callback +* @mdev: mediated device structure +* @buf: read buffer +* @count: number of bytes to read +* @ppos: address. +* Retuns number on bytes read on success or error. +* @write: Write emulation callback +* @mdev: mediated device structure +* @buf: write buffer +* @count: number of bytes to be written +* @ppos: address. +* Retuns number on bytes written on success or error. +* @ioctl: IOCTL callback +* @mdev: mediated device structure +* @cmd: ioctl command +* @arg: arguments to ioctl +* @mmap: mmap callback +* @mdev: mediated device structure +* @vma: vma structure +*/ +struct mdev_vfio_device_ops { +int (*open)(struct mdev_device *mdev); +void (*release)(struct mdev_device *mdev); +ssize_t (*read)(struct mdev_device *mdev,char __user *buf, +size_t count,loff_t *ppos); +ssize_t (*write)(struct mdev_device *mdev,const char __user *buf, +size_t count,loff_t *ppos); +long (*ioctl)(struct mdev_device *mdev,unsigned int cmd, +unsigned long arg); +int (*mmap)(struct mdev_device *mdev,struct vm_area_struct *vma); +}; + +#endif samples/vfio-mdev/mbochs.c +13
-7@@ -30,6 +30,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/dma-buf.h> #include <linux/highmem.h> @@ -516,6 +517,8 @@ static int mbochs_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mbochs_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mbochs_type *type =mbochs_find_type (kobj);@@ -561,7 +564,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; err_mem:@@ -1419,12 +1422,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mbochs_create, - .remove = mbochs_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mbochs_open, .release = mbochs_close, .read = mbochs_read,@@ -1433,6 +1431,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mbochs_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mbochs_create, + .remove = mbochs_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };samples/vfio-mdev/mdpy.c +13
-7@@ -26,6 +26,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <drm/drm_fourcc.h> #include "mdpy-defs.h" @@ -226,6 +227,8 @@ static int mdpy_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mdpy_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mdpy_type *type =mdpy_find_type (kobj);@@ -269,7 +272,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }@@ -726,12 +729,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mdpy_create, - .remove = mdpy_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mdpy_open, .release = mdpy_close, .read = mdpy_read,@@ -740,6 +738,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mdpy_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mdpy_create, + .remove = mdpy_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };samples/vfio-mdev/mtty.c +12
-1@@ -27,6 +27,7 @@#include <linux/ctype.h> #include <linux/file.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/serial.h> #include <uapi/linux/serial_reg.h> @@ -708,6 +709,8 @@ static ssize_t mdev_access(struct mdev_device *mdev, u8 *buf, size_t count,return ret; } +static const struct mdev_vfio_device_ops vfio_dev_ops; +static int mtty_create (struct kobject *kobj,struct mdev_device *mdev) {struct mdev_state *mdev_state;@@ -755,7 +758,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &vfio_dev_ops);return 0 ; }@@ -1388,6 +1391,14 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops vfio_dev_ops = { + .open = mtty_open, + .release = mtty_close, + .read = mtty_read, + .write = mtty_write, + .ioctl = mtty_ioctl, +}; +static const struct mdev_parent_ops mdev_fops = { .owner =THIS_MODULE , .dev_attr_groups = mtty_dev_groups,@@ -1395,11 +1406,6 @@ static const struct mdev_parent_ops mdev_fops = { .supported_type_groups = mdev_type_groups,
samples/vfio-mdev/mtty.c static const struct mdev_parent_ops mdev_fops = { · line 1411
Quoted 10 lines
samples/vfio-mdev/mtty.c +0
-5.create = mtty_create, .remove = mtty_remove, - .open = mtty_open, - .release = mtty_close, - .read = mtty_read, - .write = mtty_write, - .ioctl = mtty_ioctl, };static void mtty_device_release (struct device *dev)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH V7 3/6] mdev: introduce device specific ops
Quoted 19 lines · Alex Williamson
Quoted 3 lines
EXPORT_SYMBOL(mdev_set_drvdata);+
Extra whitespace
Quoted 4 lines
/* Specify the class for the mdev device, this must be called during
- *create()callback.
- */
+ *create()callback explicitly or implicity through the helperss/implicity/implicitly/
Quoted 8 lines
+ * provided by each class. */
voidmdev_set_class(struct mdev_device *mdev, u16 id){
WARN_ON(mdev->class_id);drivers/vfio/mdev/mdev_core.c +0
-0@@ -55,6 +56,26 @@ void mdev_set_class(struct mdev_device *mdev, u16 id) }EXPORT_SYMBOL (mdev_set_class);
Quoted 5 lines
drivers/vfio/mdev/mdev_core.c void mdev_set_class(struct mdev_device *mdev, u16 id) · line 62
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4
-0+/* Specify the mdev device to be a VFIO mdev device, and set VFIO +* device ops for it. This must be called from the create() callback +* for VFIO mdev device. +*/ Comment style. Thanks,
Will fix them all.
Thanks
Quoted 3 lines
Alex
Re: [PATCH V7 3/6] mdev: introduce device specific ops
In reply to Alex WilliamsonQuoted 19 lines · Alex Williamson
Quoted 3 lines
EXPORT_SYMBOL(mdev_set_drvdata);+
Extra whitespace
Quoted 4 lines
/* Specify the class for the mdev device, this must be called during
- *create()callback.
- */
+ *create()callback explicitly or implicity through the helperss/implicity/implicitly/
Quoted 8 lines
+ * provided by each class. */
voidmdev_set_class(struct mdev_device *mdev, u16 id){
WARN_ON(mdev->class_id);drivers/vfio/mdev/mdev_core.c +0
-0@@ -55,6 +56,26 @@ void mdev_set_class(struct mdev_device *mdev, u16 id) }EXPORT_SYMBOL (mdev_set_class);
Quoted 5 lines
drivers/vfio/mdev/mdev_core.c void mdev_set_class(struct mdev_device *mdev, u16 id) · line 62
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4
-0+/* Specify the mdev device to be a VFIO mdev device, and set VFIO +* device ops for it. This must be called from the create() callback +* for VFIO mdev device. +*/ Comment style. Thanks,
Will fix them all.
Thanks
Quoted 3 lines
Alex
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH V7 3/6] mdev: introduce device specific ops
In reply to Jason WangQuoted 266 lines · On Mon, 4 Nov 2019 20:39:49 +0800 Jason Wang <[email protected]> wrote:
Currently, except for the create and remove, the rest of
mdev_parent_opsis designed for vfio-mdev driver only and may not help for kernel mdev driver. With the help of class id, this patch introduces device specific callbacks insidemdev_devicestructure. This allows different set of callback to be used by vfio-mdev and virtio-mdev.Reviewed-by Parav Pandit <[email protected]>Signed-off-by Jason Wang <[email protected]>--- .../driver-api/vfio-mediated-device.rst | 35 +++++++++---- MAINTAINERS | 1 + drivers/gpu/drm/i915/gvt/kvmgt.c | 18 ++++--- drivers/s390/cio/vfio_ccw_ops.c | 18 ++++--- drivers/s390/crypto/vfio_ap_ops.c | 14 +++-- drivers/vfio/mdev/mdev_core.c | 25 ++++++++- drivers/vfio/mdev/mdev_private.h | 5 ++ drivers/vfio/mdev/vfio_mdev.c | 37 ++++++------- include/linux/mdev.h | 43 ++++----------- include/linux/mdev_vfio_ops.h | 52 +++++++++++++++++++ samples/vfio-mdev/mbochs.c | 20 ++++--- samples/vfio-mdev/mdpy.c | 20 ++++--- samples/vfio-mdev/mtty.c | 18 ++++--- 13 files changed, 206 insertions(+), 100 deletions(-) create mode 100644 include/linux/mdev_vfio_ops.hDocumentation/driver-api/vfio-mediated-device.rst +25
-10@@ -152,15 +152,6 @@ callbacks per mdev parent device, per mdev type, or any other categorization. Vendor drivers are expected to be fully asynchronous in this respect or provide their own internal resource protection.) -The callbacks in the mdev_parent_ops structure are as follows: - -* open: open callback of mediated device -* close: close callback of mediated device -* ioctl: ioctl callback of mediated device -* read : read emulation callback -* write: write emulation callback -* mmap: mmap emulation callback - A driver should use the mdev_parent_ops structure in the function call to register itself with the mdev core driver::@@ -172,10 +163,34 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); -It is also required to specify the class_id in create() callback through:: +As multiple types of mediated devices may be supported, class id needs +to be specified in the create callback(). This could be done +explicitly for the device that does not use on mdev bus for its +operation through: int mdev_set_class(struct mdev_device *mdev, u16 id); +For the device that uses on the mdev bus for its operation, the class +should provide helper function to set class id and device specific +ops. E.g for vfio-mdev devices, the function to be called is:: + + int mdev_set_vfio_ops(struct mdev_device *mdev, + const struct mdev_vfio_device_ops *vfio_ops); + +The class id (set by this function to MDEV_CLASS_ID_VFIO) is used to +match a device with an mdev driver via its id table. The device +specific callbacks (specified in *vfio_ops) are obtainable via +mdev_get_vfio_ops() (for use by the mdev bus driver). A vfio-mdev +device (class id MDEV_CLASS_ID_VFIO) uses the following +device-specific ops: + +* open: open callback of vfio mediated device +* close: close callback of vfio mediated device +* ioctl: ioctl callback of vfio mediated device +* read : read emulation callback +* write: write emulation callback +* mmap: mmap emulation callback + Mediated Device Management Interface Through sysfs ==================================================MAINTAINERS +1
-0@@ -17121,6 +17121,7 @@ S: Maintained F: Documentation/driver-api/vfio-mediated-device.rst F: drivers/vfio/mdev/ F: include/linux/mdev.h +F: include/linux/mdev_vfio_ops.h F: samples/vfio-mdev/ VFIO PLATFORM DRIVERdrivers/gpu/drm/i915/gvt/kvmgt.c +11
-7@@ -42,6 +42,7 @@#include <linux/kvm_host.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/debugfs.h> #include <linux/nospec.h> @@ -643,6 +644,8 @@ static void kvmgt_put_vfio_device(void *vgpu)vfio_device_put (((struct intel_vgpu *)vgpu)->vdev.vfio_device); } +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops; +static int intel_vgpu_create (struct kobject *kobj,struct mdev_device *mdev) {struct intel_vgpu *vgpu =NULL ;@@ -678,7 +681,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &intel_vfio_vgpu_dev_ops); out:return ret; }@@ -1599,20 +1602,21 @@ static const struct attribute_group *intel_vgpu_groups[] = { NULL, }; -static struct mdev_parent_ops intel_vgpu_ops = { - .mdev_attr_groups = intel_vgpu_groups, - .create = intel_vgpu_create, - .remove = intel_vgpu_remove, - +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops = { .open = intel_vgpu_open, .release = intel_vgpu_release, - .read = intel_vgpu_read, .write = intel_vgpu_write, .mmap = intel_vgpu_mmap, .ioctl = intel_vgpu_ioctl, }; +static struct mdev_parent_ops intel_vgpu_ops = { + .mdev_attr_groups = intel_vgpu_groups, + .create = intel_vgpu_create, + .remove = intel_vgpu_remove, +}; +static int kvmgt_host_init (struct device *dev,void *gvt,const void *ops) {struct attribute **kvm_type_attrs;drivers/s390/cio/vfio_ccw_ops.c +12
-6@@ -12,6 +12,7 @@#include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/nospec.h> #include <linux/slab.h> @@ -110,6 +111,8 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ccw_mdev_create (struct kobject *kobj,struct mdev_device *mdev) { struct vfio_ccw_private *private =@@ -129,7 +132,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }@@ -575,11 +578,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev, } } -static const struct mdev_parent_ops vfio_ccw_mdev_ops = { - .owner =THIS_MODULE , - .supported_type_groups = mdev_type_groups, - .create = vfio_ccw_mdev_create, - .remove = vfio_ccw_mdev_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = vfio_ccw_mdev_open, .release = vfio_ccw_mdev_release, .read = vfio_ccw_mdev_read,@@ -587,6 +586,13 @@ static const struct mdev_parent_ops vfio_ccw_mdev_ops = { .ioctl = vfio_ccw_mdev_ioctl, }; +static const struct mdev_parent_ops vfio_ccw_mdev_ops = { + .owner =THIS_MODULE , + .supported_type_groups = mdev_type_groups, + .create = vfio_ccw_mdev_create, + .remove = vfio_ccw_mdev_remove, +}; +int vfio_ccw_mdev_reg (struct subchannel *sch) {return mdev_register_device (&sch->dev, &vfio_ccw_mdev_ops);drivers/s390/crypto/vfio_ap_ops.c +10
-4@@ -16,6 +16,7 @@#include <linux/bitops.h> #include <linux/kvm_host.h> #include <linux/module.h> +#include <linux/mdev_vfio_ops.h> #include <asm/kvm.h> #include <asm/zcrypt.h> @@ -321,6 +322,8 @@ static void vfio_ap_matrix_init(struct ap_config_info *info, matrix->adm_max = info->apxa ? info->Nd :15 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ap_mdev_create (struct kobject *kobj,struct mdev_device *mdev) {struct ap_matrix_mdev *matrix_mdev;@@ -343,7 +346,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }@@ -1281,15 +1284,18 @@ static ssize_t vfio_ap_mdev_ioctl(struct mdev_device *mdev,return ret; } +static const struct mdev_vfio_device_ops mdev_vfio_ops = { + .open = vfio_ap_mdev_open, + .release = vfio_ap_mdev_release, + .ioctl = vfio_ap_mdev_ioctl, +}; +static const struct mdev_parent_ops vfio_ap_matrix_ops = { .owner =THIS_MODULE , .supported_type_groups = vfio_ap_mdev_type_groups, .mdev_attr_groups = vfio_ap_mdev_attr_groups, .create = vfio_ap_mdev_create, .remove = vfio_ap_mdev_remove, - .open = vfio_ap_mdev_open, - .release = vfio_ap_mdev_release, - .ioctl = vfio_ap_mdev_ioctl, };int vfio_ap_mdev_register (void )drivers/vfio/mdev/mdev_core.c +0
-0
drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 48
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +1
-0@@ -45,9 +45,10 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +
Extra whitespace
drivers/vfio/mdev/mdev_core.c void mdev_set_drvdata(struct mdev_device *mdev, void *data) · line 50
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +1
-2/* Specify the class for the mdev device, this must be called during -* create() callback. -*/ +* create() callback explicitly or implicity through the helpers
s/implicity/implicitly/
drivers/vfio/mdev/mdev_core.c void mdev_set_class(struct mdev_device *mdev, u16 id) · line 62
Quoted 12 lines
drivers/vfio/mdev/mdev_core.c +5
-0+* provided by each class. */ void mdev_set_class (struct mdev_device *mdev,u16 id) {WARN_ON (mdev->class_id);@@ -55,6 +56,26 @@ void mdev_set_class(struct mdev_device *mdev, u16 id) }EXPORT_SYMBOL (mdev_set_class); +/* Specify the mdev device to be a VFIO mdev device, and set VFIO +* device ops for it. This must be called from the create() callback +* for VFIO mdev device. +*/
Comment style. Thanks,
Alex
Quoted 457 lines
drivers/vfio/mdev/mdev_core.c +16
-0+void mdev_set_vfio_ops (struct mdev_device *mdev, +const struct mdev_vfio_device_ops *vfio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); + mdev->vfio_ops = vfio_ops; +} +EXPORT_SYMBOL (mdev_set_vfio_ops); + +/* Get the VFIO device ops for the mdev device. */ +const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VFIO ); +return mdev->vfio_ops; +} +EXPORT_SYMBOL (mdev_get_vfio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +5
-0@@ -10,6 +10,8 @@#ifndef MDEV_PRIVATE_H #define MDEV_PRIVATE_H +#include <linux/mdev_vfio_ops.h> +int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -34,6 +36,9 @@ struct mdev_device {struct device *iommu_device;bool active;u16 class_id; +union { +const struct mdev_vfio_device_ops *vfio_ops; + }; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)drivers/vfio/mdev/vfio_mdev.c +19
-18@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include "mdev_private.h" @@ -24,16 +25,16 @@static int vfio_mdev_open (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev);int ret; -if (unlikely (!parent->ops->open)) +if (unlikely (!ops->open))return -EINVAL ;if (!try_module_get (THIS_MODULE ))return -ENODEV ; - ret = parent->ops->open (mdev); + ret = ops->open (mdev);if (ret)module_put (THIS_MODULE );@@ -43,10 +44,10 @@ static int vfio_mdev_open(void *device_data)static void vfio_mdev_release (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (likely (parent->ops->release)) - parent->ops->release (mdev); +if (likely (ops->release)) + ops->release (mdev);module_put (THIS_MODULE ); }@@ -55,47 +56,47 @@ static long vfio_mdev_unlocked_ioctl(void *device_data, unsigned int cmd, unsigned long arg) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->ioctl)) +if (unlikely (!ops->ioctl))return -EINVAL ; -return parent->ops->ioctl (mdev, cmd, arg); +return ops->ioctl (mdev, cmd, arg); }static ssize_t vfio_mdev_read (void *device_data,char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->read)) +if (unlikely (!ops->read))return -EINVAL ; -return parent->ops->read (mdev, buf, count, ppos); +return ops->read (mdev, buf, count, ppos); }static ssize_t vfio_mdev_write (void *device_data,const char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->write)) +if (unlikely (!ops->write))return -EINVAL ; -return parent->ops->write (mdev, buf, count, ppos); +return ops->write (mdev, buf, count, ppos); }static int vfio_mdev_mmap (void *device_data,struct vm_area_struct *vma) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->mmap)) +if (unlikely (!ops->mmap))return -EINVAL ; -return parent->ops->mmap (mdev, vma); +return ops->mmap (mdev, vma); }static const struct vfio_device_ops vfio_mdev_dev_ops = {include/linux/mdev.h +10
-33@@ -10,7 +10,13 @@#ifndef MDEV_H #define MDEV_H +#include <linux/types.h> +#include <linux/device.h> +#include <linux/mdev.h> +#include <uapi/linux/uuid.h> +struct mdev_device ; +struct mdev_vfio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -48,30 +54,7 @@ struct device *mdev_get_iommu_device(struct device *dev);* @mdev: mdev_device device structure which is being * destroyed * Returns integer: success (0) or error (< 0) -* @open: Open mediated device. -* @mdev: mediated device. -* Returns integer: success (0) or error (< 0) -* @release: release mediated device -* @mdev: mediated device. -* @read: Read emulation callback -* @mdev: mediated device structure -* @buf: read buffer -* @count: number of bytes to read -* @ppos: address. -* Retuns number on bytes read on success or error. -* @write: Write emulation callback -* @mdev: mediated device structure -* @buf: write buffer -* @count: number of bytes to be written -* @ppos: address. -* Retuns number on bytes written on success or error. -* @ioctl: IOCTL callback -* @mdev: mediated device structure -* @cmd: ioctl command -* @arg: arguments to ioctl -* @mmap: mmap callback -* @mdev: mediated device structure -* @vma: vma structure +* * Parent device that support mediated device should be registered with mdev * module with mdev_parent_ops structure. **/ @@ -83,15 +66,6 @@ struct mdev_parent_ops {int (*create)(struct kobject *kobj,struct mdev_device *mdev);int (*remove)(struct mdev_device *mdev); -int (*open)(struct mdev_device *mdev); -void (*release)(struct mdev_device *mdev); -ssize_t (*read)(struct mdev_device *mdev,char __user *buf, -size_t count,loff_t *ppos); -ssize_t (*write)(struct mdev_device *mdev,const char __user *buf, -size_t count,loff_t *ppos); -long (*ioctl)(struct mdev_device *mdev,unsigned int cmd, -unsigned long arg); -int (*mmap)(struct mdev_device *mdev,struct vm_area_struct *vma); };/* interface for exporting mdev supported type attributes */ @@ -135,6 +109,9 @@ void *mdev_get_drvdata(struct mdev_device *mdev);void mdev_set_drvdata (struct mdev_device *mdev,void *data);const guid_t *mdev_uuid (struct mdev_device *mdev);void mdev_set_class (struct mdev_device *mdev,u16 id); +void mdev_set_vfio_ops (struct mdev_device *mdev, +const struct mdev_vfio_device_ops *vfio_ops); +const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;include/linux/mdev_vfio_ops.h new file +52
-0@@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* VFIO Mediated device definition +*/ + +#ifndef MDEV_VFIO_OPS_H +#define MDEV_VFIO_OPS_H + +#include <linux/mdev.h> + +/** +* struct mdev_vfio_device_ops - Structure to be registered for each +* mdev device to register the device to vfio-mdev module. +* +* @open: Open mediated device. +* @mdev: mediated device. +* Returns integer: success (0) or error (< 0) +* @release: release mediated device +* @mdev: mediated device. +* @read: Read emulation callback +* @mdev: mediated device structure +* @buf: read buffer +* @count: number of bytes to read +* @ppos: address. +* Retuns number on bytes read on success or error. +* @write: Write emulation callback +* @mdev: mediated device structure +* @buf: write buffer +* @count: number of bytes to be written +* @ppos: address. +* Retuns number on bytes written on success or error. +* @ioctl: IOCTL callback +* @mdev: mediated device structure +* @cmd: ioctl command +* @arg: arguments to ioctl +* @mmap: mmap callback +* @mdev: mediated device structure +* @vma: vma structure +*/ +struct mdev_vfio_device_ops { +int (*open)(struct mdev_device *mdev); +void (*release)(struct mdev_device *mdev); +ssize_t (*read)(struct mdev_device *mdev,char __user *buf, +size_t count,loff_t *ppos); +ssize_t (*write)(struct mdev_device *mdev,const char __user *buf, +size_t count,loff_t *ppos); +long (*ioctl)(struct mdev_device *mdev,unsigned int cmd, +unsigned long arg); +int (*mmap)(struct mdev_device *mdev,struct vm_area_struct *vma); +}; + +#endif samples/vfio-mdev/mbochs.c +13
-7@@ -30,6 +30,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/dma-buf.h> #include <linux/highmem.h> @@ -516,6 +517,8 @@ static int mbochs_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mbochs_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mbochs_type *type =mbochs_find_type (kobj);@@ -561,7 +564,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; err_mem:@@ -1419,12 +1422,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mbochs_create, - .remove = mbochs_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mbochs_open, .release = mbochs_close, .read = mbochs_read,@@ -1433,6 +1431,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mbochs_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mbochs_create, + .remove = mbochs_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };samples/vfio-mdev/mdpy.c +13
-7@@ -26,6 +26,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <drm/drm_fourcc.h> #include "mdpy-defs.h" @@ -226,6 +227,8 @@ static int mdpy_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mdpy_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mdpy_type *type =mdpy_find_type (kobj);@@ -269,7 +272,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }@@ -726,12 +729,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mdpy_create, - .remove = mdpy_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mdpy_open, .release = mdpy_close, .read = mdpy_read,@@ -740,6 +738,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mdpy_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mdpy_create, + .remove = mdpy_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };samples/vfio-mdev/mtty.c +12
-6@@ -27,6 +27,7 @@#include <linux/ctype.h> #include <linux/file.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/serial.h> #include <uapi/linux/serial_reg.h> @@ -708,6 +709,8 @@ static ssize_t mdev_access(struct mdev_device *mdev, u8 *buf, size_t count,return ret; } +static const struct mdev_vfio_device_ops vfio_dev_ops; +static int mtty_create (struct kobject *kobj,struct mdev_device *mdev) {struct mdev_state *mdev_state;@@ -755,7 +758,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &vfio_dev_ops);return 0 ; }@@ -1388,6 +1391,14 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops vfio_dev_ops = { + .open = mtty_open, + .release = mtty_close, + .read = mtty_read, + .write = mtty_write, + .ioctl = mtty_ioctl, +}; +static const struct mdev_parent_ops mdev_fops = { .owner =THIS_MODULE , .dev_attr_groups = mtty_dev_groups,@@ -1395,11 +1406,6 @@ static const struct mdev_parent_ops mdev_fops = { .supported_type_groups = mdev_type_groups, .create = mtty_create, .remove = mtty_remove, - .open = mtty_open, - .release = mtty_close, - .read = mtty_read, - .write = mtty_write, - .ioctl = mtty_ioctl, };static void mtty_device_release (struct device *dev)
PATCH v7 3/6 mdev: introduce device specific ops
In reply to Jason WangCurrently, except for the create and remove, the rest of mdev_parent_ops is designed for vfio-mdev driver only and may not help for kernel mdev driver. With the help of class id, this patch introduces device specific callbacks inside mdev_device structure. This allows different set of callback to be used by vfio-mdev and virtio-mdev.
--- .../driver-api/vfio-mediated-device.rst | 35 +++++++++---- MAINTAINERS | 1 + drivers/gpu/drm/i915/gvt/kvmgt.c | 18 ++++--- drivers/s390/cio/vfio_ccw_ops.c | 18 ++++--- drivers/s390/crypto/vfio_ap_ops.c | 14 +++-- drivers/vfio/mdev/mdev_core.c | 25 ++++++++- drivers/vfio/mdev/mdev_private.h | 5 ++ drivers/vfio/mdev/vfio_mdev.c | 37 ++++++------- include/linux/mdev.h | 43 ++++----------- include/linux/mdev_vfio_ops.h | 52 +++++++++++++++++++ samples/vfio-mdev/mbochs.c | 20 ++++--- samples/vfio-mdev/mdpy.c | 20 ++++--- samples/vfio-mdev/mtty.c | 18 ++++--- 13 files changed, 206 insertions(+), 100 deletions(-) create mode 100644 include/linux/mdev_vfio_ops.h
Documentation/driver-api/vfio-mediated-device.rst +25 -10
@@ -152,15 +152,6 @@ callbacks per mdev parent device, per mdev type, or any other categorization. Vendor drivers are expected to be fully asynchronous in this respect or provide their own internal resource protection.) -The callbacks in the mdev_parent_ops structure are as follows: - -* open: open callback of mediated device -* close: close callback of mediated device -* ioctl: ioctl callback of mediated device -* read : read emulation callback -* write: write emulation callback -* mmap: mmap emulation callback - A driver should use the mdev_parent_ops structure in the function call to register itself with the mdev core driver::
@@ -172,10 +163,34 @@ that a driver should use to unregister itself with the mdev core driver:: extern void mdev_unregister_device(struct device *dev); -It is also required to specify the class_id in create() callback through:: +As multiple types of mediated devices may be supported, class id needs +to be specified in the create callback(). This could be done +explicitly for the device that does not use on mdev bus for its +operation through: int mdev_set_class(struct mdev_device *mdev, u16 id); +For the device that uses on the mdev bus for its operation, the class +should provide helper function to set class id and device specific +ops. E.g for vfio-mdev devices, the function to be called is:: + + int mdev_set_vfio_ops(struct mdev_device *mdev, + const struct mdev_vfio_device_ops *vfio_ops); + +The class id (set by this function to MDEV_CLASS_ID_VFIO) is used to +match a device with an mdev driver via its id table. The device +specific callbacks (specified in *vfio_ops) are obtainable via +mdev_get_vfio_ops() (for use by the mdev bus driver). A vfio-mdev +device (class id MDEV_CLASS_ID_VFIO) uses the following +device-specific ops: + +* open: open callback of vfio mediated device +* close: close callback of vfio mediated device +* ioctl: ioctl callback of vfio mediated device +* read : read emulation callback +* write: write emulation callback +* mmap: mmap emulation callback + Mediated Device Management Interface Through sysfs ==================================================
MAINTAINERS +1 -0
@@ -17121,6 +17121,7 @@ S: Maintained F: Documentation/driver-api/vfio-mediated-device.rst F: drivers/vfio/mdev/ F: include/linux/mdev.h +F: include/linux/mdev_vfio_ops.h F: samples/vfio-mdev/ VFIO PLATFORM DRIVER
drivers/gpu/drm/i915/gvt/kvmgt.c +11 -7
@@ -42,6 +42,7 @@#include <linux/kvm_host.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/debugfs.h> #include <linux/nospec.h>
@@ -643,6 +644,8 @@ static void kvmgt_put_vfio_device(void *vgpu)vfio_device_put (((struct intel_vgpu *)vgpu)->vdev.vfio_device); } +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops; +static int intel_vgpu_create (struct kobject *kobj,struct mdev_device *mdev) {struct intel_vgpu *vgpu =NULL ;
@@ -678,7 +681,7 @@ static int intel_vgpu_create(struct kobject *kobj, struct mdev_device *mdev) dev_name(mdev_dev(mdev))); ret =0 ; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &intel_vfio_vgpu_dev_ops); out:return ret; }
@@ -1599,20 +1602,21 @@ static const struct attribute_group *intel_vgpu_groups[] = { NULL, }; -static struct mdev_parent_ops intel_vgpu_ops = { - .mdev_attr_groups = intel_vgpu_groups, - .create = intel_vgpu_create, - .remove = intel_vgpu_remove, - +static const struct mdev_vfio_device_ops intel_vfio_vgpu_dev_ops = { .open = intel_vgpu_open, .release = intel_vgpu_release, - .read = intel_vgpu_read, .write = intel_vgpu_write, .mmap = intel_vgpu_mmap, .ioctl = intel_vgpu_ioctl, }; +static struct mdev_parent_ops intel_vgpu_ops = { + .mdev_attr_groups = intel_vgpu_groups, + .create = intel_vgpu_create, + .remove = intel_vgpu_remove, +}; +static int kvmgt_host_init (struct device *dev,void *gvt,const void *ops) {struct attribute **kvm_type_attrs;
drivers/s390/cio/vfio_ccw_ops.c +12 -6
@@ -12,6 +12,7 @@#include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/nospec.h> #include <linux/slab.h>
@@ -110,6 +111,8 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ccw_mdev_create (struct kobject *kobj,struct mdev_device *mdev) { struct vfio_ccw_private *private =
@@ -129,7 +132,7 @@ static int vfio_ccw_mdev_create(struct kobject *kobj, struct mdev_device *mdev) private->sch->schid.ssid, private->sch->schid.sch_no); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }
@@ -575,11 +578,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev, } } -static const struct mdev_parent_ops vfio_ccw_mdev_ops = { - .owner =THIS_MODULE , - .supported_type_groups = mdev_type_groups, - .create = vfio_ccw_mdev_create, - .remove = vfio_ccw_mdev_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = vfio_ccw_mdev_open, .release = vfio_ccw_mdev_release, .read = vfio_ccw_mdev_read,
@@ -587,6 +586,13 @@ static const struct mdev_parent_ops vfio_ccw_mdev_ops = { .ioctl = vfio_ccw_mdev_ioctl, }; +static const struct mdev_parent_ops vfio_ccw_mdev_ops = { + .owner =THIS_MODULE , + .supported_type_groups = mdev_type_groups, + .create = vfio_ccw_mdev_create, + .remove = vfio_ccw_mdev_remove, +}; +int vfio_ccw_mdev_reg (struct subchannel *sch) {return mdev_register_device (&sch->dev, &vfio_ccw_mdev_ops);
drivers/s390/crypto/vfio_ap_ops.c +10 -4
@@ -16,6 +16,7 @@#include <linux/bitops.h> #include <linux/kvm_host.h> #include <linux/module.h> +#include <linux/mdev_vfio_ops.h> #include <asm/kvm.h> #include <asm/zcrypt.h>
@@ -321,6 +322,8 @@ static void vfio_ap_matrix_init(struct ap_config_info *info, matrix->adm_max = info->apxa ? info->Nd :15 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int vfio_ap_mdev_create (struct kobject *kobj,struct mdev_device *mdev) {struct ap_matrix_mdev *matrix_mdev;
@@ -343,7 +346,7 @@ static int vfio_ap_mdev_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&matrix_mdev->node, &matrix_dev->mdev_list);mutex_unlock (&matrix_dev->lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }
@@ -1281,15 +1284,18 @@ static ssize_t vfio_ap_mdev_ioctl(struct mdev_device *mdev,return ret; } +static const struct mdev_vfio_device_ops mdev_vfio_ops = { + .open = vfio_ap_mdev_open, + .release = vfio_ap_mdev_release, + .ioctl = vfio_ap_mdev_ioctl, +}; +static const struct mdev_parent_ops vfio_ap_matrix_ops = { .owner =THIS_MODULE , .supported_type_groups = vfio_ap_mdev_type_groups, .mdev_attr_groups = vfio_ap_mdev_attr_groups, .create = vfio_ap_mdev_create, .remove = vfio_ap_mdev_remove, - .open = vfio_ap_mdev_open, - .release = vfio_ap_mdev_release, - .ioctl = vfio_ap_mdev_ioctl, };int vfio_ap_mdev_register (void )
drivers/vfio/mdev/mdev_core.c +23 -2
@@ -45,9 +45,10 @@ void mdev_set_drvdata(struct mdev_device *mdev, void *data) }EXPORT_SYMBOL (mdev_set_drvdata); +/* Specify the class for the mdev device, this must be called during -* create() callback. -*/ +* create() callback explicitly or implicity through the helpers +* provided by each class. */ void mdev_set_class (struct mdev_device *mdev,u16 id) {WARN_ON (mdev->class_id);
@@ -55,6 +56,26 @@ void mdev_set_class(struct mdev_device *mdev, u16 id) }EXPORT_SYMBOL (mdev_set_class); +/* Specify the mdev device to be a VFIO mdev device, and set VFIO +* device ops for it. This must be called from the create() callback +* for VFIO mdev device. +*/ +void mdev_set_vfio_ops (struct mdev_device *mdev, +const struct mdev_vfio_device_ops *vfio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); + mdev->vfio_ops = vfio_ops; +} +EXPORT_SYMBOL (mdev_set_vfio_ops); + +/* Get the VFIO device ops for the mdev device. */ +const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VFIO ); +return mdev->vfio_ops; +} +EXPORT_SYMBOL (mdev_get_vfio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;
drivers/vfio/mdev/mdev_private.h +5 -0
@@ -10,6 +10,8 @@#ifndef MDEV_PRIVATE_H #define MDEV_PRIVATE_H +#include <linux/mdev_vfio_ops.h> +int mdev_bus_register (void );void mdev_bus_unregister (void );
@@ -34,6 +36,9 @@ struct mdev_device {struct device *iommu_device;bool active;u16 class_id; +union { +const struct mdev_vfio_device_ops *vfio_ops; + }; };#define to_mdev_device (dev) container_of(dev, struct mdev_device, dev)
drivers/vfio/mdev/vfio_mdev.c +19 -18
@@ -14,6 +14,7 @@#include <linux/slab.h> #include <linux/vfio.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include "mdev_private.h"
@@ -24,16 +25,16 @@static int vfio_mdev_open (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev);int ret; -if (unlikely (!parent->ops->open)) +if (unlikely (!ops->open))return -EINVAL ;if (!try_module_get (THIS_MODULE ))return -ENODEV ; - ret = parent->ops->open (mdev); + ret = ops->open (mdev);if (ret)module_put (THIS_MODULE );
@@ -43,10 +44,10 @@ static int vfio_mdev_open(void *device_data)static void vfio_mdev_release (void *device_data) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (likely (parent->ops->release)) - parent->ops->release (mdev); +if (likely (ops->release)) + ops->release (mdev);module_put (THIS_MODULE ); }
@@ -55,47 +56,47 @@ static long vfio_mdev_unlocked_ioctl(void *device_data, unsigned int cmd, unsigned long arg) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->ioctl)) +if (unlikely (!ops->ioctl))return -EINVAL ; -return parent->ops->ioctl (mdev, cmd, arg); +return ops->ioctl (mdev, cmd, arg); }static ssize_t vfio_mdev_read (void *device_data,char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->read)) +if (unlikely (!ops->read))return -EINVAL ; -return parent->ops->read (mdev, buf, count, ppos); +return ops->read (mdev, buf, count, ppos); }static ssize_t vfio_mdev_write (void *device_data,const char __user *buf,size_t count,loff_t *ppos) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->write)) +if (unlikely (!ops->write))return -EINVAL ; -return parent->ops->write (mdev, buf, count, ppos); +return ops->write (mdev, buf, count, ppos); }static int vfio_mdev_mmap (void *device_data,struct vm_area_struct *vma) {struct mdev_device *mdev = device_data; -struct mdev_parent *parent = mdev->parent; +const struct mdev_vfio_device_ops *ops =mdev_get_vfio_ops (mdev); -if (unlikely (!parent->ops->mmap)) +if (unlikely (!ops->mmap))return -EINVAL ; -return parent->ops->mmap (mdev, vma); +return ops->mmap (mdev, vma); }static const struct vfio_device_ops vfio_mdev_dev_ops = {
include/linux/mdev.h +10 -33
68 lines not on this page · raw message
include/linux/mdev_vfio_ops.h new file +52 -0
52 lines not on this page · raw message
samples/vfio-mdev/mbochs.c +13 -7
@@ -30,6 +30,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/dma-buf.h> #include <linux/highmem.h>
@@ -516,6 +517,8 @@ static int mbochs_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mbochs_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mbochs_type *type =mbochs_find_type (kobj);
@@ -561,7 +564,7 @@ static int mbochs_create(struct kobject *kobj, struct mdev_device *mdev)mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; err_mem:
@@ -1419,12 +1422,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mbochs_create, - .remove = mbochs_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mbochs_open, .release = mbochs_close, .read = mbochs_read,
@@ -1433,6 +1431,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mbochs_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mbochs_create, + .remove = mbochs_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };
samples/vfio-mdev/mdpy.c +13 -7
@@ -26,6 +26,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <drm/drm_fourcc.h> #include "mdpy-defs.h"
@@ -226,6 +227,8 @@ static int mdpy_reset(struct mdev_device *mdev)return 0 ; } +static const struct mdev_vfio_device_ops mdev_vfio_ops; +static int mdpy_create (struct kobject *kobj,struct mdev_device *mdev) {const struct mdpy_type *type =mdpy_find_type (kobj);
@@ -269,7 +272,7 @@ static int mdpy_create(struct kobject *kobj, struct mdev_device *mdev)mdpy_reset (mdev); mdpy_count++; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &mdev_vfio_ops);return 0 ; }
@@ -726,12 +729,7 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; -static const struct mdev_parent_ops mdev_fops = { - .owner =THIS_MODULE , - .mdev_attr_groups = mdev_dev_groups, - .supported_type_groups = mdev_type_groups, - .create = mdpy_create, - .remove = mdpy_remove, +static const struct mdev_vfio_device_ops mdev_vfio_ops = { .open = mdpy_open, .release = mdpy_close, .read = mdpy_read,
@@ -740,6 +738,14 @@ static const struct mdev_parent_ops mdev_fops = { .mmap = mdpy_mmap, }; +static const struct mdev_parent_ops mdev_fops = { + .owner =THIS_MODULE , + .mdev_attr_groups = mdev_dev_groups, + .supported_type_groups = mdev_type_groups, + .create = mdpy_create, + .remove = mdpy_remove, +}; +static const struct file_operations vd_fops = { .owner =THIS_MODULE , };
samples/vfio-mdev/mtty.c +12 -6
@@ -27,6 +27,7 @@#include <linux/ctype.h> #include <linux/file.h> #include <linux/mdev.h> +#include <linux/mdev_vfio_ops.h> #include <linux/pci.h> #include <linux/serial.h> #include <uapi/linux/serial_reg.h>
@@ -708,6 +709,8 @@ static ssize_t mdev_access(struct mdev_device *mdev, u8 *buf, size_t count,return ret; } +static const struct mdev_vfio_device_ops vfio_dev_ops; +static int mtty_create (struct kobject *kobj,struct mdev_device *mdev) {struct mdev_state *mdev_state;
@@ -755,7 +758,7 @@ static int mtty_create(struct kobject *kobj, struct mdev_device *mdev)list_add (&mdev_state->next, &mdev_devices_list);mutex_unlock (&mdev_list_lock); -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &vfio_dev_ops);return 0 ; }
@@ -1388,6 +1391,14 @@ static struct attribute_group *mdev_type_groups[] = { NULL, }; +static const struct mdev_vfio_device_ops vfio_dev_ops = { + .open = mtty_open, + .release = mtty_close, + .read = mtty_read, + .write = mtty_write, + .ioctl = mtty_ioctl, +}; +static const struct mdev_parent_ops mdev_fops = { .owner =THIS_MODULE , .dev_attr_groups = mtty_dev_groups,
@@ -1395,11 +1406,6 @@ static const struct mdev_parent_ops mdev_fops = { .supported_type_groups = mdev_type_groups, .create = mtty_create, .remove = mtty_remove, - .open = mtty_open, - .release = mtty_close, - .read = mtty_read, - .write = mtty_write, - .ioctl = mtty_ioctl, };static void mtty_device_release (struct device *dev)
Signature · 1 line
2.19.1
PATCH v7 4/6 mdev: introduce virtio device and its device ops
In reply to Jason WangThis patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 include/linux/mdev_virtio_ops.h
drivers/vfio/mdev/mdev_core.c +20 -0
@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops); +/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;
drivers/vfio/mdev/mdev_private.h +2 -0
@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );
@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };
include/linux/mdev.h +6 -0
@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents
@@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;
@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };
include/linux/mdev_virtio_ops.h new file +166 -0
166 lines not on this page · raw message
Signature · 1 line
2.19.1
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
Quoted 17 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 6 lines
drivers/vfio/mdev/mdev_core.c +3
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops); +/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/
Comment style.
Quoted 105 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +28
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned.
include/linux/mdev_virtio_ops.h line 38
Quoted 10 lines
include/linux/mdev_virtio_ops.h new file +10
-0+* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when +* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device.
I still don't see the point of VIRTIO_MDEV_F_VERSION_1. In what case would it not be set? What would it indicate to the caller if it were not set? The existence of this interface seems to indicate version 1.
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused? Why doesn't the previous patch take any of this into account for struct mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?
include/linux/mdev_virtio_ops.h line 39
Quoted 1 line
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be
s/get/set/
include/linux/mdev_virtio_ops.h line 42
Quoted 3 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features
s/bollean/boolean/
How does one provide a set of features to set given this prototype?
bool (*set_mdev_feature)(struct mdev_device *mdev);
This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
Thanks,
Alex
Quoted 114 lines
include/linux/mdev_virtio_ops.h new file +114
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); + void (*get_config)(struct mdev_device *mdev, unsigned int offset,
include/linux/mdev_virtio_ops.h line 166
Quoted 10 lines
include/linux/mdev_virtio_ops.h new file +10
-0+ void *buf, unsigned int len); +void (*set_config)(struct mdev_device *mdev,unsigned int offset, +const void *buf,unsigned int len); + u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
Quoted 23 lines · Alex Williamson
Quoted 20 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+)create mode 100644
include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops);
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 3 lines
drivers/vfio/mdev/mdev_core.c +3
-0+/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ Comment style.
Will fix.
Quoted 110 lines
Quoted 110 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +32
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned. +* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 38
Quoted 6 lines
include/linux/mdev_virtio_ops.h new file +6
-0+* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device. I still don't see the point of
VIRTIO_MDEV_F_VERSION_1. In what case would it not be set?
It's a must for current driver implementation.
Quoted 2 lines
What would it indicate to the caller if it were
not set? The existence of this interface seems to indicate version 1.
The idea is when VIRTIO_MDE_F_VERSION_1 is advertised, driver will assume all the mandatory callbacks for this feature were implemented. Then there's no need to check the existence of each callback.
Quoted 6 lines
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused?
For current API, the answer is yes. So if vendor only support feature B, it needs to set the device_ops that support feature A to NULL.
Quoted 3 lines
Why doesn't the previous patch take any of this into account for struct
mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?
I'm not sure if VFIO has the request. In that case new features could be extended simply through transport/bus specific way (e.g PCIE capability list). But in the case of virtio-mdev, we need invent something on our own. If the simple mapping between features and device ops is proved to be not sufficient or sub-optimal, we can introduce a more sophisticated API.
Quoted 3 lines
include/linux/mdev_virtio_ops.h line 39
Quoted 2 lines
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be s/get/set/
Will fix.
Quoted 4 lines
include/linux/mdev_virtio_ops.h line 42
Quoted 4 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features
Quoted 8 lines
s/bollean/boolean/
How does one provide a set of features to set given this prototype?
bool (*set_mdev_feature)(struct
mdev_device*mdev);This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Yes, e.g device support A,B,C, but driver will only use B and C.
Quoted 3 lines
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
My bad, will fix this.
Thanks
Quoted 120 lines
Thanks,
Alex
Quoted 116 lines
include/linux/mdev_virtio_ops.h new file +116
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); +void (*get_config)(struct mdev_device *mdev,unsigned int offset, +void *buf,unsigned int len); + void (*set_config)(struct mdev_device *mdev, unsigned int offset,
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 166
Quoted 8 lines
include/linux/mdev_virtio_ops.h new file +8
-0+ const void *buf, unsigned int len); + u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
Quoted 156 lines · On Tue, 5 Nov 2019 11:52:41 +0800 Jason Wang <[email protected]> wrote:
Quoted 23 lines · Alex Williamson
Quoted 20 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+)create mode 100644
include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops);Quoted 4 lines
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 3 lines
drivers/vfio/mdev/mdev_core.c +3
-0+/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ Comment style.
Will fix.
Quoted 110 lines
Quoted 110 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +32
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned. +* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when Quoted 8 lines
include/linux/mdev_virtio_ops.h line 38
Quoted 6 lines
include/linux/mdev_virtio_ops.h new file +6
-0+* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device. I still don't see the point of
VIRTIO_MDEV_F_VERSION_1. In what case would it not be set?It's a must for current driver implementation.
Quoted 7 lines
Quoted 2 lines
What would it indicate to the caller if it were
not set? The existence of this interface seems to indicate version 1.The idea is when
VIRTIO_MDE_F_VERSION_1is advertised, driver will assume all the mandatory callbacks for this feature were implemented. Then there's no need to check the existence of each callback.
But this is redundant to MDEV_CLASS_ID_VIRTIO, which must imply the struct mdev_virtio_device_ops or else we have no handshake between the mdev device and the mdev bus driver. Essentially this creates a flag that says there are no flags, which is useless. I can't see why checking feature bits here is preferable to checking callbacks.
Quoted 9 lines
Quoted 5 lines
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused?
For current API, the answer is yes. So if vendor only support feature B, it needs to set the
device_opsthat support feature A to NULL.
Which is exactly what we expect to happen with get_generation() but we can't be bothered to add a feature flag for it? The interface is already self inconsistent.
Quoted 11 lines
Quoted 3 lines
Why doesn't the previous patch take any of this into account for struct
mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?I'm not sure if VFIO has the request. In that case new features could be extended simply through transport/bus specific way (e.g PCIE capability list). But in the case of virtio-mdev, we need invent something on our own. If the simple mapping between features and device ops is proved to be not sufficient or sub-optimal, we can introduce a more sophisticated API.
I think the key is that device ops is not an ABI, if we add new callbacks we can extend the structures of all the vendor drivers and the mdev bus driver can either choose to test the callback at runtime or probe time. I really don't see what we're accomplishing with this callback.
Quoted 15 lines
Quoted 2 lines
include/linux/mdev_virtio_ops.h line 39
Quoted 1 line
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be s/get/set/
Will fix.
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 42
Quoted 4 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features s/bollean/boolean/
How does one provide a set of features to set given this prototype?
Quoted 7 lines
Quoted 4 lines
bool (*set_mdev_feature)(struct
mdev_device*mdev);This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Yes, e.g device support A,B,C, but driver will only use B and C.
Can you give a _concrete_ example of such features where the device needs to be informed of what features the driver will use rather than simply not using them? There appears to be no use case for this currently, so I'd suggest dropping it. If such a feature becomes necessary it can be added as needed since this is an internal interface. Also not sure my point above was well conveyed, the prototype doesn't provide a feature arg in order to set features. The comment also indicates we can set a set of features (ie. multiple), but it's not well specified what a failure indicates or why we'd use a boolean to indicate a failure versus an errno where we could interpret the return code. Both these callbacks seem like placeholders, which should be unnecessary as this is simply an internal API between virtio-mdev vendor drivers and the bus driver. Thanks,
Alex
Quoted 137 lines
Quoted 2 lines
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
My bad, will fix this.
Thanks
Quoted 128 lines
Thanks,
Alex
Quoted 124 lines
include/linux/mdev_virtio_ops.h new file +124
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); +void (*get_config)(struct mdev_device *mdev,unsigned int offset, +void *buf,unsigned int len); +void (*set_config)(struct mdev_device *mdev,unsigned int offset, +const void *buf,unsigned int len); +u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
Quoted 160 lines · Alex Williamson
Quoted 157 lines · On Tue, 5 Nov 2019 11:52:41 +0800 Jason Wang <[email protected]> wrote:
Quoted 23 lines · Alex Williamson
Quoted 20 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+)create mode 100644
include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops);Quoted 4 lines
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 3 lines
drivers/vfio/mdev/mdev_core.c +3
-0+/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ Comment style.
Will fix.
Quoted 110 lines
Quoted 110 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +32
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned. +* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when Quoted 8 lines
include/linux/mdev_virtio_ops.h line 38
Quoted 6 lines
include/linux/mdev_virtio_ops.h new file +6
-0+* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device. I still don't see the point of
VIRTIO_MDEV_F_VERSION_1. In what case would it not be set?It's a must for current driver implementation.
Quoted 2 lines
What would it indicate to the caller if it were
not set? The existence of this interface seems to indicate version 1.
Quoted 8 lines
Quoted 3 lines
The idea is when
VIRTIO_MDE_F_VERSION_1is advertised, driver will assume all the mandatory callbacks for this feature were implemented. Then there's no need to check the existence of each callback.But this is redundant to
MDEV_CLASS_ID_VIRTIO, which must imply the structmdev_virtio_device_opsor else we have no handshake between the mdev device and the mdev bus driver. Essentially this creates a flag that says there are no flags, which is useless. I can't see why checking feature bits here is preferable to checking callbacks.
Ok, so I think the point is that we can assume the existence for some callbacks from the start.
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused?
Quoted 5 lines
Quoted 2 lines
For current API, the answer is yes. So if vendor only support feature B, it needs to set the
device_opsthat support feature A to NULL.Which is exactly what we expect to happen with
get_generation()but we can't be bothered to add a feature flag for it? The interface is already self inconsistent.
For get_generation(), we can do simply fallback by return zero (like what virito core did). But for other feature, we can not have such fallback easily.
Quoted 33 lines
Quoted 11 lines
Quoted 4 lines
Why doesn't the previous patch take any of this into account for struct
mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?I'm not sure if VFIO has the request. In that case new features could be extended simply through transport/bus specific way (e.g PCIE capability list). But in the case of virtio-mdev, we need invent something on our own. If the simple mapping between features and device ops is proved to be not sufficient or sub-optimal, we can introduce a more sophisticated API.
I think the key is that device ops is not an ABI, if we add new callbacks we can extend the structures of all the vendor drivers and the mdev bus driver can either choose to test the callback at runtime or probe time. I really don't see what we're accomplishing with this callback.
Quoted 16 lines
Quoted 2 lines
include/linux/mdev_virtio_ops.h line 39
Quoted 1 line
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be s/get/set/
Will fix.
Quoted 10 lines
include/linux/mdev_virtio_ops.h line 42
Quoted 4 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features s/bollean/boolean/
How does one provide a set of features to set given this prototype?
bool (*set_mdev_feature)(struct
mdev_device*mdev);
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Yes, e.g device support A,B,C, but driver will only use B and C.
Can you give a _concrete_ example of such features where the device needs to be informed of what features the driver will use rather than simply not using them?
Two examples:
- dirty page logging by device
- control vq support
So device can choose to support one of the above features.
Quoted 4 lines
There appears to be no use case for this
currently, so I'd suggest dropping it. If such a feature becomes necessary it can be added as needed since this is an internal interface.
Ok, I think I get your point. I worried about the vhost-mdev but anyway those API is not exposed to user directly. I will drop those in next version.
Quoted 8 lines
Also not sure my point above was well conveyed, the
prototype doesn't provide a feature arg in order to set features. The comment also indicates we can set a set of features (ie. multiple), but it's not well specified what a failure indicates or why we'd use a boolean to indicate a failure versus an errno where we could interpret the return code. Both these callbacks seem like placeholders, which should be unnecessary as this is simply an internal API between virtio-mdev vendor drivers and the bus driver. Thanks,
I see.
Thanks
Quoted 139 lines
Alex
Quoted 136 lines
Quoted 2 lines
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
My bad, will fix this.
Thanks
Quoted 128 lines
Thanks,
Alex
Quoted 124 lines
include/linux/mdev_virtio_ops.h new file +124
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); +void (*get_config)(struct mdev_device *mdev,unsigned int offset, +void *buf,unsigned int len); +void (*set_config)(struct mdev_device *mdev,unsigned int offset, +const void *buf,unsigned int len); +u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
In reply to Alex WilliamsonQuoted 160 lines · Alex Williamson
Quoted 157 lines · On Tue, 5 Nov 2019 11:52:41 +0800 Jason Wang <[email protected]> wrote:
Quoted 23 lines · Alex Williamson
Quoted 20 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+)create mode 100644
include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops);Quoted 4 lines
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 3 lines
drivers/vfio/mdev/mdev_core.c +3
-0+/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ Comment style.
Will fix.
Quoted 110 lines
Quoted 110 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +32
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned. +* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when Quoted 8 lines
include/linux/mdev_virtio_ops.h line 38
Quoted 6 lines
include/linux/mdev_virtio_ops.h new file +6
-0+* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device. I still don't see the point of
VIRTIO_MDEV_F_VERSION_1. In what case would it not be set?It's a must for current driver implementation.
Quoted 2 lines
What would it indicate to the caller if it were
not set? The existence of this interface seems to indicate version 1.
Quoted 8 lines
Quoted 3 lines
The idea is when
VIRTIO_MDE_F_VERSION_1is advertised, driver will assume all the mandatory callbacks for this feature were implemented. Then there's no need to check the existence of each callback.But this is redundant to
MDEV_CLASS_ID_VIRTIO, which must imply the structmdev_virtio_device_opsor else we have no handshake between the mdev device and the mdev bus driver. Essentially this creates a flag that says there are no flags, which is useless. I can't see why checking feature bits here is preferable to checking callbacks.
Ok, so I think the point is that we can assume the existence for some callbacks from the start.
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused?
Quoted 5 lines
Quoted 2 lines
For current API, the answer is yes. So if vendor only support feature B, it needs to set the
device_opsthat support feature A to NULL.Which is exactly what we expect to happen with
get_generation()but we can't be bothered to add a feature flag for it? The interface is already self inconsistent.
For get_generation(), we can do simply fallback by return zero (like what virito core did). But for other feature, we can not have such fallback easily.
Quoted 33 lines
Quoted 11 lines
Quoted 4 lines
Why doesn't the previous patch take any of this into account for struct
mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?I'm not sure if VFIO has the request. In that case new features could be extended simply through transport/bus specific way (e.g PCIE capability list). But in the case of virtio-mdev, we need invent something on our own. If the simple mapping between features and device ops is proved to be not sufficient or sub-optimal, we can introduce a more sophisticated API.
I think the key is that device ops is not an ABI, if we add new callbacks we can extend the structures of all the vendor drivers and the mdev bus driver can either choose to test the callback at runtime or probe time. I really don't see what we're accomplishing with this callback.
Quoted 16 lines
Quoted 2 lines
include/linux/mdev_virtio_ops.h line 39
Quoted 1 line
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be s/get/set/
Will fix.
Quoted 10 lines
include/linux/mdev_virtio_ops.h line 42
Quoted 4 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features s/bollean/boolean/
How does one provide a set of features to set given this prototype?
bool (*set_mdev_feature)(struct
mdev_device*mdev);
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Yes, e.g device support A,B,C, but driver will only use B and C.
Can you give a _concrete_ example of such features where the device needs to be informed of what features the driver will use rather than simply not using them?
Two examples:
- dirty page logging by device
- control vq support
So device can choose to support one of the above features.
Quoted 4 lines
There appears to be no use case for this
currently, so I'd suggest dropping it. If such a feature becomes necessary it can be added as needed since this is an internal interface.
Ok, I think I get your point. I worried about the vhost-mdev but anyway those API is not exposed to user directly. I will drop those in next version.
Quoted 8 lines
Also not sure my point above was well conveyed, the
prototype doesn't provide a feature arg in order to set features. The comment also indicates we can set a set of features (ie. multiple), but it's not well specified what a failure indicates or why we'd use a boolean to indicate a failure versus an errno where we could interpret the return code. Both these callbacks seem like placeholders, which should be unnecessary as this is simply an internal API between virtio-mdev vendor drivers and the bus driver. Thanks,
I see.
Thanks
Quoted 131 lines
Alex
Quoted 128 lines
Quoted 2 lines
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
My bad, will fix this.
Thanks
Quoted 120 lines
Thanks,
Alex
Quoted 116 lines
include/linux/mdev_virtio_ops.h new file +116
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); +void (*get_config)(struct mdev_device *mdev,unsigned int offset, +void *buf,unsigned int len); + void (*set_config)(struct mdev_device *mdev, unsigned int offset,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 166
Quoted 8 lines
include/linux/mdev_virtio_ops.h new file +8
-0+ const void *buf, unsigned int len); + u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
In reply to Jason WangQuoted 156 lines · On Tue, 5 Nov 2019 11:52:41 +0800 Jason Wang <[email protected]> wrote:
Quoted 23 lines · Alex Williamson
Quoted 20 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+)create mode 100644
include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops);Quoted 4 lines
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 3 lines
drivers/vfio/mdev/mdev_core.c +3
-0+/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ Comment style.
Will fix.
Quoted 110 lines
Quoted 110 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +32
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned. +* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when Quoted 8 lines
include/linux/mdev_virtio_ops.h line 38
Quoted 6 lines
include/linux/mdev_virtio_ops.h new file +6
-0+* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device. I still don't see the point of
VIRTIO_MDEV_F_VERSION_1. In what case would it not be set?It's a must for current driver implementation.
Quoted 7 lines
Quoted 2 lines
What would it indicate to the caller if it were
not set? The existence of this interface seems to indicate version 1.The idea is when
VIRTIO_MDE_F_VERSION_1is advertised, driver will assume all the mandatory callbacks for this feature were implemented. Then there's no need to check the existence of each callback.
But this is redundant to MDEV_CLASS_ID_VIRTIO, which must imply the struct mdev_virtio_device_ops or else we have no handshake between the mdev device and the mdev bus driver. Essentially this creates a flag that says there are no flags, which is useless. I can't see why checking feature bits here is preferable to checking callbacks.
Quoted 9 lines
Quoted 5 lines
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused?
For current API, the answer is yes. So if vendor only support feature B, it needs to set the
device_opsthat support feature A to NULL.
Which is exactly what we expect to happen with get_generation() but we can't be bothered to add a feature flag for it? The interface is already self inconsistent.
Quoted 11 lines
Quoted 3 lines
Why doesn't the previous patch take any of this into account for struct
mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?I'm not sure if VFIO has the request. In that case new features could be extended simply through transport/bus specific way (e.g PCIE capability list). But in the case of virtio-mdev, we need invent something on our own. If the simple mapping between features and device ops is proved to be not sufficient or sub-optimal, we can introduce a more sophisticated API.
I think the key is that device ops is not an ABI, if we add new callbacks we can extend the structures of all the vendor drivers and the mdev bus driver can either choose to test the callback at runtime or probe time. I really don't see what we're accomplishing with this callback.
Quoted 15 lines
Quoted 2 lines
include/linux/mdev_virtio_ops.h line 39
Quoted 1 line
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be s/get/set/
Will fix.
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 42
Quoted 4 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features s/bollean/boolean/
How does one provide a set of features to set given this prototype?
Quoted 7 lines
Quoted 4 lines
bool (*set_mdev_feature)(struct
mdev_device*mdev);This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Yes, e.g device support A,B,C, but driver will only use B and C.
Can you give a _concrete_ example of such features where the device needs to be informed of what features the driver will use rather than simply not using them? There appears to be no use case for this currently, so I'd suggest dropping it. If such a feature becomes necessary it can be added as needed since this is an internal interface. Also not sure my point above was well conveyed, the prototype doesn't provide a feature arg in order to set features. The comment also indicates we can set a set of features (ie. multiple), but it's not well specified what a failure indicates or why we'd use a boolean to indicate a failure versus an errno where we could interpret the return code. Both these callbacks seem like placeholders, which should be unnecessary as this is simply an internal API between virtio-mdev vendor drivers and the bus driver. Thanks,
Alex
Quoted 129 lines
Quoted 2 lines
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
My bad, will fix this.
Thanks
Quoted 120 lines
Thanks,
Alex
Quoted 116 lines
include/linux/mdev_virtio_ops.h new file +116
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); +void (*get_config)(struct mdev_device *mdev,unsigned int offset, +void *buf,unsigned int len); + void (*set_config)(struct mdev_device *mdev, unsigned int offset,
Quoted 8 lines
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 166
Quoted 8 lines
include/linux/mdev_virtio_ops.h new file +8
-0+ const void *buf, unsigned int len); + u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
In reply to Alex WilliamsonQuoted 23 lines · Alex Williamson
Quoted 20 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+)create mode 100644
include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops);
Quoted 4 lines
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 3 lines
drivers/vfio/mdev/mdev_core.c +3
-0+/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ Comment style.
Will fix.
Quoted 110 lines
Quoted 110 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +32
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned. +* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 38
Quoted 6 lines
include/linux/mdev_virtio_ops.h new file +6
-0+* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device. I still don't see the point of
VIRTIO_MDEV_F_VERSION_1. In what case would it not be set?
It's a must for current driver implementation.
Quoted 2 lines
What would it indicate to the caller if it were
not set? The existence of this interface seems to indicate version 1.
The idea is when VIRTIO_MDE_F_VERSION_1 is advertised, driver will assume all the mandatory callbacks for this feature were implemented. Then there's no need to check the existence of each callback.
Quoted 6 lines
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused?
For current API, the answer is yes. So if vendor only support feature B, it needs to set the device_ops that support feature A to NULL.
Quoted 3 lines
Why doesn't the previous patch take any of this into account for struct
mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?
I'm not sure if VFIO has the request. In that case new features could be extended simply through transport/bus specific way (e.g PCIE capability list). But in the case of virtio-mdev, we need invent something on our own. If the simple mapping between features and device ops is proved to be not sufficient or sub-optimal, we can introduce a more sophisticated API.
Quoted 3 lines
include/linux/mdev_virtio_ops.h line 39
Quoted 2 lines
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be s/get/set/
Will fix.
Quoted 4 lines
include/linux/mdev_virtio_ops.h line 42
Quoted 4 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features
Quoted 8 lines
s/bollean/boolean/
How does one provide a set of features to set given this prototype?
bool (*set_mdev_feature)(struct
mdev_device*mdev);This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Yes, e.g device support A,B,C, but driver will only use B and C.
Quoted 3 lines
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
My bad, will fix this.
Thanks
Quoted 120 lines
Thanks,
Alex
Quoted 116 lines
include/linux/mdev_virtio_ops.h new file +116
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); +void (*get_config)(struct mdev_device *mdev,unsigned int offset, +void *buf,unsigned int len); + void (*set_config)(struct mdev_device *mdev, unsigned int offset,
Quoted 8 lines
include/linux/mdev_virtio_ops.h line 166
Quoted 8 lines
include/linux/mdev_virtio_ops.h new file +8
-0+ const void *buf, unsigned int len); + u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH V7 4/6] mdev: introduce virtio device and its device ops
In reply to Jason WangQuoted 17 lines · On Mon, 4 Nov 2019 20:39:50 +0800 Jason Wang <[email protected]> wrote:
This patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
Signed-off-by Jason Wang <[email protected]>--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 include/linux/mdev_virtio_ops.hdrivers/vfio/mdev/mdev_core.c +0
-0
drivers/vfio/mdev/mdev_core.c const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) · line 81
Quoted 6 lines
drivers/vfio/mdev/mdev_core.c +3
-0@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops); +/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/
Comment style.
Quoted 105 lines
drivers/vfio/mdev/mdev_core.c +17
-0+void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;drivers/vfio/mdev/mdev_private.h +2
-0@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };include/linux/mdev.h +6
-0@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents @@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };include/linux/mdev_virtio_ops.h new file +28
-0@@ -0,0 +1,166 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Virtio mediated device driver +* +* Copyright 2019, Red Hat Corp. +* Author: Jason Wang <[email protected]> +*/ +#ifndef MDEV_VIRTIO_OPS_H +#define MDEV_VIRTIO_OPS_H + +#include <linux/interrupt.h> +#include <linux/mdev.h> +#include <uapi/linux/vhost.h> + +#define VIRTIO_MDEV_DEVICE_API_STRING "virtio-mdev" +#define VIRTIO_MDEV_F_VERSION_1 0x1 + +struct virtio_mdev_callback { +irqreturn_t (*callback)(void *data); +void *private; +}; + +/** +* struct mdev_virtio_device_ops - Structure to be registered for each +* mdev device to register the device for virtio/vhost drivers. +* +* The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the +* callbacks are mandatory unless explicity mentioned.
include/linux/mdev_virtio_ops.h line 38
Quoted 10 lines
include/linux/mdev_virtio_ops.h new file +10
-0+* +* @get_mdev_features: Get a set of bits that demonstrate +* the capability of the mdev device. New +* feature bits must be added when +* introducing new device ops. This +* allows the device ops to be extended +* (one feature could have N new ops). +* @mdev: mediated device +* Returns the mdev features (API) support by +* the device.
I still don't see the point of VIRTIO_MDEV_F_VERSION_1. In what case would it not be set? What would it indicate to the caller if it were not set? The existence of this interface seems to indicate version 1.
I'm also still unclear how device ops gets extended, can you give some examples? Particularly, if feature A and feature B both add device ops callbacks, is the vendor allowed to support B but not A, and does that imply their device ops structure includes callbacks for A but they're unused? Why doesn't the previous patch take any of this into account for struct mdev_vfio_device_ops? I think this is an internal API, therefore is it worthwhile to include feature and extension support?
include/linux/mdev_virtio_ops.h line 39
Quoted 1 line
include/linux/mdev_virtio_ops.h new file +1
-0+* @get_mdev_features: Set a set of features that will be
s/get/set/
include/linux/mdev_virtio_ops.h line 42
Quoted 3 lines
include/linux/mdev_virtio_ops.h new file +3
-0+* used by the driver. +* @features: features used by the driver +* Returns bollean: whether the features
s/bollean/boolean/
How does one provide a set of features to set given this prototype?
bool (*set_mdev_feature)(struct mdev_device *mdev);
This is starting to look like a grab bag of callbacks, what sort of mdev features would the driver have the ability to set on a device?
Note that this is not listed as optional, but the sample driver doesn't implement it :-\
Thanks,
Alex
Quoted 124 lines
include/linux/mdev_virtio_ops.h new file +124
-0+* is accepted by the device. +* @set_vq_address: Set the address of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @desc_area: address of desc area +* @driver_area: address of driver area +* @device_area: address of device area +* Returns integer: success (0) or error (< 0) +* @set_vq_num: Set the size of virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @num: the size of virtqueue +* @kick_vq: Kick the virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @set_vq_cb: Set the interrupt callback function for +* a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @cb: virtio-mdev interrupt callback structure +* @set_vq_ready: Set ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @ready: ready (true) not ready(false) +* @get_vq_ready: Get ready status for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns boolean: ready (true) or not (false) +* @set_vq_state: Set the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* @state: virtqueue state (last_avail_idx) +* Returns integer: success (0) or error (< 0) +* @get_vq_state: Get the state for a virtqueue +* @mdev: mediated device +* @idx: virtqueue index +* Returns virtqueue state (last_avail_idx) +* @get_vq_align: Get the virtqueue align requirement +* for the device +* @mdev: mediated device +* Returns virtqueue algin requirement +* @get_features: Get virtio features supported by the device +* @mdev: mediated device +* Returns the virtio features support by the +* device +* @set_features: Set virtio features supported by the driver +* @mdev: mediated device +* @features: feature support by the driver +* Returns integer: success (0) or error (< 0) +* @set_config_cb: Set the config interrupt callback +* @mdev: mediated device +* @cb: virtio-mdev interrupt callback structure +* @get_vq_num_max: Get the max size of virtqueue +* @mdev: mediated device +* Returns u16: max size of virtqueue +* @get_device_id: Get virtio device id +* @mdev: mediated device +* Returns u32: virtio device id +* @get_vendor_id: Get id for the vendor that provides this device +* @mdev: mediated device +* Returns u32: virtio vendor id +* @get_status: Get the device status +* @mdev: mediated device +* Returns u8: virtio device status +* @set_status: Set the device status +* @mdev: mediated device +* @status: virtio device status +* @get_config: Read from device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to read to +* @len: the length to read from +* configration space +* @set_config: Write to device specific configuration space +* @mdev: mediated device +* @offset: offset from the beginning of +* configuration space +* @buf: buffer used to write from +* @len: the length to write to +* configration space +* @get_generation: Get device config generaton (optional) +* @mdev: mediated device +* Returns u32: device generation +*/ +struct mdev_virtio_device_ops { +/* Mdev device ops */ +u64 (*get_mdev_features)(struct mdev_device *mdev); +bool (*set_mdev_feature)(struct mdev_device *mdev); +/* Virtqueue ops */ +int (*set_vq_address)(struct mdev_device *mdev, +u16 idx,u64 desc_area,u64 driver_area, +u64 device_area); +void (*set_vq_num)(struct mdev_device *mdev,u16 idx,u32 num); +void (*kick_vq)(struct mdev_device *mdev,u16 idx); +void (*set_vq_cb)(struct mdev_device *mdev,u16 idx, +struct virtio_mdev_callback *cb); +void (*set_vq_ready)(struct mdev_device *mdev,u16 idx,bool ready); +bool (*get_vq_ready)(struct mdev_device *mdev,u16 idx); +int (*set_vq_state)(struct mdev_device *mdev,u16 idx,u64 state); +u64 (*get_vq_state)(struct mdev_device *mdev,u16 idx); + +/* Virtio device ops */ +u16 (*get_vq_align)(struct mdev_device *mdev); +u64 (*get_features)(struct mdev_device *mdev); +int (*set_features)(struct mdev_device *mdev,u64 features); +void (*set_config_cb)(struct mdev_device *mdev, +struct virtio_mdev_callback *cb); +u16 (*get_vq_num_max)(struct mdev_device *mdev); +u32 (*get_device_id)(struct mdev_device *mdev); +u32 (*get_vendor_id)(struct mdev_device *mdev); +u8 (*get_status)(struct mdev_device *mdev); +void (*set_status)(struct mdev_device *mdev,u8 status); +void (*get_config)(struct mdev_device *mdev,unsigned int offset, +void *buf,unsigned int len); +void (*set_config)(struct mdev_device *mdev,unsigned int offset, +const void *buf,unsigned int len); +u32 (*get_generation)(struct mdev_device *mdev); +}; + +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); + +#endif
PATCH v7 4/6 mdev: introduce virtio device and its device ops
In reply to Jason WangThis patch implements basic support for mdev driver that supports virtio transport for kernel virtio driver.
--- drivers/vfio/mdev/mdev_core.c | 20 ++++ drivers/vfio/mdev/mdev_private.h | 2 + include/linux/mdev.h | 6 ++ include/linux/mdev_virtio_ops.h | 166 +++++++++++++++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 include/linux/mdev_virtio_ops.h
drivers/vfio/mdev/mdev_core.c +20 -0
@@ -76,6 +76,26 @@ const struct mdev_vfio_device_ops *mdev_get_vfio_ops(struct mdev_device *mdev) }EXPORT_SYMBOL (mdev_get_vfio_ops); +/* Specify the virtio device ops for the mdev device, this +* must be called during create() callback for virtio mdev device. +*/ +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops) +{ +mdev_set_class (mdev,MDEV_CLASS_ID_VIRTIO ); + mdev->virtio_ops = virtio_ops; +} +EXPORT_SYMBOL (mdev_set_virtio_ops); + +/* Get the virtio device ops for the mdev device. */ +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev) +{ +WARN_ON (mdev->class_id !=MDEV_CLASS_ID_VIRTIO ); +return mdev->virtio_ops; +} +EXPORT_SYMBOL (mdev_get_virtio_ops); +struct device *mdev_dev (struct mdev_device *mdev) {return &mdev->dev;
drivers/vfio/mdev/mdev_private.h +2 -0
@@ -11,6 +11,7 @@#define MDEV_PRIVATE_H #include <linux/mdev_vfio_ops.h> +#include <linux/mdev_virtio_ops.h> int mdev_bus_register (void );void mdev_bus_unregister (void );
@@ -38,6 +39,7 @@ struct mdev_device {u16 class_id;union {const struct mdev_vfio_device_ops *vfio_ops; +const struct mdev_virtio_device_ops *virtio_ops; }; };
include/linux/mdev.h +6 -0
@@ -17,6 +17,7 @@struct mdev_device ;struct mdev_vfio_device_ops ; +struct mdev_virtio_device_ops ;/* * Called by the parent device driver to set the device which represents
@@ -112,6 +113,10 @@ void mdev_set_class(struct mdev_device *mdev, u16 id);void mdev_set_vfio_ops (struct mdev_device *mdev,const struct mdev_vfio_device_ops *vfio_ops);const struct mdev_vfio_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct mdev_virtio_device_ops *virtio_ops); +const struct mdev_virtio_device_ops * +mdev_get_virtio_ops (struct mdev_device *mdev);extern struct bus_type mdev_bus_type;
@@ -127,6 +132,7 @@ struct mdev_device *mdev_from_dev(struct device *dev);enum {MDEV_CLASS_ID_VFIO =1 , +MDEV_CLASS_ID_VIRTIO =2 ,/* New entries must be added here */ };
include/linux/mdev_virtio_ops.h new file +166 -0
166 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v7 5/6 virtio: introduce a mdev based transport
In reply to Jason WangThis patch introduces a new mdev transport for virtio. This is used to use kernel virtio driver to drive the mediated device that is capable of populating virtqueue directly.
A new virtio-mdev driver will be registered to the mdev bus, when a new virtio-mdev device is probed, it will register the device with mdev based config ops. This means it is a software transport between mdev driver and mdev device. The transport was implemented through device specific ops which is a part of mdev_parent_ops now.
--- drivers/virtio/Kconfig | 7 + drivers/virtio/Makefile | 1 + drivers/virtio/virtio_mdev.c | 413 +++++++++++++++++++++++++++++++++++ 3 files changed, 421 insertions(+) create mode 100644 drivers/virtio/virtio_mdev.c
drivers/virtio/Kconfig +7 -0
@@ -43,6 +43,13 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_MDEV_DEVICE + tristate "VIRTIO driver for Mediated devices" + depends on VFIO_MDEV && VIRTIO + default n + help + VIRTIO based driver for Mediated devices. + config VIRTIO_PMEM tristate "Support for virtio pmem driver" depends on VIRTIO
drivers/virtio/Makefile +1 -0
@@ -6,3 +6,4 @@ virtio_pci-y := virtio_pci_modern.o virtio_pci_common.o virtio_pci-$(CONFIG_VIRTIO_PCI_LEGACY) += virtio_pci_legacy.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o +obj-$(CONFIG_VIRTIO_MDEV_DEVICE) += virtio_mdev.o
drivers/virtio/virtio_mdev.c new file +413 -0
413 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v7 5/6 virtio: introduce a mdev based transport
In reply to Jason WangThis patch introduces a new mdev transport for virtio. This is used to use kernel virtio driver to drive the mediated device that is capable of populating virtqueue directly.
A new virtio-mdev driver will be registered to the mdev bus, when a new virtio-mdev device is probed, it will register the device with mdev based config ops. This means it is a software transport between mdev driver and mdev device. The transport was implemented through device specific ops which is a part of mdev_parent_ops now.
--- drivers/virtio/Kconfig | 7 + drivers/virtio/Makefile | 1 + drivers/virtio/virtio_mdev.c | 413 +++++++++++++++++++++++++++++++++++ 3 files changed, 421 insertions(+) create mode 100644 drivers/virtio/virtio_mdev.c
drivers/virtio/Kconfig +7 -0
@@ -43,6 +43,13 @@ config VIRTIO_PCI_LEGACY If unsure, say Y. +config VIRTIO_MDEV_DEVICE + tristate "VIRTIO driver for Mediated devices" + depends on VFIO_MDEV && VIRTIO + default n + help + VIRTIO based driver for Mediated devices. + config VIRTIO_PMEM tristate "Support for virtio pmem driver" depends on VIRTIO
drivers/virtio/Makefile +1 -0
@@ -6,3 +6,4 @@ virtio_pci-y := virtio_pci_modern.o virtio_pci_common.o virtio_pci-$(CONFIG_VIRTIO_PCI_LEGACY) += virtio_pci_legacy.o obj-$(CONFIG_VIRTIO_BALLOON) += virtio_balloon.o obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o +obj-$(CONFIG_VIRTIO_MDEV_DEVICE) += virtio_mdev.o
drivers/virtio/virtio_mdev.c new file +413 -0
413 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v7 6/6 docs: sample driver to demonstrate how to implement virtio-mdev framework
In reply to Jason WangThis sample driver creates mdev device that simulate virtio net device over virtio mdev transport. The device is implemented through vringh and workqueue. A device specific dma ops is to make sure HVA is used directly as the IOVA. This should be sufficient for kernel virtio driver to work.
Only 'virtio' type is supported right now. I plan to add 'vhost' type on top which requires some virtual IOMMU implemented in this sample driver.
--- MAINTAINERS | 1 + samples/Kconfig | 7 + samples/vfio-mdev/Makefile | 1 + samples/vfio-mdev/mvnet.c | 691 +++++++++++++++++++++++++++++++++++++ 4 files changed, 700 insertions(+) create mode 100644 samples/vfio-mdev/mvnet.c
MAINTAINERS +1 -0
@@ -17248,6 +17248,7 @@ F: include/linux/virtio*.h F: include/uapi/linux/virtio_*.h F: drivers/crypto/virtio/ F: mm/balloon_compaction.c +F: samples/vfio-mdev/mvnet.c VIRTIO BLOCK AND SCSI DRIVERS M: "Michael S. Tsirkin" <[email protected]>
samples/Kconfig +7 -0
@@ -131,6 +131,13 @@ config SAMPLE_VFIO_MDEV_MDPY mediated device. It is a simple framebuffer and supports the region display interface (VFIO_GFX_PLANE_TYPE_REGION). +config SAMPLE_VIRTIO_MDEV_NET + tristate "Build virtio mdev net example mediated device sample code -- loadable modules only" + depends on VIRTIO_MDEV_DEVICE && VHOST_RING && m + help + Build a networking sample device for use as a virtio + mediated device. + config SAMPLE_VFIO_MDEV_MDPY_FB tristate "Build VFIO mdpy example guest fbdev driver -- loadable module only" depends on FB && m
samples/vfio-mdev/Makefile +1 -0
@@ -3,3 +3,4 @@ obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o obj-$(CONFIG_SAMPLE_VFIO_MDEV_MDPY) += mdpy.o obj-$(CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB) += mdpy-fb.o obj-$(CONFIG_SAMPLE_VFIO_MDEV_MBOCHS) += mbochs.o +obj-$(CONFIG_SAMPLE_VIRTIO_MDEV_NET) += mvnet.o
samples/vfio-mdev/mvnet.c new file +691 -0
691 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v7 6/6 docs: sample driver to demonstrate how to implement virtio-mdev framework
In reply to Jason WangThis sample driver creates mdev device that simulate virtio net device over virtio mdev transport. The device is implemented through vringh and workqueue. A device specific dma ops is to make sure HVA is used directly as the IOVA. This should be sufficient for kernel virtio driver to work.
Only 'virtio' type is supported right now. I plan to add 'vhost' type on top which requires some virtual IOMMU implemented in this sample driver.
--- MAINTAINERS | 1 + samples/Kconfig | 7 + samples/vfio-mdev/Makefile | 1 + samples/vfio-mdev/mvnet.c | 691 +++++++++++++++++++++++++++++++++++++ 4 files changed, 700 insertions(+) create mode 100644 samples/vfio-mdev/mvnet.c
MAINTAINERS +1 -0
@@ -17248,6 +17248,7 @@ F: include/linux/virtio*.h F: include/uapi/linux/virtio_*.h F: drivers/crypto/virtio/ F: mm/balloon_compaction.c +F: samples/vfio-mdev/mvnet.c VIRTIO BLOCK AND SCSI DRIVERS M: "Michael S. Tsirkin" <[email protected]>
samples/Kconfig +7 -0
@@ -131,6 +131,13 @@ config SAMPLE_VFIO_MDEV_MDPY mediated device. It is a simple framebuffer and supports the region display interface (VFIO_GFX_PLANE_TYPE_REGION). +config SAMPLE_VIRTIO_MDEV_NET + tristate "Build virtio mdev net example mediated device sample code -- loadable modules only" + depends on VIRTIO_MDEV_DEVICE && VHOST_RING && m + help + Build a networking sample device for use as a virtio + mediated device. + config SAMPLE_VFIO_MDEV_MDPY_FB tristate "Build VFIO mdpy example guest fbdev driver -- loadable module only" depends on FB && m
samples/vfio-mdev/Makefile +1 -0
@@ -3,3 +3,4 @@ obj-$(CONFIG_SAMPLE_VFIO_MDEV_MTTY) += mtty.o obj-$(CONFIG_SAMPLE_VFIO_MDEV_MDPY) += mdpy.o obj-$(CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB) += mdpy-fb.o obj-$(CONFIG_SAMPLE_VFIO_MDEV_MBOCHS) += mbochs.o +obj-$(CONFIG_SAMPLE_VIRTIO_MDEV_NET) += mvnet.o
samples/vfio-mdev/mvnet.c new file +691 -0
691 lines not on this page · raw message
Signature · 1 line
2.19.1