| Message ID | 20231219180858.120898-7-dtatulea@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vdpa/mlx5: Add support for resumable vqs | expand |
On Wed, Dec 20, 2023 at 2:09 AM Dragos Tatulea <dtatulea@nvidia.com> wrote: > > Set vdpa device suspended state on successful suspend. Clear it on > successful resume and reset. > > The state will be locked by the vhost_vdpa mutex. The mutex is taken > during suspend, resume and reset in vhost_vdpa_unlocked_ioctl. The > exception is vhost_vdpa_open which does a device reset but that should > be safe because it can only happen before the other ops. > > Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> > Suggested-by: Eugenio Pérez <eperezma@redhat.com> > --- > drivers/vhost/vdpa.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > index b4e8ddf86485..00b4fa8e89f2 100644 > --- a/drivers/vhost/vdpa.c > +++ b/drivers/vhost/vdpa.c > @@ -59,6 +59,7 @@ struct vhost_vdpa { > int in_batch; > struct vdpa_iova_range range; > u32 batch_asid; > + bool suspended; Any reason why we don't do it in the core vDPA device but here? Thanks
On Wed, 2023-12-20 at 11:46 +0800, Jason Wang wrote: > On Wed, Dec 20, 2023 at 2:09 AM Dragos Tatulea <dtatulea@nvidia.com> wrote: > > > > Set vdpa device suspended state on successful suspend. Clear it on > > successful resume and reset. > > > > The state will be locked by the vhost_vdpa mutex. The mutex is taken > > during suspend, resume and reset in vhost_vdpa_unlocked_ioctl. The > > exception is vhost_vdpa_open which does a device reset but that should > > be safe because it can only happen before the other ops. > > > > Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> > > Suggested-by: Eugenio Pérez <eperezma@redhat.com> > > --- > > drivers/vhost/vdpa.c | 17 +++++++++++++++-- > > 1 file changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > index b4e8ddf86485..00b4fa8e89f2 100644 > > --- a/drivers/vhost/vdpa.c > > +++ b/drivers/vhost/vdpa.c > > @@ -59,6 +59,7 @@ struct vhost_vdpa { > > int in_batch; > > struct vdpa_iova_range range; > > u32 batch_asid; > > + bool suspended; > > Any reason why we don't do it in the core vDPA device but here? > Not really. I wanted to be safe and not expose it in a header due to locking. Thanks, Dragos
On Wed, 2023-12-20 at 13:55 +0100, Dragos Tatulea wrote: > On Wed, 2023-12-20 at 11:46 +0800, Jason Wang wrote: > > On Wed, Dec 20, 2023 at 2:09 AM Dragos Tatulea <dtatulea@nvidia.com> wrote: > > > > > > Set vdpa device suspended state on successful suspend. Clear it on > > > successful resume and reset. > > > > > > The state will be locked by the vhost_vdpa mutex. The mutex is taken > > > during suspend, resume and reset in vhost_vdpa_unlocked_ioctl. The > > > exception is vhost_vdpa_open which does a device reset but that should > > > be safe because it can only happen before the other ops. > > > > > > Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> > > > Suggested-by: Eugenio Pérez <eperezma@redhat.com> > > > --- > > > drivers/vhost/vdpa.c | 17 +++++++++++++++-- > > > 1 file changed, 15 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > > index b4e8ddf86485..00b4fa8e89f2 100644 > > > --- a/drivers/vhost/vdpa.c > > > +++ b/drivers/vhost/vdpa.c > > > @@ -59,6 +59,7 @@ struct vhost_vdpa { > > > int in_batch; > > > struct vdpa_iova_range range; > > > u32 batch_asid; > > > + bool suspended; > > > > Any reason why we don't do it in the core vDPA device but here? > > > Not really. I wanted to be safe and not expose it in a header due to locking. > A few clearer answers for why the state is not added in struct vdpa_device: - All the suspend infrastructure is currently only for vhost. - If the state would be moved to struct vdpa_device then the cf_lock would have to be used. This adds more complexity to the code. Thanks, Dragos
On Fri, Dec 22, 2023 at 7:22 PM Dragos Tatulea <dtatulea@nvidia.com> wrote: > > On Wed, 2023-12-20 at 13:55 +0100, Dragos Tatulea wrote: > > On Wed, 2023-12-20 at 11:46 +0800, Jason Wang wrote: > > > On Wed, Dec 20, 2023 at 2:09 AM Dragos Tatulea <dtatulea@nvidia.com> wrote: > > > > > > > > Set vdpa device suspended state on successful suspend. Clear it on > > > > successful resume and reset. > > > > > > > > The state will be locked by the vhost_vdpa mutex. The mutex is taken > > > > during suspend, resume and reset in vhost_vdpa_unlocked_ioctl. The > > > > exception is vhost_vdpa_open which does a device reset but that should > > > > be safe because it can only happen before the other ops. > > > > > > > > Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> > > > > Suggested-by: Eugenio Pérez <eperezma@redhat.com> > > > > --- > > > > drivers/vhost/vdpa.c | 17 +++++++++++++++-- > > > > 1 file changed, 15 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > > > index b4e8ddf86485..00b4fa8e89f2 100644 > > > > --- a/drivers/vhost/vdpa.c > > > > +++ b/drivers/vhost/vdpa.c > > > > @@ -59,6 +59,7 @@ struct vhost_vdpa { > > > > int in_batch; > > > > struct vdpa_iova_range range; > > > > u32 batch_asid; > > > > + bool suspended; > > > > > > Any reason why we don't do it in the core vDPA device but here? > > > > > Not really. I wanted to be safe and not expose it in a header due to locking. > > > A few clearer answers for why the state is not added in struct vdpa_device: > - All the suspend infrastructure is currently only for vhost. > - If the state would be moved to struct vdpa_device then the cf_lock would have > to be used. This adds more complexity to the code. > > Thanks, > Dragos Ok, I'm fine with that. Thanks
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index b4e8ddf86485..00b4fa8e89f2 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -59,6 +59,7 @@ struct vhost_vdpa { int in_batch; struct vdpa_iova_range range; u32 batch_asid; + bool suspended; }; static DEFINE_IDA(vhost_vdpa_ida); @@ -232,6 +233,8 @@ static int _compat_vdpa_reset(struct vhost_vdpa *v) struct vdpa_device *vdpa = v->vdpa; u32 flags = 0; + v->suspended = false; + if (v->vdev.vqs) { flags |= !vhost_backend_has_feature(v->vdev.vqs[0], VHOST_BACKEND_F_IOTLB_PERSIST) ? @@ -590,11 +593,16 @@ static long vhost_vdpa_suspend(struct vhost_vdpa *v) { struct vdpa_device *vdpa = v->vdpa; const struct vdpa_config_ops *ops = vdpa->config; + int ret; if (!ops->suspend) return -EOPNOTSUPP; - return ops->suspend(vdpa); + ret = ops->suspend(vdpa); + if (!ret) + v->suspended = true; + + return ret; } /* After a successful return of this ioctl the device resumes processing @@ -605,11 +613,16 @@ static long vhost_vdpa_resume(struct vhost_vdpa *v) { struct vdpa_device *vdpa = v->vdpa; const struct vdpa_config_ops *ops = vdpa->config; + int ret; if (!ops->resume) return -EOPNOTSUPP; - return ops->resume(vdpa); + ret = ops->resume(vdpa); + if (!ret) + v->suspended = false; + + return ret; } static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd,
Set vdpa device suspended state on successful suspend. Clear it on successful resume and reset. The state will be locked by the vhost_vdpa mutex. The mutex is taken during suspend, resume and reset in vhost_vdpa_unlocked_ioctl. The exception is vhost_vdpa_open which does a device reset but that should be safe because it can only happen before the other ops. Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com> Suggested-by: Eugenio Pérez <eperezma@redhat.com> --- drivers/vhost/vdpa.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)