patch 'vhost: fix external buffer in VDUSE' has been queued to stable release 23.11.6

[Shani Peretz <shperetz@nvidia.com>]

Hi,

FYI, your patch has been queued to stable release 23.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/30/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/shanipr/dpdk-stable

This queued commit can be viewed at:
https://github.com/shanipr/dpdk-stable/commit/c05fb2b9c1b3488938635c12300b58a1bc49831c

Thanks.

Shani

---
From c05fb2b9c1b3488938635c12300b58a1bc49831c Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Tue, 28 Oct 2025 13:34:53 +0100
Subject: [PATCH] vhost: fix external buffer in VDUSE

[ upstream commit 8ae4f1d511 ]

extbuf and linearbuf features are required for (enhanced) TSO support
in OVS.

VDUSE ports were generating multi-segments mbufs in case of "TSO"
buffers which resulted in OVS generating wrong packets after tunnel
encapsulation.

Enable the missing datapath features.

Fixes: 0adb8eccc6a6 ("vhost: add VDUSE device creation and destruction")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/vhost/socket.c | 3 ++-
 lib/vhost/vduse.c  | 8 +++++++-
 lib/vhost/vduse.h  | 6 ++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index 6cf76eb7ae..3baa204c62 100644
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -1197,7 +1197,8 @@ rte_vhost_driver_start(const char *path)
 		return -1;
 
 	if (vsocket->is_vduse)
-		return vduse_device_create(path, vsocket->net_compliant_ol_flags);
+		return vduse_device_create(path, vsocket->net_compliant_ol_flags,
+			vsocket->extbuf, vsocket->linearbuf);
 
 	if (fdset_tid.opaque_id == 0) {
 		/**
diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c
index 9f163de0cc..8d9486a497 100644
--- a/lib/vhost/vduse.c
+++ b/lib/vhost/vduse.c
@@ -479,7 +479,7 @@ vduse_events_handler(int fd, void *arg, int *remove __rte_unused)
 }
 
 int
-vduse_device_create(const char *path, bool compliant_ol_flags)
+vduse_device_create(const char *path, bool compliant_ol_flags, bool extbuf, bool linearbuf)
 {
 	int control_fd, dev_fd, vid, ret;
 	rte_thread_t fdset_tid;
@@ -607,6 +607,12 @@ vduse_device_create(const char *path, bool compliant_ol_flags)
 	dev->vduse_dev_fd = dev_fd;
 	vhost_setup_virtio_net(dev->vid, true, compliant_ol_flags, true, true);
 
+	if (extbuf)
+		vhost_enable_extbuf(dev->vid);
+
+	if (linearbuf)
+		vhost_enable_linearbuf(dev->vid);
+
 	for (i = 0; i < total_queues; i++) {
 		struct vduse_vq_config vq_cfg = { 0 };
 
diff --git a/lib/vhost/vduse.h b/lib/vhost/vduse.h
index 4879b1f900..67b8755a51 100644
--- a/lib/vhost/vduse.h
+++ b/lib/vhost/vduse.h
@@ -11,15 +11,17 @@
 
 #ifdef VHOST_HAS_VDUSE
 
-int vduse_device_create(const char *path, bool compliant_ol_flags);
+int vduse_device_create(const char *path, bool compliant_ol_flags, bool extbuf, bool linearbuf);
 int vduse_device_destroy(const char *path);
 
 #else
 
 static inline int
-vduse_device_create(const char *path, bool compliant_ol_flags)
+vduse_device_create(const char *path, bool compliant_ol_flags, bool extbuf, bool linearbuf)
 {
 	RTE_SET_USED(compliant_ol_flags);
+	RTE_SET_USED(extbuf);
+	RTE_SET_USED(linearbuf);
 
 	VHOST_LOG_CONFIG(path, ERR, "VDUSE support disabled at build time\n");
 	return -1;
-- 
2.43.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-12-25 11:16:39.378851915 +0200
+++ 0060-vhost-fix-external-buffer-in-VDUSE.patch	2025-12-25 11:16:35.993990000 +0200
@@ -1 +1 @@
-From 8ae4f1d511226fd65a979e9f8a1e51835281a59b Mon Sep 17 00:00:00 2001
+From c05fb2b9c1b3488938635c12300b58a1bc49831c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8ae4f1d511 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -23,2 +24,2 @@
- lib/vhost/vduse.h  | 2 +-
- 3 files changed, 10 insertions(+), 3 deletions(-)
+ lib/vhost/vduse.h  | 6 ++++--
+ 3 files changed, 13 insertions(+), 4 deletions(-)
@@ -27 +28 @@
-index 9b4f332f94..ae95e7e6b0 100644
+index 6cf76eb7ae..3baa204c62 100644
@@ -30 +31 @@
-@@ -1194,7 +1194,8 @@ rte_vhost_driver_start(const char *path)
+@@ -1197,7 +1197,8 @@ rte_vhost_driver_start(const char *path)
@@ -38,2 +39,2 @@
- 	if (vhost_user.fdset == NULL) {
- 		vhost_user.fdset = fdset_init("vhost-evt");
+ 	if (fdset_tid.opaque_id == 0) {
+ 		/**
@@ -41 +42 @@
-index 68e56843fd..897dee9f1b 100644
+index 9f163de0cc..8d9486a497 100644
@@ -44 +45 @@
-@@ -672,7 +672,7 @@ out_err:
+@@ -479,7 +479,7 @@ vduse_events_handler(int fd, void *arg, int *remove __rte_unused)
@@ -52,3 +53,3 @@
- 	uint32_t i, max_queue_pairs, total_queues;
-@@ -817,6 +817,12 @@ vduse_device_create(const char *path, bool compliant_ol_flags)
- 
+ 	rte_thread_t fdset_tid;
+@@ -607,6 +607,12 @@ vduse_device_create(const char *path, bool compliant_ol_flags)
+ 	dev->vduse_dev_fd = dev_fd;
@@ -65 +66 @@
- 		struct vhost_virtqueue *vq;
+ 
@@ -67 +68 @@
-index 47ca97a064..b2515bb9df 100644
+index 4879b1f900..67b8755a51 100644
@@ -70 +71 @@
-@@ -9,7 +9,7 @@
+@@ -11,15 +11,17 @@
@@ -72 +73 @@
- #define VDUSE_NET_SUPPORTED_FEATURES VIRTIO_NET_SUPPORTED_FEATURES
+ #ifdef VHOST_HAS_VDUSE
@@ -78 +79,12 @@
- #endif /* _VDUSE_H */
+ #else
+ 
+ static inline int
+-vduse_device_create(const char *path, bool compliant_ol_flags)
++vduse_device_create(const char *path, bool compliant_ol_flags, bool extbuf, bool linearbuf)
+ {
+ 	RTE_SET_USED(compliant_ol_flags);
++	RTE_SET_USED(extbuf);
++	RTE_SET_USED(linearbuf);
+ 
+ 	VHOST_LOG_CONFIG(path, ERR, "VDUSE support disabled at build time\n");
+ 	return -1;