From: Eric Farman <farman@linux.ibm.com> To: Jason Gunthorpe <jgg@nvidia.com>, David Airlie <airlied@linux.ie>, Tony Krowiak <akrowiak@linux.ibm.com>, Alex Williamson <alex.williamson@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Daniel Vetter <daniel@ffwll.ch>, dri-devel@lists.freedesktop.org, Harald Freudenberger <freude@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Heiko Carstens <hca@linux.ibm.com>, intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, Jani Nikula <jani.nikula@linux.intel.com>, Jason Herne <jjherne@linux.ibm.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, kvm@vger.kernel.org, Kirti Wankhede <kwankhede@nvidia.com>, linux-s390@vger.kernel.org, Matthew Rosato <mjrosato@linux.ibm.com>, Peter Oberparleiter <oberpar@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Vineeth Vijayan <vneethv@linux.ibm.com>, Zhenyu Wang <zhenyuw@linux.intel.com>, Zhi Wang <zhi.a.wang@intel.com> Cc: Christoph Hellwig <hch@lst.de> Subject: Re: [PATCH v2 3/9] vfio/ccw: Convert to use vfio_register_group_dev() Date: Fri, 24 Sep 2021 16:37:43 -0400 [thread overview] Message-ID: <9c1f3f9321f595e6d42dab1413637ad927b6bf2d.camel@linux.ibm.com> (raw) In-Reply-To: <3-v2-7d3a384024cf+2060-ccw_mdev_jgg@nvidia.com> On Thu, 2021-09-09 at 16:38 -0300, Jason Gunthorpe wrote: > This is a more complicated conversion because vfio_ccw is sharing the > vfio_device between both the mdev_device, its vfio_device and the > css_driver. > > The mdev is a singleton, and the reason for this sharing is so the > extra > css_driver function callbacks to be delivered to the vfio_device > implementation. > > This keeps things as they are, with the css_driver allocating the > singleton, not the mdev_driver. Following patches work to clean this > further. > > Embed the vfio_device in the vfio_ccw_private and instantiate it as a > vfio_device when the mdev probes. The drvdata of both the css_device > and > the mdev_device point at the private, and container_of is used to get > it > back from the vfio_device. > > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> > --- > drivers/s390/cio/vfio_ccw_drv.c | 21 ++++-- > drivers/s390/cio/vfio_ccw_ops.c | 107 +++++++++++++++++--------- > -- > drivers/s390/cio/vfio_ccw_private.h | 5 ++ > 3 files changed, 85 insertions(+), 48 deletions(-) > > diff --git a/drivers/s390/cio/vfio_ccw_drv.c > b/drivers/s390/cio/vfio_ccw_drv.c > index 1e8d3151e5480e..396e815f81f8a4 100644 > --- a/drivers/s390/cio/vfio_ccw_drv.c > +++ b/drivers/s390/cio/vfio_ccw_drv.c > @@ -469,7 +469,7 @@ static int __init vfio_ccw_sch_init(void) > vfio_ccw_work_q = create_singlethread_workqueue("vfio-ccw"); > if (!vfio_ccw_work_q) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_io_region = > kmem_cache_create_usercopy("vfio_ccw_io_region", > @@ -478,7 +478,7 @@ static int __init vfio_ccw_sch_init(void) > sizeof(struct ccw_io_region), > NULL); > if (!vfio_ccw_io_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_cmd_region = > kmem_cache_create_usercopy("vfio_ccw_cmd_region", > @@ -487,7 +487,7 @@ static int __init vfio_ccw_sch_init(void) > sizeof(struct ccw_cmd_region), > NULL); > if (!vfio_ccw_cmd_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_schib_region = > kmem_cache_create_usercopy("vfio_ccw_schib_region", > @@ -497,7 +497,7 @@ static int __init vfio_ccw_sch_init(void) > > if (!vfio_ccw_schib_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_crw_region = > kmem_cache_create_usercopy("vfio_ccw_crw_region", > @@ -507,19 +507,25 @@ static int __init vfio_ccw_sch_init(void) > > if (!vfio_ccw_crw_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > + ret = mdev_register_driver(&vfio_ccw_mdev_driver); > + if (ret) > + goto out_regions; > + > isc_register(VFIO_CCW_ISC); > ret = css_driver_register(&vfio_ccw_sch_driver); > if (ret) { > isc_unregister(VFIO_CCW_ISC); > - goto out_err; > + goto out_driver; > } > > return ret; > > -out_err: > +out_driver: > + mdev_unregister_driver(&vfio_ccw_mdev_driver); > +out_regions: > vfio_ccw_destroy_regions(); > destroy_workqueue(vfio_ccw_work_q); > vfio_ccw_debug_exit(); > @@ -528,6 +534,7 @@ static int __init vfio_ccw_sch_init(void) > > static void __exit vfio_ccw_sch_exit(void) > { > + mdev_unregister_driver(&vfio_ccw_mdev_driver); Wouldn't it be better to mirror the unwind-init case, such that the above goes... > css_driver_unregister(&vfio_ccw_sch_driver); > isc_unregister(VFIO_CCW_ISC); ...here? > vfio_ccw_destroy_regions(); > diff --git a/drivers/s390/cio/vfio_ccw_ops.c ...snip... Besides that, looks fine to me.
WARNING: multiple messages have this Message-ID (diff)
From: Eric Farman <farman@linux.ibm.com> To: Jason Gunthorpe <jgg@nvidia.com>, David Airlie <airlied@linux.ie>, Tony Krowiak <akrowiak@linux.ibm.com>, Alex Williamson <alex.williamson@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Daniel Vetter <daniel@ffwll.ch>, dri-devel@lists.freedesktop.org, Harald Freudenberger <freude@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Heiko Carstens <hca@linux.ibm.com>, intel-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, Jani Nikula <jani.nikula@linux.intel.com>, Jason Herne <jjherne@linux.ibm.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, kvm@vger.kernel.org, Kirti Wankhede <kwankhede@nvidia.com>, linux-s390@vger.kernel.org, Matthew Rosato <mjrosato@linux.ibm.com>, Peter Oberparleiter <oberpar@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Vineeth Vijayan <vneethv@linux.ibm.com>, Zhenyu Wang <zhenyuw@linux.intel.com>, Zhi Wang <zhi.a.wang@intel.com> Cc: Christoph Hellwig <hch@lst.de> Subject: Re: [Intel-gfx] [PATCH v2 3/9] vfio/ccw: Convert to use vfio_register_group_dev() Date: Fri, 24 Sep 2021 16:37:43 -0400 [thread overview] Message-ID: <9c1f3f9321f595e6d42dab1413637ad927b6bf2d.camel@linux.ibm.com> (raw) In-Reply-To: <3-v2-7d3a384024cf+2060-ccw_mdev_jgg@nvidia.com> On Thu, 2021-09-09 at 16:38 -0300, Jason Gunthorpe wrote: > This is a more complicated conversion because vfio_ccw is sharing the > vfio_device between both the mdev_device, its vfio_device and the > css_driver. > > The mdev is a singleton, and the reason for this sharing is so the > extra > css_driver function callbacks to be delivered to the vfio_device > implementation. > > This keeps things as they are, with the css_driver allocating the > singleton, not the mdev_driver. Following patches work to clean this > further. > > Embed the vfio_device in the vfio_ccw_private and instantiate it as a > vfio_device when the mdev probes. The drvdata of both the css_device > and > the mdev_device point at the private, and container_of is used to get > it > back from the vfio_device. > > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> > --- > drivers/s390/cio/vfio_ccw_drv.c | 21 ++++-- > drivers/s390/cio/vfio_ccw_ops.c | 107 +++++++++++++++++--------- > -- > drivers/s390/cio/vfio_ccw_private.h | 5 ++ > 3 files changed, 85 insertions(+), 48 deletions(-) > > diff --git a/drivers/s390/cio/vfio_ccw_drv.c > b/drivers/s390/cio/vfio_ccw_drv.c > index 1e8d3151e5480e..396e815f81f8a4 100644 > --- a/drivers/s390/cio/vfio_ccw_drv.c > +++ b/drivers/s390/cio/vfio_ccw_drv.c > @@ -469,7 +469,7 @@ static int __init vfio_ccw_sch_init(void) > vfio_ccw_work_q = create_singlethread_workqueue("vfio-ccw"); > if (!vfio_ccw_work_q) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_io_region = > kmem_cache_create_usercopy("vfio_ccw_io_region", > @@ -478,7 +478,7 @@ static int __init vfio_ccw_sch_init(void) > sizeof(struct ccw_io_region), > NULL); > if (!vfio_ccw_io_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_cmd_region = > kmem_cache_create_usercopy("vfio_ccw_cmd_region", > @@ -487,7 +487,7 @@ static int __init vfio_ccw_sch_init(void) > sizeof(struct ccw_cmd_region), > NULL); > if (!vfio_ccw_cmd_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_schib_region = > kmem_cache_create_usercopy("vfio_ccw_schib_region", > @@ -497,7 +497,7 @@ static int __init vfio_ccw_sch_init(void) > > if (!vfio_ccw_schib_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > vfio_ccw_crw_region = > kmem_cache_create_usercopy("vfio_ccw_crw_region", > @@ -507,19 +507,25 @@ static int __init vfio_ccw_sch_init(void) > > if (!vfio_ccw_crw_region) { > ret = -ENOMEM; > - goto out_err; > + goto out_regions; > } > > + ret = mdev_register_driver(&vfio_ccw_mdev_driver); > + if (ret) > + goto out_regions; > + > isc_register(VFIO_CCW_ISC); > ret = css_driver_register(&vfio_ccw_sch_driver); > if (ret) { > isc_unregister(VFIO_CCW_ISC); > - goto out_err; > + goto out_driver; > } > > return ret; > > -out_err: > +out_driver: > + mdev_unregister_driver(&vfio_ccw_mdev_driver); > +out_regions: > vfio_ccw_destroy_regions(); > destroy_workqueue(vfio_ccw_work_q); > vfio_ccw_debug_exit(); > @@ -528,6 +534,7 @@ static int __init vfio_ccw_sch_init(void) > > static void __exit vfio_ccw_sch_exit(void) > { > + mdev_unregister_driver(&vfio_ccw_mdev_driver); Wouldn't it be better to mirror the unwind-init case, such that the above goes... > css_driver_unregister(&vfio_ccw_sch_driver); > isc_unregister(VFIO_CCW_ISC); ...here? > vfio_ccw_destroy_regions(); > diff --git a/drivers/s390/cio/vfio_ccw_ops.c ...snip... Besides that, looks fine to me.
next prev parent reply other threads:[~2021-09-24 20:38 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-09 19:38 [PATCH v2 0/9] Move vfio_ccw to the new mdev API Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-09 19:38 ` [PATCH v2 1/9] vfio/ccw: Use functions for alloc/free of the vfio_ccw_private Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-10 11:27 ` Christoph Hellwig 2021-09-10 11:27 ` Christoph Hellwig 2021-09-14 15:50 ` Cornelia Huck 2021-09-14 15:50 ` [Intel-gfx] " Cornelia Huck 2021-09-14 18:03 ` Jason Gunthorpe 2021-09-14 18:03 ` [Intel-gfx] " Jason Gunthorpe 2021-09-24 2:53 ` Eric Farman 2021-09-24 2:53 ` [Intel-gfx] " Eric Farman 2021-09-09 19:38 ` [PATCH v2 2/9] vfio/ccw: Pass vfio_ccw_private not mdev_device to various functions Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-10 11:32 ` Christoph Hellwig 2021-09-10 11:32 ` Christoph Hellwig 2021-09-20 11:12 ` Cornelia Huck 2021-09-20 11:12 ` [Intel-gfx] " Cornelia Huck 2021-09-24 2:53 ` Eric Farman 2021-09-24 2:53 ` [Intel-gfx] " Eric Farman 2021-09-09 19:38 ` [PATCH v2 3/9] vfio/ccw: Convert to use vfio_register_group_dev() Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-24 20:37 ` Eric Farman [this message] 2021-09-24 20:37 ` Eric Farman 2021-09-27 12:17 ` Jason Gunthorpe 2021-09-27 12:17 ` [Intel-gfx] " Jason Gunthorpe 2021-09-09 19:38 ` [PATCH v2 4/9] vfio/ccw: Make the FSM complete and synchronize it to the mdev Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-20 12:19 ` Cornelia Huck 2021-09-20 12:19 ` [Intel-gfx] " Cornelia Huck 2021-09-20 12:30 ` Jason Gunthorpe 2021-09-20 12:30 ` [Intel-gfx] " Jason Gunthorpe 2021-09-09 19:38 ` [PATCH v2 5/9] vfio/mdev: Consolidate all the device_api sysfs into the core code Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-10 12:10 ` Christoph Hellwig 2021-09-10 12:10 ` [Intel-gfx] " Christoph Hellwig 2021-09-10 13:38 ` Jason Gunthorpe 2021-09-10 13:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-10 16:09 ` Alex Williamson 2021-09-10 16:09 ` [Intel-gfx] " Alex Williamson 2021-09-09 19:38 ` [PATCH v2 6/9] vfio/mdev: Add mdev available instance checking to the core Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-10 12:25 ` Christoph Hellwig 2021-09-10 12:25 ` [Intel-gfx] " Christoph Hellwig 2021-09-20 18:02 ` Cornelia Huck 2021-09-20 18:02 ` [Intel-gfx] " Cornelia Huck 2021-09-21 13:19 ` Jason Gunthorpe 2021-09-21 13:19 ` [Intel-gfx] " Jason Gunthorpe 2021-09-24 2:54 ` Eric Farman 2021-09-24 2:54 ` [Intel-gfx] " Eric Farman 2021-09-09 19:38 ` [PATCH v2 7/9] vfio/ccw: Remove private->mdev Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-24 20:45 ` Eric Farman 2021-09-24 20:45 ` [Intel-gfx] " Eric Farman 2021-09-27 12:32 ` Jason Gunthorpe 2021-09-27 12:32 ` [Intel-gfx] " Jason Gunthorpe 2021-09-27 20:45 ` Eric Farman 2021-09-27 20:45 ` [Intel-gfx] " Eric Farman 2021-09-09 19:38 ` [PATCH v2 8/9] vfio: Export vfio_device_try_get() Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-09 19:38 ` [PATCH v2 9/9] vfio/ccw: Move the lifecycle of the struct vfio_ccw_private to the mdev Jason Gunthorpe 2021-09-09 19:38 ` [Intel-gfx] " Jason Gunthorpe 2021-09-09 19:54 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Move vfio_ccw to the new mdev API Patchwork 2021-09-13 17:40 ` [PATCH v2 0/9] " Eric Farman 2021-09-13 17:40 ` [Intel-gfx] " Eric Farman 2021-09-13 19:24 ` Jason Gunthorpe 2021-09-13 19:24 ` [Intel-gfx] " Jason Gunthorpe 2021-09-13 20:31 ` Eric Farman 2021-09-13 20:31 ` [Intel-gfx] " Eric Farman 2021-09-14 13:36 ` Jason Gunthorpe 2021-09-14 13:36 ` [Intel-gfx] " Jason Gunthorpe 2021-09-17 11:59 ` Cornelia Huck 2021-09-17 11:59 ` [Intel-gfx] " Cornelia Huck 2021-09-17 12:51 ` Jason Gunthorpe 2021-09-17 12:51 ` [Intel-gfx] " Jason Gunthorpe 2021-09-17 14:37 ` Cornelia Huck 2021-09-17 14:37 ` [Intel-gfx] " Cornelia Huck 2021-09-14 13:46 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Move vfio_ccw to the new mdev API (rev2) Patchwork 2021-09-14 18:19 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Move vfio_ccw to the new mdev API (rev3) Patchwork 2021-09-21 15:11 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Move vfio_ccw to the new mdev API (rev4) Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=9c1f3f9321f595e6d42dab1413637ad927b6bf2d.camel@linux.ibm.com \ --to=farman@linux.ibm.com \ --cc=airlied@linux.ie \ --cc=akrowiak@linux.ibm.com \ --cc=alex.williamson@redhat.com \ --cc=borntraeger@de.ibm.com \ --cc=cohuck@redhat.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=freude@linux.ibm.com \ --cc=gor@linux.ibm.com \ --cc=hca@linux.ibm.com \ --cc=hch@lst.de \ --cc=intel-gfx@lists.freedesktop.org \ --cc=intel-gvt-dev@lists.freedesktop.org \ --cc=jani.nikula@linux.intel.com \ --cc=jgg@nvidia.com \ --cc=jjherne@linux.ibm.com \ --cc=joonas.lahtinen@linux.intel.com \ --cc=kvm@vger.kernel.org \ --cc=kwankhede@nvidia.com \ --cc=linux-s390@vger.kernel.org \ --cc=mjrosato@linux.ibm.com \ --cc=oberpar@linux.ibm.com \ --cc=pasic@linux.ibm.com \ --cc=rodrigo.vivi@intel.com \ --cc=vneethv@linux.ibm.com \ --cc=zhenyuw@linux.intel.com \ --cc=zhi.a.wang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.