vduse: Tie vduse mgmtdev and its device
PATCH 1/1 vduse: Tie vduse mgmtdev and its device
vduse devices are not backed by any real devices such as PCI. Hence it doesn't have any parent device linked to it.
Kernel driver model in [1] suggests to avoid an empty device release callback.
Hence tie the mgmtdevice object's life cycle to an allocate dummy struct device instead of static one.
--- drivers/vdpa/vdpa_user/vduse_dev.c | 60 ++++++++++++++++++------------ 1 file changed, 37 insertions(+), 23 deletions(-)
drivers/vdpa/vdpa_user/vduse_dev.c +37 -23
@@ -1475,16 +1475,12 @@ static char *vduse_devnode(struct device *dev, umode_t *mode)return kasprintf (GFP_KERNEL ,"vduse/%s" ,dev_name (dev)); } -static void vduse_mgmtdev_release (struct device *dev) -{ -} - -static struct device vduse_mgmtdev = { - .init_name ="vduse" , - .release = vduse_mgmtdev_release, +struct vduse_mgmt_dev { +struct vdpa_mgmt_dev mgmt_dev; +struct device dev; }; -static struct vdpa_mgmt_dev mgmt_dev; +static struct vduse_mgmt_dev *vduse_mgmt;static int vduse_dev_init_vdpa (struct vduse_dev *dev,const char *name) {
@@ -1509,7 +1505,7 @@ static int vduse_dev_init_vdpa(struct vduse_dev *dev, const char *name) }set_dma_ops (&vdev->vdpa.dev, &vduse_dev_dma_ops); vdev->vdpa.dma_dev = &vdev->vdpa.dev; - vdev->vdpa.mdev = &mgmt_dev; + vdev->vdpa.mdev = &vduse_mgmt->mgmt_dev;return 0 ; }
@@ -1555,34 +1551,52 @@ static struct virtio_device_id id_table[] = { { 0 }, }; -static struct vdpa_mgmt_dev mgmt_dev = { - .device = &vduse_mgmtdev, - .id_table = id_table, - .ops = &vdpa_dev_mgmtdev_ops, -}; +static void vduse_mgmtdev_release (struct device *dev) +{ +struct vduse_mgmt_dev *mgmt_dev; + + mgmt_dev = container_of(dev, struct vduse_mgmt_dev, dev); +kfree (mgmt_dev); +}static int vduse_mgmtdev_init (void ) {int ret; - ret =device_register (&vduse_mgmtdev); -if (ret) + vduse_mgmt =kzalloc (sizeof (*vduse_mgmt),GFP_KERNEL ); +if (!vduse_mgmt) +return -ENOMEM ; + + ret =dev_set_name (&vduse_mgmt->dev,"vduse-la" ); +if (ret) { +kfree (vduse_mgmt);return ret; + } - ret =vdpa_mgmtdev_register (&mgmt_dev); + vduse_mgmt->dev.release = vduse_mgmtdev_release; + + ret =device_register (&vduse_mgmt->dev);if (ret) - goto err; + goto dev_reg_err; -return 0 ; -err: -device_unregister (&vduse_mgmtdev); + vduse_mgmt->mgmt_dev.id_table = id_table; + vduse_mgmt->mgmt_dev.ops = &vdpa_dev_mgmtdev_ops; + vduse_mgmt->mgmt_dev.device = &vduse_mgmt->dev; + ret =vdpa_mgmtdev_register (&vduse_mgmt->mgmt_dev); +if (ret) +device_unregister (&vduse_mgmt->dev); + +return ret; + +dev_reg_err: +put_device (&vduse_mgmt->dev);return ret; }static void vduse_mgmtdev_exit (void ) { -vdpa_mgmtdev_unregister (&mgmt_dev); -device_unregister (&vduse_mgmtdev); +vdpa_mgmtdev_unregister (&vduse_mgmt->mgmt_dev); +device_unregister (&vduse_mgmt->dev); }static int vduse_init (void )
Signature · 6 lines
2.26.2 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
A message that is not in the archive (sent off-list or not yet received): CACycT3u5rc4H=+1Sdz9E8GEABdkuAeBQ73xw_TnBGWCWFM_3Fw@mail.gmail.com
Quoted 97 lines
From: Yongji Xie <[email protected]>
Sent: Monday, June 13, 2022 5:54 AMQuoted 4 lines · Parav Pandit
vduse devices are not backed by any real devices such as PCI. Hence it doesn't have any parent device linked to it.
Quoted 8 lines
Kernel driver model in [1] suggests to avoid an empty device release callback.
Hence tie the mgmtdevice object's life cycle to an allocate dummy struct device instead of static one.
[1]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.
Quoted 1 line
kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git %2
Quoted 1 line
Ftree%2FDocumentation%2Fcore-api%2Fkobject.rst%3Fh%3Dv5.18-
rc7%23n284&
Quoted 1 line
amp;data=05%7C01%7Cparav%40nvidia.com%7C6b16045f2b7a4e168bc008da 4d2277
Quoted 1 line
f7%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C6379071076788198 90%7CU
Quoted 1 line
nknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI 6Ik1ha
Quoted 1 line
WwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=G8R1%2BsfBPTe4P sOYqrv0pAhM
drivers/vdpa/vdpa_user/vduse_dev.c static char *vduse_devnode(struct device
Quoted 14 lines
3qFg%2F%2BWw7GmTli8%2BNNw%3D&reserved=0
Signed-off-by Parav Pandit <[email protected]>--- drivers/vdpa/vdpa_user/vduse_dev.c | 60 ++++++++++++++++++------------ 1 file changed, 37 insertions(+), 23 deletions(-)drivers/vdpa/vdpa_user/vduse_dev.c +0
-0@@ -1475,16 +1475,12 @@ static char *vduse_devnode(struct device*dev,
umode_t*mode)Quoted 46 lines
drivers/vdpa/vdpa_user/vduse_dev.c +11
-12return kasprintf (GFP_KERNEL ,"vduse/%s" ,dev_name (dev)); } -static void vduse_mgmtdev_release(struct device *dev) -{ -} - -static struct device vduse_mgmtdev = { - .init_name ="vduse" , - .release = vduse_mgmtdev_release, +struct vduse_mgmt_dev { +struct vdpa_mgmt_dev mgmt_dev; +struct device dev; }; -static struct vdpa_mgmt_dev mgmt_dev; +static struct vduse_mgmt_dev *vduse_mgmt;static int vduse_dev_init_vdpa (struct vduse_dev *dev,const char *name) { @@ -1509,7 +1505,7 @@ static int vduse_dev_init_vdpa(struct vduse_dev *dev, const char *name) }set_dma_ops (&vdev->vdpa.dev, &vduse_dev_dma_ops); vdev->vdpa.dma_dev = &vdev->vdpa.dev; - vdev->vdpa.mdev = &mgmt_dev; + vdev->vdpa.mdev = &vduse_mgmt->mgmt_dev;return 0 ; }@@ -1555,34 +1551,52 @@ static struct virtio_device_id id_table[] = { { 0 }, }; -static struct vdpa_mgmt_dev mgmt_dev = { - .device = &vduse_mgmtdev, - .id_table = id_table, - .ops = &vdpa_dev_mgmtdev_ops, -}; +static void vduse_mgmtdev_release (struct device *dev) { +struct vduse_mgmt_dev *mgmt_dev; + + mgmt_dev = container_of(dev, struct vduse_mgmt_dev, dev); +kfree (mgmt_dev); +}static int vduse_mgmtdev_init (void ) {int ret;
Quoted 10 lines
drivers/vdpa/vdpa_user/vduse_dev.c static struct virtio_device_id id_table[] = { · line 1570
Quoted 7 lines
drivers/vdpa/vdpa_user/vduse_dev.c +5
-2- ret =device_register (&vduse_mgmtdev); -if (ret) + vduse_mgmt =kzalloc (sizeof (*vduse_mgmt),GFP_KERNEL ); +if (!vduse_mgmt) +return -ENOMEM ; + + ret =dev_set_name (&vduse_mgmt->dev,"vduse-la" );Do we need to keep using "vduse" as the device name. We have documented it in qemu docs.
Yes. I added suffix of -la while testing to ensure a new code in action. I missed to remove it.
Will send v2 with the correction.
_______________________________________________
Virtualization mailing list [email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization