mdev based hardware virtio offloading support
Subsystems (16)
v6 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/29/335
[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/mod_devicetable.h | 8 + include/linux/vfio_mdev_ops.h | 52 ++ include/linux/virtio_mdev_ops.h | 161 ++++ 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, 1598 insertions(+), 91 deletions(-) create mode 100644 drivers/virtio/virtio_mdev.c create mode 100644 include/linux/vfio_mdev_ops.h create mode 100644 include/linux/virtio_mdev_ops.h create mode 100644 samples/vfio-mdev/mvnet.c
Signature · 1 line
2.19.1
PATCH v6 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 V6 1/6] mdev: class id support
Quoted 324 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Jason Wang
Sent: Wednesday, October 30, 2019 1:45 AM
To: [email protected]; [email protected]; linux- [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Ido Shamay <[email protected]>; [email protected]; [email protected]; Parav Pandit <[email protected]>; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Subject: [PATCH V6 1/6] mdev: class id supportMdev 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.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 +2
-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 themdev core driver::
Documentation/driver-api/vfio-mediated-device.rst +3
-0extern 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 +15
-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)drivers/vfio/mdev/mdev_core.c +0
-0goto add_fail;(quoted diff) +0
-0
b/drivers/vfio/mdev/mdev_driver.cindex0d3223aee20b..ed06433693e8100644drivers/vfio/mdev/mdev_driver.c +23
-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 index renamed from include/linux/mdev.h +0
-0
0ce30ca78db0..78b69d09eb54100644include/linux/mdev.h +1
-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{include/linux/mdev.h +1
-0@@ -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); voidmdev_set_drvdata(struct mdev_device *mdev, void *data); constguid_t*mdev_uuid(structmdev_device*mdev);include/linux/mdev.h +6
-0+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); structmdev_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 index renamed from samples/vfio-mdev/mbochs.c +0
-0
ac5c8c17b1ff..115bc5074656100644samples/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 index renamed from samples/vfio-mdev/mdpy.c +0
-0
cc86bf6566e4..665614574d50100644samples/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 index renamed from samples/vfio-mdev/mtty.c +0
-0
ce84a300a4da..90da12ff7fd9100644samples/vfio-mdev/mtty.c +1
-1@@ -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 ; } --
Quoted 1 line
2.19.1
PATCH v6 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 v6 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 v6 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 v6 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/vfio_mdev_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/vfio_mdev_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 vfio_mdev_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/vfio_mdev_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/vfio_mdev_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 vfio_mdev_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 vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_ops);return 0 ; }
@@ -1281,15 +1284,18 @@ static ssize_t vfio_ap_mdev_ioctl(struct mdev_device *mdev,return ret; } +static const struct vfio_mdev_device_ops vfio_mdev_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 vfio_mdev_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 vfio_mdev_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/vfio_mdev_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 vfio_mdev_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/vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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/vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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/vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 V6 3/6] mdev: introduce device specific ops
Quoted 35 lines
-----Original Message-----
From: Jason Wang <[email protected]>
Sent: Wednesday, October 30, 2019 1:45 AM
To: [email protected]; [email protected]; linux- [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Ido Shamay <[email protected]>; [email protected]; [email protected]; Parav Pandit <[email protected]>; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Subject: [PATCH V6 3/6] mdev: introduce device specific opsCurrently, 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.Signed-off-by Jason Wang <[email protected]>---
[ ..]
include/linux/vfio_mdev_ops.h line 8
Quoted 13 lines
include/linux/vfio_mdev_ops.h new file +8
-0@@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* VFIO Mediated device definition +*/ + +#ifndef VFIO_MDEV_H +#define VFIO_MDEV_H +
I should have noticed this before. :-(
APIs exposed are by the mdev module and named with mdev_ prefix. And file name is _ops.h,
We should name this file as mdev_vfio_ops.h
And #define should be MDEV_VFIO_OPS_H
include/linux/vfio_mdev_ops.h line 12
Quoted 4 lines
include/linux/vfio_mdev_ops.h new file +4
-0+#include <linux/mdev.h> + +/** +* struct vfio_mdev_device_ops - Structure to be registered for each
s/vfio_mdev_device_ops/mdev_vfio_device_ops/
Similarly for virtio in future patches.
Quoted 220 lines
include/linux/vfio_mdev_ops.h new file +37
-0+* 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 vfio_mdev_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);
include/linux/vfio_mdev_ops.h new file +3
-0+}; + +#endif samples/vfio-mdev/mbochs.c index renamed from samples/vfio-mdev/mbochs.c +0
-0
115bc5074656..1afec20bf0c5100644samples/vfio-mdev/mbochs.c +4
-0@@ -30,6 +30,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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)
samples/vfio-mdev/mbochs.c +2
-7mbochs_reset (mdev); mbochs_used_mbytes += type->mbytes; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_ops = { .open = mbochs_open, .release = mbochs_close,samples/vfio-mdev/mbochs.c +8
-0.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 index renamed from samples/vfio-mdev/mdpy.c +0
-0
665614574d50..d571fb65f50f100644samples/vfio-mdev/mdpy.c +4
-0@@ -26,6 +26,7 @@#include <linux/iommu.h> #include <linux/sysfs.h> #include <linux/mdev.h> +#include <linux/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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)
samples/vfio-mdev/mdpy.c +10
-7mdpy_reset (mdev); mdpy_count++; -mdev_set_class (mdev,MDEV_CLASS_ID_VFIO ); +mdev_set_vfio_ops (mdev, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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 index renamed from samples/vfio-mdev/mtty.c +0
-0
90da12ff7fd9..4048b242c636100644samples/vfio-mdev/mtty.c +12
-1@@ -27,6 +27,7 @@#include <linux/ctype.h> #include <linux/file.h> #include <linux/mdev.h> +#include <linux/vfio_mdev_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 vfio_mdev_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 vfio_mdev_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,samples/vfio-mdev/mtty.c +0
-6.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) --
Quoted 1 line
2.19.1
With above small nit changes to rename the fields and file,
Re: [PATCH V6 3/6] mdev: introduce device specific ops
Quoted 57 lines · Parav Pandit
Quoted 34 lines
-----Original Message-----
From: Jason Wang <[email protected]>
Sent: Wednesday, October 30, 2019 1:45 AM
To: [email protected]; [email protected]; linux- [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Ido Shamay <[email protected]>; [email protected]; [email protected]; Parav Pandit <[email protected]>; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Subject: [PATCH V6 3/6] mdev: introduce device specific opsCurrently, 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.Signed-off-by Jason Wang <[email protected]>---
[ ..]
include/linux/vfio_mdev_ops.h line 8
Quoted 13 lines
include/linux/vfio_mdev_ops.h new file +8
-0@@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* VFIO Mediated device definition +*/ + +#ifndef VFIO_MDEV_H +#define VFIO_MDEV_H +I should have noticed this before. :-(
APIs exposed are by the mdev module and named withmdev_prefix. And file name is_ops.h,We should name this file as
mdev_vfio_ops.hAnd #define should be
MDEV_VFIO_OPS_H
Quoted 8 lines
include/linux/vfio_mdev_ops.h line 12
Quoted 4 lines
include/linux/vfio_mdev_ops.h new file +4
-0+#include <linux/mdev.h> + +/** +* struct vfio_mdev_device_ops - Structure to be registered for each s/vfio_mdev_device_ops/mdev_vfio_device_ops/
Similarly for virtio in future patches.
Will fix in V7.
Quoted 6 lines
static void
mtty_device_release(struct device *dev)
--
2.19.1
With above small nit changes to rename the fields and file,Reviewed-by Parav Pandit <[email protected]>
Appreciate that, thanks.
Re: [PATCH V6 3/6] mdev: introduce device specific ops
In reply to Parav PanditQuoted 57 lines · Parav Pandit
Quoted 34 lines
-----Original Message-----
From: Jason Wang <[email protected]>
Sent: Wednesday, October 30, 2019 1:45 AM
To: [email protected]; [email protected]; linux- [email protected]; [email protected]; intel- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Ido Shamay <[email protected]>; [email protected]; [email protected]; Parav Pandit <[email protected]>; [email protected]; [email protected]; [email protected]; Jason Wang <[email protected]>
Subject: [PATCH V6 3/6] mdev: introduce device specific opsCurrently, 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.Signed-off-by Jason Wang <[email protected]>---
[ ..]
include/linux/vfio_mdev_ops.h line 8
Quoted 13 lines
include/linux/vfio_mdev_ops.h new file +8
-0@@ -0,0 +1,52 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* VFIO Mediated device definition +*/ + +#ifndef VFIO_MDEV_H +#define VFIO_MDEV_H +I should have noticed this before. :-(
APIs exposed are by the mdev module and named withmdev_prefix. And file name is_ops.h,We should name this file as
mdev_vfio_ops.hAnd #define should be
MDEV_VFIO_OPS_H
Quoted 8 lines
include/linux/vfio_mdev_ops.h line 12
Quoted 4 lines
include/linux/vfio_mdev_ops.h new file +4
-0+#include <linux/mdev.h> + +/** +* struct vfio_mdev_device_ops - Structure to be registered for each s/vfio_mdev_device_ops/mdev_vfio_device_ops/
Similarly for virtio in future patches.
Will fix in V7.
Quoted 6 lines
static void
mtty_device_release(struct device *dev)
--
2.19.1
With above small nit changes to rename the fields and file,Reviewed-by Parav Pandit <[email protected]>
Appreciate that, thanks.
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
PATCH v6 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/vfio_mdev_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/vfio_mdev_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 vfio_mdev_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/vfio_mdev_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/vfio_mdev_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 vfio_mdev_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 vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_ops);return 0 ; }
@@ -1281,15 +1284,18 @@ static ssize_t vfio_ap_mdev_ioctl(struct mdev_device *mdev,return ret; } +static const struct vfio_mdev_device_ops vfio_mdev_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 vfio_mdev_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 vfio_mdev_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/vfio_mdev_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 vfio_mdev_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/vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 vfio_mdev_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/vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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/vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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, &vfio_mdev_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 vfio_mdev_device_ops vfio_mdev_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/vfio_mdev_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 vfio_mdev_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 vfio_mdev_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 v6 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/virtio_mdev_ops.h | 161 +++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+) create mode 100644 include/linux/virtio_mdev_ops.h
drivers/vfio/mdev/mdev_core.c +20 -0
@@ -76,6 +76,26 @@ const struct vfio_mdev_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 virtio_mdev_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 virtio_mdev_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/vfio_mdev_ops.h> +#include <linux/virtio_mdev_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 vfio_mdev_device_ops *vfio_ops; +const struct virtio_mdev_device_ops *virtio_ops; }; };
include/linux/mdev.h +6 -0
@@ -17,6 +17,7 @@struct mdev_device ;struct vfio_mdev_device_ops ; +struct virtio_mdev_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 vfio_mdev_device_ops *vfio_ops);const struct vfio_mdev_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct virtio_mdev_device_ops *virtio_ops); +const struct virtio_mdev_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/virtio_mdev_ops.h new file +161 -0
161 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v6 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/virtio_mdev_ops.h | 161 +++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+) create mode 100644 include/linux/virtio_mdev_ops.h
drivers/vfio/mdev/mdev_core.c +20 -0
@@ -76,6 +76,26 @@ const struct vfio_mdev_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 virtio_mdev_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 virtio_mdev_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/vfio_mdev_ops.h> +#include <linux/virtio_mdev_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 vfio_mdev_device_ops *vfio_ops; +const struct virtio_mdev_device_ops *virtio_ops; }; };
include/linux/mdev.h +6 -0
@@ -17,6 +17,7 @@struct mdev_device ;struct vfio_mdev_device_ops ; +struct virtio_mdev_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 vfio_mdev_device_ops *vfio_ops);const struct vfio_mdev_device_ops *mdev_get_vfio_ops (struct mdev_device *mdev); +void mdev_set_virtio_ops (struct mdev_device *mdev, +const struct virtio_mdev_device_ops *virtio_ops); +const struct virtio_mdev_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/virtio_mdev_ops.h new file +161 -0
161 lines not on this page · raw message
Signature · 1 line
2.19.1
PATCH v6 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 v6 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 v6 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
Re: [PATCH V6 6/6] docs: sample driver to demonstrate how to implement virtio-mdev framework
Quoted 9 lines · Jason Wang
This 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.
Can we please submit a real driver for it? A more or less useless sample driver doesn't really qualify for our normal kernel requirements that infrastructure should have a real user.
Re: [PATCH V6 6/6] docs: sample driver to demonstrate how to implement virtio-mdev framework
Quoted 7 lines · Christoph Hellwig
Quoted 6 lines · Jason Wang
This 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.
Quoted 6 lines
Quoted 3 lines
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.
Can we please submit a real driver for it? A more or less useless sample driver doesn't really qualify for our normal kernel requirements that infrastructure should have a real user.
Intel posted a real driver here: https://lkml.org/lkml/2019/10/15/1226.
I plan to post another driver that wire virito-pci back to mdev bus on top of this series as well.
Thanks
Re: [PATCH V6 6/6] docs: sample driver to demonstrate how to implement virtio-mdev framework
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
Quoted 6 lines · Jason Wang
This 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.
Quoted 6 lines
Quoted 3 lines
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.
Can we please submit a real driver for it? A more or less useless sample driver doesn't really qualify for our normal kernel requirements that infrastructure should have a real user.
Intel posted a real driver here: https://lkml.org/lkml/2019/10/15/1226.
I plan to post another driver that wire virito-pci back to mdev bus on top of this series as well.
Thanks
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Re: [PATCH V6 6/6] docs: sample driver to demonstrate how to implement virtio-mdev framework
In reply to Christoph HellwigQuoted 7 lines · Christoph Hellwig
Quoted 6 lines · Jason Wang
This 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.
Quoted 6 lines
Quoted 3 lines
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.
Can we please submit a real driver for it? A more or less useless sample driver doesn't really qualify for our normal kernel requirements that infrastructure should have a real user.
Hello Christoph,
I am working on a real hardware driver for it, it's called IFC, I have posted RFC V1 and will post RFC V2 soon.
Thanks,
BR
Zhu Lingshan
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH V6 6/6] docs: sample driver to demonstrate how to implement virtio-mdev framework
In reply to Jason WangQuoted 9 lines · Jason Wang
This 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.
Can we please submit a real driver for it? A more or less useless sample driver doesn't really qualify for our normal kernel requirements that infrastructure should have a real user.
PATCH v6 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
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for mdev based hardware virtio offloading support (rev7)
In reply to Jason Wang== Series Details ==
== Series Details ==
Series: mdev based hardware virtio offloading support (rev7)
URL : https://patchwork.freedesktop.org/series/66989/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a54b4e12fd9e mdev: class id support 91d56ca65904 modpost: add support for mdev class id 19b3bb0c8c55 mdev: introduce device specific ops -:258: CHECK:LINE_SPACING: Please don't use multiple blank lines #258: FILE: drivers/vfio/mdev/mdev_core.c:48:
+
-:263: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #263: FILE: drivers/vfio/mdev/mdev_core.c:51:
+ * provided by each class. */
-:500: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #500:
new file mode 100644
total: 0 errors, 2 warnings, 1 checks, 620 lines checkedf26964d916d1 mdev: introduce virtio device and its device ops
-:94: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #94:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 225 lines checked7f94f725f372 virtio: introduce a mdev based transport
-:26: WARNING:CONFIG_DESCRIPTION: please write a paragraph that describes the config symbol fully #26: FILE: drivers/virtio/Kconfig:46:
+config VIRTIO_MDEV_DEVICE
-:46: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #46:
new file mode 100644
-:106: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #106: FILE: drivers/virtio/virtio_mdev.c:56:
+static void virtio_mdev_get(struct virtio_device *vdev, unsigned offset,
-:107: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #107: FILE: drivers/virtio/virtio_mdev.c:57:
+ void *buf, unsigned len)
-:115: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #115: FILE: drivers/virtio/virtio_mdev.c:65:
+static void virtio_mdev_set(struct virtio_device *vdev, unsigned offset,
-:116: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #116: FILE: drivers/virtio/virtio_mdev.c:66:
+ const void *buf, unsigned len)
-:186: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #186: FILE: drivers/virtio/virtio_mdev.c:136:
+virtio_mdev_setup_vq(struct virtio_device *vdev, unsigned index,
-:265: CHECK:BRACES: Blank lines aren't necessary before a close brace '}' #265: FILE: drivers/virtio/virtio_mdev.c:215:
+
+}
-:297: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #297: FILE: drivers/virtio/virtio_mdev.c:247:
+static int virtio_mdev_find_vqs(struct virtio_device *vdev, unsigned nvqs,
total: 0 errors, 8 warnings, 1 checks, 430 lines checked37ffc610a39e docs: sample driver to demonstrate how to implement virtio-mdev framework -:39: WARNING:CONFIG_DESCRIPTION: please write a paragraph that describes the config symbol fully #39: FILE: samples/Kconfig:134:
+config SAMPLE_VIRTIO_MDEV_NET
-:59: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #59:
new file mode 100644
-:147: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #147: FILE: samples/vfio-mdev/mvnet.c:84:
+ spinlock_t lock;
-:180: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #180: FILE: samples/vfio-mdev/mvnet.c:117:
+ vringh_init_kern(&vq->vring, mvnet_features, MVNET_QUEUE_MAX,
+ false, 0, 0, 0);
-:285: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!addr" #285: FILE: samples/vfio-mdev/mvnet.c:222:
+ if (addr == NULL)
-:288: CHECK:SPACING: No space is necessary after a cast #288: FILE: samples/vfio-mdev/mvnet.c:225:
+ *dma_addr = (dma_addr_t) addr;
-:318: CHECK:ALLOC_SIZEOF_STRUCT: Prefer kzalloc(sizeof(*mvnet)...) over kzalloc(sizeof(struct mvnet_state)...) #318: FILE: samples/vfio-mdev/mvnet.c:255:
+ mvnet = kzalloc(sizeof(struct mvnet_state), GFP_KERNEL);
-:319: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!mvnet" #319: FILE: samples/vfio-mdev/mvnet.c:256:
+ if (mvnet == NULL)
-:375: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #375: FILE: samples/vfio-mdev/mvnet.c:312:
+sample_mvnet_dev_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
total: 0 errors, 2 warnings, 7 checks, 715 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for mdev based hardware virtio offloading support (rev7)
In reply to Jason Wang== Series Details ==
== Series Details ==
Series: mdev based hardware virtio offloading support (rev7)
URL : https://patchwork.freedesktop.org/series/66989/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7222 -> Patchwork_15067
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/index.html
Known issues
------------
Here are the changes found in Patchwork_15067 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: [PASS][1] -> [FAIL][2] ([fdo#109483]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/fi-icl-u2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- fi-icl-u3: [INCOMPLETE][3] ([fdo#107713] / [fdo#109100]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/fi-icl-u3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/fi-icl-u3/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-bsw-n3050: [DMESG-FAIL][5] -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/fi-bsw-n3050/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/fi-bsw-n3050/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_execlists:
- fi-kbl-7500u: [INCOMPLETE][7] -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/fi-kbl-7500u/igt@i915_selftest@live_execlists.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/fi-kbl-7500u/igt@i915_selftest@live_execlists.html
* {igt@i915_selftest@live_gt_timelines}:
- {fi-tgl-u}: [INCOMPLETE][9] ([fdo#111831]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/fi-tgl-u/igt@i915_selftest@live_gt_timelines.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/fi-tgl-u/igt@i915_selftest@live_gt_timelines.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#111831]: https://bugs.freedesktop.org/show_bug.cgi?id=111831
Participating hosts (50 -> 43)
------------------------------
Additional (1): fi-cfl-8109u
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-pnv-d510 fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7222 -> Patchwork_15067
CI-20190529: 20190529
CI_DRM_7222: 8644d705561f6144142819da036bc3c8edbecd92 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5251: 6d30ec2314f22f465113f7a972944fee546ecbd9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15067: 37ffc610a39e943d4635a5abbd02ec7c58932b65 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
37ffc610a39e docs: sample driver to demonstrate how to implement virtio-mdev framework 7f94f725f372 virtio: introduce a mdev based transportf26964d916d1 mdev: introduce virtio device and its device ops 19b3bb0c8c55 mdev: introduce device specific ops91d56ca65904 modpost: add support for mdev class ida54b4e12fd9e mdev: class id support
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for mdev based hardware virtio offloading support (rev7)
In reply to Jason Wang== Series Details ==
== Series Details ==
Series: mdev based hardware virtio offloading support (rev7)
URL : https://patchwork.freedesktop.org/series/66989/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7222_full -> Patchwork_15067_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_15067_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vcs1-dirty-create:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276] / [fdo#112080]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb3/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#110841])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb7/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb4/igt@[email protected]
* igt@gem_ctx_switch@vcs1:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#112080]) +19 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb5/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#112146]) +7 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb3/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb4/igt@[email protected]
* igt@gem_linear_blits@normal:
- shard-apl: [PASS][9] -> [INCOMPLETE][10] ([fdo#103927])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-apl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-apl3/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-unsync:
- shard-hsw: [PASS][11] -> [DMESG-WARN][12] ([fdo#111870])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-hsw2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-hsw2/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-busy-gup:
- shard-snb: [PASS][13] -> [DMESG-WARN][14] ([fdo#111870])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-snb6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-snb6/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-kbl: [PASS][15] -> [DMESG-WARN][16] ([fdo#108566]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-kbl6/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-kbl7/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-legacy:
- shard-hsw: [PASS][17] -> [FAIL][18] ([fdo#105767])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-hsw2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-hsw6/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][19] -> [FAIL][20] ([fdo#105363]) +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-skl2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-skl6/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-glk: [PASS][21] -> [INCOMPLETE][22] ([fdo#103359] / [k.org#198133])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-glk3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-glk8/igt@[email protected]
* igt@kms_flip_tiling@flip-y-tiled:
- shard-iclb: [PASS][23] -> [FAIL][24] ([fdo#108303])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-rgb101010-draw-mmap-gtt:
- shard-snb: [PASS][25] -> [SKIP][26] ([fdo#109271]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-snb2/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-snb6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-blt:
- shard-iclb: [PASS][27] -> [FAIL][28] ([fdo#103167])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb7/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb2/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-suspend:
- shard-skl: [PASS][29] -> [INCOMPLETE][30] ([fdo#104108] / [fdo#106978])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-skl6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-skl5/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes:
- shard-apl: [PASS][31] -> [DMESG-WARN][32] ([fdo#108566])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-apl4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-apl6/igt@[email protected]
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb5/igt@kms_psr@psr2_no_drrs.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-skl: [PASS][35] -> [INCOMPLETE][36] ([fdo#104108])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-skl8/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-skl10/igt@[email protected]
* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109276]) +33 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb7/igt@[email protected]
#### Possible fixes ####
* {igt@gem_ctx_persistence@vcs1-queued}:
- shard-iclb: [SKIP][39] ([fdo#109276] / [fdo#112080]) -> [PASS][40] +3 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb2/igt@[email protected]
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][41] ([fdo#110854]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb3/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb4/igt@[email protected]
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [SKIP][43] ([fdo#112080]) -> [PASS][44] +14 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb6/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [SKIP][45] ([fdo#112146]) -> [PASS][46] +7 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb7/igt@[email protected]
* igt@gem_persistent_relocs@forked-interruptible-thrashing:
- shard-snb: [FAIL][47] ([fdo#112037]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-snb4/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-snb4/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-sync:
- shard-snb: [DMESG-WARN][49] ([fdo#111870]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-snb2/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-snb2/igt@[email protected]
* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup:
- shard-hsw: [DMESG-WARN][51] ([fdo#111870]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-hsw6/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-hsw6/igt@[email protected]
* {igt@i915_selftest@live_gt_heartbeat}:
- shard-skl: [DMESG-FAIL][53] -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-skl5/igt@i915_selftest@live_gt_heartbeat.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-skl2/igt@i915_selftest@live_gt_heartbeat.html
* igt@i915_selftest@mock_requests:
- shard-glk: [INCOMPLETE][55] ([fdo#103359] / [k.org#198133]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-glk8/igt@i915_selftest@mock_requests.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-glk8/igt@i915_selftest@mock_requests.html
* igt@kms_fbcon_fbt@psr-suspend:
- shard-skl: [INCOMPLETE][57] ([fdo#104108]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-skl1/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-skl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- shard-iclb: [FAIL][59] ([fdo#103167]) -> [PASS][60] +2 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb8/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb8/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [DMESG-WARN][61] ([fdo#108566]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-kbl3/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-kbl2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [FAIL][63] ([fdo#108145] / [fdo#110403]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-skl8/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-skl8/igt@[email protected]
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][65] ([fdo#109441]) -> [PASS][66] +2 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb6/igt@kms_psr@psr2_sprite_plane_move.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
* igt@kms_rotation_crc@primary-rotation-180:
- shard-kbl: [INCOMPLETE][67] ([fdo#103665]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-kbl3/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-kbl2/igt@[email protected]
* igt@prime_busy@hang-bsd2:
- shard-iclb: [SKIP][69] ([fdo#109276]) -> [PASS][70] +15 similar issues
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb3/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb4/igt@[email protected]
#### Warnings ####
* igt@gem_mocs_settings@mocs-isolation-bsd2:
- shard-iclb: [SKIP][71] ([fdo#109276]) -> [FAIL][72] ([fdo#111330])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb6/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb4/igt@[email protected]
* igt@gem_mocs_settings@mocs-rc6-bsd2:
- shard-iclb: [FAIL][73] ([fdo#111330]) -> [SKIP][74] ([fdo#109276])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7222/shard-iclb2/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/shard-iclb3/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108972]: https://bugs.freedesktop.org/show_bug.cgi?id=108972
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110548]: https://bugs.freedesktop.org/show_bug.cgi?id=110548
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111329]: https://bugs.freedesktop.org/show_bug.cgi?id=111329
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#111870]: https://bugs.freedesktop.org/show_bug.cgi?id=111870
[fdo#112037]: https://bugs.freedesktop.org/show_bug.cgi?id=112037
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[fdo#112180]: https://bugs.freedesktop.org/show_bug.cgi?id=112180
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7222 -> Patchwork_15067
CI-20190529: 20190529
CI_DRM_7222: 8644d705561f6144142819da036bc3c8edbecd92 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5251: 6d30ec2314f22f465113f7a972944fee546ecbd9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15067: 37ffc610a39e943d4635a5abbd02ec7c58932b65 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15067/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx