* [PATCH 1/1] vhost: add NULL callback checks [not found] <20250124141408.419674-1-ktraynor@redhat.com> @ 2025-01-24 14:14 ` Kevin Traynor 2025-02-07 13:32 ` Maxime Coquelin 2025-02-07 14:11 ` Maxime Coquelin 0 siblings, 2 replies; 3+ messages in thread From: Kevin Traynor @ 2025-01-24 14:14 UTC (permalink / raw) To: dev; +Cc: maxime.coquelin, Kevin Traynor, stable rte_vhost_driver_callback_register() does not specify any mandatory callbacks in struct rte_vhost_device_ops. Add some missing NULL checks before calling rte_vhost_device_ops callbacks. Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") Cc: stable@dpdk.org Signed-off-by: Kevin Traynor <ktraynor@redhat.com> --- lib/vhost/vduse.c | 3 ++- lib/vhost/vhost.c | 5 +++-- lib/vhost/vhost_user.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index 8ba58555f9..be548f051e 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -319,5 +319,6 @@ vduse_device_start(struct virtio_net *dev, bool reconnect) dev->flags |= VIRTIO_DEV_READY; - if (dev->notify_ops->new_device(dev->vid) == 0) + if (!dev->notify_ops->new_device || + dev->notify_ops->new_device(dev->vid) == 0) dev->flags |= VIRTIO_DEV_RUNNING; diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 5a50a06f8d..c41c29ca57 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -752,8 +752,9 @@ vhost_destroy_device_notify(struct virtio_net *dev) if (dev->flags & VIRTIO_DEV_RUNNING) { vdpa_dev = dev->vdpa_dev; - if (vdpa_dev) + if (vdpa_dev && vdpa_dev->ops->dev_close) vdpa_dev->ops->dev_close(dev->vid); dev->flags &= ~VIRTIO_DEV_RUNNING; - dev->notify_ops->destroy_device(dev->vid); + if (dev->notify_ops->destroy_device) + dev->notify_ops->destroy_device(dev->vid); } } diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 52d8078d7c..26dc0bde97 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -3302,5 +3302,6 @@ vhost_user_msg_handler(int vid, int fd) if (!(dev->flags & VIRTIO_DEV_RUNNING)) { - if (dev->notify_ops->new_device(dev->vid) == 0) + if (!dev->notify_ops->new_device || + dev->notify_ops->new_device(dev->vid) == 0) dev->flags |= VIRTIO_DEV_RUNNING; } -- 2.48.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] vhost: add NULL callback checks 2025-01-24 14:14 ` [PATCH 1/1] vhost: add NULL callback checks Kevin Traynor @ 2025-02-07 13:32 ` Maxime Coquelin 2025-02-07 14:11 ` Maxime Coquelin 1 sibling, 0 replies; 3+ messages in thread From: Maxime Coquelin @ 2025-02-07 13:32 UTC (permalink / raw) To: Kevin Traynor, dev; +Cc: stable On 1/24/25 3:14 PM, Kevin Traynor wrote: > rte_vhost_driver_callback_register() does not specify > any mandatory callbacks in struct rte_vhost_device_ops. > > Add some missing NULL checks before calling rte_vhost_device_ops > callbacks. > > Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") > Cc: stable@dpdk.org > > Signed-off-by: Kevin Traynor <ktraynor@redhat.com> > --- > lib/vhost/vduse.c | 3 ++- > lib/vhost/vhost.c | 5 +++-- > lib/vhost/vhost_user.c | 3 ++- > 3 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c > index 8ba58555f9..be548f051e 100644 > --- a/lib/vhost/vduse.c > +++ b/lib/vhost/vduse.c > @@ -319,5 +319,6 @@ vduse_device_start(struct virtio_net *dev, bool reconnect) > dev->flags |= VIRTIO_DEV_READY; > > - if (dev->notify_ops->new_device(dev->vid) == 0) > + if (!dev->notify_ops->new_device || > + dev->notify_ops->new_device(dev->vid) == 0) > dev->flags |= VIRTIO_DEV_RUNNING; > > diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c > index 5a50a06f8d..c41c29ca57 100644 > --- a/lib/vhost/vhost.c > +++ b/lib/vhost/vhost.c > @@ -752,8 +752,9 @@ vhost_destroy_device_notify(struct virtio_net *dev) > if (dev->flags & VIRTIO_DEV_RUNNING) { > vdpa_dev = dev->vdpa_dev; > - if (vdpa_dev) > + if (vdpa_dev && vdpa_dev->ops->dev_close) > vdpa_dev->ops->dev_close(dev->vid); > dev->flags &= ~VIRTIO_DEV_RUNNING; > - dev->notify_ops->destroy_device(dev->vid); > + if (dev->notify_ops->destroy_device) > + dev->notify_ops->destroy_device(dev->vid); > } > } > diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c > index 52d8078d7c..26dc0bde97 100644 > --- a/lib/vhost/vhost_user.c > +++ b/lib/vhost/vhost_user.c > @@ -3302,5 +3302,6 @@ vhost_user_msg_handler(int vid, int fd) > > if (!(dev->flags & VIRTIO_DEV_RUNNING)) { > - if (dev->notify_ops->new_device(dev->vid) == 0) > + if (!dev->notify_ops->new_device || > + dev->notify_ops->new_device(dev->vid) == 0) > dev->flags |= VIRTIO_DEV_RUNNING; > } Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com> Thanks, Maxime ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] vhost: add NULL callback checks 2025-01-24 14:14 ` [PATCH 1/1] vhost: add NULL callback checks Kevin Traynor 2025-02-07 13:32 ` Maxime Coquelin @ 2025-02-07 14:11 ` Maxime Coquelin 1 sibling, 0 replies; 3+ messages in thread From: Maxime Coquelin @ 2025-02-07 14:11 UTC (permalink / raw) To: Kevin Traynor, dev; +Cc: stable On 1/24/25 3:14 PM, Kevin Traynor wrote: > rte_vhost_driver_callback_register() does not specify > any mandatory callbacks in struct rte_vhost_device_ops. > > Add some missing NULL checks before calling rte_vhost_device_ops > callbacks. > > Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") > Cc: stable@dpdk.org > > Signed-off-by: Kevin Traynor <ktraynor@redhat.com> > --- > lib/vhost/vduse.c | 3 ++- > lib/vhost/vhost.c | 5 +++-- > lib/vhost/vhost_user.c | 3 ++- > 3 files changed, 7 insertions(+), 4 deletions(- Applied to next-virtio/for-next-net. Thanks, Maxime ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-07 14:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20250124141408.419674-1-ktraynor@redhat.com>
2025-01-24 14:14 ` [PATCH 1/1] vhost: add NULL callback checks Kevin Traynor
2025-02-07 13:32 ` Maxime Coquelin
2025-02-07 14:11 ` Maxime Coquelin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).