Skip to contentSkip to conversation

mdev based hardware virtio offloading support

PATCH Superseded Jason Wang 5 participants 44 messages Oct 23, 2019 – Oct 30, 2019

Subsystems (16)

v5 of 13 Superseded Latest is v13 →

lore
Share & tools
lore

Jason Wang

author
#0 lore raw

v5 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/22/262
[2] https://lkml.org/lkml/2019/10/15/1226

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                 |  59 ++
 drivers/vfio/mdev/mdev_driver.c               |  22 +
 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               | 159 ++++
 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                      |  10 +
 24 files changed, 1594 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 · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#1 lore raw

PATCH v5 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                 | 18 +++++++++++++++
 drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
 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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +18 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
  * mdev_register_device : Register a device
  * @dev: device structure representing parent device.
  * @ops: Parent device operation structure to be registered.
+ * @id: class id.
  *
  * Add device to list of registered parent devices.
  * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
 	if (ret)
 		goto ops_create_fail;
 
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));
+		goto add_fail;
+	}
+
 	ret = device_add(&mdev->dev);
 	if (ret)
 		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +22 -0
index 0d3223aee20b..319d886ffaf7 100644
@@ -69,8 +69,30 @@ 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;
+
+	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
index 7d922950caaf..c65f436c1869 100644
@@ -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
index 30964a4e0a28..7b24ee9cb8dd 100644
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)
 	vfio_del_group_dev(dev);
 }
 
+static const struct mdev_class_id 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 = id_table,
 };
 
 static int __init vfio_mdev_init(void)
include/linux/mdev.h +8 -0
index 0ce30ca78db0..78b69d09eb54 100644
@@ -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
index 5714fd35a83c..f32c6e44fb1a 100644
@@ -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
index ac5c8c17b1ff..115bc5074656 100644
@@ -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
index cc86bf6566e4..665614574d50 100644
@@ -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
index ce84a300a4da..90da12ff7fd9 100644
@@ -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
Reviewed-by on v5 1/6
#2 lore raw

RE: [PATCH V5 1/6] mdev: class id support

Quoted 328 lines

-----Original Message-----
From: Jason Wang <[email protected]>
Sent: Wednesday, October 23, 2019 8:08 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 V5 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                 | 18 +++++++++++++++
 drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
 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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +2 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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::

Documentation/driver-api/vfio-mediated-device.rst +3 -0
 	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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +10 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev,
 void *data)
  * mdev_register_device : Register a device
  * @dev: device structure representing parent device.
  * @ops: Parent device operation structure to be registered.
+ * @id: class id.
  *
  * Add device to list of registered parent devices.

* Returns a negative value on error, otherwise 0.

drivers/vfio/mdev/mdev_core.c +7 -0
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
 	if (ret)
 		goto ops_create_fail;
 
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));
+		goto add_fail;
+	}
+
 	ret = device_add(&mdev->dev);
 	if (ret)
 		goto add_fail;
(quoted diff) +0 -0

b/drivers/vfio/mdev/mdev_driver.c index 0d3223aee20b..319d886ffaf7 100644

drivers/vfio/mdev/mdev_driver.c +20 -0
@@ -69,8 +69,30 @@ 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;
+
+	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
index 7d922950caaf..c65f436c1869 100644
@@ -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
index 30964a4e0a28..7b24ee9cb8dd 100644
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)
 	vfio_del_group_dev(dev);
 }
 
+static const struct mdev_class_id 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 = id_table,
 };
 
 static int __init vfio_mdev_init(void)
include/linux/mdev.h index renamed from include/linux/mdev.h +0 -0

0ce30ca78db0..78b69d09eb54 100644

include/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); void mdev_set_drvdata(struct mdev_device *mdev, void *data); const guid_t *mdev_uuid(struct mdev_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);  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
index 5714fd35a83c..f32c6e44fb1a 100644
@@ -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..115bc5074656 100644

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 index renamed from samples/vfio-mdev/mdpy.c +0 -0

cc86bf6566e4..665614574d50 100644

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 index renamed from samples/vfio-mdev/mtty.c +0 -0

ce84a300a4da..90da12ff7fd9 100644

samples/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

#3 lore raw

Re: [PATCH V5 1/6] mdev: class id support

In reply to Jason Wang
Quoted 121 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
 drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
 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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
  * mdev_register_device : Register a device
  * @dev: device structure representing parent device.
  * @ops: Parent device operation structure to be registered.
+ * @id: class id.
  *
  * Add device to list of registered parent devices.
  * Returns a negative value on error, otherwise 0.

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 7 lines
drivers/vfio/mdev/mdev_core.c +4 -0
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
 	if (ret)
 		goto ops_create_fail;
 
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Quoted 11 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
 	ret = device_add(&mdev->dev);
 	if (ret)
 		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 10 lines
drivers/vfio/mdev/mdev_driver.c +7 -0
@@ -69,8 +69,30 @@ 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;
+

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

Alex

Quoted 144 lines
drivers/vfio/mdev/mdev_driver.c +15 -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
index 7d922950caaf..c65f436c1869 100644
@@ -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
index 30964a4e0a28..7b24ee9cb8dd 100644
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)
 	vfio_del_group_dev(dev);
 }
 
+static const struct mdev_class_id 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 = id_table,
 };
 
 static int __init vfio_mdev_init(void)
include/linux/mdev.h +8 -0
index 0ce30ca78db0..78b69d09eb54 100644
@@ -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
index 5714fd35a83c..f32c6e44fb1a 100644
@@ -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
index ac5c8c17b1ff..115bc5074656 100644
@@ -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
index cc86bf6566e4..665614574d50 100644
@@ -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
index ce84a300a4da..90da12ff7fd9 100644
@@ -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;
 }
 
author
#4 lore raw

Re: [PATCH V5 1/6] mdev: class id support

Quoted 127 lines · Alex Williamson
Quoted 124 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
  drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
  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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
   * mdev_register_device : Register a device
   * @dev: device structure representing parent device.
   * @ops: Parent device operation structure to be registered.
+ * @id: class id.
   *
   * Add device to list of registered parent devices.
   * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
  	if (ret)
  		goto ops_create_fail;
 
Quoted 5 lines

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4 -0
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Will fix.

Quoted 15 lines
Quoted 15 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
  	ret = device_add(&mdev->dev);
  	if (ret)
  		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644
@@ -69,8 +69,30 @@ static int mdev_remove(struct device *dev)
  	return 0;
  }
 
Quoted 12 lines

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 7 lines
drivers/vfio/mdev/mdev_driver.c +7 -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;
+

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

I'm not sure I get the point here. My understanding is that mdev-core won't try to be matched here since it was not a complete mdev device.

Thanks

Quoted 147 lines

Alex

Quoted 144 lines
drivers/vfio/mdev/mdev_driver.c +15 -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
index 7d922950caaf..c65f436c1869 100644
@@ -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
index 30964a4e0a28..7b24ee9cb8dd 100644
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)
  	vfio_del_group_dev(dev);
  }
 
+static const struct mdev_class_id 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 = id_table,
  };
 
  static int __init vfio_mdev_init(void)
include/linux/mdev.h +8 -0
index 0ce30ca78db0..78b69d09eb54 100644
@@ -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
index 5714fd35a83c..f32c6e44fb1a 100644
@@ -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
index ac5c8c17b1ff..115bc5074656 100644
@@ -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
index cc86bf6566e4..665614574d50 100644
@@ -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
index ce84a300a4da..90da12ff7fd9 100644
@@ -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;
  }
 
#5 lore raw

Re: [PATCH V5 1/6] mdev: class id support

Quoted 167 lines · On Thu, 24 Oct 2019 11:27:36 +0800 Jason Wang <[email protected]> wrote:
Quoted 127 lines · Alex Williamson
Quoted 124 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
  drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
  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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
   * mdev_register_device : Register a device
   * @dev: device structure representing parent device.
   * @ops: Parent device operation structure to be registered.
+ * @id: class id.
   *
   * Add device to list of registered parent devices.
   * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
  	if (ret)
  		goto ops_create_fail;
 
Quoted 5 lines

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4 -0
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));  

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Will fix.

Quoted 15 lines
Quoted 15 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
  	ret = device_add(&mdev->dev);
  	if (ret)
  		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644
@@ -69,8 +69,30 @@ static int mdev_remove(struct device *dev)
  	return 0;
  }
 
Quoted 12 lines

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 7 lines
drivers/vfio/mdev/mdev_driver.c +7 -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;
+  

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

Quoted 2 lines

I'm not sure I get the point here. My understanding is that mdev-core won't try to be matched here since it was not a complete mdev device.

The parent driver failing to set a type vs the parent driver failing to register with a struct mdev_driver where id_table is not null are different issues. I agree that if a vendor driver was not updated for this series that they'd never successfully create a device because the mdev-core would reject it for not setting a class, but mdev_match() is called for devices that might be created by other vendor drivers, so loading a parent driver with a null id_table potentially breaks matching for everyone. Thanks,

Alex

#6 lore raw

Re: [PATCH V5 1/6] mdev: class id support

Quoted 170 lines · On Thu, 24 Oct 2019 13:46:36 -0600 Alex Williamson…
Quoted 167 lines · On Thu, 24 Oct 2019 11:27:36 +0800 Jason Wang <[email protected]> wrote:
Quoted 127 lines · Alex Williamson
Quoted 124 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
  drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
  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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
   * mdev_register_device : Register a device
   * @dev: device structure representing parent device.
   * @ops: Parent device operation structure to be registered.
+ * @id: class id.
   *
   * Add device to list of registered parent devices.
   * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
  	if (ret)
  		goto ops_create_fail;
 
Quoted 5 lines

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4 -0
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));    

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Will fix.

Quoted 27 lines
Quoted 12 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
  	ret = device_add(&mdev->dev);
  	if (ret)
  		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 10 lines
drivers/vfio/mdev/mdev_driver.c +7 -0
@@ -69,8 +69,30 @@ 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;
+    

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

Quoted 4 lines
Quoted 2 lines

I'm not sure I get the point here. My understanding is that mdev-core won't try to be matched here since it was not a complete mdev device.

The parent driver failing to set a type vs the parent driver failing to

Correction, the second half of this should be in reference to the mdev bus driver.

Quoted 7 lines

register with a struct mdev_driver where id_table is not null are different issues. I agree that if a vendor driver was not updated for this series that they'd never successfully create a device because the mdev-core would reject it for not setting a class, but mdev_match() is called for devices that might be created by other vendor drivers, so loading a parent driver with a null id_table potentially breaks matching for everyone. Thanks,

The point is still valid though, for example if vfio-mdev registered with a null id_table it would break matching for virtio-mdev depending on the order we iterate through drivers as we call mdev_match(). Thanks,

Alex

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

author
#7 lore raw

Re: [PATCH V5 1/6] mdev: class id support

Quoted 184 lines · Alex Williamson
Quoted 168 lines · On Thu, 24 Oct 2019 13:46:36 -0600 Alex Williamson…
Quoted 165 lines · On Thu, 24 Oct 2019 11:27:36 +0800 Jason Wang <[email protected]> wrote:
Quoted 127 lines · Alex Williamson
Quoted 124 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
   drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
   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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
    * mdev_register_device : Register a device
    * @dev: device structure representing parent device.
    * @ops: Parent device operation structure to be registered.
+ * @id: class id.
    *
    * Add device to list of registered parent devices.
    * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
   	if (ret)
   		goto ops_create_fail;
 
Quoted 5 lines

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4 -0
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Will fix.

Quoted 27 lines
Quoted 12 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
   	ret = device_add(&mdev->dev);
   	if (ret)
   		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 10 lines
drivers/vfio/mdev/mdev_driver.c +7 -0
@@ -69,8 +69,30 @@ 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;
+

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

Quoted 3 lines
Quoted 2 lines

I'm not sure I get the point here. My understanding is that mdev-core won't try to be matched here since it was not a complete mdev device.

The parent driver failing to set a type vs the parent driver failing to

Correction, the second half of this should be in reference to the mdev bus driver.

Quoted 7 lines

register with a struct mdev_driver where id_table is not null are different issues. I agree that if a vendor driver was not updated for this series that they'd never successfully create a device because the mdev-core would reject it for not setting a class, but mdev_match() is called for devices that might be created by other vendor drivers, so loading a parent driver with a null id_table potentially breaks matching for everyone. Thanks,

Quoted 6 lines

The point is still valid though, for example if vfio-mdev registered with a null id_table it would break matching for virtio-mdev depending on the order we iterate through drivers as we call mdev_match(). Thanks,

Alex

I see the point, so I can check the existence of id_table before trying to do the match here.

Thanks

author
#8 lore raw

Re: [PATCH V5 1/6] mdev: class id support

In reply to Alex Williamson
Quoted 184 lines · Alex Williamson
Quoted 168 lines · On Thu, 24 Oct 2019 13:46:36 -0600 Alex Williamson…
Quoted 165 lines · On Thu, 24 Oct 2019 11:27:36 +0800 Jason Wang <[email protected]> wrote:
Quoted 127 lines · Alex Williamson
Quoted 124 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
   drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
   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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
    * mdev_register_device : Register a device
    * @dev: device structure representing parent device.
    * @ops: Parent device operation structure to be registered.
+ * @id: class id.
    *
    * Add device to list of registered parent devices.
    * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
   	if (ret)
   		goto ops_create_fail;
 
Quoted 5 lines

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4 -0
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Will fix.

Quoted 27 lines
Quoted 12 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
   	ret = device_add(&mdev->dev);
   	if (ret)
   		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 10 lines
drivers/vfio/mdev/mdev_driver.c +7 -0
@@ -69,8 +69,30 @@ 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;
+

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

Quoted 3 lines
Quoted 2 lines

I'm not sure I get the point here. My understanding is that mdev-core won't try to be matched here since it was not a complete mdev device.

The parent driver failing to set a type vs the parent driver failing to

Correction, the second half of this should be in reference to the mdev bus driver.

Quoted 7 lines

register with a struct mdev_driver where id_table is not null are different issues. I agree that if a vendor driver was not updated for this series that they'd never successfully create a device because the mdev-core would reject it for not setting a class, but mdev_match() is called for devices that might be created by other vendor drivers, so loading a parent driver with a null id_table potentially breaks matching for everyone. Thanks,

Quoted 6 lines

The point is still valid though, for example if vfio-mdev registered with a null id_table it would break matching for virtio-mdev depending on the order we iterate through drivers as we call mdev_match(). Thanks,

Alex

I see the point, so I can check the existence of id_table before trying to do the match here.

Thanks

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#9 lore raw

Re: [PATCH V5 1/6] mdev: class id support

In reply to Jason Wang
Quoted 167 lines · On Thu, 24 Oct 2019 11:27:36 +0800 Jason Wang <[email protected]> wrote:
Quoted 127 lines · Alex Williamson
Quoted 124 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
  drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
  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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
   * mdev_register_device : Register a device
   * @dev: device structure representing parent device.
   * @ops: Parent device operation structure to be registered.
+ * @id: class id.
   *
   * Add device to list of registered parent devices.
   * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
  	if (ret)
  		goto ops_create_fail;
 
Quoted 5 lines

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4 -0
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));  

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Will fix.

Quoted 15 lines
Quoted 15 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
  	ret = device_add(&mdev->dev);
  	if (ret)
  		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644
@@ -69,8 +69,30 @@ static int mdev_remove(struct device *dev)
  	return 0;
  }
 
Quoted 12 lines

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 7 lines
drivers/vfio/mdev/mdev_driver.c +7 -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;
+  

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

Quoted 2 lines

I'm not sure I get the point here. My understanding is that mdev-core won't try to be matched here since it was not a complete mdev device.

The parent driver failing to set a type vs the parent driver failing to register with a struct mdev_driver where id_table is not null are different issues. I agree that if a vendor driver was not updated for this series that they'd never successfully create a device because the mdev-core would reject it for not setting a class, but mdev_match() is called for devices that might be created by other vendor drivers, so loading a parent driver with a null id_table potentially breaks matching for everyone. Thanks,

Alex

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

author
#10 lore raw

Re: [PATCH V5 1/6] mdev: class id support

In reply to Alex Williamson
Quoted 127 lines · Alex Williamson
Quoted 124 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
  drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
  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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
   * mdev_register_device : Register a device
   * @dev: device structure representing parent device.
   * @ops: Parent device operation structure to be registered.
+ * @id: class id.
   *
   * Add device to list of registered parent devices.
   * Returns a negative value on error, otherwise 0.
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
  	if (ret)
  		goto ops_create_fail;
 
Quoted 5 lines

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 4 lines
drivers/vfio/mdev/mdev_core.c +4 -0
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Will fix.

Quoted 15 lines
Quoted 15 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
  	ret = device_add(&mdev->dev);
  	if (ret)
  		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644
@@ -69,8 +69,30 @@ static int mdev_remove(struct device *dev)
  	return 0;
  }
 
Quoted 12 lines

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 7 lines
drivers/vfio/mdev/mdev_driver.c +7 -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;
+

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

I'm not sure I get the point here. My understanding is that mdev-core won't try to be matched here since it was not a complete mdev device.

Thanks

Quoted 143 lines

Alex

Quoted 140 lines
drivers/vfio/mdev/mdev_driver.c +15 -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
index 7d922950caaf..c65f436c1869 100644
@@ -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
index 30964a4e0a28..7b24ee9cb8dd 100644
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)
  	vfio_del_group_dev(dev);
  }
 
+static const struct mdev_class_id 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 = id_table,
  };
 
  static int __init vfio_mdev_init(void)
include/linux/mdev.h +8 -0
index 0ce30ca78db0..78b69d09eb54 100644
@@ -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
index 5714fd35a83c..f32c6e44fb1a 100644
@@ -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
index ac5c8c17b1ff..115bc5074656 100644
@@ -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
index cc86bf6566e4..665614574d50 100644
@@ -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 +0 -0
index ce84a300a4da..90da12ff7fd9 100644
@@ -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);
 
Quoted 4 lines

samples/vfio-mdev/mtty.c static int mtty_create(struct kobject *kobj, struct mdev_device *mdev) · line 761

Quoted 4 lines
samples/vfio-mdev/mtty.c +1 -0
+	mdev_set_class(mdev, MDEV_CLASS_ID_VFIO);
  	return 0;
  }
 

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#11 lore raw

Re: [PATCH V5 1/6] mdev: class id support

In reply to Jason Wang
Quoted 121 lines · On Wed, 23 Oct 2019 21:07:47 +0800 Jason Wang <[email protected]> wrote:

Mdev bus only supports vfio driver right now, so it doesn't implement match method. But in the future, we may add drivers other than vfio, the first driver could be virtio-mdev. This means we need to add device class id support in bus match method to pair the mdev device and mdev driver correctly.

So this patch adds id_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                 | 18 +++++++++++++++
 drivers/vfio/mdev/mdev_driver.c               | 22 +++++++++++++++++++
 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, 74 insertions(+)
Documentation/driver-api/vfio-mediated-device.rst +5 -0
index 25eb7d5b834b..6709413bee29 100644
@@ -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
index 343d79c1cb7e..6420f0dbd31b 100644
@@ -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
index f0d71ab77c50..cf2c013ae32f 100644
@@ -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
index 5c0f53c6dde7..07c31070afeb 100644
@@ -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 +11 -0
index b558d4cfd082..3a9c52d71b4e 100644
@@ -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;
@@ -135,6 +145,7 @@ static int mdev_device_remove_cb(struct device *dev, void *data)
  * mdev_register_device : Register a device
  * @dev: device structure representing parent device.
  * @ops: Parent device operation structure to be registered.
+ * @id: class id.
  *
  * Add device to list of registered parent devices.
  * Returns a negative value on error, otherwise 0.

drivers/vfio/mdev/mdev_core.c int mdev_device_create(struct kobject *kobj, · line 341

Quoted 7 lines
drivers/vfio/mdev/mdev_core.c +4 -0
@@ -324,6 +335,13 @@ int mdev_device_create(struct kobject *kobj,
 	if (ret)
 		goto ops_create_fail;
 
+	if (!mdev->class_id) {
+		ret = -EINVAL;
+		WARN(1, "class id must be specified for device %s\n",
+		     dev_name(dev));

Nit, dev_warn(dev, "mdev vendor driver failed to specify device class\n");

Quoted 11 lines
drivers/vfio/mdev/mdev_core.c +3 -0
+		goto add_fail;
+	}
+
 	ret = device_add(&mdev->dev);
 	if (ret)
 		goto add_fail;
drivers/vfio/mdev/mdev_driver.c +0 -0
index 0d3223aee20b..319d886ffaf7 100644

drivers/vfio/mdev/mdev_driver.c static int mdev_remove(struct device *dev) · line 78

Quoted 10 lines
drivers/vfio/mdev/mdev_driver.c +7 -0
@@ -69,8 +69,30 @@ 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;
+

Nit, as we start to allow new mdev bus drivers, mdev-core might want to protect itself from a NULL id_table, by either failing the mdev_register_driver() or failing the match here. I think such a condition would segfault as written here, but clearly we don't have such external drivers yet. Thanks,

Alex

Quoted 144 lines
drivers/vfio/mdev/mdev_driver.c +15 -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
index 7d922950caaf..c65f436c1869 100644
@@ -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
index 30964a4e0a28..7b24ee9cb8dd 100644
@@ -120,10 +120,16 @@ static void vfio_mdev_remove(struct device *dev)
 	vfio_del_group_dev(dev);
 }
 
+static const struct mdev_class_id 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 = id_table,
 };
 
 static int __init vfio_mdev_init(void)
include/linux/mdev.h +8 -0
index 0ce30ca78db0..78b69d09eb54 100644
@@ -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
index 5714fd35a83c..f32c6e44fb1a 100644
@@ -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
index ac5c8c17b1ff..115bc5074656 100644
@@ -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
index cc86bf6566e4..665614574d50 100644
@@ -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
index ce84a300a4da..90da12ff7fd9 100644
@@ -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;
 }
 
author
#12 lore raw

PATCH v5 2/6 modpost: add support for mdev class id

In reply to Jason Wang

Add support to parse mdev class id table.

---
 drivers/vfio/mdev/vfio_mdev.c     |  2 ++
 scripts/mod/devicetable-offsets.c |  3 +++
 scripts/mod/file2alias.c          | 10 ++++++++++
 3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +2 -0
index 7b24ee9cb8dd..cb701cd646f0 100644
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
 	{ 0 },
 };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+
 static struct mdev_driver vfio_mdev_driver = {
 	.name	= "vfio_mdev",
 	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +10 -0
index c91eba751804..d365dfe7c718 100644
@@ -1335,6 +1335,15 @@ 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);
+	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 +1416,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 · 6 lines
2.19.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#13 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
 drivers/vfio/mdev/vfio_mdev.c     |  2 ++
 scripts/mod/devicetable-offsets.c |  3 +++
 scripts/mod/file2alias.c          | 10 ++++++++++
 3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
 	{ 0 },
 };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \
extern typeof(name) __mod_##type##__##name##_device_table \
__attribute__ ((unused, alias(__stringify(name))))

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

Quoted 21 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
 static struct mdev_driver vfio_mdev_driver = {
 	.name	= "vfio_mdev",
 	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 9 lines
scripts/mod/file2alias.c +6 -0
@@ -1335,6 +1335,15 @@ 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);

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

Alex

Quoted 14 lines
scripts/mod/file2alias.c +4 -0
+	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 +1416,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.
author
#14 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

Quoted 29 lines · Alex Williamson
Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
  drivers/vfio/mdev/vfio_mdev.c     |  2 ++
  scripts/mod/devicetable-offsets.c |  3 +++
  scripts/mod/file2alias.c          | 10 ++++++++++
  3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
  	{ 0 },
  };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \

extern typeof(name) __mod_##type##__##name##_device_table               \
   __attribute__ ((unused, alias(__stringify(name))))
Quoted 6 lines

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

It looks to me that those symbol were local, so it doesn't matter. But if you wish I can switch to use unique name.

Quoted 25 lines
Quoted 25 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
  static struct mdev_driver vfio_mdev_driver = {
  	.name	= "vfio_mdev",
  	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644
@@ -1335,6 +1335,15 @@ static int do_wmi_entry(const char *filename, void *symval, char *alias)
  	return 1;
  }
 
Quoted 8 lines

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 6 lines
scripts/mod/file2alias.c +6 -0
+/* 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);

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

It's really good question. My understanding is we won't have a module that can deal with all kinds of classes like CLASS_ID_ANY. So there's probably no need for the wildcard.

Thanks

Quoted 17 lines

Alex

Quoted 14 lines
scripts/mod/file2alias.c +4 -0
+	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 +1416,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.
#15 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

Quoted 38 lines · On Thu, 24 Oct 2019 11:31:04 +0800 Jason Wang <[email protected]> wrote:
Quoted 29 lines · Alex Williamson
Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
  drivers/vfio/mdev/vfio_mdev.c     |  2 ++
  scripts/mod/devicetable-offsets.c |  3 +++
  scripts/mod/file2alias.c          | 10 ++++++++++
  3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
  	{ 0 },
  };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+  

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \

extern typeof(name) __mod_##type##__##name##_device_table               \
   __attribute__ ((unused, alias(__stringify(name))))
Quoted 6 lines

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

Quoted 2 lines

It looks to me that those symbol were local, so it doesn't matter. But if you wish I can switch to use unique name.

I don't have a strong opinion, I'm just trying to make sure we're not doing something obviously broken.

Quoted 34 lines
Quoted 24 lines
Quoted 24 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
  static struct mdev_driver vfio_mdev_driver = {
  	.name	= "vfio_mdev",
  	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644
@@ -1335,6 +1335,15 @@ static int do_wmi_entry(const char *filename, void *symval, char *alias)
  	return 1;
  }
 
Quoted 8 lines

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 6 lines
scripts/mod/file2alias.c +6 -0
+/* 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);  

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

Quoted 3 lines

It's really good question. My understanding is we won't have a module that can deal with all kinds of classes like CLASS_ID_ANY. So there's probably no need for the wildcard.

The comment for add_wildcard() indicates future extension, so it's hard to know what we might need in the future until we do need it. The majority of modules.alias entries on my laptop (even if I exclude pci aliases) end with a wildcard. Thanks,

Alex

author
#16 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

Quoted 40 lines · Alex Williamson
Quoted 37 lines · On Thu, 24 Oct 2019 11:31:04 +0800 Jason Wang <[email protected]> wrote:
Quoted 35 lines · Alex Williamson
Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
   drivers/vfio/mdev/vfio_mdev.c     |  2 ++
   scripts/mod/devicetable-offsets.c |  3 +++
   scripts/mod/file2alias.c          | 10 ++++++++++
   3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
   	{ 0 },
   };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \

extern typeof(name) __mod_##type##__##name##_device_table               \
    __attribute__ ((unused, alias(__stringify(name))))

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

Quoted 4 lines
Quoted 2 lines

It looks to me that those symbol were local, so it doesn't matter. But if you wish I can switch to use unique name.

I don't have a strong opinion, I'm just trying to make sure we're not doing something obviously broken.

Yes, to be more safe I will switch to unique names here.

Quoted 34 lines
Quoted 34 lines
Quoted 33 lines
Quoted 22 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
   static struct mdev_driver vfio_mdev_driver = {
   	.name	= "vfio_mdev",
   	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 9 lines
scripts/mod/file2alias.c +6 -0
@@ -1335,6 +1335,15 @@ 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);

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

Quoted 7 lines
Quoted 3 lines

It's really good question. My understanding is we won't have a module that can deal with all kinds of classes like CLASS_ID_ANY. So there's probably no need for the wildcard.

The comment for add_wildcard() indicates future extension, so it's hard to know what we might need in the future until we do need it. The majority of modules.alias entries on my laptop (even if I exclude pci aliases) end with a wildcard. Thanks,

Yes, so I will add that for future extension.

Thanks

Quoted 3 lines

Alex

author
#17 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

In reply to Alex Williamson
Quoted 40 lines · Alex Williamson
Quoted 37 lines · On Thu, 24 Oct 2019 11:31:04 +0800 Jason Wang <[email protected]> wrote:
Quoted 35 lines · Alex Williamson
Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
   drivers/vfio/mdev/vfio_mdev.c     |  2 ++
   scripts/mod/devicetable-offsets.c |  3 +++
   scripts/mod/file2alias.c          | 10 ++++++++++
   3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
   	{ 0 },
   };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \

extern typeof(name) __mod_##type##__##name##_device_table               \
    __attribute__ ((unused, alias(__stringify(name))))

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

Quoted 4 lines
Quoted 2 lines

It looks to me that those symbol were local, so it doesn't matter. But if you wish I can switch to use unique name.

I don't have a strong opinion, I'm just trying to make sure we're not doing something obviously broken.

Yes, to be more safe I will switch to unique names here.

Quoted 34 lines
Quoted 34 lines
Quoted 33 lines
Quoted 22 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
   static struct mdev_driver vfio_mdev_driver = {
   	.name	= "vfio_mdev",
   	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 9 lines
scripts/mod/file2alias.c +6 -0
@@ -1335,6 +1335,15 @@ 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);

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

Quoted 7 lines
Quoted 3 lines

It's really good question. My understanding is we won't have a module that can deal with all kinds of classes like CLASS_ID_ANY. So there's probably no need for the wildcard.

The comment for add_wildcard() indicates future extension, so it's hard to know what we might need in the future until we do need it. The majority of modules.alias entries on my laptop (even if I exclude pci aliases) end with a wildcard. Thanks,

Yes, so I will add that for future extension.

Thanks

Quoted 3 lines

Alex

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#18 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

In reply to Jason Wang
Quoted 38 lines · On Thu, 24 Oct 2019 11:31:04 +0800 Jason Wang <[email protected]> wrote:
Quoted 29 lines · Alex Williamson
Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
  drivers/vfio/mdev/vfio_mdev.c     |  2 ++
  scripts/mod/devicetable-offsets.c |  3 +++
  scripts/mod/file2alias.c          | 10 ++++++++++
  3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
  	{ 0 },
  };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+  

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \

extern typeof(name) __mod_##type##__##name##_device_table               \
   __attribute__ ((unused, alias(__stringify(name))))
Quoted 6 lines

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

Quoted 2 lines

It looks to me that those symbol were local, so it doesn't matter. But if you wish I can switch to use unique name.

I don't have a strong opinion, I'm just trying to make sure we're not doing something obviously broken.

Quoted 34 lines
Quoted 24 lines
Quoted 24 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
  static struct mdev_driver vfio_mdev_driver = {
  	.name	= "vfio_mdev",
  	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644
@@ -1335,6 +1335,15 @@ static int do_wmi_entry(const char *filename, void *symval, char *alias)
  	return 1;
  }
 
Quoted 8 lines

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 6 lines
scripts/mod/file2alias.c +6 -0
+/* 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);  

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

Quoted 3 lines

It's really good question. My understanding is we won't have a module that can deal with all kinds of classes like CLASS_ID_ANY. So there's probably no need for the wildcard.

The comment for add_wildcard() indicates future extension, so it's hard to know what we might need in the future until we do need it. The majority of modules.alias entries on my laptop (even if I exclude pci aliases) end with a wildcard. Thanks,

Alex

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

author
#19 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

In reply to Alex Williamson
Quoted 29 lines · Alex Williamson
Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
  drivers/vfio/mdev/vfio_mdev.c     |  2 ++
  scripts/mod/devicetable-offsets.c |  3 +++
  scripts/mod/file2alias.c          | 10 ++++++++++
  3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
  	{ 0 },
  };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \

extern typeof(name) __mod_##type##__##name##_device_table               \
   __attribute__ ((unused, alias(__stringify(name))))
Quoted 6 lines

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

It looks to me that those symbol were local, so it doesn't matter. But if you wish I can switch to use unique name.

Quoted 25 lines
Quoted 25 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
  static struct mdev_driver vfio_mdev_driver = {
  	.name	= "vfio_mdev",
  	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644
@@ -1335,6 +1335,15 @@ static int do_wmi_entry(const char *filename, void *symval, char *alias)
  	return 1;
  }
 
Quoted 8 lines

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 6 lines
scripts/mod/file2alias.c +6 -0
+/* 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);

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

It's really good question. My understanding is we won't have a module that can deal with all kinds of classes like CLASS_ID_ANY. So there's probably no need for the wildcard.

Thanks

Quoted 16 lines

Alex

Quoted 13 lines
scripts/mod/file2alias.c +4 -0
+	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 +1416,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},
  };
 
Quoted 1 line

scripts/mod/file2alias.c static const struct devtable devtable[] = { · line 1422

Quoted 1 line
scripts/mod/file2alias.c +0 -0
  /* Create MODULE_ALIAS() statements.

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#20 lore raw

Re: [PATCH V5 2/6] modpost: add support for mdev class id

In reply to Jason Wang
Quoted 15 lines · On Wed, 23 Oct 2019 21:07:48 +0800 Jason Wang <[email protected]> wrote:

Add support to parse mdev class id table.

---
 drivers/vfio/mdev/vfio_mdev.c     |  2 ++
 scripts/mod/devicetable-offsets.c |  3 +++
 scripts/mod/file2alias.c          | 10 ++++++++++
 3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +0 -0
index 7b24ee9cb8dd..cb701cd646f0 100644

drivers/vfio/mdev/vfio_mdev.c static const struct mdev_class_id id_table[] = { · line 129

Quoted 5 lines
drivers/vfio/mdev/vfio_mdev.c +2 -0
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
 	{ 0 },
 };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+

Two questions, first we have:

#define MODULE_DEVICE_TABLE(type, name) \
extern typeof(name) __mod_##type##__##name##_device_table \
__attribute__ ((unused, alias(__stringify(name))))

Therefore we're defining __mod_mdev__id_table_device_table with alias id_table. When the virtio mdev bus driver is added in 5/6 it uses the same name value. I see virtio types all register this way (virtio, id_table), so I assume there's no conflict, but pci types mostly (not entirely) seem to use unique names. Is there a preference to one way or the other or it simply doesn't matter?

Quoted 21 lines
drivers/vfio/mdev/vfio_mdev.c +0 -0
 static struct mdev_driver vfio_mdev_driver = {
 	.name	= "vfio_mdev",
 	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +0 -0
index c91eba751804..d365dfe7c718 100644

scripts/mod/file2alias.c static int do_wmi_entry(const char *filename, void *symval, char *alias) · line 1343

Quoted 9 lines
scripts/mod/file2alias.c +6 -0
@@ -1335,6 +1335,15 @@ 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);

A lot of entries call add_wildcard() here, should we? Sorry for the basic questions, I haven't played in this code. Thanks,

Alex

Quoted 14 lines
scripts/mod/file2alias.c +4 -0
+	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 +1416,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.
author
#21 lore raw

PATCH v5 2/6 modpost: add support for mdev class id

In reply to Jason Wang

Add support to parse mdev class id table.

---
 drivers/vfio/mdev/vfio_mdev.c     |  2 ++
 scripts/mod/devicetable-offsets.c |  3 +++
 scripts/mod/file2alias.c          | 10 ++++++++++
 3 files changed, 15 insertions(+)
drivers/vfio/mdev/vfio_mdev.c +2 -0
index 7b24ee9cb8dd..cb701cd646f0 100644
@@ -125,6 +125,8 @@ static const struct mdev_class_id id_table[] = {
 	{ 0 },
 };
 
+MODULE_DEVICE_TABLE(mdev, id_table);
+
 static struct mdev_driver vfio_mdev_driver = {
 	.name	= "vfio_mdev",
 	.probe	= vfio_mdev_probe,
scripts/mod/devicetable-offsets.c +3 -0
index 054405b90ba4..6cbb1062488a 100644
@@ -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 +10 -0
index c91eba751804..d365dfe7c718 100644
@@ -1335,6 +1335,15 @@ 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);
+	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 +1416,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
author
#22 lore raw

PATCH v5 3/6 mdev: introduce device specific ops

In reply to Jason Wang

Currently, 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
index 6709413bee29..0d8f9e7d7983 100644
@@ -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
index e51a68bf8ca8..9e10ae9c2b4d 100644
@@ -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
index 6420f0dbd31b..c2b7f9dbe4d1 100644
@@ -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
index cf2c013ae32f..c36e6ca9ee65 100644
@@ -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
index 07c31070afeb..ed68d4f7c0a9 100644
@@ -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
index 3a9c52d71b4e..555bd61d8c38 100644
@@ -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
index c65f436c1869..0770410ded2a 100644
@@ -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
index cb701cd646f0..d5ede5f0544e 100644
@@ -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
index 115bc5074656..1afec20bf0c5 100644
@@ -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
index 665614574d50..d571fb65f50f 100644
@@ -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
index 90da12ff7fd9..4048b242c636 100644
@@ -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 · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#23 lore raw

PATCH v5 3/6 mdev: introduce device specific ops

In reply to Jason Wang

Currently, 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
index 6709413bee29..0d8f9e7d7983 100644
@@ -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
index e51a68bf8ca8..9e10ae9c2b4d 100644
@@ -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
index 6420f0dbd31b..c2b7f9dbe4d1 100644
@@ -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
index cf2c013ae32f..c36e6ca9ee65 100644
@@ -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
index 07c31070afeb..ed68d4f7c0a9 100644
@@ -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
index 3a9c52d71b4e..555bd61d8c38 100644
@@ -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
index c65f436c1869..0770410ded2a 100644
@@ -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
index cb701cd646f0..d5ede5f0544e 100644
@@ -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
index 115bc5074656..1afec20bf0c5 100644
@@ -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
index 665614574d50..d571fb65f50f 100644
@@ -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
index 90da12ff7fd9..4048b242c636 100644
@@ -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
author
#24 lore raw

PATCH v5 4/6 mdev: introduce virtio device and its device ops

In reply to Jason Wang

This 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  | 159 +++++++++++++++++++++++++++++++
 4 files changed, 187 insertions(+)
 create mode 100644 include/linux/virtio_mdev_ops.h
drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +159 -0

159 lines not on this page · raw message

Signature · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#25 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

Quoted 118 lines · On Wed, 23 Oct 2019 21:07:50 +0800 Jason Wang <[email protected]> wrote:

This 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  | 159 +++++++++++++++++++++++++++++++
 4 files changed, 187 insertions(+)
 create mode 100644 include/linux/virtio_mdev_ops.h
drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +18 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang <[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {

include/linux/virtio_mdev_ops.h line 28

Quoted 10 lines
include/linux/virtio_mdev_ops.h new file +10 -0
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
+ * callbacks are mandatory unless explicity mentioned.

If the version of the callbacks is returned by a callback within the structure defined by the version... isn't that a bit circular? This seems redundant to me versus the class id. The fact that the parent driver defines the device as MDEV_CLASS_ID_VIRTIO should tell us this already. If it was incremented, we'd need an MDEV_CLASS_ID_VIRTIOv2, which the virtio-mdev bus driver could add to its id table and handle differently.

Quoted 36 lines
include/linux/virtio_mdev_ops.h new file +36 -0
+ *
+ * @set_vq_address:		Set the address of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@desc_area: address of desc area
+ *				@driver_area: address of driver area
+ *				@device_area: address of device area
+ *				Returns integer: success (0) or error (< 0)
+ * @set_vq_num:			Set the size of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@num: the size of virtqueue
+ * @kick_vq:			Kick the virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ * @set_vq_cb:			Set the interrupt callback function for
+ *				a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@cb: virtio-mdev interrupt callback structure
+ * @set_vq_ready:		Set ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@ready: ready (true) not ready(false)
+ * @get_vq_ready:		Get ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				Returns boolean: ready (true) or not (false)
+ * @set_vq_state:		Set the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@state: virtqueue state (last_avail_idx)
+ *				Returns integer: success (0) or error (< 0)
+ * @get_vq_state:		Get the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index

include/linux/virtio_mdev_ops.h line 74

Quoted 10 lines
include/linux/virtio_mdev_ops.h new file +10 -0
+ *				Returns virtqueue state (last_avail_idx)
+ * @get_vq_align:		Get the virtqueue align requirement
+ *				for the device
+ *				@mdev: mediated device
+ *				Returns virtqueue algin requirement
+ * @get_features:		Get virtio features supported by the device
+ *				@mdev: mediated device
+ *				Returns the virtio features support by the
+ *				device
+ * @get_features:		Set virtio features supported by the driver
       ^ s/g/s/

Thanks,
Alex

Quoted 85 lines
include/linux/virtio_mdev_ops.h new file +85 -0
+ *				@mdev: mediated device
+ *				@features: feature support by the driver
+ *				Returns integer: success (0) or error (< 0)
+ * @set_config_cb:		Set the config interrupt callback
+ *				@mdev: mediated device
+ *				@cb: virtio-mdev interrupt callback structure
+ * @get_vq_num_max:		Get the max size of virtqueue
+ *				@mdev: mediated device
+ *				Returns u16: max size of virtqueue
+ * @get_device_id:		Get virtio device id
+ *				@mdev: mediated device
+ *				Returns u32: virtio device id
+ * @get_vendor_id:		Get id for the vendor that provides this device
+ *				@mdev: mediated device
+ *				Returns u32: virtio vendor id
+ * @get_status:			Get the device status
+ *				@mdev: mediated device
+ *				Returns u8: virtio device status
+ * @set_status:			Set the device status
+ *				@mdev: mediated device
+ *				@status: virtio device status
+ * @get_config:			Read from device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to read to
+ *				@len: the length to read from
+ *				configration space
+ * @set_config:			Write to device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to write from
+ *				@len: the length to write to
+ *				configration space
+ * @get_mdev_features:		Get a set of bits that demonstrate
+ *				thecapability of the mdev device. New
+ *				features bits must be added when
+ *				introducing new device ops.
+ *				@mdev: mediated device
+ *				Returns the mdev features (API) support by
+ *				the device.
+ * @get_generation:		Get device config generaton (optionally)
+ *				@mdev: mediated device
+ *				Returns u32: device generation
+ */
+struct virtio_mdev_device_ops {
+	/* Virtqueue ops */
+	int (*set_vq_address)(struct mdev_device *mdev,
+			      u16 idx, u64 desc_area, u64 driver_area,
+			      u64 device_area);
+	void (*set_vq_num)(struct mdev_device *mdev, u16 idx, u32 num);
+	void (*kick_vq)(struct mdev_device *mdev, u16 idx);
+	void (*set_vq_cb)(struct mdev_device *mdev, u16 idx,
+			  struct virtio_mdev_callback *cb);
+	void (*set_vq_ready)(struct mdev_device *mdev, u16 idx, bool ready);
+	bool (*get_vq_ready)(struct mdev_device *mdev, u16 idx);
+	int (*set_vq_state)(struct mdev_device *mdev, u16 idx, u64 state);
+	u64 (*get_vq_state)(struct mdev_device *mdev, u16 idx);
+
+	/* Virtio device ops */
+	u16 (*get_vq_align)(struct mdev_device *mdev);
+	u64 (*get_features)(struct mdev_device *mdev);
+	int (*set_features)(struct mdev_device *mdev, u64 features);
+	void (*set_config_cb)(struct mdev_device *mdev,
+			      struct virtio_mdev_callback *cb);
+	u16 (*get_vq_num_max)(struct mdev_device *mdev);
+	u32 (*get_device_id)(struct mdev_device *mdev);
+	u32 (*get_vendor_id)(struct mdev_device *mdev);
+	u8 (*get_status)(struct mdev_device *mdev);
+	void (*set_status)(struct mdev_device *mdev, u8 status);
+	void (*get_config)(struct mdev_device *mdev, unsigned int offset,
+			   void *buf, unsigned int len);
+	void (*set_config)(struct mdev_device *mdev, unsigned int offset,
+			   const void *buf, unsigned int len);
+	u32 (*get_generation)(struct mdev_device *mdev);
+
+	/* Mdev device ops */
+	u64 (*get_mdev_features)(struct mdev_device *mdev);
+};
+
+void mdev_set_virtio_ops(struct mdev_device *mdev,
+			 const struct virtio_mdev_device_ops *virtio_ops);
+
+#endif
author
#26 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

Quoted 130 lines · Alex Williamson
Quoted 127 lines · On Wed, 23 Oct 2019 21:07:50 +0800 Jason Wang <[email protected]> wrote:

This 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  | 159 +++++++++++++++++++++++++++++++
  4 files changed, 187 insertions(+)

create mode 100644 include/linux/virtio_mdev_ops.h

drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +27 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang <[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 28

Quoted 1 line
include/linux/virtio_mdev_ops.h new file +1 -0
+ * callbacks are mandatory unless explicity mentioned.

If the version of the callbacks is returned by a callback within the structure defined by the version... isn't that a bit circular? This seems redundant to me versus the class id. The fact that the parent driver defines the device as MDEV_CLASS_ID_VIRTIO should tell us this already. If it was incremented, we'd need an MDEV_CLASS_ID_VIRTIOv2, which the virtio-mdev bus driver could add to its id table and handle differently.

My understanding is versions are only allowed to increase monotonically, this seems less flexible than features. E.g we have features A, B, C, mdev device can choose to support only a subset. E.g when mdev device can support dirty page logging, it can add a new feature bit for driver to know that it support new device ops. MDEV_CLASS_ID_VIRTIOv2 may only be useful when we will invent a complete new API.

Quoted 47 lines
Quoted 37 lines
include/linux/virtio_mdev_ops.h new file +36 -0
+ *
+ * @set_vq_address:		Set the address of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@desc_area: address of desc area
+ *				@driver_area: address of driver area
+ *				@device_area: address of device area
+ *				Returns integer: success (0) or error (< 0)
+ * @set_vq_num:			Set the size of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@num: the size of virtqueue
+ * @kick_vq:			Kick the virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ * @set_vq_cb:			Set the interrupt callback function for
+ *				a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@cb: virtio-mdev interrupt callback structure
+ * @set_vq_ready:		Set ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@ready: ready (true) not ready(false)
+ * @get_vq_ready:		Get ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				Returns boolean: ready (true) or not (false)
+ * @set_vq_state:		Set the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@state: virtqueue state (last_avail_idx)
+ *				Returns integer: success (0) or error (< 0)
+ * @get_vq_state:		Get the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index

include/linux/virtio_mdev_ops.h line 74

Quoted 10 lines
include/linux/virtio_mdev_ops.h new file +10 -0
+ *				Returns virtqueue state (last_avail_idx)
+ * @get_vq_align:		Get the virtqueue align requirement
+ *				for the device
+ *				@mdev: mediated device
+ *				Returns virtqueue algin requirement
+ * @get_features:		Get virtio features supported by the device
+ *				@mdev: mediated device
+ *				Returns the virtio features support by the
+ *				device
+ * @get_features:		Set virtio features supported by the driver
Quoted 4 lines
        ^ s/g/s/

Thanks,
Alex

Will fix.

Thanks

Quoted 78 lines
Quoted 78 lines
include/linux/virtio_mdev_ops.h new file +77 -0
+ *				@mdev: mediated device
+ *				@features: feature support by the driver
+ *				Returns integer: success (0) or error (< 0)
+ * @set_config_cb:		Set the config interrupt callback
+ *				@mdev: mediated device
+ *				@cb: virtio-mdev interrupt callback structure
+ * @get_vq_num_max:		Get the max size of virtqueue
+ *				@mdev: mediated device
+ *				Returns u16: max size of virtqueue
+ * @get_device_id:		Get virtio device id
+ *				@mdev: mediated device
+ *				Returns u32: virtio device id
+ * @get_vendor_id:		Get id for the vendor that provides this device
+ *				@mdev: mediated device
+ *				Returns u32: virtio vendor id
+ * @get_status:			Get the device status
+ *				@mdev: mediated device
+ *				Returns u8: virtio device status
+ * @set_status:			Set the device status
+ *				@mdev: mediated device
+ *				@status: virtio device status
+ * @get_config:			Read from device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to read to
+ *				@len: the length to read from
+ *				configration space
+ * @set_config:			Write to device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to write from
+ *				@len: the length to write to
+ *				configration space
+ * @get_mdev_features:		Get a set of bits that demonstrate
+ *				thecapability of the mdev device. New
+ *				features bits must be added when
+ *				introducing new device ops.
+ *				@mdev: mediated device
+ *				Returns the mdev features (API) support by
+ *				the device.
+ * @get_generation:		Get device config generaton (optionally)
+ *				@mdev: mediated device
+ *				Returns u32: device generation
+ */
+struct virtio_mdev_device_ops {
+	/* Virtqueue ops */
+	int (*set_vq_address)(struct mdev_device *mdev,
+			      u16 idx, u64 desc_area, u64 driver_area,
+			      u64 device_area);
+	void (*set_vq_num)(struct mdev_device *mdev, u16 idx, u32 num);
+	void (*kick_vq)(struct mdev_device *mdev, u16 idx);
+	void (*set_vq_cb)(struct mdev_device *mdev, u16 idx,
+			  struct virtio_mdev_callback *cb);
+	void (*set_vq_ready)(struct mdev_device *mdev, u16 idx, bool ready);
+	bool (*get_vq_ready)(struct mdev_device *mdev, u16 idx);
+	int (*set_vq_state)(struct mdev_device *mdev, u16 idx, u64 state);
+	u64 (*get_vq_state)(struct mdev_device *mdev, u16 idx);
+
+	/* Virtio device ops */
+	u16 (*get_vq_align)(struct mdev_device *mdev);
+	u64 (*get_features)(struct mdev_device *mdev);
+	int (*set_features)(struct mdev_device *mdev, u64 features);
+	void (*set_config_cb)(struct mdev_device *mdev,
+			      struct virtio_mdev_callback *cb);
+	u16 (*get_vq_num_max)(struct mdev_device *mdev);
+	u32 (*get_device_id)(struct mdev_device *mdev);
+	u32 (*get_vendor_id)(struct mdev_device *mdev);
+	u8 (*get_status)(struct mdev_device *mdev);
+	void (*set_status)(struct mdev_device *mdev, u8 status);
+	void (*get_config)(struct mdev_device *mdev, unsigned int offset,
+			   void *buf, unsigned int len);
+	void (*set_config)(struct mdev_device *mdev, unsigned int offset,
+			   const void *buf, unsigned int len);
+	u32 (*get_generation)(struct mdev_device *mdev);
+
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 159

Quoted 8 lines
include/linux/virtio_mdev_ops.h new file +8 -0
+	/* Mdev device ops */
+	u64 (*get_mdev_features)(struct mdev_device *mdev);
+};
+
+void mdev_set_virtio_ops(struct mdev_device *mdev,
+			 const struct virtio_mdev_device_ops *virtio_ops);
+
+#endif

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#27 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

Quoted 141 lines · On Thu, 24 Oct 2019 11:51:35 +0800 Jason Wang <[email protected]> wrote:
Quoted 130 lines · Alex Williamson
Quoted 127 lines · On Wed, 23 Oct 2019 21:07:50 +0800 Jason Wang <[email protected]> wrote:

This 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  | 159 +++++++++++++++++++++++++++++++
  4 files changed, 187 insertions(+)

create mode 100644 include/linux/virtio_mdev_ops.h

drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +27 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang <[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 28

Quoted 1 line
include/linux/virtio_mdev_ops.h new file +1 -0
+ * callbacks are mandatory unless explicity mentioned.  

If the version of the callbacks is returned by a callback within the structure defined by the version... isn't that a bit circular? This seems redundant to me versus the class id. The fact that the parent driver defines the device as MDEV_CLASS_ID_VIRTIO should tell us this already. If it was incremented, we'd need an MDEV_CLASS_ID_VIRTIOv2, which the virtio-mdev bus driver could add to its id table and handle differently.

Quoted 6 lines

My understanding is versions are only allowed to increase monotonically, this seems less flexible than features. E.g we have features A, B, C, mdev device can choose to support only a subset. E.g when mdev device can support dirty page logging, it can add a new feature bit for driver to know that it support new device ops. MDEV_CLASS_ID_VIRTIOv2 may only be useful when we will invent a complete new API.

But this interface rather conflates features and versions by returning a version as a feature. If we simply want to say that there are no additional features, then get_mdev_features() should return an empty set. If dirty page logging is a feature, then I'd expect a bit in the get_mdev_features() return value to identify that feature.

However, I've been under the impression (perhaps wrongly) that the class-id has a 1:1 correlation to the device-ops exposed to the bus driver, so if dirty page logging requires extra callbacks, that would imply a new device-ops, which requires a new class-id. In that case virtio-mdev would claim both class-ids and would need some way to differentiate them. But I also see that such a solution can become unmanageable as the set of class-ids would need to encompass every combination of features.

So I think what's suggested by this is that the initial struct virtio_mdev_device_ops is a base set of callbacks which would be extended via features? But then why does get_generation() not make use of this? And if we can define get_generation() as optional and simply test if it's implemented, then it seems we don't need any feature bits to extend the structure (unless we're looking at binary compatibility). So maybe get_mdev_features() is meant to expose underlying features unrelated to the callbacks? Which is not in line with the description? Hopefully you can see my confusion in what we're trying to do here. Thanks,

Alex

Quoted 135 lines
Quoted 46 lines
Quoted 36 lines
include/linux/virtio_mdev_ops.h new file +36 -0
+ *
+ * @set_vq_address:		Set the address of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@desc_area: address of desc area
+ *				@driver_area: address of driver area
+ *				@device_area: address of device area
+ *				Returns integer: success (0) or error (< 0)
+ * @set_vq_num:			Set the size of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@num: the size of virtqueue
+ * @kick_vq:			Kick the virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ * @set_vq_cb:			Set the interrupt callback function for
+ *				a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@cb: virtio-mdev interrupt callback structure
+ * @set_vq_ready:		Set ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@ready: ready (true) not ready(false)
+ * @get_vq_ready:		Get ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				Returns boolean: ready (true) or not (false)
+ * @set_vq_state:		Set the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@state: virtqueue state (last_avail_idx)
+ *				Returns integer: success (0) or error (< 0)
+ * @get_vq_state:		Get the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index

include/linux/virtio_mdev_ops.h line 74

Quoted 10 lines
include/linux/virtio_mdev_ops.h new file +10 -0
+ *				Returns virtqueue state (last_avail_idx)
+ * @get_vq_align:		Get the virtqueue align requirement
+ *				for the device
+ *				@mdev: mediated device
+ *				Returns virtqueue algin requirement
+ * @get_features:		Get virtio features supported by the device
+ *				@mdev: mediated device
+ *				Returns the virtio features support by the
+ *				device
+ * @get_features:		Set virtio features supported by the driver  
Quoted 4 lines
        ^ s/g/s/

Thanks,
Alex

Will fix.

Thanks

Quoted 78 lines
Quoted 78 lines
include/linux/virtio_mdev_ops.h new file +77 -0
+ *				@mdev: mediated device
+ *				@features: feature support by the driver
+ *				Returns integer: success (0) or error (< 0)
+ * @set_config_cb:		Set the config interrupt callback
+ *				@mdev: mediated device
+ *				@cb: virtio-mdev interrupt callback structure
+ * @get_vq_num_max:		Get the max size of virtqueue
+ *				@mdev: mediated device
+ *				Returns u16: max size of virtqueue
+ * @get_device_id:		Get virtio device id
+ *				@mdev: mediated device
+ *				Returns u32: virtio device id
+ * @get_vendor_id:		Get id for the vendor that provides this device
+ *				@mdev: mediated device
+ *				Returns u32: virtio vendor id
+ * @get_status:			Get the device status
+ *				@mdev: mediated device
+ *				Returns u8: virtio device status
+ * @set_status:			Set the device status
+ *				@mdev: mediated device
+ *				@status: virtio device status
+ * @get_config:			Read from device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to read to
+ *				@len: the length to read from
+ *				configration space
+ * @set_config:			Write to device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to write from
+ *				@len: the length to write to
+ *				configration space
+ * @get_mdev_features:		Get a set of bits that demonstrate
+ *				thecapability of the mdev device. New
+ *				features bits must be added when
+ *				introducing new device ops.
+ *				@mdev: mediated device
+ *				Returns the mdev features (API) support by
+ *				the device.
+ * @get_generation:		Get device config generaton (optionally)
+ *				@mdev: mediated device
+ *				Returns u32: device generation
+ */
+struct virtio_mdev_device_ops {
+	/* Virtqueue ops */
+	int (*set_vq_address)(struct mdev_device *mdev,
+			      u16 idx, u64 desc_area, u64 driver_area,
+			      u64 device_area);
+	void (*set_vq_num)(struct mdev_device *mdev, u16 idx, u32 num);
+	void (*kick_vq)(struct mdev_device *mdev, u16 idx);
+	void (*set_vq_cb)(struct mdev_device *mdev, u16 idx,
+			  struct virtio_mdev_callback *cb);
+	void (*set_vq_ready)(struct mdev_device *mdev, u16 idx, bool ready);
+	bool (*get_vq_ready)(struct mdev_device *mdev, u16 idx);
+	int (*set_vq_state)(struct mdev_device *mdev, u16 idx, u64 state);
+	u64 (*get_vq_state)(struct mdev_device *mdev, u16 idx);
+
+	/* Virtio device ops */
+	u16 (*get_vq_align)(struct mdev_device *mdev);
+	u64 (*get_features)(struct mdev_device *mdev);
+	int (*set_features)(struct mdev_device *mdev, u64 features);
+	void (*set_config_cb)(struct mdev_device *mdev,
+			      struct virtio_mdev_callback *cb);
+	u16 (*get_vq_num_max)(struct mdev_device *mdev);
+	u32 (*get_device_id)(struct mdev_device *mdev);
+	u32 (*get_vendor_id)(struct mdev_device *mdev);
+	u8 (*get_status)(struct mdev_device *mdev);
+	void (*set_status)(struct mdev_device *mdev, u8 status);
+	void (*get_config)(struct mdev_device *mdev, unsigned int offset,
+			   void *buf, unsigned int len);
+	void (*set_config)(struct mdev_device *mdev, unsigned int offset,
+			   const void *buf, unsigned int len);
+	u32 (*get_generation)(struct mdev_device *mdev);
+
Quoted 8 lines
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 159

Quoted 8 lines
include/linux/virtio_mdev_ops.h new file +8 -0
+	/* Mdev device ops */
+	u64 (*get_mdev_features)(struct mdev_device *mdev);
+};
+
+void mdev_set_virtio_ops(struct mdev_device *mdev,
+			 const struct virtio_mdev_device_ops *virtio_ops);
+
+#endif  

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

author
#28 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

Quoted 163 lines · Alex Williamson
Quoted 139 lines · On Thu, 24 Oct 2019 11:51:35 +0800 Jason Wang<[email protected]> wrote:
Quoted 130 lines · Alex Williamson
Quoted 127 lines · On Wed, 23 Oct 2019 21:07:50 +0800 Jason Wang<[email protected]> wrote:

This 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  | 159 +++++++++++++++++++++++++++++++
   4 files changed, 187 insertions(+)

create mode 100644 include/linux/virtio_mdev_ops.h

drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +27 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang<[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 28

Quoted 1 line
include/linux/virtio_mdev_ops.h new file +1 -0
+ * callbacks are mandatory unless explicity mentioned.

If the version of the callbacks is returned by a callback within the structure defined by the version... isn't that a bit circular? This seems redundant to me versus the class id. The fact that the parent driver defines the device as MDEV_CLASS_ID_VIRTIO should tell us this already. If it was incremented, we'd need an MDEV_CLASS_ID_VIRTIOv2, which the virtio-mdev bus driver could add to its id table and handle differently.

Quoted 6 lines

My understanding is versions are only allowed to increase monotonically, this seems less flexible than features. E.g we have features A, B, C, mdev device can choose to support only a subset. E.g when mdev device can support dirty page logging, it can add a new feature bit for driver to know that it support new device ops. MDEV_CLASS_ID_VIRTIOv2 may only be useful when we will invent a complete new API.

But this interface rather conflates features and versions by returning a version as a feature. If we simply want to say that there are no additional features, then get_mdev_features() should return an empty set. If dirty page logging is a feature, then I'd expect a bit in the get_mdev_features() return value to identify that feature.

However, I've been under the impression (perhaps wrongly) that the class-id has a 1:1 correlation to the device-ops exposed to the bus driver, so if dirty page logging requires extra callbacks, that would imply a new device-ops, which requires a new class-id. In that case virtio-mdev would claim both class-ids and would need some way to differentiate them. But I also see that such a solution can become unmanageable as the set of class-ids would need to encompass every combination of features.

Quoted 3 lines

So I think what's suggested by this is that the initial struct virtio_mdev_device_ops is a base set of callbacks which would be extended via features?

Yes.

Quoted 4 lines

But then why does get_generation() not make use
of this? And if we can define get_generation() as optional and simply test if it's implemented, then it seems we don't need any feature bits to extend the structure (unless we're looking at binary compatibility).

I think the mapping between ops and features is N:1. We start with a base feature like VIRTIO_MDEV_VERSION_1, this allows us to do simply checking during probe without the need to checking the existence of each op. Testing the existence of a specific op should work but less convenient when a feature requires several new ops. For the case of get_generation(), it works because the bus driver have workaround when parent doesn't provide that. This may not work for a real feature.

Quoted 2 lines

So maybe get_mdev_features() is meant to expose underlying features unrelated to the callbacks? Which is not in line with the description?

At least not for current virtio-mdev/vhost-mdev. Virtio specific features should be done via get_features().

Quoted 1 line

Hopefully you can see my confusion in what we're trying to do here.

I think I get you and hope my answer make sense. Suggestions are welcomed.

Thanks

Quoted 4 lines

Thanks,

Alex

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#29 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

In reply to Alex Williamson
Quoted 163 lines · Alex Williamson
Quoted 139 lines · On Thu, 24 Oct 2019 11:51:35 +0800 Jason Wang<[email protected]> wrote:
Quoted 130 lines · Alex Williamson
Quoted 127 lines · On Wed, 23 Oct 2019 21:07:50 +0800 Jason Wang<[email protected]> wrote:

This 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  | 159 +++++++++++++++++++++++++++++++
   4 files changed, 187 insertions(+)

create mode 100644 include/linux/virtio_mdev_ops.h

drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +27 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang<[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 28

Quoted 1 line
include/linux/virtio_mdev_ops.h new file +1 -0
+ * callbacks are mandatory unless explicity mentioned.

If the version of the callbacks is returned by a callback within the structure defined by the version... isn't that a bit circular? This seems redundant to me versus the class id. The fact that the parent driver defines the device as MDEV_CLASS_ID_VIRTIO should tell us this already. If it was incremented, we'd need an MDEV_CLASS_ID_VIRTIOv2, which the virtio-mdev bus driver could add to its id table and handle differently.

Quoted 6 lines

My understanding is versions are only allowed to increase monotonically, this seems less flexible than features. E.g we have features A, B, C, mdev device can choose to support only a subset. E.g when mdev device can support dirty page logging, it can add a new feature bit for driver to know that it support new device ops. MDEV_CLASS_ID_VIRTIOv2 may only be useful when we will invent a complete new API.

But this interface rather conflates features and versions by returning a version as a feature. If we simply want to say that there are no additional features, then get_mdev_features() should return an empty set. If dirty page logging is a feature, then I'd expect a bit in the get_mdev_features() return value to identify that feature.

However, I've been under the impression (perhaps wrongly) that the class-id has a 1:1 correlation to the device-ops exposed to the bus driver, so if dirty page logging requires extra callbacks, that would imply a new device-ops, which requires a new class-id. In that case virtio-mdev would claim both class-ids and would need some way to differentiate them. But I also see that such a solution can become unmanageable as the set of class-ids would need to encompass every combination of features.

Quoted 3 lines

So I think what's suggested by this is that the initial struct virtio_mdev_device_ops is a base set of callbacks which would be extended via features?

Yes.

Quoted 4 lines

But then why does get_generation() not make use
of this? And if we can define get_generation() as optional and simply test if it's implemented, then it seems we don't need any feature bits to extend the structure (unless we're looking at binary compatibility).

I think the mapping between ops and features is N:1. We start with a base feature like VIRTIO_MDEV_VERSION_1, this allows us to do simply checking during probe without the need to checking the existence of each op. Testing the existence of a specific op should work but less convenient when a feature requires several new ops. For the case of get_generation(), it works because the bus driver have workaround when parent doesn't provide that. This may not work for a real feature.

Quoted 2 lines

So maybe get_mdev_features() is meant to expose underlying features unrelated to the callbacks? Which is not in line with the description?

At least not for current virtio-mdev/vhost-mdev. Virtio specific features should be done via get_features().

Quoted 1 line

Hopefully you can see my confusion in what we're trying to do here.

I think I get you and hope my answer make sense. Suggestions are welcomed.

Thanks

Quoted 4 lines

Thanks,

Alex

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#30 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

In reply to Jason Wang
Quoted 141 lines · On Thu, 24 Oct 2019 11:51:35 +0800 Jason Wang <[email protected]> wrote:
Quoted 130 lines · Alex Williamson
Quoted 127 lines · On Wed, 23 Oct 2019 21:07:50 +0800 Jason Wang <[email protected]> wrote:

This 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  | 159 +++++++++++++++++++++++++++++++
  4 files changed, 187 insertions(+)

create mode 100644 include/linux/virtio_mdev_ops.h

drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +27 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang <[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 28

Quoted 1 line
include/linux/virtio_mdev_ops.h new file +1 -0
+ * callbacks are mandatory unless explicity mentioned.  

If the version of the callbacks is returned by a callback within the structure defined by the version... isn't that a bit circular? This seems redundant to me versus the class id. The fact that the parent driver defines the device as MDEV_CLASS_ID_VIRTIO should tell us this already. If it was incremented, we'd need an MDEV_CLASS_ID_VIRTIOv2, which the virtio-mdev bus driver could add to its id table and handle differently.

Quoted 6 lines

My understanding is versions are only allowed to increase monotonically, this seems less flexible than features. E.g we have features A, B, C, mdev device can choose to support only a subset. E.g when mdev device can support dirty page logging, it can add a new feature bit for driver to know that it support new device ops. MDEV_CLASS_ID_VIRTIOv2 may only be useful when we will invent a complete new API.

But this interface rather conflates features and versions by returning a version as a feature. If we simply want to say that there are no additional features, then get_mdev_features() should return an empty set. If dirty page logging is a feature, then I'd expect a bit in the get_mdev_features() return value to identify that feature.

However, I've been under the impression (perhaps wrongly) that the class-id has a 1:1 correlation to the device-ops exposed to the bus driver, so if dirty page logging requires extra callbacks, that would imply a new device-ops, which requires a new class-id. In that case virtio-mdev would claim both class-ids and would need some way to differentiate them. But I also see that such a solution can become unmanageable as the set of class-ids would need to encompass every combination of features.

So I think what's suggested by this is that the initial struct virtio_mdev_device_ops is a base set of callbacks which would be extended via features? But then why does get_generation() not make use of this? And if we can define get_generation() as optional and simply test if it's implemented, then it seems we don't need any feature bits to extend the structure (unless we're looking at binary compatibility). So maybe get_mdev_features() is meant to expose underlying features unrelated to the callbacks? Which is not in line with the description? Hopefully you can see my confusion in what we're trying to do here. Thanks,

Alex

Quoted 135 lines
Quoted 46 lines
Quoted 36 lines
include/linux/virtio_mdev_ops.h new file +36 -0
+ *
+ * @set_vq_address:		Set the address of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@desc_area: address of desc area
+ *				@driver_area: address of driver area
+ *				@device_area: address of device area
+ *				Returns integer: success (0) or error (< 0)
+ * @set_vq_num:			Set the size of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@num: the size of virtqueue
+ * @kick_vq:			Kick the virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ * @set_vq_cb:			Set the interrupt callback function for
+ *				a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@cb: virtio-mdev interrupt callback structure
+ * @set_vq_ready:		Set ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@ready: ready (true) not ready(false)
+ * @get_vq_ready:		Get ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				Returns boolean: ready (true) or not (false)
+ * @set_vq_state:		Set the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@state: virtqueue state (last_avail_idx)
+ *				Returns integer: success (0) or error (< 0)
+ * @get_vq_state:		Get the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index

include/linux/virtio_mdev_ops.h line 74

Quoted 10 lines
include/linux/virtio_mdev_ops.h new file +10 -0
+ *				Returns virtqueue state (last_avail_idx)
+ * @get_vq_align:		Get the virtqueue align requirement
+ *				for the device
+ *				@mdev: mediated device
+ *				Returns virtqueue algin requirement
+ * @get_features:		Get virtio features supported by the device
+ *				@mdev: mediated device
+ *				Returns the virtio features support by the
+ *				device
+ * @get_features:		Set virtio features supported by the driver  
Quoted 4 lines
        ^ s/g/s/

Thanks,
Alex

Will fix.

Thanks

Quoted 78 lines
Quoted 78 lines
include/linux/virtio_mdev_ops.h new file +77 -0
+ *				@mdev: mediated device
+ *				@features: feature support by the driver
+ *				Returns integer: success (0) or error (< 0)
+ * @set_config_cb:		Set the config interrupt callback
+ *				@mdev: mediated device
+ *				@cb: virtio-mdev interrupt callback structure
+ * @get_vq_num_max:		Get the max size of virtqueue
+ *				@mdev: mediated device
+ *				Returns u16: max size of virtqueue
+ * @get_device_id:		Get virtio device id
+ *				@mdev: mediated device
+ *				Returns u32: virtio device id
+ * @get_vendor_id:		Get id for the vendor that provides this device
+ *				@mdev: mediated device
+ *				Returns u32: virtio vendor id
+ * @get_status:			Get the device status
+ *				@mdev: mediated device
+ *				Returns u8: virtio device status
+ * @set_status:			Set the device status
+ *				@mdev: mediated device
+ *				@status: virtio device status
+ * @get_config:			Read from device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to read to
+ *				@len: the length to read from
+ *				configration space
+ * @set_config:			Write to device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to write from
+ *				@len: the length to write to
+ *				configration space
+ * @get_mdev_features:		Get a set of bits that demonstrate
+ *				thecapability of the mdev device. New
+ *				features bits must be added when
+ *				introducing new device ops.
+ *				@mdev: mediated device
+ *				Returns the mdev features (API) support by
+ *				the device.
+ * @get_generation:		Get device config generaton (optionally)
+ *				@mdev: mediated device
+ *				Returns u32: device generation
+ */
+struct virtio_mdev_device_ops {
+	/* Virtqueue ops */
+	int (*set_vq_address)(struct mdev_device *mdev,
+			      u16 idx, u64 desc_area, u64 driver_area,
+			      u64 device_area);
+	void (*set_vq_num)(struct mdev_device *mdev, u16 idx, u32 num);
+	void (*kick_vq)(struct mdev_device *mdev, u16 idx);
+	void (*set_vq_cb)(struct mdev_device *mdev, u16 idx,
+			  struct virtio_mdev_callback *cb);
+	void (*set_vq_ready)(struct mdev_device *mdev, u16 idx, bool ready);
+	bool (*get_vq_ready)(struct mdev_device *mdev, u16 idx);
+	int (*set_vq_state)(struct mdev_device *mdev, u16 idx, u64 state);
+	u64 (*get_vq_state)(struct mdev_device *mdev, u16 idx);
+
+	/* Virtio device ops */
+	u16 (*get_vq_align)(struct mdev_device *mdev);
+	u64 (*get_features)(struct mdev_device *mdev);
+	int (*set_features)(struct mdev_device *mdev, u64 features);
+	void (*set_config_cb)(struct mdev_device *mdev,
+			      struct virtio_mdev_callback *cb);
+	u16 (*get_vq_num_max)(struct mdev_device *mdev);
+	u32 (*get_device_id)(struct mdev_device *mdev);
+	u32 (*get_vendor_id)(struct mdev_device *mdev);
+	u8 (*get_status)(struct mdev_device *mdev);
+	void (*set_status)(struct mdev_device *mdev, u8 status);
+	void (*get_config)(struct mdev_device *mdev, unsigned int offset,
+			   void *buf, unsigned int len);
+	void (*set_config)(struct mdev_device *mdev, unsigned int offset,
+			   const void *buf, unsigned int len);
+	u32 (*get_generation)(struct mdev_device *mdev);
+
Quoted 8 lines
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 159

Quoted 8 lines
include/linux/virtio_mdev_ops.h new file +8 -0
+	/* Mdev device ops */
+	u64 (*get_mdev_features)(struct mdev_device *mdev);
+};
+
+void mdev_set_virtio_ops(struct mdev_device *mdev,
+			 const struct virtio_mdev_device_ops *virtio_ops);
+
+#endif  

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

author
#31 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

In reply to Alex Williamson
Quoted 130 lines · Alex Williamson
Quoted 127 lines · On Wed, 23 Oct 2019 21:07:50 +0800 Jason Wang <[email protected]> wrote:

This 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  | 159 +++++++++++++++++++++++++++++++
  4 files changed, 187 insertions(+)

create mode 100644 include/linux/virtio_mdev_ops.h

drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +27 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang <[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 28

Quoted 1 line
include/linux/virtio_mdev_ops.h new file +1 -0
+ * callbacks are mandatory unless explicity mentioned.

If the version of the callbacks is returned by a callback within the structure defined by the version... isn't that a bit circular? This seems redundant to me versus the class id. The fact that the parent driver defines the device as MDEV_CLASS_ID_VIRTIO should tell us this already. If it was incremented, we'd need an MDEV_CLASS_ID_VIRTIOv2, which the virtio-mdev bus driver could add to its id table and handle differently.

My understanding is versions are only allowed to increase monotonically, this seems less flexible than features. E.g we have features A, B, C, mdev device can choose to support only a subset. E.g when mdev device can support dirty page logging, it can add a new feature bit for driver to know that it support new device ops. MDEV_CLASS_ID_VIRTIOv2 may only be useful when we will invent a complete new API.

Quoted 47 lines
Quoted 37 lines
include/linux/virtio_mdev_ops.h new file +36 -0
+ *
+ * @set_vq_address:		Set the address of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@desc_area: address of desc area
+ *				@driver_area: address of driver area
+ *				@device_area: address of device area
+ *				Returns integer: success (0) or error (< 0)
+ * @set_vq_num:			Set the size of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@num: the size of virtqueue
+ * @kick_vq:			Kick the virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ * @set_vq_cb:			Set the interrupt callback function for
+ *				a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@cb: virtio-mdev interrupt callback structure
+ * @set_vq_ready:		Set ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@ready: ready (true) not ready(false)
+ * @get_vq_ready:		Get ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				Returns boolean: ready (true) or not (false)
+ * @set_vq_state:		Set the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@state: virtqueue state (last_avail_idx)
+ *				Returns integer: success (0) or error (< 0)
+ * @get_vq_state:		Get the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index

include/linux/virtio_mdev_ops.h line 74

Quoted 10 lines
include/linux/virtio_mdev_ops.h new file +10 -0
+ *				Returns virtqueue state (last_avail_idx)
+ * @get_vq_align:		Get the virtqueue align requirement
+ *				for the device
+ *				@mdev: mediated device
+ *				Returns virtqueue algin requirement
+ * @get_features:		Get virtio features supported by the device
+ *				@mdev: mediated device
+ *				Returns the virtio features support by the
+ *				device
+ * @get_features:		Set virtio features supported by the driver
Quoted 4 lines
        ^ s/g/s/

Thanks,
Alex

Will fix.

Thanks

Quoted 78 lines
Quoted 78 lines
include/linux/virtio_mdev_ops.h new file +77 -0
+ *				@mdev: mediated device
+ *				@features: feature support by the driver
+ *				Returns integer: success (0) or error (< 0)
+ * @set_config_cb:		Set the config interrupt callback
+ *				@mdev: mediated device
+ *				@cb: virtio-mdev interrupt callback structure
+ * @get_vq_num_max:		Get the max size of virtqueue
+ *				@mdev: mediated device
+ *				Returns u16: max size of virtqueue
+ * @get_device_id:		Get virtio device id
+ *				@mdev: mediated device
+ *				Returns u32: virtio device id
+ * @get_vendor_id:		Get id for the vendor that provides this device
+ *				@mdev: mediated device
+ *				Returns u32: virtio vendor id
+ * @get_status:			Get the device status
+ *				@mdev: mediated device
+ *				Returns u8: virtio device status
+ * @set_status:			Set the device status
+ *				@mdev: mediated device
+ *				@status: virtio device status
+ * @get_config:			Read from device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to read to
+ *				@len: the length to read from
+ *				configration space
+ * @set_config:			Write to device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to write from
+ *				@len: the length to write to
+ *				configration space
+ * @get_mdev_features:		Get a set of bits that demonstrate
+ *				thecapability of the mdev device. New
+ *				features bits must be added when
+ *				introducing new device ops.
+ *				@mdev: mediated device
+ *				Returns the mdev features (API) support by
+ *				the device.
+ * @get_generation:		Get device config generaton (optionally)
+ *				@mdev: mediated device
+ *				Returns u32: device generation
+ */
+struct virtio_mdev_device_ops {
+	/* Virtqueue ops */
+	int (*set_vq_address)(struct mdev_device *mdev,
+			      u16 idx, u64 desc_area, u64 driver_area,
+			      u64 device_area);
+	void (*set_vq_num)(struct mdev_device *mdev, u16 idx, u32 num);
+	void (*kick_vq)(struct mdev_device *mdev, u16 idx);
+	void (*set_vq_cb)(struct mdev_device *mdev, u16 idx,
+			  struct virtio_mdev_callback *cb);
+	void (*set_vq_ready)(struct mdev_device *mdev, u16 idx, bool ready);
+	bool (*get_vq_ready)(struct mdev_device *mdev, u16 idx);
+	int (*set_vq_state)(struct mdev_device *mdev, u16 idx, u64 state);
+	u64 (*get_vq_state)(struct mdev_device *mdev, u16 idx);
+
+	/* Virtio device ops */
+	u16 (*get_vq_align)(struct mdev_device *mdev);
+	u64 (*get_features)(struct mdev_device *mdev);
+	int (*set_features)(struct mdev_device *mdev, u64 features);
+	void (*set_config_cb)(struct mdev_device *mdev,
+			      struct virtio_mdev_callback *cb);
+	u16 (*get_vq_num_max)(struct mdev_device *mdev);
+	u32 (*get_device_id)(struct mdev_device *mdev);
+	u32 (*get_vendor_id)(struct mdev_device *mdev);
+	u8 (*get_status)(struct mdev_device *mdev);
+	void (*set_status)(struct mdev_device *mdev, u8 status);
+	void (*get_config)(struct mdev_device *mdev, unsigned int offset,
+			   void *buf, unsigned int len);
+	void (*set_config)(struct mdev_device *mdev, unsigned int offset,
+			   const void *buf, unsigned int len);
+	u32 (*get_generation)(struct mdev_device *mdev);
+
Quoted 8 lines

include/linux/virtio_mdev_ops.h line 159

Quoted 8 lines
include/linux/virtio_mdev_ops.h new file +8 -0
+	/* Mdev device ops */
+	u64 (*get_mdev_features)(struct mdev_device *mdev);
+};
+
+void mdev_set_virtio_ops(struct mdev_device *mdev,
+			 const struct virtio_mdev_device_ops *virtio_ops);
+
+#endif

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#32 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

In reply to Jason Wang
Quoted 235 lines · Jason Wang

This 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  | 159 +++++++++++++++++++++++++++++++
  4 files changed, 187 insertions(+)

create mode 100644 include/linux/virtio_mdev_ops.h

drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +135 -0
new file mode 100644
index 000000000000..d417b41f2845
@@ -0,0 +1,159 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Virtio mediated device driver
+ *
+ * Copyright 2019, Red Hat Corp.
+ *     Author: Jason Wang <[email protected]>
+ */
+#ifndef _LINUX_VIRTIO_MDEV_H
+#define _LINUX_VIRTIO_MDEV_H
+
+#include <linux/interrupt.h>
+#include <linux/mdev.h>
+#include <uapi/linux/vhost.h>
+
+#define VIRTIO_MDEV_DEVICE_API_STRING		"virtio-mdev"
+#define VIRTIO_MDEV_F_VERSION_1 0x1
+
+struct virtio_mdev_callback {
+	irqreturn_t (*callback)(void *data);
+	void *private;
+};
+
+/**
+ * struct vfio_mdev_device_ops - Structure to be registered for each
+ * mdev device to register the device for virtio/vhost drivers.
+ *
+ * The device ops that is supported by VIRTIO_MDEV_F_VERSION_1, the
+ * callbacks are mandatory unless explicity mentioned.
+ *
+ * @set_vq_address:		Set the address of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@desc_area: address of desc area
+ *				@driver_area: address of driver area
+ *				@device_area: address of device area
+ *				Returns integer: success (0) or error (< 0)
+ * @set_vq_num:			Set the size of virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@num: the size of virtqueue
+ * @kick_vq:			Kick the virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ * @set_vq_cb:			Set the interrupt callback function for
+ *				a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@cb: virtio-mdev interrupt callback structure
+ * @set_vq_ready:		Set ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@ready: ready (true) not ready(false)
+ * @get_vq_ready:		Get ready status for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				Returns boolean: ready (true) or not (false)
+ * @set_vq_state:		Set the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				@state: virtqueue state (last_avail_idx)
+ *				Returns integer: success (0) or error (< 0)
+ * @get_vq_state:		Get the state for a virtqueue
+ *				@mdev: mediated device
+ *				@idx: virtqueue index
+ *				Returns virtqueue state (last_avail_idx)
+ * @get_vq_align:		Get the virtqueue align requirement
+ *				for the device
+ *				@mdev: mediated device
+ *				Returns virtqueue algin requirement
+ * @get_features:		Get virtio features supported by the device
+ *				@mdev: mediated device
+ *				Returns the virtio features support by the
+ *				device
+ * @get_features:		Set virtio features supported by the driver
+ *				@mdev: mediated device
+ *				@features: feature support by the driver
+ *				Returns integer: success (0) or error (< 0)
+ * @set_config_cb:		Set the config interrupt callback
+ *				@mdev: mediated device
+ *				@cb: virtio-mdev interrupt callback structure
+ * @get_vq_num_max:		Get the max size of virtqueue
+ *				@mdev: mediated device
+ *				Returns u16: max size of virtqueue
+ * @get_device_id:		Get virtio device id
+ *				@mdev: mediated device
+ *				Returns u32: virtio device id
+ * @get_vendor_id:		Get id for the vendor that provides this device
+ *				@mdev: mediated device
+ *				Returns u32: virtio vendor id
+ * @get_status:			Get the device status
+ *				@mdev: mediated device
+ *				Returns u8: virtio device status
+ * @set_status:			Set the device status
+ *				@mdev: mediated device
+ *				@status: virtio device status
+ * @get_config:			Read from device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to read to
+ *				@len: the length to read from
+ *				configration space
+ * @set_config:			Write to device specific configuration space
+ *				@mdev: mediated device
+ *				@offset: offset from the beginning of
+ *				configuration space
+ *				@buf: buffer used to write from
+ *				@len: the length to write to
+ *				configration space
+ * @get_mdev_features:		Get a set of bits that demonstrate
+ *				thecapability of the mdev device. New
+ *				features bits must be added when
+ *				introducing new device ops.
+ *				@mdev: mediated device
+ *				Returns the mdev features (API) support by
+ *				the device.
+ * @get_generation:		Get device config generaton (optionally)
+ *				@mdev: mediated device
+ *				Returns u32: device generation
+ */
+struct virtio_mdev_device_ops {
+	/* Virtqueue ops */
+	int (*set_vq_address)(struct mdev_device *mdev,
+			      u16 idx, u64 desc_area, u64 driver_area,
+			      u64 device_area);
+	void (*set_vq_num)(struct mdev_device *mdev, u16 idx, u32 num);
+	void (*kick_vq)(struct mdev_device *mdev, u16 idx);
+	void (*set_vq_cb)(struct mdev_device *mdev, u16 idx,
+			  struct virtio_mdev_callback *cb);
+	void (*set_vq_ready)(struct mdev_device *mdev, u16 idx, bool ready);
+	bool (*get_vq_ready)(struct mdev_device *mdev, u16 idx);
+	int (*set_vq_state)(struct mdev_device *mdev, u16 idx, u64 state);
+	u64 (*get_vq_state)(struct mdev_device *mdev, u16 idx);
+
+	/* Virtio device ops */

include/linux/virtio_mdev_ops.h line 145

Quoted 10 lines
include/linux/virtio_mdev_ops.h new file +10 -0
+	u16 (*get_vq_align)(struct mdev_device *mdev);
+	u64 (*get_features)(struct mdev_device *mdev);
+	int (*set_features)(struct mdev_device *mdev, u64 features);
+	void (*set_config_cb)(struct mdev_device *mdev,
+			      struct virtio_mdev_callback *cb);
+	u16 (*get_vq_num_max)(struct mdev_device *mdev);
+	u32 (*get_device_id)(struct mdev_device *mdev);
+	u32 (*get_vendor_id)(struct mdev_device *mdev);
+	u8 (*get_status)(struct mdev_device *mdev);
+	void (*set_status)(struct mdev_device *mdev, u8 status);

Hi Jason

Is it possible to make set_status() return an u8 or bool, because this may fail in real hardware. Without a returned code, I am not sure  whether it is a good idea to set the status | NEED_RESET when fail.

Thanks,
BR
Zhu Lingshan

Quoted 14 lines
include/linux/virtio_mdev_ops.h new file +14 -0
+	void (*get_config)(struct mdev_device *mdev, unsigned int offset,
+			   void *buf, unsigned int len);
+	void (*set_config)(struct mdev_device *mdev, unsigned int offset,
+			   const void *buf, unsigned int len);
+	u32 (*get_generation)(struct mdev_device *mdev);
+
+	/* Mdev device ops */
+	u64 (*get_mdev_features)(struct mdev_device *mdev);
+};
+
+void mdev_set_virtio_ops(struct mdev_device *mdev,
+			 const struct virtio_mdev_device_ops *virtio_ops);
+
+#endif
author
#33 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

Quoted 5 lines · Zhu Lingshan
Quoted 2 lines

+    void (*set_status)(struct mdev_device *mdev, u8 status);

Hi Jason

Quoted 7 lines

Is it possible to make set_status() return an u8 or bool, because this may fail in real hardware. Without a returned code, I am not sure whether it is a good idea to set the status | NEED_RESET when fail.

Thanks,
BR
Zhu Lingshan

Hi:

It's possible but I'm not sure whether any user will care about it. E.g see virtio_add_status():

void virtio_add_status(struct virtio_device *dev, unsigned int status) {
    might_sleep();
    dev->config->set_status(dev, dev->config->get_status(dev) | status); }
EXPORT_SYMBOL_GPL(virtio_add_status);

And I believe how it work should be:

virtio_add_status(xyz);

status = virtio_get_status();

if (!(status & xyz))

    error;

Thanks

#34 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

Quoted 29 lines · Jason Wang
Quoted 10 lines · Zhu Lingshan
Quoted 1 line

+    void (*set_status)(struct mdev_device *mdev, u8 status);

Hi Jason

Is it possible to make set_status() return an u8 or bool, because this may fail in real hardware. Without a returned code, I am not sure whether it is a good idea to set the status | NEED_RESET when fail.

Thanks,
BR
Zhu Lingshan

Hi:

It's possible but I'm not sure whether any user will care about it. E.g see virtio_add_status():

void virtio_add_status(struct virtio_device *dev, unsigned int status) {
    might_sleep();
    dev->config->set_status(dev, dev->config->get_status(dev) | status);
}
EXPORT_SYMBOL_GPL(virtio_add_status);

And I believe how it work should be:

virtio_add_status(xyz);

Quoted 8 lines

status = virtio_get_status();

if (!(status & xyz))

    error;

Thanks

Thanks Jason, then I believe upper layer can handle this well.

Quoted 1 line
author
#35 lore raw

Re: [PATCH V5 4/6] mdev: introduce virtio device and its device ops

In reply to Zhu Lingshan
Quoted 5 lines · Zhu Lingshan
Quoted 2 lines

+    void (*set_status)(struct mdev_device *mdev, u8 status);

Hi Jason

Quoted 7 lines

Is it possible to make set_status() return an u8 or bool, because this may fail in real hardware. Without a returned code, I am not sure whether it is a good idea to set the status | NEED_RESET when fail.

Thanks,
BR
Zhu Lingshan

Hi:

It's possible but I'm not sure whether any user will care about it. E.g see virtio_add_status():

void virtio_add_status(struct virtio_device *dev, unsigned int status) {
    might_sleep();
    dev->config->set_status(dev, dev->config->get_status(dev) | status); }
EXPORT_SYMBOL_GPL(virtio_add_status);

And I believe how it work should be:

virtio_add_status(xyz);

status = virtio_get_status();

if (!(status & xyz))

    error;

Thanks

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

author
#36 lore raw

PATCH v5 4/6 mdev: introduce virtio device and its device ops

In reply to Jason Wang

This 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  | 159 +++++++++++++++++++++++++++++++
 4 files changed, 187 insertions(+)
 create mode 100644 include/linux/virtio_mdev_ops.h
drivers/vfio/mdev/mdev_core.c +20 -0
index 555bd61d8c38..9b00c3513120 100644
@@ -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
index 0770410ded2a..7b47890c34e7 100644
@@ -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
index 4625f1a11014..9b69b0bbebfd 100644
@@ -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 +159 -0

159 lines not on this page · raw message

Signature · 1 line
2.19.1
author
#37 lore raw

PATCH v5 5/6 virtio: introduce a mdev based transport

In reply to Jason Wang

This 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
index 078615cf2afc..8d18722ab572 100644
@@ -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
index 3a2b5c5dcf46..ebc7fa15ae82 100644
@@ -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
author
#38 lore raw

PATCH v5 5/6 virtio: introduce a mdev based transport

In reply to Jason Wang

This 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
index 078615cf2afc..8d18722ab572 100644
@@ -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
index 3a2b5c5dcf46..ebc7fa15ae82 100644
@@ -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
author
#39 lore raw

PATCH v5 6/6 docs: sample driver to demonstrate how to implement virtio-mdev framework

In reply to 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.

---
 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
index 9e10ae9c2b4d..8b17927a81fd 100644
@@ -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
index c8dacb4dda80..a1a1ca2c00b7 100644
@@ -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
index 10d179c4fdeb..f34af90ed0a0 100644
@@ -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 · 6 lines
2.19.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
author
#40 lore raw

PATCH v5 6/6 docs: sample driver to demonstrate how to implement virtio-mdev framework

In reply to 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.

---
 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
index 9e10ae9c2b4d..8b17927a81fd 100644
@@ -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
index c8dacb4dda80..a1a1ca2c00b7 100644
@@ -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
index 10d179c4fdeb..f34af90ed0a0 100644
@@ -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
#41 lore raw

✗ Fi.CI.CHECKPATCH: warning for mdev based hardware virtio offloading support (rev6)

In reply to Jason Wang
== Series Details ==

== Series Details ==

Series: mdev based hardware virtio offloading support (rev6)
URL : https://patchwork.freedesktop.org/series/66989/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
dbcc3602f990 mdev: class id support
cdfeed47be7f modpost: add support for mdev class id
d18fa8d08a1d 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 checked
091ee68346c6 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, 223 lines checked
76b1265016b1 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 checked
e114c74e4182 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

#42 lore raw

✓ Fi.CI.BAT: success for mdev based hardware virtio offloading support (rev6)

In reply to Jason Wang
== Series Details ==

== Series Details ==

Series: mdev based hardware virtio offloading support (rev6)
URL : https://patchwork.freedesktop.org/series/66989/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7167 -> Patchwork_14949
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_14949:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* {igt@i915_selftest@live_gt_heartbeat}:
- fi-glk-dsi: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-glk-dsi/igt@i915_selftest@live_gt_heartbeat.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-glk-dsi/igt@i915_selftest@live_gt_heartbeat.html

Known issues
------------

Here are the changes found in Patchwork_14949 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_create@basic-files:
- fi-bxt-dsi: [PASS][3] -> [INCOMPLETE][4] ([fdo#103927])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-bxt-dsi/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-bxt-dsi/igt@[email protected]

* igt@gem_ringfill@basic-default-fd:
- fi-icl-u3: [PASS][5] -> [DMESG-WARN][6] ([fdo#107724]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-icl-u3/igt@[email protected]

* igt@i915_selftest@live_gem_contexts:
- fi-cfl-8109u: [PASS][7] -> [DMESG-FAIL][8] ([fdo#112050 ])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-cfl-8109u/igt@i915_selftest@live_gem_contexts.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-cfl-8109u/igt@i915_selftest@live_gem_contexts.html

#### Possible fixes ####

* igt@gem_sync@basic-store-all:
- {fi-tgl-u}: [INCOMPLETE][9] ([fdo#111880]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-tgl-u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-tgl-u/igt@[email protected]

* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-skl-6600u: [FAIL][11] ([fdo#107707]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-skl-6600u/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-skl-6600u/igt@[email protected]

* {igt@i915_selftest@live_gt_heartbeat}:
- {fi-icl-dsi}: [DMESG-FAIL][13] -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-icl-dsi/igt@i915_selftest@live_gt_heartbeat.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-icl-dsi/igt@i915_selftest@live_gt_heartbeat.html
- fi-kbl-8809g: [DMESG-FAIL][15] ([fdo#112096]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-kbl-8809g/igt@i915_selftest@live_gt_heartbeat.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-kbl-8809g/igt@i915_selftest@live_gt_heartbeat.html

* igt@prime_vgem@basic-fence-wait-default:
- fi-icl-u3: [DMESG-WARN][17] ([fdo#107724]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-icl-u3/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-icl-u3/igt@[email protected]

#### Warnings ####

* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-guc: [SKIP][19] ([fdo#109271]) -> [FAIL][20] ([fdo#110829])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/fi-kbl-guc/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/fi-kbl-guc/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#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107707]: https://bugs.freedesktop.org/show_bug.cgi?id=107707
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#110829]: https://bugs.freedesktop.org/show_bug.cgi?id=110829
[fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381
[fdo#111880]: https://bugs.freedesktop.org/show_bug.cgi?id=111880
[fdo#112050 ]: https://bugs.freedesktop.org/show_bug.cgi?id=112050
[fdo#112096]: https://bugs.freedesktop.org/show_bug.cgi?id=112096

Participating hosts (52 -> 44)
------------------------------

Missing (8): fi-ilk-m540 fi-hsw-4200u fi-hsw-peppy fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_7167 -> Patchwork_14949

CI-20190529: 20190529
CI_DRM_7167: a62b1c4e7739c6777d51e7b2d66406b935131451 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5236: 8153b95b53bdef26d2c3e318197d174e982b4265 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14949: e114c74e4182071da35ba361b0aa8b49d47c2353 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

e114c74e4182 docs: sample driver to demonstrate how to implement virtio-mdev framework 76b1265016b1 virtio: introduce a mdev based transport
091ee68346c6 mdev: introduce virtio device and its device ops d18fa8d08a1d mdev: introduce device specific ops
cdfeed47be7f modpost: add support for mdev class id
dbcc3602f990 mdev: class id support

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#43 lore raw

✗ Fi.CI.IGT: failure for mdev based hardware virtio offloading support (rev6)

In reply to Jason Wang
== Series Details ==

== Series Details ==

Series: mdev based hardware virtio offloading support (rev6)
URL : https://patchwork.freedesktop.org/series/66989/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_7167_full -> Patchwork_14949_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_14949_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_14949_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_14949_full:

### IGT changes ###

#### Possible regressions ####

* igt@gem_ctx_shared@q-promotion-bsd1:
- shard-iclb: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb2/igt@[email protected]
- shard-apl: [PASS][2] -> [FAIL][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-apl2/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-apl8/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd:
- shard-skl: NOTRUN -> [FAIL][4]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl10/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-contexts-render:
- shard-skl: [PASS][5] -> [FAIL][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl9/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl10/igt@[email protected]

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@gem_ctx_shared@q-promotion-bsd1:
- {shard-tglb}: [PASS][7] -> [FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb4/igt@[email protected]

* igt@gem_persistent_relocs@forked-thrashing:
- {shard-tglb}: [PASS][9] -> [INCOMPLETE][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb1/igt@[email protected]

Known issues
------------

Here are the changes found in Patchwork_14949_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_isolation@vcs1-dirty-create:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109276] / [fdo#112080])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb3/igt@[email protected]

* igt@gem_exec_parallel@vcs1:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#112080]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb2/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb6/igt@[email protected]

* igt@gem_exec_schedule@preempt-bsd:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#111325])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb5/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb1/igt@[email protected]

* igt@gem_exec_schedule@wide-blt:
- shard-kbl: [PASS][17] -> [INCOMPLETE][18] ([fdo#103665])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-kbl6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-kbl6/igt@[email protected]

* igt@gem_userptr_blits@map-fixed-invalidate-busy:
- shard-hsw: [PASS][19] -> [DMESG-WARN][20] ([fdo#111870])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-hsw7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-hsw5/igt@[email protected]

* igt@i915_suspend@debugfs-reader:
- shard-skl: [PASS][21] -> [INCOMPLETE][22] ([fdo#104108]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl8/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl4/igt@[email protected]

* igt@kms_draw_crc@draw-method-rgb565-mmap-wc-ytiled:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#103184] / [fdo#103232])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl6/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl7/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][25] -> [FAIL][26] ([fdo#105363])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl8/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl4/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-snb: [PASS][27] -> [INCOMPLETE][28] ([fdo#105411])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-snb4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-snb1/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-iclb: [PASS][29] -> [FAIL][30] ([fdo#103167]) +5 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb5/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-skl: [PASS][31] -> [FAIL][32] ([fdo#103167]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-draw-mmap-gtt.html

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- shard-skl: [PASS][33] -> [FAIL][34] ([fdo#103191])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl7/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [PASS][35] -> [DMESG-WARN][36] ([fdo#108566]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-apl2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-apl4/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: [PASS][37] -> [DMESG-WARN][38] ([fdo#108566]) +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-kbl1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-kbl2/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][39] -> [FAIL][40] ([fdo#108145])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl4/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl7/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][41] -> [FAIL][42] ([fdo#108145] / [fdo#110403])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl7/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl7/igt@[email protected]

* igt@prime_busy@after-bsd2:
- shard-iclb: [PASS][43] -> [SKIP][44] ([fdo#109276]) +8 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb3/igt@[email protected]

* igt@prime_busy@wait-hang-bsd:
- shard-kbl: [PASS][45] -> [SKIP][46] ([fdo#109271])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-kbl6/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-kbl6/igt@[email protected]

* igt@tools_test@tools_test:
- shard-glk: [PASS][47] -> [SKIP][48] ([fdo#109271])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-glk4/igt@tools_test@tools_test.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-glk7/igt@tools_test@tools_test.html

#### Possible fixes ####

* igt@gem_busy@extended-parallel-vcs1:
- shard-iclb: [SKIP][49] ([fdo#112080]) -> [PASS][50] +5 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb5/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb4/igt@[email protected]

* igt@gem_ctx_isolation@vcs1-none:
- shard-iclb: [SKIP][51] ([fdo#109276] / [fdo#112080]) -> [PASS][52] +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb6/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb4/igt@[email protected]

* {igt@gem_eio@kms}:
- shard-snb: [DMESG-WARN][53] ([fdo# 112000 ] / [fdo#111781]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-snb1/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-snb5/igt@[email protected]

* igt@gem_eio@unwedge-stress:
- shard-snb: [FAIL][55] ([fdo#109661]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-snb5/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-snb6/igt@[email protected]

* igt@gem_exec_reloc@basic-cpu-wc-active:
- shard-skl: [DMESG-WARN][57] ([fdo#106107]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl6/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl9/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-contexts-render:
- shard-kbl: [FAIL][59] -> [PASS][60] +2 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-kbl2/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-kbl4/igt@[email protected]

* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [SKIP][61] ([fdo#111325]) -> [PASS][62] +5 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb2/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb6/igt@[email protected]

* igt@gem_linear_blits@interruptible:
- {shard-tglb}: [TIMEOUT][63] -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb7/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb3/igt@[email protected]

* igt@gem_persistent_relocs@forked-thrash-inactive:
- shard-snb: [INCOMPLETE][65] ([fdo#105411]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-snb4/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-snb7/igt@[email protected]

* igt@gem_softpin@noreloc-s3:
- shard-skl: [INCOMPLETE][67] ([fdo#104108]) -> [PASS][68] +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl6/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl9/igt@[email protected]

* igt@gem_sync@basic-store-all:
- {shard-tglb}: [INCOMPLETE][69] ([fdo#111647]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb4/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb5/igt@[email protected]

* igt@gem_userptr_blits@sync-unmap:
- shard-hsw: [DMESG-WARN][71] ([fdo#111870]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-hsw4/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-hsw7/igt@[email protected]

* igt@gem_userptr_blits@sync-unmap-after-close:
- shard-snb: [DMESG-WARN][73] ([fdo#111870]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-snb1/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-snb5/igt@[email protected]

* igt@i915_hangman@error-state-basic:
- shard-kbl: [SKIP][75] ([fdo#109271]) -> [PASS][76] +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-kbl2/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-kbl4/igt@[email protected]

* igt@i915_pm_backlight@fade_with_suspend:
- {shard-tglb}: [INCOMPLETE][77] ([fdo#111832] / [fdo#111850]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb3/igt@i915_pm_backlight@fade_with_suspend.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb8/igt@i915_pm_backlight@fade_with_suspend.html

* {igt@i915_pm_dc@dc6-dpms}:
- shard-iclb: [FAIL][79] ([fdo#110548]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb3/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb8/igt@[email protected]

* igt@i915_pm_rpm@system-suspend:
- {shard-tglb}: [INCOMPLETE][81] ([fdo#111747] / [fdo#111850]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb7/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb4/igt@[email protected]

* igt@i915_pm_rpm@system-suspend-execbuf:
- shard-skl: [INCOMPLETE][83] ([fdo#104108] / [fdo#107807]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl7/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl10/igt@[email protected]

* {igt@i915_selftest@live_gt_heartbeat}:
- shard-skl: [DMESG-FAIL][85] -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl3/igt@i915_selftest@live_gt_heartbeat.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl1/igt@i915_selftest@live_gt_heartbeat.html

* igt@i915_selftest@live_hangcheck:
- shard-hsw: [DMESG-FAIL][87] ([fdo#111991]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-hsw7/igt@i915_selftest@live_hangcheck.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-hsw5/igt@i915_selftest@live_hangcheck.html
- shard-iclb: [INCOMPLETE][89] ([fdo#107713] / [fdo#108569]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb3/igt@i915_selftest@live_hangcheck.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb5/igt@i915_selftest@live_hangcheck.html

* igt@kms_cursor_legacy@cursor-vs-flip-legacy:
- shard-hsw: [FAIL][91] ([fdo#103355]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-hsw6/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-hsw1/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [FAIL][93] ([fdo#105363]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-skl7/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-skl10/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc:
- shard-iclb: [FAIL][95] ([fdo#103167]) -> [PASS][96] +5 similar issues
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb4/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-indfb-draw-mmap-wc.html

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-blt:
- shard-snb: [SKIP][97] ([fdo#109271]) -> [PASS][98] +1 similar issue
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-snb2/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-snb4/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-suspend:
- {shard-tglb}: [INCOMPLETE][99] ([fdo#111832] / [fdo#111850] / [fdo#111884]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb4/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt:
- {shard-tglb}: [FAIL][101] ([fdo#103167]) -> [PASS][102] +2 similar issues
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-tglb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/shard-tglb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html

* igt@kms_frontbuffer_tracking@fbcpsr-1p-rte:
- shard-iclb: [FAIL][103] ([fdo#103167] / [fdo#110378]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7167/shard-iclb5/igt@[email protected]
[104]: https://

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14949/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx