Re: [PATCH 1/1] vhost: add NULL callback checks

[Maxime Coquelin]

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: sta...@dpdk.org

Signed-off-by: Kevin Traynor <ktray...@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.coque...@redhat.com>

Thanks,
Maxime