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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.8

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/25. So 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://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/7a8aeea3366b7366b13d4827a6c57ade4791f2bd

Thanks.

Luca Boccassi

---
>From 7a8aeea3366b7366b13d4827a6c57ade4791f2bd 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

[ 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/vhost.c      | 5 +++--
 lib/vhost/vhost_user.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index 9e28198528..662f7f3f11 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -716,10 +716,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 6657355c2a..0c4accfc08 100644
--- a/lib/vhost/vhost_user.c
+++ b/lib/vhost/vhost_user.c
@@ -3190,7 +3190,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.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-17 16:13:17.790473321 +0000
+++ 0026-vhost-add-null-callback-checks.patch	2025-02-17 16:13:16.814441593 +0000
@@ -1 +1 @@
-From 66be1a05a480a0484b02c1a0194126763f4dbb99 Mon Sep 17 00:00:00 2001
+From 7a8aeea3366b7366b13d4827a6c57ade4791f2bd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 66be1a05a480a0484b02c1a0194126763f4dbb99 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +18,0 @@
- lib/vhost/vduse.c      | 3 ++-
@@ -21 +21 @@
- 3 files changed, 7 insertions(+), 4 deletions(-)
+ 2 files changed, 5 insertions(+), 3 deletions(-)
@@ -23,14 +22,0 @@
-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
-@@ -318,7 +318,8 @@ 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;
- 
- 	for (i = 0; i < dev->nr_vring; i++) {
@@ -38 +24 @@
-index 2f34d3500e..f01ae6130e 100644
+index 9e28198528..662f7f3f11 100644
@@ -41 +27 @@
-@@ -751,10 +751,11 @@ vhost_destroy_device_notify(struct virtio_net *dev)
+@@ -716,10 +716,11 @@ vhost_destroy_device_notify(struct virtio_net *dev)
@@ -56 +42 @@
-index 52d8078d7c..26dc0bde97 100644
+index 6657355c2a..0c4accfc08 100644
@@ -59 +45 @@
-@@ -3301,7 +3301,8 @@ unlock:
+@@ -3190,7 +3190,8 @@ unlock: