patch 'vhost: add null callback checks' has been queued to stable release 23.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
Please shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=c452aa7dc067ca90419d85ba633ca8dedbae312c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From c452aa7dc067ca90419d85ba633ca8dedbae312c Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor at redhat.com>
Date: Fri, 24 Jan 2025 14:14:07 +0000
Subject: [PATCH] vhost: add null callback checks
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 66be1a05a480a0484b02c1a0194126763f4dbb99 ]

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")

Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at 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 b46f0e53c7..3b1a3b008e 100644
--- a/lib/vhost/vduse.c
+++ b/lib/vhost/vduse.c
@@ -317,7 +317,8 @@ vduse_device_start(struct virtio_net *dev)

 	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;

 	for (i = 0; i < dev->nr_vring; i++) {
diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index 8a1f992d9d..276c5f12b7 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -750,10 +750,11 @@ 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 14808bd5bc..e01675e478 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -3280,7 +3280,8 @@ unlock:
 	 */

 	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.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-18 19:39:02.055757102 +0800
+++ 0037-vhost-add-null-callback-checks.patch	2025-02-18 19:39:00.548244061 +0800
@@ -1 +1 @@
-From 66be1a05a480a0484b02c1a0194126763f4dbb99 Mon Sep 17 00:00:00 2001
+From c452aa7dc067ca90419d85ba633ca8dedbae312c Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 66be1a05a480a0484b02c1a0194126763f4dbb99 ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 8ba58555f9..be548f051e 100644
+index b46f0e53c7..3b1a3b008e 100644
@@ -27 +29 @@
-@@ -318,7 +318,8 @@ vduse_device_start(struct virtio_net *dev, bool reconnect)
+@@ -317,7 +317,8 @@ vduse_device_start(struct virtio_net *dev)
@@ -38 +40 @@
-index 2f34d3500e..f01ae6130e 100644
+index 8a1f992d9d..276c5f12b7 100644
@@ -41 +43 @@
-@@ -751,10 +751,11 @@ vhost_destroy_device_notify(struct virtio_net *dev)
+@@ -750,10 +750,11 @@ vhost_destroy_device_notify(struct virtio_net *dev)
@@ -56 +58 @@
-index 52d8078d7c..26dc0bde97 100644
+index 14808bd5bc..e01675e478 100644
@@ -59 +61 @@
-@@ -3301,7 +3301,8 @@ unlock:
+@@ -3280,7 +3280,8 @@ unlock: