* [PATCH v6 01/14] net: bundle all offloads in a single struct
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-12 13:06 ` [PATCH v6 02/14] linux-headers: deal with counted_by annotation Paolo Abeni
` (13 subsequent siblings)
14 siblings, 0 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
The set_offload() argument list is already pretty long and
we are going to introduce soon a bunch of additional offloads.
Replace the offload arguments with a single struct and update
all the relevant call-sites.
No functional changes intended.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v5 -> v6:
- re-included into the main series
v4 -> v5:
- sent as standalone patch
v3 -> v4:
- style fix for NetOffloads init
v1 -> v2:
- drop unneeded 'struct' keywords
- moved to series start
---
hw/net/e1000e_core.c | 5 +++--
hw/net/igb_core.c | 5 +++--
hw/net/virtio-net.c | 19 +++++++++++--------
hw/net/vmxnet3.c | 13 +++++--------
include/net/net.h | 15 ++++++++++++---
net/net.c | 5 ++---
net/netmap.c | 3 +--
net/tap-bsd.c | 3 +--
net/tap-linux.c | 21 ++++++++++++---------
net/tap-solaris.c | 4 ++--
net/tap-stub.c | 3 +--
net/tap.c | 8 ++++----
net/tap_int.h | 4 ++--
13 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index 06657bb3ac..8fef598b49 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -2822,8 +2822,9 @@ e1000e_update_rx_offloads(E1000ECore *core)
trace_e1000e_rx_set_cso(cso_state);
if (core->has_vnet) {
- qemu_set_offload(qemu_get_queue(core->owner_nic)->peer,
- cso_state, 0, 0, 0, 0, 0, 0);
+ NetOffloads ol = { .csum = cso_state };
+
+ qemu_set_offload(qemu_get_queue(core->owner_nic)->peer, &ol);
}
}
diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c
index 39e3ce1c8f..45d8fd795b 100644
--- a/hw/net/igb_core.c
+++ b/hw/net/igb_core.c
@@ -3058,8 +3058,9 @@ igb_update_rx_offloads(IGBCore *core)
trace_e1000e_rx_set_cso(cso_state);
if (core->has_vnet) {
- qemu_set_offload(qemu_get_queue(core->owner_nic)->peer,
- cso_state, 0, 0, 0, 0, 0, 0);
+ NetOffloads ol = {.csum = cso_state };
+
+ qemu_set_offload(qemu_get_queue(core->owner_nic)->peer, &ol);
}
}
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 6b5b5dace3..b86ba1fd27 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -773,14 +773,17 @@ static uint64_t virtio_net_bad_features(VirtIODevice *vdev)
static void virtio_net_apply_guest_offloads(VirtIONet *n)
{
- qemu_set_offload(qemu_get_queue(n->nic)->peer,
- !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_CSUM)),
- !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO4)),
- !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO6)),
- !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_ECN)),
- !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_UFO)),
- !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO4)),
- !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO6)));
+ NetOffloads ol = {
+ .csum = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_CSUM)),
+ .tso4 = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO4)),
+ .tso6 = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_TSO6)),
+ .ecn = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_ECN)),
+ .ufo = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_UFO)),
+ .uso4 = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO4)),
+ .uso6 = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO6)),
+ };
+
+ qemu_set_offload(qemu_get_queue(n->nic)->peer, &ol);
}
static uint64_t virtio_net_guest_offloads_by_features(uint64_t features)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index af73aa8ef2..03732375a7 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -1322,14 +1322,11 @@ static void vmxnet3_update_features(VMXNET3State *s)
s->lro_supported, rxcso_supported,
s->rx_vlan_stripping);
if (s->peer_has_vhdr) {
- qemu_set_offload(qemu_get_queue(s->nic)->peer,
- rxcso_supported,
- s->lro_supported,
- s->lro_supported,
- 0,
- 0,
- 0,
- 0);
+ NetOffloads ol = { .csum = rxcso_supported,
+ .tso4 = s->lro_supported,
+ .tso6 = s->lro_supported };
+
+ qemu_set_offload(qemu_get_queue(s->nic)->peer, &ol);
}
}
diff --git a/include/net/net.h b/include/net/net.h
index 84ee18e0f9..48ba333d02 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -35,6 +35,16 @@ typedef struct NICConf {
int32_t bootindex;
} NICConf;
+typedef struct NetOffloads {
+ bool csum;
+ bool tso4;
+ bool tso6;
+ bool ecn;
+ bool ufo;
+ bool uso4;
+ bool uso6;
+} NetOffloads;
+
#define DEFINE_NIC_PROPERTIES(_state, _conf) \
DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \
DEFINE_PROP_NETDEV("netdev", _state, _conf.peers)
@@ -57,7 +67,7 @@ typedef bool (HasUfo)(NetClientState *);
typedef bool (HasUso)(NetClientState *);
typedef bool (HasVnetHdr)(NetClientState *);
typedef bool (HasVnetHdrLen)(NetClientState *, int);
-typedef void (SetOffload)(NetClientState *, int, int, int, int, int, int, int);
+typedef void (SetOffload)(NetClientState *, const NetOffloads *);
typedef int (GetVnetHdrLen)(NetClientState *);
typedef void (SetVnetHdrLen)(NetClientState *, int);
typedef bool (GetVnetHashSupportedTypes)(NetClientState *, uint32_t *);
@@ -189,8 +199,7 @@ bool qemu_has_ufo(NetClientState *nc);
bool qemu_has_uso(NetClientState *nc);
bool qemu_has_vnet_hdr(NetClientState *nc);
bool qemu_has_vnet_hdr_len(NetClientState *nc, int len);
-void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
- int ecn, int ufo, int uso4, int uso6);
+void qemu_set_offload(NetClientState *nc, const NetOffloads *ol);
int qemu_get_vnet_hdr_len(NetClientState *nc);
void qemu_set_vnet_hdr_len(NetClientState *nc, int len);
bool qemu_get_vnet_hash_supported_types(NetClientState *nc, uint32_t *types);
diff --git a/net/net.c b/net/net.c
index da275db86e..63872b6855 100644
--- a/net/net.c
+++ b/net/net.c
@@ -540,14 +540,13 @@ bool qemu_has_vnet_hdr_len(NetClientState *nc, int len)
return nc->info->has_vnet_hdr_len(nc, len);
}
-void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
- int ecn, int ufo, int uso4, int uso6)
+void qemu_set_offload(NetClientState *nc, const NetOffloads *ol)
{
if (!nc || !nc->info->set_offload) {
return;
}
- nc->info->set_offload(nc, csum, tso4, tso6, ecn, ufo, uso4, uso6);
+ nc->info->set_offload(nc, ol);
}
int qemu_get_vnet_hdr_len(NetClientState *nc)
diff --git a/net/netmap.c b/net/netmap.c
index 297510e190..6cd8f2bdc5 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -366,8 +366,7 @@ static void netmap_set_vnet_hdr_len(NetClientState *nc, int len)
}
}
-static void netmap_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
- int ecn, int ufo, int uso4, int uso6)
+static void netmap_set_offload(NetClientState *nc, const NetOffloads *ol)
{
NetmapState *s = DO_UPCAST(NetmapState, nc, nc);
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index b4c84441ba..86b6edee94 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -231,8 +231,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
return -EINVAL;
}
-void tap_fd_set_offload(int fd, int csum, int tso4,
- int tso6, int ecn, int ufo, int uso4, int uso6)
+void tap_fd_set_offload(int fd, const NetOffloads *ol)
{
}
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 22ec2f45d2..a1c58f74f5 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -239,8 +239,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
abort();
}
-void tap_fd_set_offload(int fd, int csum, int tso4,
- int tso6, int ecn, int ufo, int uso4, int uso6)
+void tap_fd_set_offload(int fd, const NetOffloads *ol)
{
unsigned int offload = 0;
@@ -249,20 +248,24 @@ void tap_fd_set_offload(int fd, int csum, int tso4,
return;
}
- if (csum) {
+ if (ol->csum) {
offload |= TUN_F_CSUM;
- if (tso4)
+ if (ol->tso4) {
offload |= TUN_F_TSO4;
- if (tso6)
+ }
+ if (ol->tso6) {
offload |= TUN_F_TSO6;
- if ((tso4 || tso6) && ecn)
+ }
+ if ((ol->tso4 || ol->tso6) && ol->ecn) {
offload |= TUN_F_TSO_ECN;
- if (ufo)
+ }
+ if (ol->ufo) {
offload |= TUN_F_UFO;
- if (uso4) {
+ }
+ if (ol->uso4) {
offload |= TUN_F_USO4;
}
- if (uso6) {
+ if (ol->uso6) {
offload |= TUN_F_USO6;
}
}
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 51b7830bef..833c066bee 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -27,6 +27,7 @@
#include "tap_int.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
+#include "net/net.h"
#include <sys/ethernet.h>
#include <sys/sockio.h>
@@ -235,8 +236,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
return -EINVAL;
}
-void tap_fd_set_offload(int fd, int csum, int tso4,
- int tso6, int ecn, int ufo, int uso4, int uso6)
+void tap_fd_set_offload(int fd, const NetOffloads *ol)
{
}
diff --git a/net/tap-stub.c b/net/tap-stub.c
index 38673434cb..67d14ad4d5 100644
--- a/net/tap-stub.c
+++ b/net/tap-stub.c
@@ -66,8 +66,7 @@ int tap_fd_set_vnet_be(int fd, int is_be)
return -EINVAL;
}
-void tap_fd_set_offload(int fd, int csum, int tso4,
- int tso6, int ecn, int ufo, int uso4, int uso6)
+void tap_fd_set_offload(int fd, const NetOffloads *ol)
{
}
diff --git a/net/tap.c b/net/tap.c
index f7df702f97..72046a43aa 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -285,15 +285,14 @@ static int tap_set_vnet_be(NetClientState *nc, bool is_be)
return tap_fd_set_vnet_be(s->fd, is_be);
}
-static void tap_set_offload(NetClientState *nc, int csum, int tso4,
- int tso6, int ecn, int ufo, int uso4, int uso6)
+static void tap_set_offload(NetClientState *nc, const NetOffloads *ol)
{
TAPState *s = DO_UPCAST(TAPState, nc, nc);
if (s->fd < 0) {
return;
}
- tap_fd_set_offload(s->fd, csum, tso4, tso6, ecn, ufo, uso4, uso6);
+ tap_fd_set_offload(s->fd, ol);
}
static void tap_exit_notify(Notifier *notifier, void *data)
@@ -391,6 +390,7 @@ static TAPState *net_tap_fd_init(NetClientState *peer,
int fd,
int vnet_hdr)
{
+ NetOffloads ol = {};
NetClientState *nc;
TAPState *s;
@@ -404,7 +404,7 @@ static TAPState *net_tap_fd_init(NetClientState *peer,
s->has_ufo = tap_probe_has_ufo(s->fd);
s->has_uso = tap_probe_has_uso(s->fd);
s->enabled = true;
- tap_set_offload(&s->nc, 0, 0, 0, 0, 0, 0, 0);
+ tap_set_offload(&s->nc, &ol);
/*
* Make sure host header length is set correctly in tap:
* it might have been modified by another instance of qemu.
diff --git a/net/tap_int.h b/net/tap_int.h
index 8857ff299d..f8bbe1cb0c 100644
--- a/net/tap_int.h
+++ b/net/tap_int.h
@@ -27,6 +27,7 @@
#define NET_TAP_INT_H
#include "qapi/qapi-types-net.h"
+#include "net/net.h"
int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
int vnet_hdr_required, int mq_required, Error **errp);
@@ -37,8 +38,7 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp);
int tap_probe_vnet_hdr(int fd, Error **errp);
int tap_probe_has_ufo(int fd);
int tap_probe_has_uso(int fd);
-void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo,
- int uso4, int uso6);
+void tap_fd_set_offload(int fd, const NetOffloads *ol);
void tap_fd_set_vnet_hdr_len(int fd, int len);
int tap_fd_set_vnet_le(int fd, int vnet_is_le);
int tap_fd_set_vnet_be(int fd, int vnet_is_be);
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v6 02/14] linux-headers: deal with counted_by annotation
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
2025-09-12 13:06 ` [PATCH v6 01/14] net: bundle all offloads in a single struct Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-17 12:10 ` Stefano Garzarella
2025-09-12 13:06 ` [PATCH v6 03/14] linux-headers: Update to Linux v6.17-rc1 Paolo Abeni
` (12 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Such annotation is present into the kernel uAPI headers since
v6.7, and will be used soon by the vhost_type.h. Deal with it
just stripping it.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
| 1 +
1 file changed, 1 insertion(+)
--git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
index 717c379f9e..64c0d7c4eb 100755
--- a/scripts/update-linux-headers.sh
+++ b/scripts/update-linux-headers.sh
@@ -90,6 +90,7 @@ cp_portable() {
-e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
-e "$arch_cmd" \
-e 's/__bitwise//' \
+ -e 's/__counted_by(\w*)//' \
-e 's/__attribute__((packed))/QEMU_PACKED/' \
-e 's/__inline__/inline/' \
-e 's/__BITS_PER_LONG/HOST_LONG_BITS/' \
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 02/14] linux-headers: deal with counted_by annotation
2025-09-12 13:06 ` [PATCH v6 02/14] linux-headers: deal with counted_by annotation Paolo Abeni
@ 2025-09-17 12:10 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:10 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:06:53PM +0200, Paolo Abeni wrote:
>Such annotation is present into the kernel uAPI headers since
>v6.7, and will be used soon by the vhost_type.h. Deal with it
>just stripping it.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
> scripts/update-linux-headers.sh | 1 +
> 1 file changed, 1 insertion(+)
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers.sh
>index 717c379f9e..64c0d7c4eb 100755
>--- a/scripts/update-linux-headers.sh
>+++ b/scripts/update-linux-headers.sh
>@@ -90,6 +90,7 @@ cp_portable() {
> -e 's/<linux\/\([^>]*\)>/"standard-headers\/linux\/\1"/' \
> -e "$arch_cmd" \
> -e 's/__bitwise//' \
>+ -e 's/__counted_by(\w*)//' \
> -e 's/__attribute__((packed))/QEMU_PACKED/' \
> -e 's/__inline__/inline/' \
> -e 's/__BITS_PER_LONG/HOST_LONG_BITS/' \
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 03/14] linux-headers: Update to Linux v6.17-rc1
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
2025-09-12 13:06 ` [PATCH v6 01/14] net: bundle all offloads in a single struct Paolo Abeni
2025-09-12 13:06 ` [PATCH v6 02/14] linux-headers: deal with counted_by annotation Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-12 13:06 ` [PATCH v6 04/14] virtio: introduce extended features type Paolo Abeni
` (11 subsequent siblings)
14 siblings, 0 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Update headers to include the virtio GSO over UDP tunnel features
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- fetch the headers from the linux vanilla tree instead of net-next
---
include/standard-headers/drm/drm_fourcc.h | 56 ++++++-
include/standard-headers/linux/ethtool.h | 4 +-
.../linux/input-event-codes.h | 8 +
include/standard-headers/linux/input.h | 1 +
include/standard-headers/linux/pci_regs.h | 9 +
include/standard-headers/linux/vhost_types.h | 5 +
include/standard-headers/linux/virtio_net.h | 33 ++++
| 10 +-
| 2 +
| 8 +-
| 2 +
| 2 +
| 2 +
| 2 +
| 13 --
| 2 +
| 2 +
| 1 +
| 2 +
| 2 +
| 2 +
| 2 +
| 2 +
| 2 +
| 2 +
| 154 +++++++++++++++++-
| 2 +
| 12 +-
| 35 ++++
29 files changed, 352 insertions(+), 27 deletions(-)
diff --git a/include/standard-headers/drm/drm_fourcc.h b/include/standard-headers/drm/drm_fourcc.h
index c8309d378b..cef077dfb3 100644
--- a/include/standard-headers/drm/drm_fourcc.h
+++ b/include/standard-headers/drm/drm_fourcc.h
@@ -209,6 +209,10 @@ extern "C" {
#define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0') /* [31:0] R:G:B:A 10:10:10:2 little endian */
#define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0') /* [31:0] B:G:R:A 10:10:10:2 little endian */
+/* 48 bpp RGB */
+#define DRM_FORMAT_RGB161616 fourcc_code('R', 'G', '4', '8') /* [47:0] R:G:B 16:16:16 little endian */
+#define DRM_FORMAT_BGR161616 fourcc_code('B', 'G', '4', '8') /* [47:0] B:G:R 16:16:16 little endian */
+
/* 64 bpp RGB */
#define DRM_FORMAT_XRGB16161616 fourcc_code('X', 'R', '4', '8') /* [63:0] x:R:G:B 16:16:16:16 little endian */
#define DRM_FORMAT_XBGR16161616 fourcc_code('X', 'B', '4', '8') /* [63:0] x:B:G:R 16:16:16:16 little endian */
@@ -217,7 +221,7 @@ extern "C" {
#define DRM_FORMAT_ABGR16161616 fourcc_code('A', 'B', '4', '8') /* [63:0] A:B:G:R 16:16:16:16 little endian */
/*
- * Floating point 64bpp RGB
+ * Half-Floating point - 16b/component
* IEEE 754-2008 binary16 half-precision float
* [15:0] sign:exponent:mantissa 1:5:10
*/
@@ -227,6 +231,20 @@ extern "C" {
#define DRM_FORMAT_ARGB16161616F fourcc_code('A', 'R', '4', 'H') /* [63:0] A:R:G:B 16:16:16:16 little endian */
#define DRM_FORMAT_ABGR16161616F fourcc_code('A', 'B', '4', 'H') /* [63:0] A:B:G:R 16:16:16:16 little endian */
+#define DRM_FORMAT_R16F fourcc_code('R', ' ', ' ', 'H') /* [15:0] R 16 little endian */
+#define DRM_FORMAT_GR1616F fourcc_code('G', 'R', ' ', 'H') /* [31:0] G:R 16:16 little endian */
+#define DRM_FORMAT_BGR161616F fourcc_code('B', 'G', 'R', 'H') /* [47:0] B:G:R 16:16:16 little endian */
+
+/*
+ * Floating point - 32b/component
+ * IEEE 754-2008 binary32 float
+ * [31:0] sign:exponent:mantissa 1:8:23
+ */
+#define DRM_FORMAT_R32F fourcc_code('R', ' ', ' ', 'F') /* [31:0] R 32 little endian */
+#define DRM_FORMAT_GR3232F fourcc_code('G', 'R', ' ', 'F') /* [63:0] R:G 32:32 little endian */
+#define DRM_FORMAT_BGR323232F fourcc_code('B', 'G', 'R', 'F') /* [95:0] R:G:B 32:32:32 little endian */
+#define DRM_FORMAT_ABGR32323232F fourcc_code('A', 'B', '8', 'F') /* [127:0] R:G:B:A 32:32:32:32 little endian */
+
/*
* RGBA format with 10-bit components packed in 64-bit per pixel, with 6 bits
* of unused padding per component:
@@ -376,6 +394,42 @@ extern "C" {
*/
#define DRM_FORMAT_Q401 fourcc_code('Q', '4', '0', '1')
+/*
+ * 3 plane YCbCr LSB aligned
+ * In order to use these formats in a similar fashion to MSB aligned ones
+ * implementation can multiply the values by 2^6=64. For that reason the padding
+ * must only contain zeros.
+ * index 0 = Y plane, [15:0] z:Y [6:10] little endian
+ * index 1 = Cr plane, [15:0] z:Cr [6:10] little endian
+ * index 2 = Cb plane, [15:0] z:Cb [6:10] little endian
+ */
+#define DRM_FORMAT_S010 fourcc_code('S', '0', '1', '0') /* 2x2 subsampled Cb (1) and Cr (2) planes 10 bits per channel */
+#define DRM_FORMAT_S210 fourcc_code('S', '2', '1', '0') /* 2x1 subsampled Cb (1) and Cr (2) planes 10 bits per channel */
+#define DRM_FORMAT_S410 fourcc_code('S', '4', '1', '0') /* non-subsampled Cb (1) and Cr (2) planes 10 bits per channel */
+
+/*
+ * 3 plane YCbCr LSB aligned
+ * In order to use these formats in a similar fashion to MSB aligned ones
+ * implementation can multiply the values by 2^4=16. For that reason the padding
+ * must only contain zeros.
+ * index 0 = Y plane, [15:0] z:Y [4:12] little endian
+ * index 1 = Cr plane, [15:0] z:Cr [4:12] little endian
+ * index 2 = Cb plane, [15:0] z:Cb [4:12] little endian
+ */
+#define DRM_FORMAT_S012 fourcc_code('S', '0', '1', '2') /* 2x2 subsampled Cb (1) and Cr (2) planes 12 bits per channel */
+#define DRM_FORMAT_S212 fourcc_code('S', '2', '1', '2') /* 2x1 subsampled Cb (1) and Cr (2) planes 12 bits per channel */
+#define DRM_FORMAT_S412 fourcc_code('S', '4', '1', '2') /* non-subsampled Cb (1) and Cr (2) planes 12 bits per channel */
+
+/*
+ * 3 plane YCbCr
+ * index 0 = Y plane, [15:0] Y little endian
+ * index 1 = Cr plane, [15:0] Cr little endian
+ * index 2 = Cb plane, [15:0] Cb little endian
+ */
+#define DRM_FORMAT_S016 fourcc_code('S', '0', '1', '6') /* 2x2 subsampled Cb (1) and Cr (2) planes 16 bits per channel */
+#define DRM_FORMAT_S216 fourcc_code('S', '2', '1', '6') /* 2x1 subsampled Cb (1) and Cr (2) planes 16 bits per channel */
+#define DRM_FORMAT_S416 fourcc_code('S', '4', '1', '6') /* non-subsampled Cb (1) and Cr (2) planes 16 bits per channel */
+
/*
* 3 plane YCbCr
* index 0: Y plane, [7:0] Y
diff --git a/include/standard-headers/linux/ethtool.h b/include/standard-headers/linux/ethtool.h
index cef0d207a6..eb80314028 100644
--- a/include/standard-headers/linux/ethtool.h
+++ b/include/standard-headers/linux/ethtool.h
@@ -2314,7 +2314,7 @@ enum {
IPV6_USER_FLOW = 0x0e, /* spec only (usr_ip6_spec; nfc only) */
IPV4_FLOW = 0x10, /* hash only */
IPV6_FLOW = 0x11, /* hash only */
- ETHER_FLOW = 0x12, /* spec only (ether_spec) */
+ ETHER_FLOW = 0x12, /* hash or spec (ether_spec) */
/* Used for GTP-U IPv4 and IPv6.
* The format of GTP packets only includes
@@ -2371,7 +2371,7 @@ enum {
/* Flag to enable RSS spreading of traffic matching rule (nfc only) */
#define FLOW_RSS 0x20000000
-/* L3-L4 network traffic flow hash options */
+/* L2-L4 network traffic flow hash options */
#define RXH_L2DA (1 << 1)
#define RXH_VLAN (1 << 2)
#define RXH_L3_PROTO (1 << 3)
diff --git a/include/standard-headers/linux/input-event-codes.h b/include/standard-headers/linux/input-event-codes.h
index a82ff795e0..00dc9caac9 100644
--- a/include/standard-headers/linux/input-event-codes.h
+++ b/include/standard-headers/linux/input-event-codes.h
@@ -601,6 +601,11 @@
#define BTN_DPAD_LEFT 0x222
#define BTN_DPAD_RIGHT 0x223
+#define BTN_GRIPL 0x224
+#define BTN_GRIPR 0x225
+#define BTN_GRIPL2 0x226
+#define BTN_GRIPR2 0x227
+
#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */
#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */
#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */
@@ -765,6 +770,9 @@
#define KEY_KBD_LCD_MENU4 0x2bb
#define KEY_KBD_LCD_MENU5 0x2bc
+/* Performance Boost key (Alienware)/G-Mode key (Dell) */
+#define KEY_PERFORMANCE 0x2bd
+
#define BTN_TRIGGER_HAPPY 0x2c0
#define BTN_TRIGGER_HAPPY1 0x2c0
#define BTN_TRIGGER_HAPPY2 0x2c1
diff --git a/include/standard-headers/linux/input.h b/include/standard-headers/linux/input.h
index 942ea6aaa9..d4512c20b5 100644
--- a/include/standard-headers/linux/input.h
+++ b/include/standard-headers/linux/input.h
@@ -272,6 +272,7 @@ struct input_mask {
#define BUS_CEC 0x1E
#define BUS_INTEL_ISHTP 0x1F
#define BUS_AMD_SFH 0x20
+#define BUS_SDW 0x21
/*
* MT_TOOL types
diff --git a/include/standard-headers/linux/pci_regs.h b/include/standard-headers/linux/pci_regs.h
index a3a3e942de..f5b17745de 100644
--- a/include/standard-headers/linux/pci_regs.h
+++ b/include/standard-headers/linux/pci_regs.h
@@ -745,6 +745,7 @@
#define PCI_EXT_CAP_ID_L1SS 0x1E /* L1 PM Substates */
#define PCI_EXT_CAP_ID_PTM 0x1F /* Precision Time Measurement */
#define PCI_EXT_CAP_ID_DVSEC 0x23 /* Designated Vendor-Specific */
+#define PCI_EXT_CAP_ID_VF_REBAR 0x24 /* VF Resizable BAR */
#define PCI_EXT_CAP_ID_DLF 0x25 /* Data Link Feature */
#define PCI_EXT_CAP_ID_PL_16GT 0x26 /* Physical Layer 16.0 GT/s */
#define PCI_EXT_CAP_ID_NPEM 0x29 /* Native PCIe Enclosure Management */
@@ -1141,6 +1142,14 @@
#define PCI_DVSEC_HEADER2 0x8 /* Designated Vendor-Specific Header2 */
#define PCI_DVSEC_HEADER2_ID(x) ((x) & 0xffff)
+/* VF Resizable BARs, same layout as PCI_REBAR */
+#define PCI_VF_REBAR_CAP PCI_REBAR_CAP
+#define PCI_VF_REBAR_CAP_SIZES PCI_REBAR_CAP_SIZES
+#define PCI_VF_REBAR_CTRL PCI_REBAR_CTRL
+#define PCI_VF_REBAR_CTRL_BAR_IDX PCI_REBAR_CTRL_BAR_IDX
+#define PCI_VF_REBAR_CTRL_NBAR_MASK PCI_REBAR_CTRL_NBAR_MASK
+#define PCI_VF_REBAR_CTRL_BAR_SIZE PCI_REBAR_CTRL_BAR_SIZE
+
/* Data Link Feature */
#define PCI_DLF_CAP 0x04 /* Capabilities Register */
#define PCI_DLF_EXCHANGE_ENABLE 0x80000000 /* Data Link Feature Exchange Enable */
diff --git a/include/standard-headers/linux/vhost_types.h b/include/standard-headers/linux/vhost_types.h
index fd54044936..79b53a931a 100644
--- a/include/standard-headers/linux/vhost_types.h
+++ b/include/standard-headers/linux/vhost_types.h
@@ -110,6 +110,11 @@ struct vhost_msg_v2 {
};
};
+struct vhost_features_array {
+ uint64_t count; /* number of entries present in features array */
+ uint64_t features[] ;
+};
+
struct vhost_memory_region {
uint64_t guest_phys_addr;
uint64_t memory_size; /* bytes */
diff --git a/include/standard-headers/linux/virtio_net.h b/include/standard-headers/linux/virtio_net.h
index 982e854f14..93abaae0b9 100644
--- a/include/standard-headers/linux/virtio_net.h
+++ b/include/standard-headers/linux/virtio_net.h
@@ -70,6 +70,28 @@
* with the same MAC.
*/
#define VIRTIO_NET_F_SPEED_DUPLEX 63 /* Device set linkspeed and duplex */
+#define VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO 65 /* Driver can receive
+ * GSO-over-UDP-tunnel packets
+ */
+#define VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM 66 /* Driver handles
+ * GSO-over-UDP-tunnel
+ * packets with partial csum
+ * for the outer header
+ */
+#define VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO 67 /* Device can receive
+ * GSO-over-UDP-tunnel packets
+ */
+#define VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM 68 /* Device handles
+ * GSO-over-UDP-tunnel
+ * packets with partial csum
+ * for the outer header
+ */
+
+/* Offloads bits corresponding to VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO{,_CSUM}
+ * features
+ */
+#define VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_MAPPED 46
+#define VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM_MAPPED 47
#ifndef VIRTIO_NET_NO_LEGACY
#define VIRTIO_NET_F_GSO 6 /* Host handles pkts w/ any GSO type */
@@ -131,12 +153,17 @@ struct virtio_net_hdr_v1 {
#define VIRTIO_NET_HDR_F_NEEDS_CSUM 1 /* Use csum_start, csum_offset */
#define VIRTIO_NET_HDR_F_DATA_VALID 2 /* Csum is valid */
#define VIRTIO_NET_HDR_F_RSC_INFO 4 /* rsc info in csum_ fields */
+#define VIRTIO_NET_HDR_F_UDP_TUNNEL_CSUM 8 /* UDP tunnel csum offload */
uint8_t flags;
#define VIRTIO_NET_HDR_GSO_NONE 0 /* Not a GSO frame */
#define VIRTIO_NET_HDR_GSO_TCPV4 1 /* GSO frame, IPv4 TCP (TSO) */
#define VIRTIO_NET_HDR_GSO_UDP 3 /* GSO frame, IPv4 UDP (UFO) */
#define VIRTIO_NET_HDR_GSO_TCPV6 4 /* GSO frame, IPv6 TCP */
#define VIRTIO_NET_HDR_GSO_UDP_L4 5 /* GSO frame, IPv4& IPv6 UDP (USO) */
+#define VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV4 0x20 /* UDPv4 tunnel present */
+#define VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV6 0x40 /* UDPv6 tunnel present */
+#define VIRTIO_NET_HDR_GSO_UDP_TUNNEL (VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV4 | \
+ VIRTIO_NET_HDR_GSO_UDP_TUNNEL_IPV6)
#define VIRTIO_NET_HDR_GSO_ECN 0x80 /* TCP has ECN set */
uint8_t gso_type;
__virtio16 hdr_len; /* Ethernet + IP + tcp/udp hdrs */
@@ -181,6 +208,12 @@ struct virtio_net_hdr_v1_hash {
uint16_t padding;
};
+struct virtio_net_hdr_v1_hash_tunnel {
+ struct virtio_net_hdr_v1_hash hash_hdr;
+ uint16_t outer_th_offset;
+ uint16_t inner_nh_offset;
+};
+
#ifndef VIRTIO_NET_NO_LEGACY
/* This header comes first in the scatter-gather list.
* For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must
--git a/linux-headers/LICENSES/preferred/GPL-2.0 b/linux-headers/LICENSES/preferred/GPL-2.0
index ff0812fd89..ea8e93dc44 100644
--- a/linux-headers/LICENSES/preferred/GPL-2.0
+++ b/linux-headers/LICENSES/preferred/GPL-2.0
@@ -20,8 +20,8 @@ License-Text:
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -322,10 +322,8 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
--git a/linux-headers/asm-arm64/unistd_64.h b/linux-headers/asm-arm64/unistd_64.h
index ee9aaebdf3..4ae25c2b91 100644
--- a/linux-headers/asm-arm64/unistd_64.h
+++ b/linux-headers/asm-arm64/unistd_64.h
@@ -324,6 +324,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_64_H */
--git a/linux-headers/asm-generic/unistd.h b/linux-headers/asm-generic/unistd.h
index 2892a45023..04e0077fb4 100644
--- a/linux-headers/asm-generic/unistd.h
+++ b/linux-headers/asm-generic/unistd.h
@@ -852,8 +852,14 @@ __SYSCALL(__NR_removexattrat, sys_removexattrat)
#define __NR_open_tree_attr 467
__SYSCALL(__NR_open_tree_attr, sys_open_tree_attr)
+/* fs/inode.c */
+#define __NR_file_getattr 468
+__SYSCALL(__NR_file_getattr, sys_file_getattr)
+#define __NR_file_setattr 469
+__SYSCALL(__NR_file_setattr, sys_file_setattr)
+
#undef __NR_syscalls
-#define __NR_syscalls 468
+#define __NR_syscalls 470
/*
* 32 bit systems traditionally used different
--git a/linux-headers/asm-loongarch/unistd_64.h b/linux-headers/asm-loongarch/unistd_64.h
index 50d22df8f7..5033fc8f2f 100644
--- a/linux-headers/asm-loongarch/unistd_64.h
+++ b/linux-headers/asm-loongarch/unistd_64.h
@@ -320,6 +320,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_64_H */
--git a/linux-headers/asm-mips/unistd_n32.h b/linux-headers/asm-mips/unistd_n32.h
index bdcc2f460b..c99c10e5bf 100644
--- a/linux-headers/asm-mips/unistd_n32.h
+++ b/linux-headers/asm-mips/unistd_n32.h
@@ -396,5 +396,7 @@
#define __NR_listxattrat (__NR_Linux + 465)
#define __NR_removexattrat (__NR_Linux + 466)
#define __NR_open_tree_attr (__NR_Linux + 467)
+#define __NR_file_getattr (__NR_Linux + 468)
+#define __NR_file_setattr (__NR_Linux + 469)
#endif /* _ASM_UNISTD_N32_H */
--git a/linux-headers/asm-mips/unistd_n64.h b/linux-headers/asm-mips/unistd_n64.h
index 3b6b0193b6..0d975bb185 100644
--- a/linux-headers/asm-mips/unistd_n64.h
+++ b/linux-headers/asm-mips/unistd_n64.h
@@ -372,5 +372,7 @@
#define __NR_listxattrat (__NR_Linux + 465)
#define __NR_removexattrat (__NR_Linux + 466)
#define __NR_open_tree_attr (__NR_Linux + 467)
+#define __NR_file_getattr (__NR_Linux + 468)
+#define __NR_file_setattr (__NR_Linux + 469)
#endif /* _ASM_UNISTD_N64_H */
--git a/linux-headers/asm-mips/unistd_o32.h b/linux-headers/asm-mips/unistd_o32.h
index 4609a4b4d3..86ac0ac84b 100644
--- a/linux-headers/asm-mips/unistd_o32.h
+++ b/linux-headers/asm-mips/unistd_o32.h
@@ -442,5 +442,7 @@
#define __NR_listxattrat (__NR_Linux + 465)
#define __NR_removexattrat (__NR_Linux + 466)
#define __NR_open_tree_attr (__NR_Linux + 467)
+#define __NR_file_getattr (__NR_Linux + 468)
+#define __NR_file_setattr (__NR_Linux + 469)
#endif /* _ASM_UNISTD_O32_H */
--git a/linux-headers/asm-powerpc/kvm.h b/linux-headers/asm-powerpc/kvm.h
index eaeda00178..077c5437f5 100644
--- a/linux-headers/asm-powerpc/kvm.h
+++ b/linux-headers/asm-powerpc/kvm.h
@@ -1,18 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
* Copyright IBM Corp. 2007
*
* Authors: Hollis Blanchard <hollisb@us.ibm.com>
--git a/linux-headers/asm-powerpc/unistd_32.h b/linux-headers/asm-powerpc/unistd_32.h
index 5d38a427e0..d7a32c5e06 100644
--- a/linux-headers/asm-powerpc/unistd_32.h
+++ b/linux-headers/asm-powerpc/unistd_32.h
@@ -449,6 +449,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_32_H */
--git a/linux-headers/asm-powerpc/unistd_64.h b/linux-headers/asm-powerpc/unistd_64.h
index 860a488e4d..ff35c51fc6 100644
--- a/linux-headers/asm-powerpc/unistd_64.h
+++ b/linux-headers/asm-powerpc/unistd_64.h
@@ -421,6 +421,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_64_H */
--git a/linux-headers/asm-riscv/kvm.h b/linux-headers/asm-riscv/kvm.h
index 5f59fd226c..ef27d4289d 100644
--- a/linux-headers/asm-riscv/kvm.h
+++ b/linux-headers/asm-riscv/kvm.h
@@ -18,6 +18,7 @@
#define __KVM_HAVE_IRQ_LINE
#define KVM_COALESCED_MMIO_PAGE_OFFSET 1
+#define KVM_DIRTY_LOG_PAGE_OFFSET 64
#define KVM_INTERRUPT_SET -1U
#define KVM_INTERRUPT_UNSET -2U
--git a/linux-headers/asm-riscv/unistd_32.h b/linux-headers/asm-riscv/unistd_32.h
index a5e769f1d9..6083373e88 100644
--- a/linux-headers/asm-riscv/unistd_32.h
+++ b/linux-headers/asm-riscv/unistd_32.h
@@ -315,6 +315,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_32_H */
--git a/linux-headers/asm-riscv/unistd_64.h b/linux-headers/asm-riscv/unistd_64.h
index 8df4d64841..f0c7585c60 100644
--- a/linux-headers/asm-riscv/unistd_64.h
+++ b/linux-headers/asm-riscv/unistd_64.h
@@ -325,6 +325,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_64_H */
--git a/linux-headers/asm-s390/unistd_32.h b/linux-headers/asm-s390/unistd_32.h
index 85eedbd18e..37b8f6f358 100644
--- a/linux-headers/asm-s390/unistd_32.h
+++ b/linux-headers/asm-s390/unistd_32.h
@@ -440,5 +440,7 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_S390_UNISTD_32_H */
--git a/linux-headers/asm-s390/unistd_64.h b/linux-headers/asm-s390/unistd_64.h
index c03b1b9701..0652ba6331 100644
--- a/linux-headers/asm-s390/unistd_64.h
+++ b/linux-headers/asm-s390/unistd_64.h
@@ -388,5 +388,7 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_S390_UNISTD_64_H */
--git a/linux-headers/asm-x86/unistd_32.h b/linux-headers/asm-x86/unistd_32.h
index 491d6b4eb6..8f784a5634 100644
--- a/linux-headers/asm-x86/unistd_32.h
+++ b/linux-headers/asm-x86/unistd_32.h
@@ -458,6 +458,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_32_H */
--git a/linux-headers/asm-x86/unistd_64.h b/linux-headers/asm-x86/unistd_64.h
index 7cf88bf9bd..2f55bebb81 100644
--- a/linux-headers/asm-x86/unistd_64.h
+++ b/linux-headers/asm-x86/unistd_64.h
@@ -381,6 +381,8 @@
#define __NR_listxattrat 465
#define __NR_removexattrat 466
#define __NR_open_tree_attr 467
+#define __NR_file_getattr 468
+#define __NR_file_setattr 469
#endif /* _ASM_UNISTD_64_H */
--git a/linux-headers/asm-x86/unistd_x32.h b/linux-headers/asm-x86/unistd_x32.h
index 82959111e6..8cc8673f15 100644
--- a/linux-headers/asm-x86/unistd_x32.h
+++ b/linux-headers/asm-x86/unistd_x32.h
@@ -334,6 +334,8 @@
#define __NR_listxattrat (__X32_SYSCALL_BIT + 465)
#define __NR_removexattrat (__X32_SYSCALL_BIT + 466)
#define __NR_open_tree_attr (__X32_SYSCALL_BIT + 467)
+#define __NR_file_getattr (__X32_SYSCALL_BIT + 468)
+#define __NR_file_setattr (__X32_SYSCALL_BIT + 469)
#define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)
#define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)
#define __NR_ioctl (__X32_SYSCALL_BIT + 514)
--git a/linux-headers/linux/iommufd.h b/linux-headers/linux/iommufd.h
index cb0f7d6b4d..2105a03955 100644
--- a/linux-headers/linux/iommufd.h
+++ b/linux-headers/linux/iommufd.h
@@ -56,6 +56,7 @@ enum {
IOMMUFD_CMD_VDEVICE_ALLOC = 0x91,
IOMMUFD_CMD_IOAS_CHANGE_PROCESS = 0x92,
IOMMUFD_CMD_VEVENTQ_ALLOC = 0x93,
+ IOMMUFD_CMD_HW_QUEUE_ALLOC = 0x94,
};
/**
@@ -590,17 +591,44 @@ struct iommu_hw_info_arm_smmuv3 {
__u32 aidr;
};
+/**
+ * struct iommu_hw_info_tegra241_cmdqv - NVIDIA Tegra241 CMDQV Hardware
+ * Information (IOMMU_HW_INFO_TYPE_TEGRA241_CMDQV)
+ *
+ * @flags: Must be 0
+ * @version: Version number for the CMDQ-V HW for PARAM bits[03:00]
+ * @log2vcmdqs: Log2 of the total number of VCMDQs for PARAM bits[07:04]
+ * @log2vsids: Log2 of the total number of SID replacements for PARAM bits[15:12]
+ * @__reserved: Must be 0
+ *
+ * VMM can use these fields directly in its emulated global PARAM register. Note
+ * that only one Virtual Interface (VINTF) should be exposed to a VM, i.e. PARAM
+ * bits[11:08] should be set to 0 for log2 of the total number of VINTFs.
+ */
+struct iommu_hw_info_tegra241_cmdqv {
+ __u32 flags;
+ __u8 version;
+ __u8 log2vcmdqs;
+ __u8 log2vsids;
+ __u8 __reserved;
+};
+
/**
* enum iommu_hw_info_type - IOMMU Hardware Info Types
- * @IOMMU_HW_INFO_TYPE_NONE: Used by the drivers that do not report hardware
+ * @IOMMU_HW_INFO_TYPE_NONE: Output by the drivers that do not report hardware
* info
+ * @IOMMU_HW_INFO_TYPE_DEFAULT: Input to request for a default type
* @IOMMU_HW_INFO_TYPE_INTEL_VTD: Intel VT-d iommu info type
* @IOMMU_HW_INFO_TYPE_ARM_SMMUV3: ARM SMMUv3 iommu info type
+ * @IOMMU_HW_INFO_TYPE_TEGRA241_CMDQV: NVIDIA Tegra241 CMDQV (extension for ARM
+ * SMMUv3) info type
*/
enum iommu_hw_info_type {
IOMMU_HW_INFO_TYPE_NONE = 0,
+ IOMMU_HW_INFO_TYPE_DEFAULT = 0,
IOMMU_HW_INFO_TYPE_INTEL_VTD = 1,
IOMMU_HW_INFO_TYPE_ARM_SMMUV3 = 2,
+ IOMMU_HW_INFO_TYPE_TEGRA241_CMDQV = 3,
};
/**
@@ -625,6 +653,15 @@ enum iommufd_hw_capabilities {
IOMMU_HW_CAP_PCI_PASID_PRIV = 1 << 2,
};
+/**
+ * enum iommufd_hw_info_flags - Flags for iommu_hw_info
+ * @IOMMU_HW_INFO_FLAG_INPUT_TYPE: If set, @in_data_type carries an input type
+ * for user space to request for a specific info
+ */
+enum iommufd_hw_info_flags {
+ IOMMU_HW_INFO_FLAG_INPUT_TYPE = 1 << 0,
+};
+
/**
* struct iommu_hw_info - ioctl(IOMMU_GET_HW_INFO)
* @size: sizeof(struct iommu_hw_info)
@@ -634,6 +671,12 @@ enum iommufd_hw_capabilities {
* data that kernel supports
* @data_uptr: User pointer to a user-space buffer used by the kernel to fill
* the iommu type specific hardware information data
+ * @in_data_type: This shares the same field with @out_data_type, making it be
+ * a bidirectional field. When IOMMU_HW_INFO_FLAG_INPUT_TYPE is
+ * set, an input type carried via this @in_data_type field will
+ * be valid, requesting for the info data to the given type. If
+ * IOMMU_HW_INFO_FLAG_INPUT_TYPE is unset, any input value will
+ * be seen as IOMMU_HW_INFO_TYPE_DEFAULT
* @out_data_type: Output the iommu hardware info type as defined in the enum
* iommu_hw_info_type.
* @out_capabilities: Output the generic iommu capability info type as defined
@@ -663,7 +706,10 @@ struct iommu_hw_info {
__u32 dev_id;
__u32 data_len;
__aligned_u64 data_uptr;
- __u32 out_data_type;
+ union {
+ __u32 in_data_type;
+ __u32 out_data_type;
+ };
__u8 out_max_pasid_log2;
__u8 __reserved[3];
__aligned_u64 out_capabilities;
@@ -951,10 +997,29 @@ struct iommu_fault_alloc {
* enum iommu_viommu_type - Virtual IOMMU Type
* @IOMMU_VIOMMU_TYPE_DEFAULT: Reserved for future use
* @IOMMU_VIOMMU_TYPE_ARM_SMMUV3: ARM SMMUv3 driver specific type
+ * @IOMMU_VIOMMU_TYPE_TEGRA241_CMDQV: NVIDIA Tegra241 CMDQV (extension for ARM
+ * SMMUv3) enabled ARM SMMUv3 type
*/
enum iommu_viommu_type {
IOMMU_VIOMMU_TYPE_DEFAULT = 0,
IOMMU_VIOMMU_TYPE_ARM_SMMUV3 = 1,
+ IOMMU_VIOMMU_TYPE_TEGRA241_CMDQV = 2,
+};
+
+/**
+ * struct iommu_viommu_tegra241_cmdqv - NVIDIA Tegra241 CMDQV Virtual Interface
+ * (IOMMU_VIOMMU_TYPE_TEGRA241_CMDQV)
+ * @out_vintf_mmap_offset: mmap offset argument for VINTF's page0
+ * @out_vintf_mmap_length: mmap length argument for VINTF's page0
+ *
+ * Both @out_vintf_mmap_offset and @out_vintf_mmap_length are reported by kernel
+ * for user space to mmap the VINTF page0 from the host physical address space
+ * to the guest physical address space so that a guest kernel can directly R/W
+ * access to the VINTF page0 in order to control its virtual command queues.
+ */
+struct iommu_viommu_tegra241_cmdqv {
+ __aligned_u64 out_vintf_mmap_offset;
+ __aligned_u64 out_vintf_mmap_length;
};
/**
@@ -965,6 +1030,9 @@ enum iommu_viommu_type {
* @dev_id: The device's physical IOMMU will be used to back the virtual IOMMU
* @hwpt_id: ID of a nesting parent HWPT to associate to
* @out_viommu_id: Output virtual IOMMU ID for the allocated object
+ * @data_len: Length of the type specific data
+ * @__reserved: Must be 0
+ * @data_uptr: User pointer to a driver-specific virtual IOMMU data
*
* Allocate a virtual IOMMU object, representing the underlying physical IOMMU's
* virtualization support that is a security-isolated slice of the real IOMMU HW
@@ -985,6 +1053,9 @@ struct iommu_viommu_alloc {
__u32 dev_id;
__u32 hwpt_id;
__u32 out_viommu_id;
+ __u32 data_len;
+ __u32 __reserved;
+ __aligned_u64 data_uptr;
};
#define IOMMU_VIOMMU_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_VIOMMU_ALLOC)
@@ -995,10 +1066,15 @@ struct iommu_viommu_alloc {
* @dev_id: The physical device to allocate a virtual instance on the vIOMMU
* @out_vdevice_id: Object handle for the vDevice. Pass to IOMMU_DESTORY
* @virt_id: Virtual device ID per vIOMMU, e.g. vSID of ARM SMMUv3, vDeviceID
- * of AMD IOMMU, and vRID of a nested Intel VT-d to a Context Table
+ * of AMD IOMMU, and vRID of Intel VT-d
*
* Allocate a virtual device instance (for a physical device) against a vIOMMU.
* This instance holds the device's information (related to its vIOMMU) in a VM.
+ * User should use IOMMU_DESTROY to destroy the virtual device before
+ * destroying the physical device (by closing vfio_cdev fd). Otherwise the
+ * virtual device would be forcibly destroyed on physical device destruction,
+ * its vdevice_id would be permanently leaked (unremovable & unreusable) until
+ * iommu fd closed.
*/
struct iommu_vdevice_alloc {
__u32 size;
@@ -1075,10 +1151,12 @@ struct iommufd_vevent_header {
* enum iommu_veventq_type - Virtual Event Queue Type
* @IOMMU_VEVENTQ_TYPE_DEFAULT: Reserved for future use
* @IOMMU_VEVENTQ_TYPE_ARM_SMMUV3: ARM SMMUv3 Virtual Event Queue
+ * @IOMMU_VEVENTQ_TYPE_TEGRA241_CMDQV: NVIDIA Tegra241 CMDQV Extension IRQ
*/
enum iommu_veventq_type {
IOMMU_VEVENTQ_TYPE_DEFAULT = 0,
IOMMU_VEVENTQ_TYPE_ARM_SMMUV3 = 1,
+ IOMMU_VEVENTQ_TYPE_TEGRA241_CMDQV = 2,
};
/**
@@ -1102,6 +1180,19 @@ struct iommu_vevent_arm_smmuv3 {
__aligned_le64 evt[4];
};
+/**
+ * struct iommu_vevent_tegra241_cmdqv - Tegra241 CMDQV IRQ
+ * (IOMMU_VEVENTQ_TYPE_TEGRA241_CMDQV)
+ * @lvcmdq_err_map: 128-bit logical vcmdq error map, little-endian.
+ * (Refer to register LVCMDQ_ERR_MAPs per VINTF )
+ *
+ * The 128-bit register value from HW exclusively reflect the error bits for a
+ * Virtual Interface represented by a vIOMMU object. Read and report directly.
+ */
+struct iommu_vevent_tegra241_cmdqv {
+ __aligned_le64 lvcmdq_err_map[2];
+};
+
/**
* struct iommu_veventq_alloc - ioctl(IOMMU_VEVENTQ_ALLOC)
* @size: sizeof(struct iommu_veventq_alloc)
@@ -1141,4 +1232,61 @@ struct iommu_veventq_alloc {
__u32 __reserved;
};
#define IOMMU_VEVENTQ_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_VEVENTQ_ALLOC)
+
+/**
+ * enum iommu_hw_queue_type - HW Queue Type
+ * @IOMMU_HW_QUEUE_TYPE_DEFAULT: Reserved for future use
+ * @IOMMU_HW_QUEUE_TYPE_TEGRA241_CMDQV: NVIDIA Tegra241 CMDQV (extension for ARM
+ * SMMUv3) Virtual Command Queue (VCMDQ)
+ */
+enum iommu_hw_queue_type {
+ IOMMU_HW_QUEUE_TYPE_DEFAULT = 0,
+ /*
+ * TEGRA241_CMDQV requirements (otherwise, allocation will fail)
+ * - alloc starts from the lowest @index=0 in ascending order
+ * - destroy starts from the last allocated @index in descending order
+ * - @base_addr must be aligned to @length in bytes and mapped in IOAS
+ * - @length must be a power of 2, with a minimum 32 bytes and a maximum
+ * 2 ^ idr[1].CMDQS * 16 bytes (use GET_HW_INFO call to read idr[1]
+ * from struct iommu_hw_info_arm_smmuv3)
+ * - suggest to back the queue memory with contiguous physical pages or
+ * a single huge page with alignment of the queue size, and limit the
+ * emulated vSMMU's IDR1.CMDQS to log2(huge page size / 16 bytes)
+ */
+ IOMMU_HW_QUEUE_TYPE_TEGRA241_CMDQV = 1,
+};
+
+/**
+ * struct iommu_hw_queue_alloc - ioctl(IOMMU_HW_QUEUE_ALLOC)
+ * @size: sizeof(struct iommu_hw_queue_alloc)
+ * @flags: Must be 0
+ * @viommu_id: Virtual IOMMU ID to associate the HW queue with
+ * @type: One of enum iommu_hw_queue_type
+ * @index: The logical index to the HW queue per virtual IOMMU for a multi-queue
+ * model
+ * @out_hw_queue_id: The ID of the new HW queue
+ * @nesting_parent_iova: Base address of the queue memory in the guest physical
+ * address space
+ * @length: Length of the queue memory
+ *
+ * Allocate a HW queue object for a vIOMMU-specific HW-accelerated queue, which
+ * allows HW to access a guest queue memory described using @nesting_parent_iova
+ * and @length.
+ *
+ * A vIOMMU can allocate multiple queues, but it must use a different @index per
+ * type to separate each allocation, e.g::
+ *
+ * Type1 HW queue0, Type1 HW queue1, Type2 HW queue0, ...
+ */
+struct iommu_hw_queue_alloc {
+ __u32 size;
+ __u32 flags;
+ __u32 viommu_id;
+ __u32 type;
+ __u32 index;
+ __u32 out_hw_queue_id;
+ __aligned_u64 nesting_parent_iova;
+ __aligned_u64 length;
+};
+#define IOMMU_HW_QUEUE_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HW_QUEUE_ALLOC)
#endif
--git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 32c5885a3c..be704965d8 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -636,6 +636,7 @@ struct kvm_ioeventfd {
#define KVM_X86_DISABLE_EXITS_HLT (1 << 1)
#define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2)
#define KVM_X86_DISABLE_EXITS_CSTATE (1 << 3)
+#define KVM_X86_DISABLE_EXITS_APERFMPERF (1 << 4)
/* for KVM_ENABLE_CAP */
struct kvm_enable_cap {
@@ -952,6 +953,7 @@ struct kvm_enable_cap {
#define KVM_CAP_ARM_EL2 240
#define KVM_CAP_ARM_EL2_E2H0 241
#define KVM_CAP_RISCV_MP_STATE_RESET 242
+#define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243
struct kvm_irq_routing_irqchip {
__u32 irqchip;
--git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h
index 79bf8c0cc5..4d96d1fc12 100644
--- a/linux-headers/linux/vfio.h
+++ b/linux-headers/linux/vfio.h
@@ -905,10 +905,12 @@ struct vfio_device_feature {
* VFIO_DEVICE_BIND_IOMMUFD - _IOR(VFIO_TYPE, VFIO_BASE + 18,
* struct vfio_device_bind_iommufd)
* @argsz: User filled size of this data.
- * @flags: Must be 0.
+ * @flags: Must be 0 or a bit flags of VFIO_DEVICE_BIND_*
* @iommufd: iommufd to bind.
* @out_devid: The device id generated by this bind. devid is a handle for
* this device/iommufd bond and can be used in IOMMUFD commands.
+ * @token_uuid_ptr: Valid if VFIO_DEVICE_BIND_FLAG_TOKEN. Points to a 16 byte
+ * UUID in the same format as VFIO_DEVICE_FEATURE_PCI_VF_TOKEN.
*
* Bind a vfio_device to the specified iommufd.
*
@@ -917,13 +919,21 @@ struct vfio_device_feature {
*
* Unbind is automatically conducted when device fd is closed.
*
+ * A token is sometimes required to open the device, unless this is known to be
+ * needed VFIO_DEVICE_BIND_FLAG_TOKEN should not be set and token_uuid_ptr is
+ * ignored. The only case today is a PF/VF relationship where the VF bind must
+ * be provided the same token as VFIO_DEVICE_FEATURE_PCI_VF_TOKEN provided to
+ * the PF.
+ *
* Return: 0 on success, -errno on failure.
*/
struct vfio_device_bind_iommufd {
__u32 argsz;
__u32 flags;
+#define VFIO_DEVICE_BIND_FLAG_TOKEN (1 << 0)
__s32 iommufd;
__u32 out_devid;
+ __aligned_u64 token_uuid_ptr;
};
#define VFIO_DEVICE_BIND_IOMMUFD _IO(VFIO_TYPE, VFIO_BASE + 18)
--git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h
index d4b3e2ae13..283348b64a 100644
--- a/linux-headers/linux/vhost.h
+++ b/linux-headers/linux/vhost.h
@@ -235,4 +235,39 @@
*/
#define VHOST_VDPA_GET_VRING_SIZE _IOWR(VHOST_VIRTIO, 0x82, \
struct vhost_vring_state)
+
+/* Extended features manipulation */
+#define VHOST_GET_FEATURES_ARRAY _IOR(VHOST_VIRTIO, 0x83, \
+ struct vhost_features_array)
+#define VHOST_SET_FEATURES_ARRAY _IOW(VHOST_VIRTIO, 0x83, \
+ struct vhost_features_array)
+
+/* fork_owner values for vhost */
+#define VHOST_FORK_OWNER_KTHREAD 0
+#define VHOST_FORK_OWNER_TASK 1
+
+/**
+ * VHOST_SET_FORK_FROM_OWNER - Set the fork_owner flag for the vhost device,
+ * This ioctl must called before VHOST_SET_OWNER.
+ * Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
+ *
+ * @param fork_owner: An 8-bit value that determines the vhost thread mode
+ *
+ * When fork_owner is set to VHOST_FORK_OWNER_TASK(default value):
+ * - Vhost will create vhost worker as tasks forked from the owner,
+ * inheriting all of the owner's attributes.
+ *
+ * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
+ * - Vhost will create vhost workers as kernel threads.
+ */
+#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)
+
+/**
+ * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
+ * Only available when CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y
+ *
+ * @return: An 8-bit value indicating the current thread mode.
+ */
+#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)
+
#endif
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v6 04/14] virtio: introduce extended features type
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (2 preceding siblings ...)
2025-09-12 13:06 ` [PATCH v6 03/14] linux-headers: Update to Linux v6.17-rc1 Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-17 12:12 ` Stefano Garzarella
2025-09-12 13:06 ` [PATCH v6 05/14] virtio: serialize extended features state Paolo Abeni
` (10 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
The virtio specifications allows for up to 128 bits for the
device features. Soon we are going to use some of the 'extended'
bits features (bit 64 and above) for the virtio net driver.
Represent the virtio features bitmask with a fixes size array, and
introduce a few helpers to help manipulate them.
Most drivers will keep using only 64 bits features space: use union
to allow them access the lower part of the extended space without any
per driver change.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v5 -> v6:
- removed trailing EoL
v4 -> v5:
- DEFINE_PROP_FEATURE -> VIRTIO_DEFINE_PROP_FEATURE
v3 -> v4:
- VIRTIO_FEATURES_DWORDS -> VIRTIO_FEATURES_NU64S
- VIRTIO_FEATURES_WORDS -> VIRTIO_FEATURES_NU32S
- VIRTIO_DWORD -> VIRTIO_FEATURES_U64
- VIRTIO_BIT -> VIRTIO_FEATURES_BIT
- virtio_features_use_extended -> virtio_features_use_ex
- move DEFINE_PROP_FEATURE definition here
v2 -> v3:
- fix preprocessor guard name
- use BIT_ULL
- add missing parentheses
- use memcmp()
- _is_empty() -> _empty()
- _andnot() returns a bool, true if dst has any non zero bits
- _array -> _ex
v1 -> v2:
- use a fixed size array for features instead of uint128
- use union with u64 to reduce the needed code churn
---
include/hw/virtio/virtio-features.h | 126 ++++++++++++++++++++++++++++
include/hw/virtio/virtio.h | 7 +-
2 files changed, 130 insertions(+), 3 deletions(-)
create mode 100644 include/hw/virtio/virtio-features.h
diff --git a/include/hw/virtio/virtio-features.h b/include/hw/virtio/virtio-features.h
new file mode 100644
index 0000000000..e29b7fe48f
--- /dev/null
+++ b/include/hw/virtio/virtio-features.h
@@ -0,0 +1,126 @@
+/*
+ * Virtio features helpers
+ *
+ * Copyright 2025 Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef QEMU_VIRTIO_FEATURES_H
+#define QEMU_VIRTIO_FEATURES_H
+
+#include "qemu/bitops.h"
+
+#define VIRTIO_FEATURES_FMT "%016"PRIx64"%016"PRIx64
+#define VIRTIO_FEATURES_PR(f) (f)[1], (f)[0]
+
+#define VIRTIO_FEATURES_MAX 128
+#define VIRTIO_FEATURES_BIT(b) BIT_ULL((b) % 64)
+#define VIRTIO_FEATURES_U64(b) ((b) / 64)
+#define VIRTIO_FEATURES_NU32S (VIRTIO_FEATURES_MAX / 32)
+#define VIRTIO_FEATURES_NU64S (VIRTIO_FEATURES_MAX / 64)
+
+#define VIRTIO_DECLARE_FEATURES(name) \
+ union { \
+ uint64_t name; \
+ uint64_t name##_ex[VIRTIO_FEATURES_NU64S]; \
+ }
+
+#define VIRTIO_DEFINE_PROP_FEATURE(_name, _state, _field, _bit, _defval) \
+ DEFINE_PROP_BIT64(_name, _state, _field[VIRTIO_FEATURES_U64(_bit)], \
+ (_bit) % 64, _defval)
+
+static inline void virtio_features_clear(uint64_t *features)
+{
+ memset(features, 0, sizeof(features[0]) * VIRTIO_FEATURES_NU64S);
+}
+
+static inline void virtio_features_from_u64(uint64_t *features, uint64_t from)
+{
+ virtio_features_clear(features);
+ features[0] = from;
+}
+
+static inline bool virtio_has_feature_ex(const uint64_t *features,
+ unsigned int fbit)
+{
+ assert(fbit < VIRTIO_FEATURES_MAX);
+ return features[VIRTIO_FEATURES_U64(fbit)] & VIRTIO_FEATURES_BIT(fbit);
+}
+
+static inline void virtio_add_feature_ex(uint64_t *features,
+ unsigned int fbit)
+{
+ assert(fbit < VIRTIO_FEATURES_MAX);
+ features[VIRTIO_FEATURES_U64(fbit)] |= VIRTIO_FEATURES_BIT(fbit);
+}
+
+static inline void virtio_clear_feature_ex(uint64_t *features,
+ unsigned int fbit)
+{
+ assert(fbit < VIRTIO_FEATURES_MAX);
+ features[VIRTIO_FEATURES_U64(fbit)] &= ~VIRTIO_FEATURES_BIT(fbit);
+}
+
+static inline bool virtio_features_equal(const uint64_t *f1,
+ const uint64_t *f2)
+{
+ return !memcmp(f1, f2, sizeof(uint64_t) * VIRTIO_FEATURES_NU64S);
+}
+
+static inline bool virtio_features_use_ex(const uint64_t *features)
+{
+ int i;
+
+ for (i = 1; i < VIRTIO_FEATURES_NU64S; ++i) {
+ if (features[i]) {
+ return true;
+ }
+ }
+ return false;
+}
+
+static inline bool virtio_features_empty(const uint64_t *features)
+{
+ return !virtio_features_use_ex(features) && !features[0];
+}
+
+static inline void virtio_features_copy(uint64_t *to, const uint64_t *from)
+{
+ memcpy(to, from, sizeof(to[0]) * VIRTIO_FEATURES_NU64S);
+}
+
+static inline bool virtio_features_andnot(uint64_t *to, const uint64_t *f1,
+ const uint64_t *f2)
+{
+ uint64_t diff = 0;
+ int i;
+
+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
+ to[i] = f1[i] & ~f2[i];
+ diff |= to[i];
+ }
+ return diff;
+}
+
+static inline void virtio_features_and(uint64_t *to, const uint64_t *f1,
+ const uint64_t *f2)
+{
+ int i;
+
+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
+ to[i] = f1[i] & f2[i];
+ }
+}
+
+static inline void virtio_features_or(uint64_t *to, const uint64_t *f1,
+ const uint64_t *f2)
+{
+ int i;
+
+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
+ to[i] = f1[i] | f2[i];
+ }
+}
+
+#endif
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index c594764f23..39e4059a66 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -16,6 +16,7 @@
#include "system/memory.h"
#include "hw/qdev-core.h"
+#include "hw/virtio/virtio-features.h"
#include "net/net.h"
#include "migration/vmstate.h"
#include "qemu/event_notifier.h"
@@ -121,9 +122,9 @@ struct VirtIODevice
* backend (e.g. vhost) and could potentially be a subset of the
* total feature set offered by QEMU.
*/
- uint64_t host_features;
- uint64_t guest_features;
- uint64_t backend_features;
+ VIRTIO_DECLARE_FEATURES(host_features);
+ VIRTIO_DECLARE_FEATURES(guest_features);
+ VIRTIO_DECLARE_FEATURES(backend_features);
size_t config_len;
void *config;
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 04/14] virtio: introduce extended features type
2025-09-12 13:06 ` [PATCH v6 04/14] virtio: introduce extended features type Paolo Abeni
@ 2025-09-17 12:12 ` Stefano Garzarella
2025-09-17 12:24 ` Stefano Garzarella
0 siblings, 1 reply; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:12 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:06:55PM +0200, Paolo Abeni wrote:
>The virtio specifications allows for up to 128 bits for the
>device features. Soon we are going to use some of the 'extended'
>bits features (bit 64 and above) for the virtio net driver.
>
>Represent the virtio features bitmask with a fixes size array, and
>introduce a few helpers to help manipulate them.
>
>Most drivers will keep using only 64 bits features space: use union
>to allow them access the lower part of the extended space without any
>per driver change.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
>v5 -> v6:
> - removed trailing EoL
>
>v4 -> v5:
> - DEFINE_PROP_FEATURE -> VIRTIO_DEFINE_PROP_FEATURE
>
>v3 -> v4:
> - VIRTIO_FEATURES_DWORDS -> VIRTIO_FEATURES_NU64S
> - VIRTIO_FEATURES_WORDS -> VIRTIO_FEATURES_NU32S
> - VIRTIO_DWORD -> VIRTIO_FEATURES_U64
> - VIRTIO_BIT -> VIRTIO_FEATURES_BIT
> - virtio_features_use_extended -> virtio_features_use_ex
> - move DEFINE_PROP_FEATURE definition here
>
>v2 -> v3:
> - fix preprocessor guard name
> - use BIT_ULL
> - add missing parentheses
> - use memcmp()
> - _is_empty() -> _empty()
> - _andnot() returns a bool, true if dst has any non zero bits
> - _array -> _ex
>
>v1 -> v2:
> - use a fixed size array for features instead of uint128
> - use union with u64 to reduce the needed code churn
>---
> include/hw/virtio/virtio-features.h | 126 ++++++++++++++++++++++++++++
> include/hw/virtio/virtio.h | 7 +-
> 2 files changed, 130 insertions(+), 3 deletions(-)
> create mode 100644 include/hw/virtio/virtio-features.h
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/include/hw/virtio/virtio-features.h b/include/hw/virtio/virtio-features.h
>new file mode 100644
>index 0000000000..e29b7fe48f
>--- /dev/null
>+++ b/include/hw/virtio/virtio-features.h
>@@ -0,0 +1,126 @@
>+/*
>+ * Virtio features helpers
>+ *
>+ * Copyright 2025 Red Hat, Inc.
>+ *
>+ * SPDX-License-Identifier: GPL-2.0-or-later
>+ */
>+
>+#ifndef QEMU_VIRTIO_FEATURES_H
>+#define QEMU_VIRTIO_FEATURES_H
>+
>+#include "qemu/bitops.h"
>+
>+#define VIRTIO_FEATURES_FMT "%016"PRIx64"%016"PRIx64
>+#define VIRTIO_FEATURES_PR(f) (f)[1], (f)[0]
>+
>+#define VIRTIO_FEATURES_MAX 128
>+#define VIRTIO_FEATURES_BIT(b) BIT_ULL((b) % 64)
>+#define VIRTIO_FEATURES_U64(b) ((b) / 64)
>+#define VIRTIO_FEATURES_NU32S (VIRTIO_FEATURES_MAX / 32)
>+#define VIRTIO_FEATURES_NU64S (VIRTIO_FEATURES_MAX / 64)
>+
>+#define VIRTIO_DECLARE_FEATURES(name) \
>+ union { \
>+ uint64_t name; \
>+ uint64_t name##_ex[VIRTIO_FEATURES_NU64S]; \
>+ }
>+
>+#define VIRTIO_DEFINE_PROP_FEATURE(_name, _state, _field, _bit, _defval) \
>+ DEFINE_PROP_BIT64(_name, _state, _field[VIRTIO_FEATURES_U64(_bit)], \
>+ (_bit) % 64, _defval)
>+
>+static inline void virtio_features_clear(uint64_t *features)
>+{
>+ memset(features, 0, sizeof(features[0]) * VIRTIO_FEATURES_NU64S);
>+}
>+
>+static inline void virtio_features_from_u64(uint64_t *features, uint64_t from)
>+{
>+ virtio_features_clear(features);
>+ features[0] = from;
>+}
>+
>+static inline bool virtio_has_feature_ex(const uint64_t *features,
>+ unsigned int fbit)
>+{
>+ assert(fbit < VIRTIO_FEATURES_MAX);
>+ return features[VIRTIO_FEATURES_U64(fbit)] & VIRTIO_FEATURES_BIT(fbit);
>+}
>+
>+static inline void virtio_add_feature_ex(uint64_t *features,
>+ unsigned int fbit)
>+{
>+ assert(fbit < VIRTIO_FEATURES_MAX);
>+ features[VIRTIO_FEATURES_U64(fbit)] |= VIRTIO_FEATURES_BIT(fbit);
>+}
>+
>+static inline void virtio_clear_feature_ex(uint64_t *features,
>+ unsigned int fbit)
>+{
>+ assert(fbit < VIRTIO_FEATURES_MAX);
>+ features[VIRTIO_FEATURES_U64(fbit)] &= ~VIRTIO_FEATURES_BIT(fbit);
>+}
>+
>+static inline bool virtio_features_equal(const uint64_t *f1,
>+ const uint64_t *f2)
>+{
>+ return !memcmp(f1, f2, sizeof(uint64_t) * VIRTIO_FEATURES_NU64S);
>+}
>+
>+static inline bool virtio_features_use_ex(const uint64_t *features)
>+{
>+ int i;
>+
>+ for (i = 1; i < VIRTIO_FEATURES_NU64S; ++i) {
>+ if (features[i]) {
>+ return true;
>+ }
>+ }
>+ return false;
>+}
>+
>+static inline bool virtio_features_empty(const uint64_t *features)
>+{
>+ return !virtio_features_use_ex(features) && !features[0];
>+}
>+
>+static inline void virtio_features_copy(uint64_t *to, const uint64_t *from)
>+{
>+ memcpy(to, from, sizeof(to[0]) * VIRTIO_FEATURES_NU64S);
>+}
>+
>+static inline bool virtio_features_andnot(uint64_t *to, const uint64_t *f1,
>+ const uint64_t *f2)
>+{
>+ uint64_t diff = 0;
>+ int i;
>+
>+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
>+ to[i] = f1[i] & ~f2[i];
>+ diff |= to[i];
>+ }
>+ return diff;
>+}
>+
>+static inline void virtio_features_and(uint64_t *to, const uint64_t *f1,
>+ const uint64_t *f2)
>+{
>+ int i;
>+
>+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
>+ to[i] = f1[i] & f2[i];
>+ }
>+}
>+
>+static inline void virtio_features_or(uint64_t *to, const uint64_t *f1,
>+ const uint64_t *f2)
>+{
>+ int i;
>+
>+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
>+ to[i] = f1[i] | f2[i];
>+ }
>+}
>+
>+#endif
>diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
>index c594764f23..39e4059a66 100644
>--- a/include/hw/virtio/virtio.h
>+++ b/include/hw/virtio/virtio.h
>@@ -16,6 +16,7 @@
>
> #include "system/memory.h"
> #include "hw/qdev-core.h"
>+#include "hw/virtio/virtio-features.h"
> #include "net/net.h"
> #include "migration/vmstate.h"
> #include "qemu/event_notifier.h"
>@@ -121,9 +122,9 @@ struct VirtIODevice
> * backend (e.g. vhost) and could potentially be a subset of the
> * total feature set offered by QEMU.
> */
>- uint64_t host_features;
>- uint64_t guest_features;
>- uint64_t backend_features;
>+ VIRTIO_DECLARE_FEATURES(host_features);
>+ VIRTIO_DECLARE_FEATURES(guest_features);
>+ VIRTIO_DECLARE_FEATURES(backend_features);
>
> size_t config_len;
> void *config;
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v6 04/14] virtio: introduce extended features type
2025-09-17 12:12 ` Stefano Garzarella
@ 2025-09-17 12:24 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:24 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Wed, 17 Sept 2025 at 14:12, Stefano Garzarella <sgarzare@redhat.com> wrote:
>
> On Fri, Sep 12, 2025 at 03:06:55PM +0200, Paolo Abeni wrote:
> >The virtio specifications allows for up to 128 bits for the
> >device features. Soon we are going to use some of the 'extended'
> >bits features (bit 64 and above) for the virtio net driver.
> >
> >Represent the virtio features bitmask with a fixes size array, and
s/fixes/fixed
But again, my A-b remains, we can fix only if there will be a v7.
Stefano
> >introduce a few helpers to help manipulate them.
> >
> >Most drivers will keep using only 64 bits features space: use union
> >to allow them access the lower part of the extended space without any
> >per driver change.
> >
> >Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> >Acked-by: Jason Wang <jasowang@redhat.com>
> >Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> >---
> >v5 -> v6:
> > - removed trailing EoL
> >
> >v4 -> v5:
> > - DEFINE_PROP_FEATURE -> VIRTIO_DEFINE_PROP_FEATURE
> >
> >v3 -> v4:
> > - VIRTIO_FEATURES_DWORDS -> VIRTIO_FEATURES_NU64S
> > - VIRTIO_FEATURES_WORDS -> VIRTIO_FEATURES_NU32S
> > - VIRTIO_DWORD -> VIRTIO_FEATURES_U64
> > - VIRTIO_BIT -> VIRTIO_FEATURES_BIT
> > - virtio_features_use_extended -> virtio_features_use_ex
> > - move DEFINE_PROP_FEATURE definition here
> >
> >v2 -> v3:
> > - fix preprocessor guard name
> > - use BIT_ULL
> > - add missing parentheses
> > - use memcmp()
> > - _is_empty() -> _empty()
> > - _andnot() returns a bool, true if dst has any non zero bits
> > - _array -> _ex
> >
> >v1 -> v2:
> > - use a fixed size array for features instead of uint128
> > - use union with u64 to reduce the needed code churn
> >---
> > include/hw/virtio/virtio-features.h | 126 ++++++++++++++++++++++++++++
> > include/hw/virtio/virtio.h | 7 +-
> > 2 files changed, 130 insertions(+), 3 deletions(-)
> > create mode 100644 include/hw/virtio/virtio-features.h
>
> Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
> >
> >diff --git a/include/hw/virtio/virtio-features.h b/include/hw/virtio/virtio-features.h
> >new file mode 100644
> >index 0000000000..e29b7fe48f
> >--- /dev/null
> >+++ b/include/hw/virtio/virtio-features.h
> >@@ -0,0 +1,126 @@
> >+/*
> >+ * Virtio features helpers
> >+ *
> >+ * Copyright 2025 Red Hat, Inc.
> >+ *
> >+ * SPDX-License-Identifier: GPL-2.0-or-later
> >+ */
> >+
> >+#ifndef QEMU_VIRTIO_FEATURES_H
> >+#define QEMU_VIRTIO_FEATURES_H
> >+
> >+#include "qemu/bitops.h"
> >+
> >+#define VIRTIO_FEATURES_FMT "%016"PRIx64"%016"PRIx64
> >+#define VIRTIO_FEATURES_PR(f) (f)[1], (f)[0]
> >+
> >+#define VIRTIO_FEATURES_MAX 128
> >+#define VIRTIO_FEATURES_BIT(b) BIT_ULL((b) % 64)
> >+#define VIRTIO_FEATURES_U64(b) ((b) / 64)
> >+#define VIRTIO_FEATURES_NU32S (VIRTIO_FEATURES_MAX / 32)
> >+#define VIRTIO_FEATURES_NU64S (VIRTIO_FEATURES_MAX / 64)
> >+
> >+#define VIRTIO_DECLARE_FEATURES(name) \
> >+ union { \
> >+ uint64_t name; \
> >+ uint64_t name##_ex[VIRTIO_FEATURES_NU64S]; \
> >+ }
> >+
> >+#define VIRTIO_DEFINE_PROP_FEATURE(_name, _state, _field, _bit, _defval) \
> >+ DEFINE_PROP_BIT64(_name, _state, _field[VIRTIO_FEATURES_U64(_bit)], \
> >+ (_bit) % 64, _defval)
> >+
> >+static inline void virtio_features_clear(uint64_t *features)
> >+{
> >+ memset(features, 0, sizeof(features[0]) * VIRTIO_FEATURES_NU64S);
> >+}
> >+
> >+static inline void virtio_features_from_u64(uint64_t *features, uint64_t from)
> >+{
> >+ virtio_features_clear(features);
> >+ features[0] = from;
> >+}
> >+
> >+static inline bool virtio_has_feature_ex(const uint64_t *features,
> >+ unsigned int fbit)
> >+{
> >+ assert(fbit < VIRTIO_FEATURES_MAX);
> >+ return features[VIRTIO_FEATURES_U64(fbit)] & VIRTIO_FEATURES_BIT(fbit);
> >+}
> >+
> >+static inline void virtio_add_feature_ex(uint64_t *features,
> >+ unsigned int fbit)
> >+{
> >+ assert(fbit < VIRTIO_FEATURES_MAX);
> >+ features[VIRTIO_FEATURES_U64(fbit)] |= VIRTIO_FEATURES_BIT(fbit);
> >+}
> >+
> >+static inline void virtio_clear_feature_ex(uint64_t *features,
> >+ unsigned int fbit)
> >+{
> >+ assert(fbit < VIRTIO_FEATURES_MAX);
> >+ features[VIRTIO_FEATURES_U64(fbit)] &= ~VIRTIO_FEATURES_BIT(fbit);
> >+}
> >+
> >+static inline bool virtio_features_equal(const uint64_t *f1,
> >+ const uint64_t *f2)
> >+{
> >+ return !memcmp(f1, f2, sizeof(uint64_t) * VIRTIO_FEATURES_NU64S);
> >+}
> >+
> >+static inline bool virtio_features_use_ex(const uint64_t *features)
> >+{
> >+ int i;
> >+
> >+ for (i = 1; i < VIRTIO_FEATURES_NU64S; ++i) {
> >+ if (features[i]) {
> >+ return true;
> >+ }
> >+ }
> >+ return false;
> >+}
> >+
> >+static inline bool virtio_features_empty(const uint64_t *features)
> >+{
> >+ return !virtio_features_use_ex(features) && !features[0];
> >+}
> >+
> >+static inline void virtio_features_copy(uint64_t *to, const uint64_t *from)
> >+{
> >+ memcpy(to, from, sizeof(to[0]) * VIRTIO_FEATURES_NU64S);
> >+}
> >+
> >+static inline bool virtio_features_andnot(uint64_t *to, const uint64_t *f1,
> >+ const uint64_t *f2)
> >+{
> >+ uint64_t diff = 0;
> >+ int i;
> >+
> >+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
> >+ to[i] = f1[i] & ~f2[i];
> >+ diff |= to[i];
> >+ }
> >+ return diff;
> >+}
> >+
> >+static inline void virtio_features_and(uint64_t *to, const uint64_t *f1,
> >+ const uint64_t *f2)
> >+{
> >+ int i;
> >+
> >+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
> >+ to[i] = f1[i] & f2[i];
> >+ }
> >+}
> >+
> >+static inline void virtio_features_or(uint64_t *to, const uint64_t *f1,
> >+ const uint64_t *f2)
> >+{
> >+ int i;
> >+
> >+ for (i = 0; i < VIRTIO_FEATURES_NU64S; i++) {
> >+ to[i] = f1[i] | f2[i];
> >+ }
> >+}
> >+
> >+#endif
> >diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> >index c594764f23..39e4059a66 100644
> >--- a/include/hw/virtio/virtio.h
> >+++ b/include/hw/virtio/virtio.h
> >@@ -16,6 +16,7 @@
> >
> > #include "system/memory.h"
> > #include "hw/qdev-core.h"
> >+#include "hw/virtio/virtio-features.h"
> > #include "net/net.h"
> > #include "migration/vmstate.h"
> > #include "qemu/event_notifier.h"
> >@@ -121,9 +122,9 @@ struct VirtIODevice
> > * backend (e.g. vhost) and could potentially be a subset of the
> > * total feature set offered by QEMU.
> > */
> >- uint64_t host_features;
> >- uint64_t guest_features;
> >- uint64_t backend_features;
> >+ VIRTIO_DECLARE_FEATURES(host_features);
> >+ VIRTIO_DECLARE_FEATURES(guest_features);
> >+ VIRTIO_DECLARE_FEATURES(backend_features);
> >
> > size_t config_len;
> > void *config;
> >--
> >2.51.0
> >
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 05/14] virtio: serialize extended features state
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (3 preceding siblings ...)
2025-09-12 13:06 ` [PATCH v6 04/14] virtio: introduce extended features type Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-17 12:13 ` Stefano Garzarella
2025-09-12 13:06 ` [PATCH v6 06/14] virtio: add support for negotiating extended features Paolo Abeni
` (9 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
If the driver uses any of the extended features (i.e. 64 or above),
store the extended features range (64-127 bits).
At load time, let legacy features initialize the full features range
and pass it to the set helper; sub-states loading will have filled-up
the extended part as needed.
This is one of the few spots that need explicitly to know and set
in stone the extended features array size; add a build bug to prevent
breaking the migration should such size change again in the future:
more serialization plumbing will be needed.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v3 -> v4:
- move the build bug before vmstate_virtio
- use new virtio_features macro names
v2 -> v3:
- 128bit_features state load/stores only the high bits
- consolidate the load implementation to use a single set
helper for 128/64/32 bits features
- _array -> _ex
v1 -> v2:
- uint128_t -> u64[2]
---
hw/virtio/virtio.c | 88 ++++++++++++++++++++++++++++++----------------
1 file changed, 57 insertions(+), 31 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 9a81ad912e..bf53c211e5 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2964,6 +2964,30 @@ static const VMStateDescription vmstate_virtio_disabled = {
}
};
+static bool virtio_128bit_features_needed(void *opaque)
+{
+ VirtIODevice *vdev = opaque;
+
+ return virtio_features_use_ex(vdev->host_features_ex);
+}
+
+static const VMStateDescription vmstate_virtio_128bit_features = {
+ .name = "virtio/128bit_features",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = &virtio_128bit_features_needed,
+ .fields = (const VMStateField[]) {
+ VMSTATE_UINT64(guest_features_ex[1], VirtIODevice),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+/*
+ * Avoid silently breaking migration should the feature space increase
+ * even more in the (far away) future
+ */
+QEMU_BUILD_BUG_ON(VIRTIO_FEATURES_NU64S != 2);
+
static const VMStateDescription vmstate_virtio = {
.name = "virtio",
.version_id = 1,
@@ -2973,6 +2997,7 @@ static const VMStateDescription vmstate_virtio = {
},
.subsections = (const VMStateDescription * const []) {
&vmstate_virtio_device_endian,
+ &vmstate_virtio_128bit_features,
&vmstate_virtio_64bit_features,
&vmstate_virtio_virtqueues,
&vmstate_virtio_ringsize,
@@ -3069,23 +3094,28 @@ const VMStateInfo virtio_vmstate_info = {
.put = virtio_device_put,
};
-static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val)
+static int virtio_set_features_nocheck(VirtIODevice *vdev, const uint64_t *val)
{
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
- bool bad = (val & ~(vdev->host_features)) != 0;
+ uint64_t tmp[VIRTIO_FEATURES_NU64S];
+ bool bad;
+
+ bad = virtio_features_andnot(tmp, val, vdev->host_features_ex);
+ virtio_features_and(tmp, val, vdev->host_features_ex);
- val &= vdev->host_features;
if (k->set_features) {
- k->set_features(vdev, val);
+ bad = bad || virtio_features_use_ex(tmp);
+ k->set_features(vdev, tmp[0]);
}
- vdev->guest_features = val;
+
+ virtio_features_copy(vdev->guest_features_ex, tmp);
return bad ? -1 : 0;
}
typedef struct VirtioSetFeaturesNocheckData {
Coroutine *co;
VirtIODevice *vdev;
- uint64_t val;
+ uint64_t val[VIRTIO_FEATURES_NU64S];
int ret;
} VirtioSetFeaturesNocheckData;
@@ -3098,14 +3128,15 @@ static void virtio_set_features_nocheck_bh(void *opaque)
}
static int coroutine_mixed_fn
-virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev, uint64_t val)
+virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev,
+ const uint64_t *val)
{
if (qemu_in_coroutine()) {
VirtioSetFeaturesNocheckData data = {
.co = qemu_coroutine_self(),
.vdev = vdev,
- .val = val,
};
+ virtio_features_copy(data.val, val);
aio_bh_schedule_oneshot(qemu_get_current_aio_context(),
virtio_set_features_nocheck_bh, &data);
qemu_coroutine_yield();
@@ -3117,6 +3148,7 @@ virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev, uint64_t val)
int virtio_set_features(VirtIODevice *vdev, uint64_t val)
{
+ uint64_t features[VIRTIO_FEATURES_NU64S];
int ret;
/*
* The driver must not attempt to set features after feature negotiation
@@ -3132,7 +3164,8 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
__func__, vdev->name);
}
- ret = virtio_set_features_nocheck(vdev, val);
+ virtio_features_from_u64(features, val);
+ ret = virtio_set_features_nocheck(vdev, features);
if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
/* VIRTIO_RING_F_EVENT_IDX changes the size of the caches. */
int i;
@@ -3155,6 +3188,7 @@ void virtio_reset(void *opaque)
{
VirtIODevice *vdev = opaque;
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
+ uint64_t features[VIRTIO_FEATURES_NU64S];
int i;
virtio_set_status(vdev, 0);
@@ -3181,7 +3215,8 @@ void virtio_reset(void *opaque)
vdev->start_on_kick = false;
vdev->started = false;
vdev->broken = false;
- virtio_set_features_nocheck(vdev, 0);
+ virtio_features_clear(features);
+ virtio_set_features_nocheck(vdev, features);
vdev->queue_sel = 0;
vdev->status = 0;
vdev->disabled = false;
@@ -3264,7 +3299,7 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
* Note: devices should always test host features in future - don't create
* new dependencies like this.
*/
- vdev->guest_features = features;
+ virtio_features_from_u64(vdev->guest_features_ex, features);
config_len = qemu_get_be32(f);
@@ -3343,26 +3378,17 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
vdev->device_endian = virtio_default_endian();
}
- if (virtio_64bit_features_needed(vdev)) {
- /*
- * Subsection load filled vdev->guest_features. Run them
- * through virtio_set_features to sanity-check them against
- * host_features.
- */
- uint64_t features64 = vdev->guest_features;
- if (virtio_set_features_nocheck_maybe_co(vdev, features64) < 0) {
- error_report("Features 0x%" PRIx64 " unsupported. "
- "Allowed features: 0x%" PRIx64,
- features64, vdev->host_features);
- return -1;
- }
- } else {
- if (virtio_set_features_nocheck_maybe_co(vdev, features) < 0) {
- error_report("Features 0x%x unsupported. "
- "Allowed features: 0x%" PRIx64,
- features, vdev->host_features);
- return -1;
- }
+ /*
+ * guest_features_ex is fully initialized with u32 features and upper
+ * bits have been filled as needed by the later load.
+ */
+ if (virtio_set_features_nocheck_maybe_co(vdev,
+ vdev->guest_features_ex) < 0) {
+ error_report("Features 0x" VIRTIO_FEATURES_FMT " unsupported. "
+ "Allowed features: 0x" VIRTIO_FEATURES_FMT,
+ VIRTIO_FEATURES_PR(vdev->guest_features_ex),
+ VIRTIO_FEATURES_PR(vdev->host_features_ex));
+ return -1;
}
if (!virtio_device_started(vdev, vdev->status) &&
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 05/14] virtio: serialize extended features state
2025-09-12 13:06 ` [PATCH v6 05/14] virtio: serialize extended features state Paolo Abeni
@ 2025-09-17 12:13 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:13 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:06:56PM +0200, Paolo Abeni wrote:
>If the driver uses any of the extended features (i.e. 64 or above),
>store the extended features range (64-127 bits).
>
>At load time, let legacy features initialize the full features range
>and pass it to the set helper; sub-states loading will have filled-up
>the extended part as needed.
>
>This is one of the few spots that need explicitly to know and set
>in stone the extended features array size; add a build bug to prevent
>breaking the migration should such size change again in the future:
>more serialization plumbing will be needed.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
>v3 -> v4:
> - move the build bug before vmstate_virtio
> - use new virtio_features macro names
>
>v2 -> v3:
> - 128bit_features state load/stores only the high bits
> - consolidate the load implementation to use a single set
> helper for 128/64/32 bits features
> - _array -> _ex
>
>v1 -> v2:
> - uint128_t -> u64[2]
>---
> hw/virtio/virtio.c | 88 ++++++++++++++++++++++++++++++----------------
> 1 file changed, 57 insertions(+), 31 deletions(-)
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
>index 9a81ad912e..bf53c211e5 100644
>--- a/hw/virtio/virtio.c
>+++ b/hw/virtio/virtio.c
>@@ -2964,6 +2964,30 @@ static const VMStateDescription vmstate_virtio_disabled = {
> }
> };
>
>+static bool virtio_128bit_features_needed(void *opaque)
>+{
>+ VirtIODevice *vdev = opaque;
>+
>+ return virtio_features_use_ex(vdev->host_features_ex);
>+}
>+
>+static const VMStateDescription vmstate_virtio_128bit_features = {
>+ .name = "virtio/128bit_features",
>+ .version_id = 1,
>+ .minimum_version_id = 1,
>+ .needed = &virtio_128bit_features_needed,
>+ .fields = (const VMStateField[]) {
>+ VMSTATE_UINT64(guest_features_ex[1], VirtIODevice),
>+ VMSTATE_END_OF_LIST()
>+ }
>+};
>+
>+/*
>+ * Avoid silently breaking migration should the feature space increase
>+ * even more in the (far away) future
>+ */
>+QEMU_BUILD_BUG_ON(VIRTIO_FEATURES_NU64S != 2);
>+
> static const VMStateDescription vmstate_virtio = {
> .name = "virtio",
> .version_id = 1,
>@@ -2973,6 +2997,7 @@ static const VMStateDescription vmstate_virtio = {
> },
> .subsections = (const VMStateDescription * const []) {
> &vmstate_virtio_device_endian,
>+ &vmstate_virtio_128bit_features,
> &vmstate_virtio_64bit_features,
> &vmstate_virtio_virtqueues,
> &vmstate_virtio_ringsize,
>@@ -3069,23 +3094,28 @@ const VMStateInfo virtio_vmstate_info = {
> .put = virtio_device_put,
> };
>
>-static int virtio_set_features_nocheck(VirtIODevice *vdev, uint64_t val)
>+static int virtio_set_features_nocheck(VirtIODevice *vdev, const uint64_t *val)
> {
> VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
>- bool bad = (val & ~(vdev->host_features)) != 0;
>+ uint64_t tmp[VIRTIO_FEATURES_NU64S];
>+ bool bad;
>+
>+ bad = virtio_features_andnot(tmp, val, vdev->host_features_ex);
>+ virtio_features_and(tmp, val, vdev->host_features_ex);
>
>- val &= vdev->host_features;
> if (k->set_features) {
>- k->set_features(vdev, val);
>+ bad = bad || virtio_features_use_ex(tmp);
>+ k->set_features(vdev, tmp[0]);
> }
>- vdev->guest_features = val;
>+
>+ virtio_features_copy(vdev->guest_features_ex, tmp);
> return bad ? -1 : 0;
> }
>
> typedef struct VirtioSetFeaturesNocheckData {
> Coroutine *co;
> VirtIODevice *vdev;
>- uint64_t val;
>+ uint64_t val[VIRTIO_FEATURES_NU64S];
> int ret;
> } VirtioSetFeaturesNocheckData;
>
>@@ -3098,14 +3128,15 @@ static void virtio_set_features_nocheck_bh(void *opaque)
> }
>
> static int coroutine_mixed_fn
>-virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev, uint64_t val)
>+virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev,
>+ const uint64_t *val)
> {
> if (qemu_in_coroutine()) {
> VirtioSetFeaturesNocheckData data = {
> .co = qemu_coroutine_self(),
> .vdev = vdev,
>- .val = val,
> };
>+ virtio_features_copy(data.val, val);
> aio_bh_schedule_oneshot(qemu_get_current_aio_context(),
> virtio_set_features_nocheck_bh, &data);
> qemu_coroutine_yield();
>@@ -3117,6 +3148,7 @@ virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev, uint64_t val)
>
> int virtio_set_features(VirtIODevice *vdev, uint64_t val)
> {
>+ uint64_t features[VIRTIO_FEATURES_NU64S];
> int ret;
> /*
> * The driver must not attempt to set features after feature negotiation
>@@ -3132,7 +3164,8 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
> __func__, vdev->name);
> }
>
>- ret = virtio_set_features_nocheck(vdev, val);
>+ virtio_features_from_u64(features, val);
>+ ret = virtio_set_features_nocheck(vdev, features);
> if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
> /* VIRTIO_RING_F_EVENT_IDX changes the size of the caches. */
> int i;
>@@ -3155,6 +3188,7 @@ void virtio_reset(void *opaque)
> {
> VirtIODevice *vdev = opaque;
> VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
>+ uint64_t features[VIRTIO_FEATURES_NU64S];
> int i;
>
> virtio_set_status(vdev, 0);
>@@ -3181,7 +3215,8 @@ void virtio_reset(void *opaque)
> vdev->start_on_kick = false;
> vdev->started = false;
> vdev->broken = false;
>- virtio_set_features_nocheck(vdev, 0);
>+ virtio_features_clear(features);
>+ virtio_set_features_nocheck(vdev, features);
> vdev->queue_sel = 0;
> vdev->status = 0;
> vdev->disabled = false;
>@@ -3264,7 +3299,7 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
> * Note: devices should always test host features in future - don't create
> * new dependencies like this.
> */
>- vdev->guest_features = features;
>+ virtio_features_from_u64(vdev->guest_features_ex, features);
>
> config_len = qemu_get_be32(f);
>
>@@ -3343,26 +3378,17 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id)
> vdev->device_endian = virtio_default_endian();
> }
>
>- if (virtio_64bit_features_needed(vdev)) {
>- /*
>- * Subsection load filled vdev->guest_features. Run them
>- * through virtio_set_features to sanity-check them against
>- * host_features.
>- */
>- uint64_t features64 = vdev->guest_features;
>- if (virtio_set_features_nocheck_maybe_co(vdev, features64) < 0) {
>- error_report("Features 0x%" PRIx64 " unsupported. "
>- "Allowed features: 0x%" PRIx64,
>- features64, vdev->host_features);
>- return -1;
>- }
>- } else {
>- if (virtio_set_features_nocheck_maybe_co(vdev, features) < 0) {
>- error_report("Features 0x%x unsupported. "
>- "Allowed features: 0x%" PRIx64,
>- features, vdev->host_features);
>- return -1;
>- }
>+ /*
>+ * guest_features_ex is fully initialized with u32 features and upper
>+ * bits have been filled as needed by the later load.
>+ */
>+ if (virtio_set_features_nocheck_maybe_co(vdev,
>+ vdev->guest_features_ex) < 0) {
>+ error_report("Features 0x" VIRTIO_FEATURES_FMT " unsupported. "
>+ "Allowed features: 0x" VIRTIO_FEATURES_FMT,
>+ VIRTIO_FEATURES_PR(vdev->guest_features_ex),
>+ VIRTIO_FEATURES_PR(vdev->host_features_ex));
>+ return -1;
> }
>
> if (!virtio_device_started(vdev, vdev->status) &&
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 06/14] virtio: add support for negotiating extended features
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (4 preceding siblings ...)
2025-09-12 13:06 ` [PATCH v6 05/14] virtio: serialize extended features state Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-17 12:19 ` Stefano Garzarella
2025-09-12 13:06 ` [PATCH v6 07/14] virtio-pci: implement support for " Paolo Abeni
` (8 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
The virtio specifications allows for up to 128 bits for the
device features. Soon we are going to use some of the 'extended'
bits features for the virtio net driver.
Add support to allow extended features negotiation on a per
devices basis. Devices willing to negotiated extended features
need to implemented a new pair of features getter/setter, the
core will conditionally use them instead of the basic one.
Note that 'bad_features' don't need to be extended, as they are
bound to the 64 bits limit.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- reordered virtio_set_features{_ex}() definitions
v3 -> v4:
- use new virtio_features macro names
v2 -> v3:
- _array -> _ex
v1 -> v2:
- uint128_t -> uint64_t[]
---
hw/virtio/virtio-bus.c | 11 ++++++++---
hw/virtio/virtio.c | 14 +++++++++++---
include/hw/virtio/virtio.h | 4 ++++
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 11adfbf3ab..cef944e015 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -62,9 +62,14 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
}
/* Get the features of the plugged device. */
- assert(vdc->get_features != NULL);
- vdev->host_features = vdc->get_features(vdev, vdev->host_features,
- &local_err);
+ if (vdc->get_features_ex) {
+ vdc->get_features_ex(vdev, vdev->host_features_ex, &local_err);
+ } else {
+ assert(vdc->get_features != NULL);
+ virtio_features_from_u64(vdev->host_features_ex,
+ vdc->get_features(vdev, vdev->host_features,
+ &local_err));
+ }
if (local_err) {
error_propagate(errp, local_err);
return;
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index bf53c211e5..34f977a3c9 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -3103,7 +3103,9 @@ static int virtio_set_features_nocheck(VirtIODevice *vdev, const uint64_t *val)
bad = virtio_features_andnot(tmp, val, vdev->host_features_ex);
virtio_features_and(tmp, val, vdev->host_features_ex);
- if (k->set_features) {
+ if (k->set_features_ex) {
+ k->set_features_ex(vdev, val);
+ } else if (k->set_features) {
bad = bad || virtio_features_use_ex(tmp);
k->set_features(vdev, tmp[0]);
}
@@ -3149,6 +3151,13 @@ virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev,
int virtio_set_features(VirtIODevice *vdev, uint64_t val)
{
uint64_t features[VIRTIO_FEATURES_NU64S];
+
+ virtio_features_from_u64(features, val);
+ return virtio_set_features_ex(vdev, features);
+}
+
+int virtio_set_features_ex(VirtIODevice *vdev, const uint64_t *features)
+{
int ret;
/*
* The driver must not attempt to set features after feature negotiation
@@ -3158,13 +3167,12 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
return -EINVAL;
}
- if (val & (1ull << VIRTIO_F_BAD_FEATURE)) {
+ if (features[0] & (1ull << VIRTIO_F_BAD_FEATURE)) {
qemu_log_mask(LOG_GUEST_ERROR,
"%s: guest driver for %s has enabled UNUSED(30) feature bit!\n",
__func__, vdev->name);
}
- virtio_features_from_u64(features, val);
ret = virtio_set_features_nocheck(vdev, features);
if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
/* VIRTIO_RING_F_EVENT_IDX changes the size of the caches. */
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 39e4059a66..2aeb021fb3 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -178,6 +178,9 @@ struct VirtioDeviceClass {
/* This is what a VirtioDevice must implement */
DeviceRealize realize;
DeviceUnrealize unrealize;
+ void (*get_features_ex)(VirtIODevice *vdev, uint64_t *requested_features,
+ Error **errp);
+ void (*set_features_ex)(VirtIODevice *vdev, const uint64_t *val);
uint64_t (*get_features)(VirtIODevice *vdev,
uint64_t requested_features,
Error **errp);
@@ -373,6 +376,7 @@ void virtio_queue_reset(VirtIODevice *vdev, uint32_t queue_index);
void virtio_queue_enable(VirtIODevice *vdev, uint32_t queue_index);
void virtio_update_irq(VirtIODevice *vdev);
int virtio_set_features(VirtIODevice *vdev, uint64_t val);
+int virtio_set_features_ex(VirtIODevice *vdev, const uint64_t *val);
/* Base devices. */
typedef struct VirtIOBlkConf VirtIOBlkConf;
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 06/14] virtio: add support for negotiating extended features
2025-09-12 13:06 ` [PATCH v6 06/14] virtio: add support for negotiating extended features Paolo Abeni
@ 2025-09-17 12:19 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:19 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:06:57PM +0200, Paolo Abeni wrote:
>The virtio specifications allows for up to 128 bits for the
I'm not really sure about this, IIUC the spec doesn't set any upper
limit. From
https://docs.oasis-open.org/virtio/virtio/v1.3/csd01/virtio-v1.3-csd01.html#x1-140002
2.2 Feature Bits
...
42 to 49, and 128 and above
Feature bits reserved for future extensions.
BTW I don't think that's a valid reason to re-post this series. Let's
only fix it if we have to re-send it for other reason.
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>device features. Soon we are going to use some of the 'extended'
>bits features for the virtio net driver.
>
>Add support to allow extended features negotiation on a per
>devices basis. Devices willing to negotiated extended features
>need to implemented a new pair of features getter/setter, the
>core will conditionally use them instead of the basic one.
>
>Note that 'bad_features' don't need to be extended, as they are
>bound to the 64 bits limit.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
>v4 -> v5:
> - reordered virtio_set_features{_ex}() definitions
>
>v3 -> v4:
> - use new virtio_features macro names
>
>v2 -> v3:
> - _array -> _ex
>
>v1 -> v2:
> - uint128_t -> uint64_t[]
>---
> hw/virtio/virtio-bus.c | 11 ++++++++---
> hw/virtio/virtio.c | 14 +++++++++++---
> include/hw/virtio/virtio.h | 4 ++++
> 3 files changed, 23 insertions(+), 6 deletions(-)
>
>diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
>index 11adfbf3ab..cef944e015 100644
>--- a/hw/virtio/virtio-bus.c
>+++ b/hw/virtio/virtio-bus.c
>@@ -62,9 +62,14 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
> }
>
> /* Get the features of the plugged device. */
>- assert(vdc->get_features != NULL);
>- vdev->host_features = vdc->get_features(vdev, vdev->host_features,
>- &local_err);
>+ if (vdc->get_features_ex) {
>+ vdc->get_features_ex(vdev, vdev->host_features_ex, &local_err);
>+ } else {
>+ assert(vdc->get_features != NULL);
>+ virtio_features_from_u64(vdev->host_features_ex,
>+ vdc->get_features(vdev, vdev->host_features,
>+ &local_err));
>+ }
> if (local_err) {
> error_propagate(errp, local_err);
> return;
>diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
>index bf53c211e5..34f977a3c9 100644
>--- a/hw/virtio/virtio.c
>+++ b/hw/virtio/virtio.c
>@@ -3103,7 +3103,9 @@ static int virtio_set_features_nocheck(VirtIODevice *vdev, const uint64_t *val)
> bad = virtio_features_andnot(tmp, val, vdev->host_features_ex);
> virtio_features_and(tmp, val, vdev->host_features_ex);
>
>- if (k->set_features) {
>+ if (k->set_features_ex) {
>+ k->set_features_ex(vdev, val);
>+ } else if (k->set_features) {
> bad = bad || virtio_features_use_ex(tmp);
> k->set_features(vdev, tmp[0]);
> }
>@@ -3149,6 +3151,13 @@ virtio_set_features_nocheck_maybe_co(VirtIODevice *vdev,
> int virtio_set_features(VirtIODevice *vdev, uint64_t val)
> {
> uint64_t features[VIRTIO_FEATURES_NU64S];
>+
>+ virtio_features_from_u64(features, val);
>+ return virtio_set_features_ex(vdev, features);
>+}
>+
>+int virtio_set_features_ex(VirtIODevice *vdev, const uint64_t *features)
>+{
> int ret;
> /*
> * The driver must not attempt to set features after feature negotiation
>@@ -3158,13 +3167,12 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
> return -EINVAL;
> }
>
>- if (val & (1ull << VIRTIO_F_BAD_FEATURE)) {
>+ if (features[0] & (1ull << VIRTIO_F_BAD_FEATURE)) {
> qemu_log_mask(LOG_GUEST_ERROR,
> "%s: guest driver for %s has enabled UNUSED(30) feature bit!\n",
> __func__, vdev->name);
> }
>
>- virtio_features_from_u64(features, val);
> ret = virtio_set_features_nocheck(vdev, features);
> if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
> /* VIRTIO_RING_F_EVENT_IDX changes the size of the caches. */
>diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
>index 39e4059a66..2aeb021fb3 100644
>--- a/include/hw/virtio/virtio.h
>+++ b/include/hw/virtio/virtio.h
>@@ -178,6 +178,9 @@ struct VirtioDeviceClass {
> /* This is what a VirtioDevice must implement */
> DeviceRealize realize;
> DeviceUnrealize unrealize;
>+ void (*get_features_ex)(VirtIODevice *vdev, uint64_t *requested_features,
>+ Error **errp);
>+ void (*set_features_ex)(VirtIODevice *vdev, const uint64_t *val);
> uint64_t (*get_features)(VirtIODevice *vdev,
> uint64_t requested_features,
> Error **errp);
>@@ -373,6 +376,7 @@ void virtio_queue_reset(VirtIODevice *vdev, uint32_t queue_index);
> void virtio_queue_enable(VirtIODevice *vdev, uint32_t queue_index);
> void virtio_update_irq(VirtIODevice *vdev);
> int virtio_set_features(VirtIODevice *vdev, uint64_t val);
>+int virtio_set_features_ex(VirtIODevice *vdev, const uint64_t *val);
>
> /* Base devices. */
> typedef struct VirtIOBlkConf VirtIOBlkConf;
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 07/14] virtio-pci: implement support for extended features
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (5 preceding siblings ...)
2025-09-12 13:06 ` [PATCH v6 06/14] virtio: add support for negotiating extended features Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-17 12:25 ` Stefano Garzarella
2025-09-12 13:06 ` [PATCH v6 08/14] vhost: add support for negotiating " Paolo Abeni
` (7 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Extend the features configuration space to 128 bits. If the virtio
device supports any extended features, allow the common read/write
operation to access all of it, otherwise keep exposing only the
lower 64 bits.
On migration, save the 128 bit version of the features only if the
upper bits are non zero. Relay on reset to clear all the feature
space before load.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v5 -> v6:
- fixed checkpatch error (missing brackets on a single line statement)
v4 -> v5:
- add blank line after QEMU_BUILD_BUG_ON()
- make virtio_pci_select_max() robust vs future feature space increase
v3 -> v4:
- use new virtio_features macro names
- move the build bug before vmstate_virtio_pci_modern_state_sub
v2 -> v3:
- drop the pre_load/post_load trickery and relay on reset zeroing
the features instead.
- avoid union usage, just increase guest_features size and use
SUB_ARRAY.
- drop unneeded '!!'
- _array -> _ex
v1 -> v2:
- use separate VMStateDescription and pre/post load to avoid breaking
migration
- clear proxy features on device reset
---
hw/virtio/virtio-pci.c | 76 ++++++++++++++++++++++++++++++----
include/hw/virtio/virtio-pci.h | 2 +-
2 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 767216d795..01e4fecaf4 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -109,6 +109,29 @@ static const VMStateDescription vmstate_virtio_pci_modern_queue_state = {
}
};
+static bool virtio_pci_modern_state_features128_needed(void *opaque)
+{
+ VirtIOPCIProxy *proxy = opaque;
+ uint32_t features = 0;
+ int i;
+
+ for (i = 2; i < ARRAY_SIZE(proxy->guest_features); ++i) {
+ features |= proxy->guest_features[i];
+ }
+ return features;
+}
+
+static const VMStateDescription vmstate_virtio_pci_modern_state_features128 = {
+ .name = "virtio_pci/modern_state/features128",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = &virtio_pci_modern_state_features128_needed,
+ .fields = (const VMStateField[]) {
+ VMSTATE_UINT32_SUB_ARRAY(guest_features, VirtIOPCIProxy, 2, 2),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static bool virtio_pci_modern_state_needed(void *opaque)
{
VirtIOPCIProxy *proxy = opaque;
@@ -116,6 +139,12 @@ static bool virtio_pci_modern_state_needed(void *opaque)
return virtio_pci_modern(proxy);
}
+/*
+ * Avoid silently breaking migration should the feature space increase
+ * even more in the (far away) future
+ */
+QEMU_BUILD_BUG_ON(VIRTIO_FEATURES_NU32S != 4);
+
static const VMStateDescription vmstate_virtio_pci_modern_state_sub = {
.name = "virtio_pci/modern_state",
.version_id = 1,
@@ -124,11 +153,15 @@ static const VMStateDescription vmstate_virtio_pci_modern_state_sub = {
.fields = (const VMStateField[]) {
VMSTATE_UINT32(dfselect, VirtIOPCIProxy),
VMSTATE_UINT32(gfselect, VirtIOPCIProxy),
- VMSTATE_UINT32_ARRAY(guest_features, VirtIOPCIProxy, 2),
+ VMSTATE_UINT32_SUB_ARRAY(guest_features, VirtIOPCIProxy, 0, 2),
VMSTATE_STRUCT_ARRAY(vqs, VirtIOPCIProxy, VIRTIO_QUEUE_MAX, 0,
vmstate_virtio_pci_modern_queue_state,
VirtIOPCIQueue),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (const VMStateDescription * const []) {
+ &vmstate_virtio_pci_modern_state_features128,
+ NULL
}
};
@@ -1477,6 +1510,19 @@ int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
return virtio_pci_add_mem_cap(proxy, &cap.cap);
}
+static int virtio_pci_select_max(const VirtIODevice *vdev)
+{
+ int i;
+
+ for (i = VIRTIO_FEATURES_NU64S - 1; i > 0; i--) {
+ if (vdev->host_features_ex[i]) {
+ return (i + 1) * 2;
+ }
+ }
+
+ return 2;
+}
+
static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,
unsigned size)
{
@@ -1494,18 +1540,21 @@ static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,
val = proxy->dfselect;
break;
case VIRTIO_PCI_COMMON_DF:
- if (proxy->dfselect <= 1) {
+ if (proxy->dfselect < virtio_pci_select_max(vdev)) {
VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
- val = (vdev->host_features & ~vdc->legacy_features) >>
- (32 * proxy->dfselect);
+ val = vdev->host_features_ex[proxy->dfselect >> 1] >>
+ (32 * (proxy->dfselect & 1));
+ if (proxy->dfselect <= 1) {
+ val &= (~vdc->legacy_features) >> (32 * proxy->dfselect);
+ }
}
break;
case VIRTIO_PCI_COMMON_GFSELECT:
val = proxy->gfselect;
break;
case VIRTIO_PCI_COMMON_GF:
- if (proxy->gfselect < ARRAY_SIZE(proxy->guest_features)) {
+ if (proxy->gfselect < virtio_pci_select_max(vdev)) {
val = proxy->guest_features[proxy->gfselect];
}
break;
@@ -1588,11 +1637,18 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
proxy->gfselect = val;
break;
case VIRTIO_PCI_COMMON_GF:
- if (proxy->gfselect < ARRAY_SIZE(proxy->guest_features)) {
+ if (proxy->gfselect < virtio_pci_select_max(vdev)) {
+ uint64_t features[VIRTIO_FEATURES_NU64S];
+ int i;
+
proxy->guest_features[proxy->gfselect] = val;
- virtio_set_features(vdev,
- (((uint64_t)proxy->guest_features[1]) << 32) |
- proxy->guest_features[0]);
+ virtio_features_clear(features);
+ for (i = 0; i < ARRAY_SIZE(proxy->guest_features); ++i) {
+ uint64_t cur = proxy->guest_features[i];
+
+ features[i >> 1] |= cur << ((i & 1) * 32);
+ }
+ virtio_set_features_ex(vdev, features);
}
break;
case VIRTIO_PCI_COMMON_MSIX:
@@ -2311,6 +2367,8 @@ static void virtio_pci_reset(DeviceState *qdev)
virtio_bus_reset(bus);
msix_unuse_all_vectors(&proxy->pci_dev);
+ memset(proxy->guest_features, 0, sizeof(proxy->guest_features));
+
for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
proxy->vqs[i].enabled = 0;
proxy->vqs[i].reset = 0;
diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h
index eab5394898..639752977e 100644
--- a/include/hw/virtio/virtio-pci.h
+++ b/include/hw/virtio/virtio-pci.h
@@ -158,7 +158,7 @@ struct VirtIOPCIProxy {
uint32_t nvectors;
uint32_t dfselect;
uint32_t gfselect;
- uint32_t guest_features[2];
+ uint32_t guest_features[VIRTIO_FEATURES_NU32S];
VirtIOPCIQueue vqs[VIRTIO_QUEUE_MAX];
VirtIOIRQFD *vector_irqfd;
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 07/14] virtio-pci: implement support for extended features
2025-09-12 13:06 ` [PATCH v6 07/14] virtio-pci: implement support for " Paolo Abeni
@ 2025-09-17 12:25 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:25 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:06:58PM +0200, Paolo Abeni wrote:
>Extend the features configuration space to 128 bits. If the virtio
>device supports any extended features, allow the common read/write
>operation to access all of it, otherwise keep exposing only the
>lower 64 bits.
>
>On migration, save the 128 bit version of the features only if the
>upper bits are non zero. Relay on reset to clear all the feature
>space before load.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
>v5 -> v6:
> - fixed checkpatch error (missing brackets on a single line statement)
>
>v4 -> v5:
> - add blank line after QEMU_BUILD_BUG_ON()
> - make virtio_pci_select_max() robust vs future feature space increase
>
>v3 -> v4:
> - use new virtio_features macro names
> - move the build bug before vmstate_virtio_pci_modern_state_sub
>
>v2 -> v3:
> - drop the pre_load/post_load trickery and relay on reset zeroing
> the features instead.
> - avoid union usage, just increase guest_features size and use
> SUB_ARRAY.
> - drop unneeded '!!'
> - _array -> _ex
>
>v1 -> v2:
> - use separate VMStateDescription and pre/post load to avoid breaking
> migration
> - clear proxy features on device reset
>---
> hw/virtio/virtio-pci.c | 76 ++++++++++++++++++++++++++++++----
> include/hw/virtio/virtio-pci.h | 2 +-
> 2 files changed, 68 insertions(+), 10 deletions(-)
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
>index 767216d795..01e4fecaf4 100644
>--- a/hw/virtio/virtio-pci.c
>+++ b/hw/virtio/virtio-pci.c
>@@ -109,6 +109,29 @@ static const VMStateDescription vmstate_virtio_pci_modern_queue_state = {
> }
> };
>
>+static bool virtio_pci_modern_state_features128_needed(void *opaque)
>+{
>+ VirtIOPCIProxy *proxy = opaque;
>+ uint32_t features = 0;
>+ int i;
>+
>+ for (i = 2; i < ARRAY_SIZE(proxy->guest_features); ++i) {
>+ features |= proxy->guest_features[i];
>+ }
>+ return features;
>+}
>+
>+static const VMStateDescription vmstate_virtio_pci_modern_state_features128 = {
>+ .name = "virtio_pci/modern_state/features128",
>+ .version_id = 1,
>+ .minimum_version_id = 1,
>+ .needed = &virtio_pci_modern_state_features128_needed,
>+ .fields = (const VMStateField[]) {
>+ VMSTATE_UINT32_SUB_ARRAY(guest_features, VirtIOPCIProxy, 2, 2),
>+ VMSTATE_END_OF_LIST()
>+ }
>+};
>+
> static bool virtio_pci_modern_state_needed(void *opaque)
> {
> VirtIOPCIProxy *proxy = opaque;
>@@ -116,6 +139,12 @@ static bool virtio_pci_modern_state_needed(void *opaque)
> return virtio_pci_modern(proxy);
> }
>
>+/*
>+ * Avoid silently breaking migration should the feature space increase
>+ * even more in the (far away) future
>+ */
>+QEMU_BUILD_BUG_ON(VIRTIO_FEATURES_NU32S != 4);
>+
> static const VMStateDescription vmstate_virtio_pci_modern_state_sub = {
> .name = "virtio_pci/modern_state",
> .version_id = 1,
>@@ -124,11 +153,15 @@ static const VMStateDescription vmstate_virtio_pci_modern_state_sub = {
> .fields = (const VMStateField[]) {
> VMSTATE_UINT32(dfselect, VirtIOPCIProxy),
> VMSTATE_UINT32(gfselect, VirtIOPCIProxy),
>- VMSTATE_UINT32_ARRAY(guest_features, VirtIOPCIProxy, 2),
>+ VMSTATE_UINT32_SUB_ARRAY(guest_features, VirtIOPCIProxy, 0, 2),
> VMSTATE_STRUCT_ARRAY(vqs, VirtIOPCIProxy, VIRTIO_QUEUE_MAX, 0,
> vmstate_virtio_pci_modern_queue_state,
> VirtIOPCIQueue),
> VMSTATE_END_OF_LIST()
>+ },
>+ .subsections = (const VMStateDescription * const []) {
>+ &vmstate_virtio_pci_modern_state_features128,
>+ NULL
> }
> };
>
>@@ -1477,6 +1510,19 @@ int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy,
> return virtio_pci_add_mem_cap(proxy, &cap.cap);
> }
>
>+static int virtio_pci_select_max(const VirtIODevice *vdev)
>+{
>+ int i;
>+
>+ for (i = VIRTIO_FEATURES_NU64S - 1; i > 0; i--) {
>+ if (vdev->host_features_ex[i]) {
>+ return (i + 1) * 2;
>+ }
>+ }
>+
>+ return 2;
>+}
>+
> static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,
> unsigned size)
> {
>@@ -1494,18 +1540,21 @@ static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,
> val = proxy->dfselect;
> break;
> case VIRTIO_PCI_COMMON_DF:
>- if (proxy->dfselect <= 1) {
>+ if (proxy->dfselect < virtio_pci_select_max(vdev)) {
> VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev);
>
>- val = (vdev->host_features & ~vdc->legacy_features) >>
>- (32 * proxy->dfselect);
>+ val = vdev->host_features_ex[proxy->dfselect >> 1] >>
>+ (32 * (proxy->dfselect & 1));
>+ if (proxy->dfselect <= 1) {
>+ val &= (~vdc->legacy_features) >> (32 * proxy->dfselect);
>+ }
> }
> break;
> case VIRTIO_PCI_COMMON_GFSELECT:
> val = proxy->gfselect;
> break;
> case VIRTIO_PCI_COMMON_GF:
>- if (proxy->gfselect < ARRAY_SIZE(proxy->guest_features)) {
>+ if (proxy->gfselect < virtio_pci_select_max(vdev)) {
> val = proxy->guest_features[proxy->gfselect];
> }
> break;
>@@ -1588,11 +1637,18 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,
> proxy->gfselect = val;
> break;
> case VIRTIO_PCI_COMMON_GF:
>- if (proxy->gfselect < ARRAY_SIZE(proxy->guest_features)) {
>+ if (proxy->gfselect < virtio_pci_select_max(vdev)) {
>+ uint64_t features[VIRTIO_FEATURES_NU64S];
>+ int i;
>+
> proxy->guest_features[proxy->gfselect] = val;
>- virtio_set_features(vdev,
>- (((uint64_t)proxy->guest_features[1]) << 32) |
>- proxy->guest_features[0]);
>+ virtio_features_clear(features);
>+ for (i = 0; i < ARRAY_SIZE(proxy->guest_features); ++i) {
>+ uint64_t cur = proxy->guest_features[i];
>+
>+ features[i >> 1] |= cur << ((i & 1) * 32);
>+ }
>+ virtio_set_features_ex(vdev, features);
> }
> break;
> case VIRTIO_PCI_COMMON_MSIX:
>@@ -2311,6 +2367,8 @@ static void virtio_pci_reset(DeviceState *qdev)
> virtio_bus_reset(bus);
> msix_unuse_all_vectors(&proxy->pci_dev);
>
>+ memset(proxy->guest_features, 0, sizeof(proxy->guest_features));
>+
> for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
> proxy->vqs[i].enabled = 0;
> proxy->vqs[i].reset = 0;
>diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h
>index eab5394898..639752977e 100644
>--- a/include/hw/virtio/virtio-pci.h
>+++ b/include/hw/virtio/virtio-pci.h
>@@ -158,7 +158,7 @@ struct VirtIOPCIProxy {
> uint32_t nvectors;
> uint32_t dfselect;
> uint32_t gfselect;
>- uint32_t guest_features[2];
>+ uint32_t guest_features[VIRTIO_FEATURES_NU32S];
> VirtIOPCIQueue vqs[VIRTIO_QUEUE_MAX];
>
> VirtIOIRQFD *vector_irqfd;
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 08/14] vhost: add support for negotiating extended features
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (6 preceding siblings ...)
2025-09-12 13:06 ` [PATCH v6 07/14] virtio-pci: implement support for " Paolo Abeni
@ 2025-09-12 13:06 ` Paolo Abeni
2025-09-17 12:29 ` Stefano Garzarella
2025-09-12 13:07 ` [PATCH v6 09/14] qmp: update virtio features map to support " Paolo Abeni
` (6 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:06 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Similar to virtio infra, vhost core maintains the features status
in the full extended format and allows the devices to implement
extended version of the getter/setter.
Note that 'protocol_features' are not extended: they are only
used by vhost-user, and the latter device is not going to implement
extended features soon.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v3 -> v4:
- fix compile warning for real :(
- de-duplicate code from vhost_{get,ack}_features and
vhost_{get,ack}_features_ex
- use new virtio_features macro names
v2 -> v3:
- fix compile warning
- _array -> _ex
v1 -> v2:
- uint128_t -> uint64_t[]
- add _ex() variant of features manipulation helpers
---
hw/virtio/vhost.c | 68 ++++++++++++++++++++++---------
include/hw/virtio/vhost-backend.h | 6 +++
include/hw/virtio/vhost.h | 56 +++++++++++++++++++++----
3 files changed, 103 insertions(+), 27 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 6557c58d12..5f485ad6cb 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -972,20 +972,34 @@ static int vhost_virtqueue_set_addr(struct vhost_dev *dev,
static int vhost_dev_set_features(struct vhost_dev *dev,
bool enable_log)
{
- uint64_t features = dev->acked_features;
+ uint64_t features[VIRTIO_FEATURES_NU64S];
int r;
+
+ virtio_features_copy(features, dev->acked_features_ex);
if (enable_log) {
- features |= 0x1ULL << VHOST_F_LOG_ALL;
+ virtio_add_feature_ex(features, VHOST_F_LOG_ALL);
}
if (!vhost_dev_has_iommu(dev)) {
- features &= ~(0x1ULL << VIRTIO_F_IOMMU_PLATFORM);
+ virtio_clear_feature_ex(features, VIRTIO_F_IOMMU_PLATFORM);
}
if (dev->vhost_ops->vhost_force_iommu) {
if (dev->vhost_ops->vhost_force_iommu(dev) == true) {
- features |= 0x1ULL << VIRTIO_F_IOMMU_PLATFORM;
+ virtio_add_feature_ex(features, VIRTIO_F_IOMMU_PLATFORM);
}
}
- r = dev->vhost_ops->vhost_set_features(dev, features);
+
+ if (virtio_features_use_ex(features) &&
+ !dev->vhost_ops->vhost_set_features_ex) {
+ r = -EINVAL;
+ VHOST_OPS_DEBUG(r, "extended features without device support");
+ goto out;
+ }
+
+ if (dev->vhost_ops->vhost_set_features_ex) {
+ r = dev->vhost_ops->vhost_set_features_ex(dev, features);
+ } else {
+ r = dev->vhost_ops->vhost_set_features(dev, features[0]);
+ }
if (r < 0) {
VHOST_OPS_DEBUG(r, "vhost_set_features failed");
goto out;
@@ -1508,12 +1522,27 @@ static void vhost_virtqueue_cleanup(struct vhost_virtqueue *vq)
}
}
+static int vhost_dev_get_features(struct vhost_dev *hdev,
+ uint64_t *features)
+{
+ uint64_t features64;
+ int r;
+
+ if (hdev->vhost_ops->vhost_get_features_ex) {
+ return hdev->vhost_ops->vhost_get_features_ex(hdev, features);
+ }
+
+ r = hdev->vhost_ops->vhost_get_features(hdev, &features64);
+ virtio_features_from_u64(features, features64);
+ return r;
+}
+
int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
VhostBackendType backend_type, uint32_t busyloop_timeout,
Error **errp)
{
+ uint64_t features[VIRTIO_FEATURES_NU64S];
unsigned int used, reserved, limit;
- uint64_t features;
int i, r, n_initialized_vqs = 0;
hdev->vdev = NULL;
@@ -1533,7 +1562,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
goto fail;
}
- r = hdev->vhost_ops->vhost_get_features(hdev, &features);
+ r = vhost_dev_get_features(hdev, features);
if (r < 0) {
error_setg_errno(errp, -r, "vhost_get_features failed");
goto fail;
@@ -1571,7 +1600,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
}
}
- hdev->features = features;
+ virtio_features_copy(hdev->features_ex, features);
hdev->memory_listener = (MemoryListener) {
.name = "vhost",
@@ -1594,7 +1623,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
};
if (hdev->migration_blocker == NULL) {
- if (!(hdev->features & (0x1ULL << VHOST_F_LOG_ALL))) {
+ if (!virtio_has_feature_ex(hdev->features_ex, VHOST_F_LOG_ALL)) {
error_setg(&hdev->migration_blocker,
"Migration disabled: vhost lacks VHOST_F_LOG_ALL feature.");
} else if (vhost_dev_log_is_shared(hdev) && !qemu_memfd_alloc_check()) {
@@ -1859,28 +1888,27 @@ static void vhost_start_config_intr(struct vhost_dev *dev)
}
}
-uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
- uint64_t features)
+void vhost_get_features_ex(struct vhost_dev *hdev,
+ const int *feature_bits,
+ uint64_t *features)
{
const int *bit = feature_bits;
+
while (*bit != VHOST_INVALID_FEATURE_BIT) {
- uint64_t bit_mask = (1ULL << *bit);
- if (!(hdev->features & bit_mask)) {
- features &= ~bit_mask;
+ if (!virtio_has_feature_ex(hdev->features_ex, *bit)) {
+ virtio_clear_feature_ex(features, *bit);
}
bit++;
}
- return features;
}
-void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits,
- uint64_t features)
+void vhost_ack_features_ex(struct vhost_dev *hdev, const int *feature_bits,
+ const uint64_t *features)
{
const int *bit = feature_bits;
while (*bit != VHOST_INVALID_FEATURE_BIT) {
- uint64_t bit_mask = (1ULL << *bit);
- if (features & bit_mask) {
- hdev->acked_features |= bit_mask;
+ if (virtio_has_feature_ex(features, *bit)) {
+ virtio_add_feature_ex(hdev->acked_features_ex, *bit);
}
bit++;
}
diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
index d6df209a2f..ff94fa1734 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -95,6 +95,10 @@ typedef int (*vhost_new_worker_op)(struct vhost_dev *dev,
struct vhost_worker_state *worker);
typedef int (*vhost_free_worker_op)(struct vhost_dev *dev,
struct vhost_worker_state *worker);
+typedef int (*vhost_set_features_ex_op)(struct vhost_dev *dev,
+ const uint64_t *features);
+typedef int (*vhost_get_features_ex_op)(struct vhost_dev *dev,
+ uint64_t *features);
typedef int (*vhost_set_features_op)(struct vhost_dev *dev,
uint64_t features);
typedef int (*vhost_get_features_op)(struct vhost_dev *dev,
@@ -186,6 +190,8 @@ typedef struct VhostOps {
vhost_free_worker_op vhost_free_worker;
vhost_get_vring_worker_op vhost_get_vring_worker;
vhost_attach_vring_worker_op vhost_attach_vring_worker;
+ vhost_set_features_ex_op vhost_set_features_ex;
+ vhost_get_features_ex_op vhost_get_features_ex;
vhost_set_features_op vhost_set_features;
vhost_get_features_op vhost_get_features;
vhost_set_backend_cap_op vhost_set_backend_cap;
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index 66be6afc88..08bbb4dfe9 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -107,9 +107,9 @@ struct vhost_dev {
* future use should be discouraged and the variable retired as
* its easy to confuse with the VirtIO backend_features.
*/
- uint64_t features;
- uint64_t acked_features;
- uint64_t backend_features;
+ VIRTIO_DECLARE_FEATURES(features);
+ VIRTIO_DECLARE_FEATURES(acked_features);
+ VIRTIO_DECLARE_FEATURES(backend_features);
/**
* @protocol_features: is the vhost-user only feature set by
@@ -320,6 +320,20 @@ bool vhost_virtqueue_pending(struct vhost_dev *hdev, int n);
void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int n,
bool mask);
+/**
+ * vhost_get_features_ex() - sanitize the extended features set
+ * @hdev: common vhost_dev structure
+ * @feature_bits: pointer to terminated table of feature bits
+ * @features: original features set, filtered out on return
+ *
+ * This is the extended variant of vhost_get_features(), supporting the
+ * the extended features set. Filter it with the intersection of what is
+ * supported by the vhost backend (hdev->features) and the supported
+ * feature_bits.
+ */
+void vhost_get_features_ex(struct vhost_dev *hdev,
+ const int *feature_bits,
+ uint64_t *features);
/**
* vhost_get_features() - return a sanitised set of feature bits
* @hdev: common vhost_dev structure
@@ -330,8 +344,28 @@ void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int n,
* is supported by the vhost backend (hdev->features), the supported
* feature_bits and the requested feature set.
*/
-uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
- uint64_t features);
+static inline uint64_t vhost_get_features(struct vhost_dev *hdev,
+ const int *feature_bits,
+ uint64_t features)
+{
+ uint64_t features_ex[VIRTIO_FEATURES_NU64S];
+
+ virtio_features_from_u64(features_ex, features);
+ vhost_get_features_ex(hdev, feature_bits, features_ex);
+ return features_ex[0];
+}
+
+/**
+ * vhost_ack_features_ex() - set vhost full set of acked_features
+ * @hdev: common vhost_dev structure
+ * @feature_bits: pointer to terminated table of feature bits
+ * @features: requested feature set
+ *
+ * This sets the internal hdev->acked_features to the intersection of
+ * the backends advertised features and the supported feature_bits.
+ */
+void vhost_ack_features_ex(struct vhost_dev *hdev, const int *feature_bits,
+ const uint64_t *features);
/**
* vhost_ack_features() - set vhost acked_features
@@ -342,8 +376,16 @@ uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
* This sets the internal hdev->acked_features to the intersection of
* the backends advertised features and the supported feature_bits.
*/
-void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits,
- uint64_t features);
+static inline void vhost_ack_features(struct vhost_dev *hdev,
+ const int *feature_bits,
+ uint64_t features)
+{
+ uint64_t features_ex[VIRTIO_FEATURES_NU64S];
+
+ virtio_features_from_u64(features_ex, features);
+ vhost_ack_features_ex(hdev, feature_bits, features_ex);
+}
+
unsigned int vhost_get_max_memslots(void);
unsigned int vhost_get_free_memslots(void);
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 08/14] vhost: add support for negotiating extended features
2025-09-12 13:06 ` [PATCH v6 08/14] vhost: add support for negotiating " Paolo Abeni
@ 2025-09-17 12:29 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:29 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:06:59PM +0200, Paolo Abeni wrote:
>Similar to virtio infra, vhost core maintains the features status
>in the full extended format and allows the devices to implement
>extended version of the getter/setter.
>
>Note that 'protocol_features' are not extended: they are only
>used by vhost-user, and the latter device is not going to implement
>extended features soon.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
>v3 -> v4:
> - fix compile warning for real :(
> - de-duplicate code from vhost_{get,ack}_features and
> vhost_{get,ack}_features_ex
> - use new virtio_features macro names
>
>v2 -> v3:
> - fix compile warning
> - _array -> _ex
>
>v1 -> v2:
> - uint128_t -> uint64_t[]
> - add _ex() variant of features manipulation helpers
>---
> hw/virtio/vhost.c | 68 ++++++++++++++++++++++---------
> include/hw/virtio/vhost-backend.h | 6 +++
> include/hw/virtio/vhost.h | 56 +++++++++++++++++++++----
> 3 files changed, 103 insertions(+), 27 deletions(-)
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
>index 6557c58d12..5f485ad6cb 100644
>--- a/hw/virtio/vhost.c
>+++ b/hw/virtio/vhost.c
>@@ -972,20 +972,34 @@ static int vhost_virtqueue_set_addr(struct vhost_dev *dev,
> static int vhost_dev_set_features(struct vhost_dev *dev,
> bool enable_log)
> {
>- uint64_t features = dev->acked_features;
>+ uint64_t features[VIRTIO_FEATURES_NU64S];
> int r;
>+
>+ virtio_features_copy(features, dev->acked_features_ex);
> if (enable_log) {
>- features |= 0x1ULL << VHOST_F_LOG_ALL;
>+ virtio_add_feature_ex(features, VHOST_F_LOG_ALL);
> }
> if (!vhost_dev_has_iommu(dev)) {
>- features &= ~(0x1ULL << VIRTIO_F_IOMMU_PLATFORM);
>+ virtio_clear_feature_ex(features, VIRTIO_F_IOMMU_PLATFORM);
> }
> if (dev->vhost_ops->vhost_force_iommu) {
> if (dev->vhost_ops->vhost_force_iommu(dev) == true) {
>- features |= 0x1ULL << VIRTIO_F_IOMMU_PLATFORM;
>+ virtio_add_feature_ex(features, VIRTIO_F_IOMMU_PLATFORM);
> }
> }
>- r = dev->vhost_ops->vhost_set_features(dev, features);
>+
>+ if (virtio_features_use_ex(features) &&
>+ !dev->vhost_ops->vhost_set_features_ex) {
>+ r = -EINVAL;
>+ VHOST_OPS_DEBUG(r, "extended features without device support");
>+ goto out;
>+ }
>+
>+ if (dev->vhost_ops->vhost_set_features_ex) {
>+ r = dev->vhost_ops->vhost_set_features_ex(dev, features);
>+ } else {
>+ r = dev->vhost_ops->vhost_set_features(dev, features[0]);
>+ }
> if (r < 0) {
> VHOST_OPS_DEBUG(r, "vhost_set_features failed");
> goto out;
>@@ -1508,12 +1522,27 @@ static void vhost_virtqueue_cleanup(struct vhost_virtqueue *vq)
> }
> }
>
>+static int vhost_dev_get_features(struct vhost_dev *hdev,
>+ uint64_t *features)
>+{
>+ uint64_t features64;
>+ int r;
>+
>+ if (hdev->vhost_ops->vhost_get_features_ex) {
>+ return hdev->vhost_ops->vhost_get_features_ex(hdev, features);
>+ }
>+
>+ r = hdev->vhost_ops->vhost_get_features(hdev, &features64);
>+ virtio_features_from_u64(features, features64);
>+ return r;
>+}
>+
> int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
> VhostBackendType backend_type, uint32_t busyloop_timeout,
> Error **errp)
> {
>+ uint64_t features[VIRTIO_FEATURES_NU64S];
> unsigned int used, reserved, limit;
>- uint64_t features;
> int i, r, n_initialized_vqs = 0;
>
> hdev->vdev = NULL;
>@@ -1533,7 +1562,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
> goto fail;
> }
>
>- r = hdev->vhost_ops->vhost_get_features(hdev, &features);
>+ r = vhost_dev_get_features(hdev, features);
> if (r < 0) {
> error_setg_errno(errp, -r, "vhost_get_features failed");
> goto fail;
>@@ -1571,7 +1600,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
> }
> }
>
>- hdev->features = features;
>+ virtio_features_copy(hdev->features_ex, features);
>
> hdev->memory_listener = (MemoryListener) {
> .name = "vhost",
>@@ -1594,7 +1623,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
> };
>
> if (hdev->migration_blocker == NULL) {
>- if (!(hdev->features & (0x1ULL << VHOST_F_LOG_ALL))) {
>+ if (!virtio_has_feature_ex(hdev->features_ex, VHOST_F_LOG_ALL)) {
> error_setg(&hdev->migration_blocker,
> "Migration disabled: vhost lacks VHOST_F_LOG_ALL feature.");
> } else if (vhost_dev_log_is_shared(hdev) && !qemu_memfd_alloc_check()) {
>@@ -1859,28 +1888,27 @@ static void vhost_start_config_intr(struct vhost_dev *dev)
> }
> }
>
>-uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
>- uint64_t features)
>+void vhost_get_features_ex(struct vhost_dev *hdev,
>+ const int *feature_bits,
>+ uint64_t *features)
> {
> const int *bit = feature_bits;
>+
> while (*bit != VHOST_INVALID_FEATURE_BIT) {
>- uint64_t bit_mask = (1ULL << *bit);
>- if (!(hdev->features & bit_mask)) {
>- features &= ~bit_mask;
>+ if (!virtio_has_feature_ex(hdev->features_ex, *bit)) {
>+ virtio_clear_feature_ex(features, *bit);
> }
> bit++;
> }
>- return features;
> }
>
>-void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits,
>- uint64_t features)
>+void vhost_ack_features_ex(struct vhost_dev *hdev, const int *feature_bits,
>+ const uint64_t *features)
> {
> const int *bit = feature_bits;
> while (*bit != VHOST_INVALID_FEATURE_BIT) {
>- uint64_t bit_mask = (1ULL << *bit);
>- if (features & bit_mask) {
>- hdev->acked_features |= bit_mask;
>+ if (virtio_has_feature_ex(features, *bit)) {
>+ virtio_add_feature_ex(hdev->acked_features_ex, *bit);
> }
> bit++;
> }
>diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
>index d6df209a2f..ff94fa1734 100644
>--- a/include/hw/virtio/vhost-backend.h
>+++ b/include/hw/virtio/vhost-backend.h
>@@ -95,6 +95,10 @@ typedef int (*vhost_new_worker_op)(struct vhost_dev *dev,
> struct vhost_worker_state *worker);
> typedef int (*vhost_free_worker_op)(struct vhost_dev *dev,
> struct vhost_worker_state *worker);
>+typedef int (*vhost_set_features_ex_op)(struct vhost_dev *dev,
>+ const uint64_t *features);
>+typedef int (*vhost_get_features_ex_op)(struct vhost_dev *dev,
>+ uint64_t *features);
> typedef int (*vhost_set_features_op)(struct vhost_dev *dev,
> uint64_t features);
> typedef int (*vhost_get_features_op)(struct vhost_dev *dev,
>@@ -186,6 +190,8 @@ typedef struct VhostOps {
> vhost_free_worker_op vhost_free_worker;
> vhost_get_vring_worker_op vhost_get_vring_worker;
> vhost_attach_vring_worker_op vhost_attach_vring_worker;
>+ vhost_set_features_ex_op vhost_set_features_ex;
>+ vhost_get_features_ex_op vhost_get_features_ex;
> vhost_set_features_op vhost_set_features;
> vhost_get_features_op vhost_get_features;
> vhost_set_backend_cap_op vhost_set_backend_cap;
>diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
>index 66be6afc88..08bbb4dfe9 100644
>--- a/include/hw/virtio/vhost.h
>+++ b/include/hw/virtio/vhost.h
>@@ -107,9 +107,9 @@ struct vhost_dev {
> * future use should be discouraged and the variable retired as
> * its easy to confuse with the VirtIO backend_features.
> */
>- uint64_t features;
>- uint64_t acked_features;
>- uint64_t backend_features;
>+ VIRTIO_DECLARE_FEATURES(features);
>+ VIRTIO_DECLARE_FEATURES(acked_features);
>+ VIRTIO_DECLARE_FEATURES(backend_features);
>
> /**
> * @protocol_features: is the vhost-user only feature set by
>@@ -320,6 +320,20 @@ bool vhost_virtqueue_pending(struct vhost_dev *hdev, int n);
> void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int n,
> bool mask);
>
>+/**
>+ * vhost_get_features_ex() - sanitize the extended features set
>+ * @hdev: common vhost_dev structure
>+ * @feature_bits: pointer to terminated table of feature bits
>+ * @features: original features set, filtered out on return
>+ *
>+ * This is the extended variant of vhost_get_features(), supporting the
>+ * the extended features set. Filter it with the intersection of what is
>+ * supported by the vhost backend (hdev->features) and the supported
>+ * feature_bits.
>+ */
>+void vhost_get_features_ex(struct vhost_dev *hdev,
>+ const int *feature_bits,
>+ uint64_t *features);
> /**
> * vhost_get_features() - return a sanitised set of feature bits
> * @hdev: common vhost_dev structure
>@@ -330,8 +344,28 @@ void vhost_virtqueue_mask(struct vhost_dev *hdev, VirtIODevice *vdev, int n,
> * is supported by the vhost backend (hdev->features), the supported
> * feature_bits and the requested feature set.
> */
>-uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
>- uint64_t features);
>+static inline uint64_t vhost_get_features(struct vhost_dev *hdev,
>+ const int *feature_bits,
>+ uint64_t features)
>+{
>+ uint64_t features_ex[VIRTIO_FEATURES_NU64S];
>+
>+ virtio_features_from_u64(features_ex, features);
>+ vhost_get_features_ex(hdev, feature_bits, features_ex);
>+ return features_ex[0];
>+}
>+
>+/**
>+ * vhost_ack_features_ex() - set vhost full set of acked_features
>+ * @hdev: common vhost_dev structure
>+ * @feature_bits: pointer to terminated table of feature bits
>+ * @features: requested feature set
>+ *
>+ * This sets the internal hdev->acked_features to the intersection of
>+ * the backends advertised features and the supported feature_bits.
>+ */
>+void vhost_ack_features_ex(struct vhost_dev *hdev, const int *feature_bits,
>+ const uint64_t *features);
>
> /**
> * vhost_ack_features() - set vhost acked_features
>@@ -342,8 +376,16 @@ uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_bits,
> * This sets the internal hdev->acked_features to the intersection of
> * the backends advertised features and the supported feature_bits.
> */
>-void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits,
>- uint64_t features);
>+static inline void vhost_ack_features(struct vhost_dev *hdev,
>+ const int *feature_bits,
>+ uint64_t features)
>+{
>+ uint64_t features_ex[VIRTIO_FEATURES_NU64S];
>+
>+ virtio_features_from_u64(features_ex, features);
>+ vhost_ack_features_ex(hdev, feature_bits, features_ex);
>+}
>+
> unsigned int vhost_get_max_memslots(void);
> unsigned int vhost_get_free_memslots(void);
>
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (7 preceding siblings ...)
2025-09-12 13:06 ` [PATCH v6 08/14] vhost: add support for negotiating " Paolo Abeni
@ 2025-09-12 13:07 ` Paolo Abeni
2025-09-12 13:42 ` Markus Armbruster
` (2 more replies)
2025-09-12 13:07 ` [PATCH v6 10/14] vhost-backend: implement extended features support Paolo Abeni
` (5 subsequent siblings)
14 siblings, 3 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:07 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Extend the VirtioDeviceFeatures struct with an additional u64
to track unknown features in the 64-127 bit range and decode
the full virtio features spaces for vhost and virtio devices.
Also add entries for the soon-to-be-supported virtio net GSO over
UDP features.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v3 -> v4:
- cleanup unknown features init
- update QMP example and doc accordingly
- use new virtio_features macro names
v2 -> v3:
- unknown-dev-features-dword2 -> unknown-dev-features2
- _array -> _ex
- fixed typos in entries description
v1 -> v2:
- uint128_t -> uint64_t[]
---
hw/virtio/virtio-hmp-cmds.c | 3 +-
hw/virtio/virtio-qmp.c | 91 +++++++++++++++++++++++++------------
hw/virtio/virtio-qmp.h | 3 +-
qapi/virtio.json | 9 +++-
4 files changed, 74 insertions(+), 32 deletions(-)
diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
index 7d8677bcf0..1daae482d3 100644
--- a/hw/virtio/virtio-hmp-cmds.c
+++ b/hw/virtio/virtio-hmp-cmds.c
@@ -74,7 +74,8 @@ static void hmp_virtio_dump_features(Monitor *mon,
}
if (features->has_unknown_dev_features) {
- monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
+ monitor_printf(mon, " unknown-features(0x%016"PRIx64"%016"PRIx64")\n",
+ features->unknown_dev_features2,
features->unknown_dev_features);
}
}
diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
index 3b6377cf0d..502c9ae930 100644
--- a/hw/virtio/virtio-qmp.c
+++ b/hw/virtio/virtio-qmp.c
@@ -325,6 +325,20 @@ static const qmp_virtio_feature_map_t virtio_net_feature_map[] = {
FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
"VHOST_USER_F_PROTOCOL_FEATURES: Vhost-user protocol features "
"negotiation supported"),
+ FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO, \
+ "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
+ "UDP tunnel packets"),
+ FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM, \
+ "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
+ "UDP tunnel packets requiring checksum offload for the outer "
+ "header"),
+ FEATURE_ENTRY(VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO, \
+ "VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO: Device can receive GSO over "
+ "UDP tunnel packets"),
+ FEATURE_ENTRY(VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM, \
+ "VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO: Device can receive GSO over "
+ "UDP tunnel packets requiring checksum offload for the outer "
+ "header"),
{ -1, "" }
};
#endif
@@ -510,6 +524,24 @@ static const qmp_virtio_feature_map_t virtio_gpio_feature_map[] = {
list; \
})
+#define CONVERT_FEATURES_EX(type, map, bitmap) \
+ ({ \
+ type *list = NULL; \
+ type *node; \
+ for (i = 0; map[i].virtio_bit != -1; i++) { \
+ bit = map[i].virtio_bit; \
+ if (!virtio_has_feature_ex(bitmap, bit)) { \
+ continue; \
+ } \
+ node = g_new0(type, 1); \
+ node->value = g_strdup(map[i].feature_desc); \
+ node->next = list; \
+ list = node; \
+ virtio_clear_feature_ex(bitmap, bit); \
+ } \
+ list; \
+ })
+
VirtioDeviceStatus *qmp_decode_status(uint8_t bitmap)
{
VirtioDeviceStatus *status;
@@ -545,109 +577,112 @@ VhostDeviceProtocols *qmp_decode_protocols(uint64_t bitmap)
return vhu_protocols;
}
-VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap)
+VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id,
+ const uint64_t *bmap)
{
+ uint64_t bitmap[VIRTIO_FEATURES_NU64S];
VirtioDeviceFeatures *features;
uint64_t bit;
int i;
+ virtio_features_copy(bitmap, bmap);
features = g_new0(VirtioDeviceFeatures, 1);
features->has_dev_features = true;
/* transport features */
- features->transports = CONVERT_FEATURES(strList, virtio_transport_map, 0,
- bitmap);
+ features->transports = CONVERT_FEATURES_EX(strList, virtio_transport_map,
+ bitmap);
/* device features */
switch (device_id) {
#ifdef CONFIG_VIRTIO_SERIAL
case VIRTIO_ID_CONSOLE:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_serial_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_serial_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_BLK
case VIRTIO_ID_BLOCK:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_blk_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_blk_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_GPU
case VIRTIO_ID_GPU:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_gpu_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_gpu_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_NET
case VIRTIO_ID_NET:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_net_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_net_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_SCSI
case VIRTIO_ID_SCSI:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_scsi_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_scsi_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_BALLOON
case VIRTIO_ID_BALLOON:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_balloon_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_balloon_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_IOMMU
case VIRTIO_ID_IOMMU:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_iommu_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_iommu_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_INPUT
case VIRTIO_ID_INPUT:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_input_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_input_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VHOST_USER_FS
case VIRTIO_ID_FS:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_fs_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_fs_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VHOST_VSOCK
case VIRTIO_ID_VSOCK:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_vsock_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_vsock_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_CRYPTO
case VIRTIO_ID_CRYPTO:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_crypto_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_crypto_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_MEM
case VIRTIO_ID_MEM:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_mem_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_mem_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_I2C_ADAPTER
case VIRTIO_ID_I2C_ADAPTER:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_i2c_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_i2c_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VIRTIO_RNG
case VIRTIO_ID_RNG:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_rng_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_rng_feature_map, bitmap);
break;
#endif
#ifdef CONFIG_VHOST_USER_GPIO
case VIRTIO_ID_GPIO:
features->dev_features =
- CONVERT_FEATURES(strList, virtio_gpio_feature_map, 0, bitmap);
+ CONVERT_FEATURES_EX(strList, virtio_gpio_feature_map, bitmap);
break;
#endif
/* No features */
@@ -680,10 +715,9 @@ VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap)
g_assert_not_reached();
}
- features->has_unknown_dev_features = bitmap != 0;
- if (features->has_unknown_dev_features) {
- features->unknown_dev_features = bitmap;
- }
+ features->has_unknown_dev_features = !virtio_features_empty(bitmap);
+ features->unknown_dev_features = bitmap[0];
+ features->unknown_dev_features2 = bitmap[1];
return features;
}
@@ -743,11 +777,11 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp)
status->device_id = vdev->device_id;
status->vhost_started = vdev->vhost_started;
status->guest_features = qmp_decode_features(vdev->device_id,
- vdev->guest_features);
+ vdev->guest_features_ex);
status->host_features = qmp_decode_features(vdev->device_id,
- vdev->host_features);
+ vdev->host_features_ex);
status->backend_features = qmp_decode_features(vdev->device_id,
- vdev->backend_features);
+ vdev->backend_features_ex);
switch (vdev->device_endian) {
case VIRTIO_DEVICE_ENDIAN_LITTLE:
@@ -785,11 +819,12 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp)
status->vhost_dev->nvqs = hdev->nvqs;
status->vhost_dev->vq_index = hdev->vq_index;
status->vhost_dev->features =
- qmp_decode_features(vdev->device_id, hdev->features);
+ qmp_decode_features(vdev->device_id, hdev->features_ex);
status->vhost_dev->acked_features =
- qmp_decode_features(vdev->device_id, hdev->acked_features);
+ qmp_decode_features(vdev->device_id, hdev->acked_features_ex);
status->vhost_dev->backend_features =
- qmp_decode_features(vdev->device_id, hdev->backend_features);
+ qmp_decode_features(vdev->device_id, hdev->backend_features_ex);
+
status->vhost_dev->protocol_features =
qmp_decode_protocols(hdev->protocol_features);
status->vhost_dev->max_queues = hdev->max_queues;
diff --git a/hw/virtio/virtio-qmp.h b/hw/virtio/virtio-qmp.h
index 245a446a56..e0a1e49035 100644
--- a/hw/virtio/virtio-qmp.h
+++ b/hw/virtio/virtio-qmp.h
@@ -18,6 +18,7 @@
VirtIODevice *qmp_find_virtio_device(const char *path);
VirtioDeviceStatus *qmp_decode_status(uint8_t bitmap);
VhostDeviceProtocols *qmp_decode_protocols(uint64_t bitmap);
-VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap);
+VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id,
+ const uint64_t *bitmap);
#endif
diff --git a/qapi/virtio.json b/qapi/virtio.json
index 9d652fe4a8..05295ab665 100644
--- a/qapi/virtio.json
+++ b/qapi/virtio.json
@@ -247,6 +247,7 @@
# },
# "host-features": {
# "unknown-dev-features": 1073741824,
+# "unknown-dev-features2": 0,
# "dev-features": [],
# "transports": [
# "VIRTIO_RING_F_EVENT_IDX: Used & avail. event fields enabled",
@@ -490,14 +491,18 @@
# unique features)
#
# @unknown-dev-features: Virtio device features bitmap that have not
-# been decoded
+# been decoded (bits 0-63)
+#
+# @unknown-dev-features2: Virtio device features bitmap that have not
+# been decoded (bits 64-127) (since 10.2)
#
# Since: 7.2
##
{ 'struct': 'VirtioDeviceFeatures',
'data': { 'transports': [ 'str' ],
'*dev-features': [ 'str' ],
- '*unknown-dev-features': 'uint64' } }
+ '*unknown-dev-features': 'uint64',
+ '*unknown-dev-features2': 'uint64' } }
##
# @VirtQueueStatus:
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-12 13:07 ` [PATCH v6 09/14] qmp: update virtio features map to support " Paolo Abeni
@ 2025-09-12 13:42 ` Markus Armbruster
2025-09-12 13:57 ` Paolo Abeni
2025-09-17 12:35 ` Stefano Garzarella
2025-09-22 12:55 ` Michael S. Tsirkin
2 siblings, 1 reply; 34+ messages in thread
From: Markus Armbruster @ 2025-09-12 13:42 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin,
Stefano Garzarella, Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri,
Vincenzo Maffione, Eric Blake
Paolo Abeni <pabeni@redhat.com> writes:
> Extend the VirtioDeviceFeatures struct with an additional u64
> to track unknown features in the 64-127 bit range and decode
> the full virtio features spaces for vhost and virtio devices.
>
> Also add entries for the soon-to-be-supported virtio net GSO over
> UDP features.
>
> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> Acked-by: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
You lost my
Acked-by: Markus Armbruster <armbru@redhat.com>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-12 13:42 ` Markus Armbruster
@ 2025-09-12 13:57 ` Paolo Abeni
2025-09-12 14:04 ` Markus Armbruster
0 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:57 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin,
Stefano Garzarella, Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri,
Vincenzo Maffione, Eric Blake
On 9/12/25 3:42 PM, Markus Armbruster wrote:
> Paolo Abeni <pabeni@redhat.com> writes:
>
>> Extend the VirtioDeviceFeatures struct with an additional u64
>> to track unknown features in the 64-127 bit range and decode
>> the full virtio features spaces for vhost and virtio devices.
>>
>> Also add entries for the soon-to-be-supported virtio net GSO over
>> UDP features.
>>
>> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>> Acked-by: Jason Wang <jasowang@redhat.com>
>> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>
> You lost my
> Acked-by: Markus Armbruster <armbru@redhat.com>
Whoops, sorry!
And thanks for persisting with it :)
Paolo
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-12 13:57 ` Paolo Abeni
@ 2025-09-12 14:04 ` Markus Armbruster
0 siblings, 0 replies; 34+ messages in thread
From: Markus Armbruster @ 2025-09-12 14:04 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin,
Stefano Garzarella, Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri,
Vincenzo Maffione, Eric Blake
Paolo Abeni <pabeni@redhat.com> writes:
> On 9/12/25 3:42 PM, Markus Armbruster wrote:
>> Paolo Abeni <pabeni@redhat.com> writes:
>>
>>> Extend the VirtioDeviceFeatures struct with an additional u64
>>> to track unknown features in the 64-127 bit range and decode
>>> the full virtio features spaces for vhost and virtio devices.
>>>
>>> Also add entries for the soon-to-be-supported virtio net GSO over
>>> UDP features.
>>>
>>> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>>> Acked-by: Jason Wang <jasowang@redhat.com>
>>> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>>
>> You lost my
>> Acked-by: Markus Armbruster <armbru@redhat.com>
>
> Whoops, sorry!
>
> And thanks for persisting with it :)
No problem :)
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-12 13:07 ` [PATCH v6 09/14] qmp: update virtio features map to support " Paolo Abeni
2025-09-12 13:42 ` Markus Armbruster
@ 2025-09-17 12:35 ` Stefano Garzarella
2025-09-22 12:55 ` Michael S. Tsirkin
2 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:35 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:07:00PM +0200, Paolo Abeni wrote:
>Extend the VirtioDeviceFeatures struct with an additional u64
>to track unknown features in the 64-127 bit range and decode
>the full virtio features spaces for vhost and virtio devices.
>
>Also add entries for the soon-to-be-supported virtio net GSO over
>UDP features.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
>v3 -> v4:
> - cleanup unknown features init
> - update QMP example and doc accordingly
> - use new virtio_features macro names
>
>v2 -> v3:
> - unknown-dev-features-dword2 -> unknown-dev-features2
> - _array -> _ex
> - fixed typos in entries description
>
>v1 -> v2:
> - uint128_t -> uint64_t[]
>---
> hw/virtio/virtio-hmp-cmds.c | 3 +-
> hw/virtio/virtio-qmp.c | 91 +++++++++++++++++++++++++------------
> hw/virtio/virtio-qmp.h | 3 +-
> qapi/virtio.json | 9 +++-
> 4 files changed, 74 insertions(+), 32 deletions(-)
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
>index 7d8677bcf0..1daae482d3 100644
>--- a/hw/virtio/virtio-hmp-cmds.c
>+++ b/hw/virtio/virtio-hmp-cmds.c
>@@ -74,7 +74,8 @@ static void hmp_virtio_dump_features(Monitor *mon,
> }
>
> if (features->has_unknown_dev_features) {
>- monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
>+ monitor_printf(mon, " unknown-features(0x%016"PRIx64"%016"PRIx64")\n",
>+ features->unknown_dev_features2,
> features->unknown_dev_features);
> }
> }
>diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
>index 3b6377cf0d..502c9ae930 100644
>--- a/hw/virtio/virtio-qmp.c
>+++ b/hw/virtio/virtio-qmp.c
>@@ -325,6 +325,20 @@ static const qmp_virtio_feature_map_t virtio_net_feature_map[] = {
> FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
> "VHOST_USER_F_PROTOCOL_FEATURES: Vhost-user protocol features "
> "negotiation supported"),
>+ FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO, \
>+ "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
>+ "UDP tunnel packets"),
>+ FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM, \
>+ "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
>+ "UDP tunnel packets requiring checksum offload for the outer "
>+ "header"),
>+ FEATURE_ENTRY(VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO, \
>+ "VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO: Device can receive GSO over "
>+ "UDP tunnel packets"),
>+ FEATURE_ENTRY(VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM, \
>+ "VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO: Device can receive GSO over "
>+ "UDP tunnel packets requiring checksum offload for the outer "
>+ "header"),
> { -1, "" }
> };
> #endif
>@@ -510,6 +524,24 @@ static const qmp_virtio_feature_map_t virtio_gpio_feature_map[] = {
> list; \
> })
>
>+#define CONVERT_FEATURES_EX(type, map, bitmap) \
>+ ({ \
>+ type *list = NULL; \
>+ type *node; \
>+ for (i = 0; map[i].virtio_bit != -1; i++) { \
>+ bit = map[i].virtio_bit; \
>+ if (!virtio_has_feature_ex(bitmap, bit)) { \
>+ continue; \
>+ } \
>+ node = g_new0(type, 1); \
>+ node->value = g_strdup(map[i].feature_desc); \
>+ node->next = list; \
>+ list = node; \
>+ virtio_clear_feature_ex(bitmap, bit); \
>+ } \
>+ list; \
>+ })
>+
> VirtioDeviceStatus *qmp_decode_status(uint8_t bitmap)
> {
> VirtioDeviceStatus *status;
>@@ -545,109 +577,112 @@ VhostDeviceProtocols *qmp_decode_protocols(uint64_t bitmap)
> return vhu_protocols;
> }
>
>-VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap)
>+VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id,
>+ const uint64_t *bmap)
> {
>+ uint64_t bitmap[VIRTIO_FEATURES_NU64S];
> VirtioDeviceFeatures *features;
> uint64_t bit;
> int i;
>
>+ virtio_features_copy(bitmap, bmap);
> features = g_new0(VirtioDeviceFeatures, 1);
> features->has_dev_features = true;
>
> /* transport features */
>- features->transports = CONVERT_FEATURES(strList, virtio_transport_map, 0,
>- bitmap);
>+ features->transports = CONVERT_FEATURES_EX(strList, virtio_transport_map,
>+ bitmap);
>
> /* device features */
> switch (device_id) {
> #ifdef CONFIG_VIRTIO_SERIAL
> case VIRTIO_ID_CONSOLE:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_serial_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_serial_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_BLK
> case VIRTIO_ID_BLOCK:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_blk_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_blk_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_GPU
> case VIRTIO_ID_GPU:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_gpu_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_gpu_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_NET
> case VIRTIO_ID_NET:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_net_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_net_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_SCSI
> case VIRTIO_ID_SCSI:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_scsi_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_scsi_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_BALLOON
> case VIRTIO_ID_BALLOON:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_balloon_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_balloon_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_IOMMU
> case VIRTIO_ID_IOMMU:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_iommu_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_iommu_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_INPUT
> case VIRTIO_ID_INPUT:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_input_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_input_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VHOST_USER_FS
> case VIRTIO_ID_FS:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_fs_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_fs_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VHOST_VSOCK
> case VIRTIO_ID_VSOCK:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_vsock_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_vsock_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_CRYPTO
> case VIRTIO_ID_CRYPTO:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_crypto_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_crypto_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_MEM
> case VIRTIO_ID_MEM:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_mem_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_mem_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_I2C_ADAPTER
> case VIRTIO_ID_I2C_ADAPTER:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_i2c_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_i2c_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_RNG
> case VIRTIO_ID_RNG:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_rng_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_rng_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VHOST_USER_GPIO
> case VIRTIO_ID_GPIO:
> features->dev_features =
>- CONVERT_FEATURES(strList, virtio_gpio_feature_map, 0, bitmap);
>+ CONVERT_FEATURES_EX(strList, virtio_gpio_feature_map, bitmap);
> break;
> #endif
> /* No features */
>@@ -680,10 +715,9 @@ VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap)
> g_assert_not_reached();
> }
>
>- features->has_unknown_dev_features = bitmap != 0;
>- if (features->has_unknown_dev_features) {
>- features->unknown_dev_features = bitmap;
>- }
>+ features->has_unknown_dev_features = !virtio_features_empty(bitmap);
>+ features->unknown_dev_features = bitmap[0];
>+ features->unknown_dev_features2 = bitmap[1];
>
> return features;
> }
>@@ -743,11 +777,11 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp)
> status->device_id = vdev->device_id;
> status->vhost_started = vdev->vhost_started;
> status->guest_features = qmp_decode_features(vdev->device_id,
>- vdev->guest_features);
>+ vdev->guest_features_ex);
> status->host_features = qmp_decode_features(vdev->device_id,
>- vdev->host_features);
>+ vdev->host_features_ex);
> status->backend_features = qmp_decode_features(vdev->device_id,
>- vdev->backend_features);
>+ vdev->backend_features_ex);
>
> switch (vdev->device_endian) {
> case VIRTIO_DEVICE_ENDIAN_LITTLE:
>@@ -785,11 +819,12 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp)
> status->vhost_dev->nvqs = hdev->nvqs;
> status->vhost_dev->vq_index = hdev->vq_index;
> status->vhost_dev->features =
>- qmp_decode_features(vdev->device_id, hdev->features);
>+ qmp_decode_features(vdev->device_id, hdev->features_ex);
> status->vhost_dev->acked_features =
>- qmp_decode_features(vdev->device_id, hdev->acked_features);
>+ qmp_decode_features(vdev->device_id, hdev->acked_features_ex);
> status->vhost_dev->backend_features =
>- qmp_decode_features(vdev->device_id, hdev->backend_features);
>+ qmp_decode_features(vdev->device_id, hdev->backend_features_ex);
>+
> status->vhost_dev->protocol_features =
> qmp_decode_protocols(hdev->protocol_features);
> status->vhost_dev->max_queues = hdev->max_queues;
>diff --git a/hw/virtio/virtio-qmp.h b/hw/virtio/virtio-qmp.h
>index 245a446a56..e0a1e49035 100644
>--- a/hw/virtio/virtio-qmp.h
>+++ b/hw/virtio/virtio-qmp.h
>@@ -18,6 +18,7 @@
> VirtIODevice *qmp_find_virtio_device(const char *path);
> VirtioDeviceStatus *qmp_decode_status(uint8_t bitmap);
> VhostDeviceProtocols *qmp_decode_protocols(uint64_t bitmap);
>-VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap);
>+VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id,
>+ const uint64_t *bitmap);
>
> #endif
>diff --git a/qapi/virtio.json b/qapi/virtio.json
>index 9d652fe4a8..05295ab665 100644
>--- a/qapi/virtio.json
>+++ b/qapi/virtio.json
>@@ -247,6 +247,7 @@
> # },
> # "host-features": {
> # "unknown-dev-features": 1073741824,
>+# "unknown-dev-features2": 0,
> # "dev-features": [],
> # "transports": [
> # "VIRTIO_RING_F_EVENT_IDX: Used & avail. event fields enabled",
>@@ -490,14 +491,18 @@
> # unique features)
> #
> # @unknown-dev-features: Virtio device features bitmap that have not
>-# been decoded
>+# been decoded (bits 0-63)
>+#
>+# @unknown-dev-features2: Virtio device features bitmap that have not
>+# been decoded (bits 64-127) (since 10.2)
> #
> # Since: 7.2
> ##
> { 'struct': 'VirtioDeviceFeatures',
> 'data': { 'transports': [ 'str' ],
> '*dev-features': [ 'str' ],
>- '*unknown-dev-features': 'uint64' } }
>+ '*unknown-dev-features': 'uint64',
>+ '*unknown-dev-features2': 'uint64' } }
>
> ##
> # @VirtQueueStatus:
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-12 13:07 ` [PATCH v6 09/14] qmp: update virtio features map to support " Paolo Abeni
2025-09-12 13:42 ` Markus Armbruster
2025-09-17 12:35 ` Stefano Garzarella
@ 2025-09-22 12:55 ` Michael S. Tsirkin
2025-09-22 13:10 ` Paolo Abeni
2 siblings, 1 reply; 34+ messages in thread
From: Michael S. Tsirkin @ 2025-09-22 12:55 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Stefano Garzarella, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:07:00PM +0200, Paolo Abeni wrote:
> Extend the VirtioDeviceFeatures struct with an additional u64
> to track unknown features in the 64-127 bit range and decode
> the full virtio features spaces for vhost and virtio devices.
>
> Also add entries for the soon-to-be-supported virtio net GSO over
> UDP features.
>
> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> Acked-by: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> v3 -> v4:
> - cleanup unknown features init
> - update QMP example and doc accordingly
> - use new virtio_features macro names
>
> v2 -> v3:
> - unknown-dev-features-dword2 -> unknown-dev-features2
> - _array -> _ex
> - fixed typos in entries description
>
> v1 -> v2:
> - uint128_t -> uint64_t[]
> ---
> hw/virtio/virtio-hmp-cmds.c | 3 +-
> hw/virtio/virtio-qmp.c | 91 +++++++++++++++++++++++++------------
> hw/virtio/virtio-qmp.h | 3 +-
> qapi/virtio.json | 9 +++-
> 4 files changed, 74 insertions(+), 32 deletions(-)
>
> diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
> index 7d8677bcf0..1daae482d3 100644
> --- a/hw/virtio/virtio-hmp-cmds.c
> +++ b/hw/virtio/virtio-hmp-cmds.c
> @@ -74,7 +74,8 @@ static void hmp_virtio_dump_features(Monitor *mon,
> }
>
> if (features->has_unknown_dev_features) {
> - monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
> + monitor_printf(mon, " unknown-features(0x%016"PRIx64"%016"PRIx64")\n",
> + features->unknown_dev_features2,
> features->unknown_dev_features);
> }
> }
> diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
> index 3b6377cf0d..502c9ae930 100644
> --- a/hw/virtio/virtio-qmp.c
> +++ b/hw/virtio/virtio-qmp.c
> @@ -325,6 +325,20 @@ static const qmp_virtio_feature_map_t virtio_net_feature_map[] = {
> FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
> "VHOST_USER_F_PROTOCOL_FEATURES: Vhost-user protocol features "
> "negotiation supported"),
> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO, \
> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
> + "UDP tunnel packets"),
> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM, \
> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
This really should be VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM.
Given they all seem to start with repeating the feature name,
why not just add it to the string automatically by the macro?
> + "UDP tunnel packets requiring checksum offload for the outer "
> + "header"),
> + FEATURE_ENTRY(VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO, \
> + "VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO: Device can receive GSO over "
> + "UDP tunnel packets"),
> + FEATURE_ENTRY(VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM, \
> + "VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO: Device can receive GSO over "
> + "UDP tunnel packets requiring checksum offload for the outer "
> + "header"),
> { -1, "" }
> };
> #endif
> @@ -510,6 +524,24 @@ static const qmp_virtio_feature_map_t virtio_gpio_feature_map[] = {
> list; \
> })
>
> +#define CONVERT_FEATURES_EX(type, map, bitmap) \
> + ({ \
> + type *list = NULL; \
> + type *node; \
> + for (i = 0; map[i].virtio_bit != -1; i++) { \
> + bit = map[i].virtio_bit; \
> + if (!virtio_has_feature_ex(bitmap, bit)) { \
> + continue; \
> + } \
> + node = g_new0(type, 1); \
> + node->value = g_strdup(map[i].feature_desc); \
> + node->next = list; \
> + list = node; \
> + virtio_clear_feature_ex(bitmap, bit); \
> + } \
> + list; \
> + })
> +
> VirtioDeviceStatus *qmp_decode_status(uint8_t bitmap)
> {
> VirtioDeviceStatus *status;
> @@ -545,109 +577,112 @@ VhostDeviceProtocols *qmp_decode_protocols(uint64_t bitmap)
> return vhu_protocols;
> }
>
> -VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap)
> +VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id,
> + const uint64_t *bmap)
> {
> + uint64_t bitmap[VIRTIO_FEATURES_NU64S];
> VirtioDeviceFeatures *features;
> uint64_t bit;
> int i;
>
> + virtio_features_copy(bitmap, bmap);
> features = g_new0(VirtioDeviceFeatures, 1);
> features->has_dev_features = true;
>
> /* transport features */
> - features->transports = CONVERT_FEATURES(strList, virtio_transport_map, 0,
> - bitmap);
> + features->transports = CONVERT_FEATURES_EX(strList, virtio_transport_map,
> + bitmap);
>
> /* device features */
> switch (device_id) {
> #ifdef CONFIG_VIRTIO_SERIAL
> case VIRTIO_ID_CONSOLE:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_serial_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_serial_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_BLK
> case VIRTIO_ID_BLOCK:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_blk_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_blk_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_GPU
> case VIRTIO_ID_GPU:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_gpu_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_gpu_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_NET
> case VIRTIO_ID_NET:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_net_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_net_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_SCSI
> case VIRTIO_ID_SCSI:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_scsi_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_scsi_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_BALLOON
> case VIRTIO_ID_BALLOON:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_balloon_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_balloon_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_IOMMU
> case VIRTIO_ID_IOMMU:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_iommu_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_iommu_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_INPUT
> case VIRTIO_ID_INPUT:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_input_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_input_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VHOST_USER_FS
> case VIRTIO_ID_FS:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_fs_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_fs_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VHOST_VSOCK
> case VIRTIO_ID_VSOCK:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_vsock_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_vsock_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_CRYPTO
> case VIRTIO_ID_CRYPTO:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_crypto_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_crypto_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_MEM
> case VIRTIO_ID_MEM:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_mem_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_mem_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_I2C_ADAPTER
> case VIRTIO_ID_I2C_ADAPTER:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_i2c_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_i2c_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VIRTIO_RNG
> case VIRTIO_ID_RNG:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_rng_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_rng_feature_map, bitmap);
> break;
> #endif
> #ifdef CONFIG_VHOST_USER_GPIO
> case VIRTIO_ID_GPIO:
> features->dev_features =
> - CONVERT_FEATURES(strList, virtio_gpio_feature_map, 0, bitmap);
> + CONVERT_FEATURES_EX(strList, virtio_gpio_feature_map, bitmap);
> break;
> #endif
> /* No features */
> @@ -680,10 +715,9 @@ VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap)
> g_assert_not_reached();
> }
>
> - features->has_unknown_dev_features = bitmap != 0;
> - if (features->has_unknown_dev_features) {
> - features->unknown_dev_features = bitmap;
> - }
> + features->has_unknown_dev_features = !virtio_features_empty(bitmap);
> + features->unknown_dev_features = bitmap[0];
> + features->unknown_dev_features2 = bitmap[1];
>
> return features;
> }
> @@ -743,11 +777,11 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp)
> status->device_id = vdev->device_id;
> status->vhost_started = vdev->vhost_started;
> status->guest_features = qmp_decode_features(vdev->device_id,
> - vdev->guest_features);
> + vdev->guest_features_ex);
> status->host_features = qmp_decode_features(vdev->device_id,
> - vdev->host_features);
> + vdev->host_features_ex);
> status->backend_features = qmp_decode_features(vdev->device_id,
> - vdev->backend_features);
> + vdev->backend_features_ex);
>
> switch (vdev->device_endian) {
> case VIRTIO_DEVICE_ENDIAN_LITTLE:
> @@ -785,11 +819,12 @@ VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp)
> status->vhost_dev->nvqs = hdev->nvqs;
> status->vhost_dev->vq_index = hdev->vq_index;
> status->vhost_dev->features =
> - qmp_decode_features(vdev->device_id, hdev->features);
> + qmp_decode_features(vdev->device_id, hdev->features_ex);
> status->vhost_dev->acked_features =
> - qmp_decode_features(vdev->device_id, hdev->acked_features);
> + qmp_decode_features(vdev->device_id, hdev->acked_features_ex);
> status->vhost_dev->backend_features =
> - qmp_decode_features(vdev->device_id, hdev->backend_features);
> + qmp_decode_features(vdev->device_id, hdev->backend_features_ex);
> +
> status->vhost_dev->protocol_features =
> qmp_decode_protocols(hdev->protocol_features);
> status->vhost_dev->max_queues = hdev->max_queues;
> diff --git a/hw/virtio/virtio-qmp.h b/hw/virtio/virtio-qmp.h
> index 245a446a56..e0a1e49035 100644
> --- a/hw/virtio/virtio-qmp.h
> +++ b/hw/virtio/virtio-qmp.h
> @@ -18,6 +18,7 @@
> VirtIODevice *qmp_find_virtio_device(const char *path);
> VirtioDeviceStatus *qmp_decode_status(uint8_t bitmap);
> VhostDeviceProtocols *qmp_decode_protocols(uint64_t bitmap);
> -VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap);
> +VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id,
> + const uint64_t *bitmap);
>
> #endif
> diff --git a/qapi/virtio.json b/qapi/virtio.json
> index 9d652fe4a8..05295ab665 100644
> --- a/qapi/virtio.json
> +++ b/qapi/virtio.json
> @@ -247,6 +247,7 @@
> # },
> # "host-features": {
> # "unknown-dev-features": 1073741824,
> +# "unknown-dev-features2": 0,
> # "dev-features": [],
> # "transports": [
> # "VIRTIO_RING_F_EVENT_IDX: Used & avail. event fields enabled",
> @@ -490,14 +491,18 @@
> # unique features)
> #
> # @unknown-dev-features: Virtio device features bitmap that have not
> -# been decoded
> +# been decoded (bits 0-63)
> +#
> +# @unknown-dev-features2: Virtio device features bitmap that have not
> +# been decoded (bits 64-127) (since 10.2)
> #
> # Since: 7.2
> ##
> { 'struct': 'VirtioDeviceFeatures',
> 'data': { 'transports': [ 'str' ],
> '*dev-features': [ 'str' ],
> - '*unknown-dev-features': 'uint64' } }
> + '*unknown-dev-features': 'uint64',
> + '*unknown-dev-features2': 'uint64' } }
>
> ##
> # @VirtQueueStatus:
> --
> 2.51.0
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-22 12:55 ` Michael S. Tsirkin
@ 2025-09-22 13:10 ` Paolo Abeni
2025-09-22 13:15 ` Michael S. Tsirkin
0 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-22 13:10 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Stefano Garzarella, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On 9/22/25 2:55 PM, Michael S. Tsirkin wrote:
> On Fri, Sep 12, 2025 at 03:07:00PM +0200, Paolo Abeni wrote:
>> Extend the VirtioDeviceFeatures struct with an additional u64
>> to track unknown features in the 64-127 bit range and decode
>> the full virtio features spaces for vhost and virtio devices.
>>
>> Also add entries for the soon-to-be-supported virtio net GSO over
>> UDP features.
>>
>> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>> Acked-by: Jason Wang <jasowang@redhat.com>
>> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>> ---
>> v3 -> v4:
>> - cleanup unknown features init
>> - update QMP example and doc accordingly
>> - use new virtio_features macro names
>>
>> v2 -> v3:
>> - unknown-dev-features-dword2 -> unknown-dev-features2
>> - _array -> _ex
>> - fixed typos in entries description
>>
>> v1 -> v2:
>> - uint128_t -> uint64_t[]
>> ---
>> hw/virtio/virtio-hmp-cmds.c | 3 +-
>> hw/virtio/virtio-qmp.c | 91 +++++++++++++++++++++++++------------
>> hw/virtio/virtio-qmp.h | 3 +-
>> qapi/virtio.json | 9 +++-
>> 4 files changed, 74 insertions(+), 32 deletions(-)
>>
>> diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
>> index 7d8677bcf0..1daae482d3 100644
>> --- a/hw/virtio/virtio-hmp-cmds.c
>> +++ b/hw/virtio/virtio-hmp-cmds.c
>> @@ -74,7 +74,8 @@ static void hmp_virtio_dump_features(Monitor *mon,
>> }
>>
>> if (features->has_unknown_dev_features) {
>> - monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
>> + monitor_printf(mon, " unknown-features(0x%016"PRIx64"%016"PRIx64")\n",
>> + features->unknown_dev_features2,
>> features->unknown_dev_features);
>> }
>> }
>> diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
>> index 3b6377cf0d..502c9ae930 100644
>> --- a/hw/virtio/virtio-qmp.c
>> +++ b/hw/virtio/virtio-qmp.c
>> @@ -325,6 +325,20 @@ static const qmp_virtio_feature_map_t virtio_net_feature_map[] = {
>> FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
>> "VHOST_USER_F_PROTOCOL_FEATURES: Vhost-user protocol features "
>> "negotiation supported"),
>> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO, \
>> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
>> + "UDP tunnel packets"),
>> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM, \
>> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
>
> This really should be VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM.
>
> Given they all seem to start with repeating the feature name,
> why not just add it to the string automatically by the macro?
UHmm... let me keep the things simple and just fix the string; macro
refactoring could be a follow-up, I hope?
Thanks,
Paolo
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-22 13:10 ` Paolo Abeni
@ 2025-09-22 13:15 ` Michael S. Tsirkin
2025-09-22 13:28 ` Paolo Abeni
0 siblings, 1 reply; 34+ messages in thread
From: Michael S. Tsirkin @ 2025-09-22 13:15 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Stefano Garzarella, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Mon, Sep 22, 2025 at 03:10:36PM +0200, Paolo Abeni wrote:
> On 9/22/25 2:55 PM, Michael S. Tsirkin wrote:
> > On Fri, Sep 12, 2025 at 03:07:00PM +0200, Paolo Abeni wrote:
> >> Extend the VirtioDeviceFeatures struct with an additional u64
> >> to track unknown features in the 64-127 bit range and decode
> >> the full virtio features spaces for vhost and virtio devices.
> >>
> >> Also add entries for the soon-to-be-supported virtio net GSO over
> >> UDP features.
> >>
> >> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
> >> Acked-by: Jason Wang <jasowang@redhat.com>
> >> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> >> ---
> >> v3 -> v4:
> >> - cleanup unknown features init
> >> - update QMP example and doc accordingly
> >> - use new virtio_features macro names
> >>
> >> v2 -> v3:
> >> - unknown-dev-features-dword2 -> unknown-dev-features2
> >> - _array -> _ex
> >> - fixed typos in entries description
> >>
> >> v1 -> v2:
> >> - uint128_t -> uint64_t[]
> >> ---
> >> hw/virtio/virtio-hmp-cmds.c | 3 +-
> >> hw/virtio/virtio-qmp.c | 91 +++++++++++++++++++++++++------------
> >> hw/virtio/virtio-qmp.h | 3 +-
> >> qapi/virtio.json | 9 +++-
> >> 4 files changed, 74 insertions(+), 32 deletions(-)
> >>
> >> diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
> >> index 7d8677bcf0..1daae482d3 100644
> >> --- a/hw/virtio/virtio-hmp-cmds.c
> >> +++ b/hw/virtio/virtio-hmp-cmds.c
> >> @@ -74,7 +74,8 @@ static void hmp_virtio_dump_features(Monitor *mon,
> >> }
> >>
> >> if (features->has_unknown_dev_features) {
> >> - monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
> >> + monitor_printf(mon, " unknown-features(0x%016"PRIx64"%016"PRIx64")\n",
> >> + features->unknown_dev_features2,
> >> features->unknown_dev_features);
> >> }
> >> }
> >> diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
> >> index 3b6377cf0d..502c9ae930 100644
> >> --- a/hw/virtio/virtio-qmp.c
> >> +++ b/hw/virtio/virtio-qmp.c
> >> @@ -325,6 +325,20 @@ static const qmp_virtio_feature_map_t virtio_net_feature_map[] = {
> >> FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
> >> "VHOST_USER_F_PROTOCOL_FEATURES: Vhost-user protocol features "
> >> "negotiation supported"),
> >> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO, \
> >> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
> >> + "UDP tunnel packets"),
> >> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM, \
> >> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
> >
> > This really should be VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM.
> >
> > Given they all seem to start with repeating the feature name,
> > why not just add it to the string automatically by the macro?
>
> UHmm... let me keep the things simple and just fix the string; macro
> refactoring could be a follow-up, I hope?
>
> Thanks,
>
> Paolo
the fix can be a follow-up too, but I'd like it done now pls,
there could be more I missed.
--
MST
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v6 09/14] qmp: update virtio features map to support extended features
2025-09-22 13:15 ` Michael S. Tsirkin
@ 2025-09-22 13:28 ` Paolo Abeni
0 siblings, 0 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-22 13:28 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Stefano Garzarella, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On 9/22/25 3:15 PM, Michael S. Tsirkin wrote:
> On Mon, Sep 22, 2025 at 03:10:36PM +0200, Paolo Abeni wrote:
>> On 9/22/25 2:55 PM, Michael S. Tsirkin wrote:
>>> On Fri, Sep 12, 2025 at 03:07:00PM +0200, Paolo Abeni wrote:
>>>> Extend the VirtioDeviceFeatures struct with an additional u64
>>>> to track unknown features in the 64-127 bit range and decode
>>>> the full virtio features spaces for vhost and virtio devices.
>>>>
>>>> Also add entries for the soon-to-be-supported virtio net GSO over
>>>> UDP features.
>>>>
>>>> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>>>> Acked-by: Jason Wang <jasowang@redhat.com>
>>>> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>>>> ---
>>>> v3 -> v4:
>>>> - cleanup unknown features init
>>>> - update QMP example and doc accordingly
>>>> - use new virtio_features macro names
>>>>
>>>> v2 -> v3:
>>>> - unknown-dev-features-dword2 -> unknown-dev-features2
>>>> - _array -> _ex
>>>> - fixed typos in entries description
>>>>
>>>> v1 -> v2:
>>>> - uint128_t -> uint64_t[]
>>>> ---
>>>> hw/virtio/virtio-hmp-cmds.c | 3 +-
>>>> hw/virtio/virtio-qmp.c | 91 +++++++++++++++++++++++++------------
>>>> hw/virtio/virtio-qmp.h | 3 +-
>>>> qapi/virtio.json | 9 +++-
>>>> 4 files changed, 74 insertions(+), 32 deletions(-)
>>>>
>>>> diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
>>>> index 7d8677bcf0..1daae482d3 100644
>>>> --- a/hw/virtio/virtio-hmp-cmds.c
>>>> +++ b/hw/virtio/virtio-hmp-cmds.c
>>>> @@ -74,7 +74,8 @@ static void hmp_virtio_dump_features(Monitor *mon,
>>>> }
>>>>
>>>> if (features->has_unknown_dev_features) {
>>>> - monitor_printf(mon, " unknown-features(0x%016"PRIx64")\n",
>>>> + monitor_printf(mon, " unknown-features(0x%016"PRIx64"%016"PRIx64")\n",
>>>> + features->unknown_dev_features2,
>>>> features->unknown_dev_features);
>>>> }
>>>> }
>>>> diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
>>>> index 3b6377cf0d..502c9ae930 100644
>>>> --- a/hw/virtio/virtio-qmp.c
>>>> +++ b/hw/virtio/virtio-qmp.c
>>>> @@ -325,6 +325,20 @@ static const qmp_virtio_feature_map_t virtio_net_feature_map[] = {
>>>> FEATURE_ENTRY(VHOST_USER_F_PROTOCOL_FEATURES, \
>>>> "VHOST_USER_F_PROTOCOL_FEATURES: Vhost-user protocol features "
>>>> "negotiation supported"),
>>>> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO, \
>>>> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
>>>> + "UDP tunnel packets"),
>>>> + FEATURE_ENTRY(VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM, \
>>>> + "VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO: Driver can receive GSO over "
>>>
>>> This really should be VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM.
>>>
>>> Given they all seem to start with repeating the feature name,
>>> why not just add it to the string automatically by the macro?
>>
>> UHmm... let me keep the things simple and just fix the string; macro
>> refactoring could be a follow-up, I hope?
>>
>> Thanks,
>>
>> Paolo
>
> the fix can be a follow-up too, but I'd like it done now pls,
> there could be more I missed.
Np. I'll follow-up as soon as this series will be merged. I'll send v7
soon with the above typo fixed (plus the others pointed by Stefano).
Thanks,
Paolo
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 10/14] vhost-backend: implement extended features support
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (8 preceding siblings ...)
2025-09-12 13:07 ` [PATCH v6 09/14] qmp: update virtio features map to support " Paolo Abeni
@ 2025-09-12 13:07 ` Paolo Abeni
2025-09-17 12:29 ` Stefano Garzarella
2025-09-12 13:07 ` [PATCH v6 11/14] vhost-net: " Paolo Abeni
` (4 subsequent siblings)
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:07 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Leverage the kernel extended features manipulation ioctls(), if
available, and fallback to old ops otherwise. Error out when setting
extended features but kernel support is not available.
Note that extended support for get/set backend features is not needed,
as the only feature that can be changed belongs to the 64 bit range.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v3 -> v4:
- use new virtio_features macro names
v1 -> v2:
- synced with kernel ioctl changes
---
hw/virtio/vhost-backend.c | 62 ++++++++++++++++++++++++++++++++-------
1 file changed, 51 insertions(+), 11 deletions(-)
diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
index 833804dd40..4367db0d95 100644
--- a/hw/virtio/vhost-backend.c
+++ b/hw/virtio/vhost-backend.c
@@ -20,6 +20,11 @@
#include <linux/vhost.h>
#include <sys/ioctl.h>
+struct vhost_features {
+ uint64_t count;
+ uint64_t features[VIRTIO_FEATURES_NU64S];
+};
+
static int vhost_kernel_call(struct vhost_dev *dev, unsigned long int request,
void *arg)
{
@@ -182,12 +187,6 @@ static int vhost_kernel_get_vring_worker(struct vhost_dev *dev,
return vhost_kernel_call(dev, VHOST_GET_VRING_WORKER, worker);
}
-static int vhost_kernel_set_features(struct vhost_dev *dev,
- uint64_t features)
-{
- return vhost_kernel_call(dev, VHOST_SET_FEATURES, &features);
-}
-
static int vhost_kernel_set_backend_cap(struct vhost_dev *dev)
{
uint64_t features;
@@ -210,10 +209,51 @@ static int vhost_kernel_set_backend_cap(struct vhost_dev *dev)
return 0;
}
-static int vhost_kernel_get_features(struct vhost_dev *dev,
- uint64_t *features)
+static int vhost_kernel_set_features(struct vhost_dev *dev,
+ const uint64_t *features)
{
- return vhost_kernel_call(dev, VHOST_GET_FEATURES, features);
+ struct vhost_features farray;
+ bool extended_in_use;
+ int r;
+
+ farray.count = VIRTIO_FEATURES_NU64S;
+ virtio_features_copy(farray.features, features);
+ extended_in_use = virtio_features_use_ex(farray.features);
+
+ /*
+ * Can't check for ENOTTY: for unknown ioctls the kernel interprets
+ * the argument as a virtio queue id and most likely errors out validating
+ * such id, instead of reporting an unknown operation.
+ */
+ r = vhost_kernel_call(dev, VHOST_SET_FEATURES_ARRAY, &farray);
+ if (!r) {
+ return 0;
+ }
+
+ if (extended_in_use) {
+ error_report("Trying to set extended features without kernel support");
+ return -EINVAL;
+ }
+ return vhost_kernel_call(dev, VHOST_SET_FEATURES, &farray.features[0]);
+}
+
+static int vhost_kernel_get_features(struct vhost_dev *dev, uint64_t *features)
+{
+ struct vhost_features farray;
+ int r;
+
+ farray.count = VIRTIO_FEATURES_NU64S;
+ r = vhost_kernel_call(dev, VHOST_GET_FEATURES_ARRAY, &farray);
+ if (r) {
+ memset(&farray, 0, sizeof(farray));
+ r = vhost_kernel_call(dev, VHOST_GET_FEATURES, &farray.features[0]);
+ }
+ if (r) {
+ return r;
+ }
+
+ virtio_features_copy(features, farray.features);
+ return 0;
}
static int vhost_kernel_set_owner(struct vhost_dev *dev)
@@ -341,8 +381,8 @@ const VhostOps kernel_ops = {
.vhost_attach_vring_worker = vhost_kernel_attach_vring_worker,
.vhost_new_worker = vhost_kernel_new_worker,
.vhost_free_worker = vhost_kernel_free_worker,
- .vhost_set_features = vhost_kernel_set_features,
- .vhost_get_features = vhost_kernel_get_features,
+ .vhost_set_features_ex = vhost_kernel_set_features,
+ .vhost_get_features_ex = vhost_kernel_get_features,
.vhost_set_backend_cap = vhost_kernel_set_backend_cap,
.vhost_set_owner = vhost_kernel_set_owner,
.vhost_get_vq_index = vhost_kernel_get_vq_index,
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 10/14] vhost-backend: implement extended features support
2025-09-12 13:07 ` [PATCH v6 10/14] vhost-backend: implement extended features support Paolo Abeni
@ 2025-09-17 12:29 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:29 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:07:01PM +0200, Paolo Abeni wrote:
>Leverage the kernel extended features manipulation ioctls(), if
>available, and fallback to old ops otherwise. Error out when setting
>extended features but kernel support is not available.
>
>Note that extended support for get/set backend features is not needed,
>as the only feature that can be changed belongs to the 64 bit range.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>---
>v3 -> v4:
> - use new virtio_features macro names
>
>v1 -> v2:
> - synced with kernel ioctl changes
>---
> hw/virtio/vhost-backend.c | 62 ++++++++++++++++++++++++++++++++-------
> 1 file changed, 51 insertions(+), 11 deletions(-)
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c
>index 833804dd40..4367db0d95 100644
>--- a/hw/virtio/vhost-backend.c
>+++ b/hw/virtio/vhost-backend.c
>@@ -20,6 +20,11 @@
> #include <linux/vhost.h>
> #include <sys/ioctl.h>
>
>+struct vhost_features {
>+ uint64_t count;
>+ uint64_t features[VIRTIO_FEATURES_NU64S];
>+};
>+
> static int vhost_kernel_call(struct vhost_dev *dev, unsigned long int request,
> void *arg)
> {
>@@ -182,12 +187,6 @@ static int vhost_kernel_get_vring_worker(struct vhost_dev *dev,
> return vhost_kernel_call(dev, VHOST_GET_VRING_WORKER, worker);
> }
>
>-static int vhost_kernel_set_features(struct vhost_dev *dev,
>- uint64_t features)
>-{
>- return vhost_kernel_call(dev, VHOST_SET_FEATURES, &features);
>-}
>-
> static int vhost_kernel_set_backend_cap(struct vhost_dev *dev)
> {
> uint64_t features;
>@@ -210,10 +209,51 @@ static int vhost_kernel_set_backend_cap(struct vhost_dev *dev)
> return 0;
> }
>
>-static int vhost_kernel_get_features(struct vhost_dev *dev,
>- uint64_t *features)
>+static int vhost_kernel_set_features(struct vhost_dev *dev,
>+ const uint64_t *features)
> {
>- return vhost_kernel_call(dev, VHOST_GET_FEATURES, features);
>+ struct vhost_features farray;
>+ bool extended_in_use;
>+ int r;
>+
>+ farray.count = VIRTIO_FEATURES_NU64S;
>+ virtio_features_copy(farray.features, features);
>+ extended_in_use = virtio_features_use_ex(farray.features);
>+
>+ /*
>+ * Can't check for ENOTTY: for unknown ioctls the kernel interprets
>+ * the argument as a virtio queue id and most likely errors out validating
>+ * such id, instead of reporting an unknown operation.
>+ */
>+ r = vhost_kernel_call(dev, VHOST_SET_FEATURES_ARRAY, &farray);
>+ if (!r) {
>+ return 0;
>+ }
>+
>+ if (extended_in_use) {
>+ error_report("Trying to set extended features without kernel support");
>+ return -EINVAL;
>+ }
>+ return vhost_kernel_call(dev, VHOST_SET_FEATURES, &farray.features[0]);
>+}
>+
>+static int vhost_kernel_get_features(struct vhost_dev *dev, uint64_t *features)
>+{
>+ struct vhost_features farray;
>+ int r;
>+
>+ farray.count = VIRTIO_FEATURES_NU64S;
>+ r = vhost_kernel_call(dev, VHOST_GET_FEATURES_ARRAY, &farray);
>+ if (r) {
>+ memset(&farray, 0, sizeof(farray));
>+ r = vhost_kernel_call(dev, VHOST_GET_FEATURES, &farray.features[0]);
>+ }
>+ if (r) {
>+ return r;
>+ }
>+
>+ virtio_features_copy(features, farray.features);
>+ return 0;
> }
>
> static int vhost_kernel_set_owner(struct vhost_dev *dev)
>@@ -341,8 +381,8 @@ const VhostOps kernel_ops = {
> .vhost_attach_vring_worker = vhost_kernel_attach_vring_worker,
> .vhost_new_worker = vhost_kernel_new_worker,
> .vhost_free_worker = vhost_kernel_free_worker,
>- .vhost_set_features = vhost_kernel_set_features,
>- .vhost_get_features = vhost_kernel_get_features,
>+ .vhost_set_features_ex = vhost_kernel_set_features,
>+ .vhost_get_features_ex = vhost_kernel_get_features,
> .vhost_set_backend_cap = vhost_kernel_set_backend_cap,
> .vhost_set_owner = vhost_kernel_set_owner,
> .vhost_get_vq_index = vhost_kernel_get_vq_index,
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 11/14] vhost-net: implement extended features support
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (9 preceding siblings ...)
2025-09-12 13:07 ` [PATCH v6 10/14] vhost-backend: implement extended features support Paolo Abeni
@ 2025-09-12 13:07 ` Paolo Abeni
2025-09-12 13:07 ` [PATCH v6 12/14] virtio-net: " Paolo Abeni
` (3 subsequent siblings)
14 siblings, 0 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:07 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Provide extended version of the features manipulation helpers,
and let the device initialization deal with the full features space,
adjusting the relevant format strings accordingly.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v3 -> v4:
- add missing features initialization
- use new virtio_features macro names
v2 -> v3:
- use virtio_features_andnot return value instead of virtio_features_empty
- rebased on top of "net: Consolidate vhost feature bits into vhost_net
structure"
- _array -> _ex
v1 -> v2:
- uint128_t -> uint64_t[]
- provide extended variant of the features manipulation helpers
---
hw/net/vhost_net-stub.c | 8 +++-----
hw/net/vhost_net.c | 45 +++++++++++++++++++++++------------------
include/net/vhost_net.h | 33 +++++++++++++++++++++++++++---
3 files changed, 58 insertions(+), 28 deletions(-)
diff --git a/hw/net/vhost_net-stub.c b/hw/net/vhost_net-stub.c
index 7d49f82906..0740d5a2eb 100644
--- a/hw/net/vhost_net-stub.c
+++ b/hw/net/vhost_net-stub.c
@@ -46,9 +46,8 @@ void vhost_net_cleanup(struct vhost_net *net)
{
}
-uint64_t vhost_net_get_features(struct vhost_net *net, uint64_t features)
+void vhost_net_get_features_ex(struct vhost_net *net, uint64_t *features)
{
- return features;
}
int vhost_net_get_config(struct vhost_net *net, uint8_t *config,
@@ -62,13 +61,12 @@ int vhost_net_set_config(struct vhost_net *net, const uint8_t *data,
return 0;
}
-void vhost_net_ack_features(struct vhost_net *net, uint64_t features)
+void vhost_net_ack_features_ex(struct vhost_net *net, const uint64_t *features)
{
}
-uint64_t vhost_net_get_acked_features(VHostNetState *net)
+void vhost_net_get_acked_features_ex(VHostNetState *net, uint64_t *features)
{
- return 0;
}
bool vhost_net_virtqueue_pending(VHostNetState *net, int idx)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 540492b37d..a8ee18a912 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -35,10 +35,9 @@
#include "hw/virtio/virtio-bus.h"
#include "linux-headers/linux/vhost.h"
-uint64_t vhost_net_get_features(struct vhost_net *net, uint64_t features)
+void vhost_net_get_features_ex(struct vhost_net *net, uint64_t *features)
{
- return vhost_get_features(&net->dev, net->feature_bits,
- features);
+ vhost_get_features_ex(&net->dev, net->feature_bits, features);
}
int vhost_net_get_config(struct vhost_net *net, uint8_t *config,
uint32_t config_len)
@@ -51,10 +50,11 @@ int vhost_net_set_config(struct vhost_net *net, const uint8_t *data,
return vhost_dev_set_config(&net->dev, data, offset, size, flags);
}
-void vhost_net_ack_features(struct vhost_net *net, uint64_t features)
+void vhost_net_ack_features_ex(struct vhost_net *net, const uint64_t *features)
{
- net->dev.acked_features = net->dev.backend_features;
- vhost_ack_features(&net->dev, net->feature_bits, features);
+ virtio_features_copy(net->dev.acked_features_ex,
+ net->dev.backend_features_ex);
+ vhost_ack_features_ex(&net->dev, net->feature_bits, features);
}
uint64_t vhost_net_get_max_queues(VHostNetState *net)
@@ -62,9 +62,9 @@ uint64_t vhost_net_get_max_queues(VHostNetState *net)
return net->dev.max_queues;
}
-uint64_t vhost_net_get_acked_features(VHostNetState *net)
+void vhost_net_get_acked_features_ex(VHostNetState *net, uint64_t *features)
{
- return net->dev.acked_features;
+ virtio_features_copy(features, net->dev.acked_features_ex);
}
void vhost_net_save_acked_features(NetClientState *nc)
@@ -234,7 +234,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
int r;
bool backend_kernel = options->backend_type == VHOST_BACKEND_TYPE_KERNEL;
struct vhost_net *net = g_new0(struct vhost_net, 1);
- uint64_t features = 0;
+ uint64_t missing_features[VIRTIO_FEATURES_NU64S];
+ uint64_t features[VIRTIO_FEATURES_NU64S];
Error *local_err = NULL;
if (!options->net_backend) {
@@ -247,6 +248,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
net->save_acked_features = options->save_acked_features;
net->max_tx_queue_size = options->max_tx_queue_size;
net->is_vhost_user = options->is_vhost_user;
+ virtio_features_clear(features);
net->dev.max_queues = 1;
net->dev.vqs = net->vqs;
@@ -261,7 +263,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
net->backend = r;
net->dev.protocol_features = 0;
} else {
- net->dev.backend_features = 0;
+ virtio_features_clear(net->dev.backend_features_ex);
net->dev.protocol_features = 0;
net->backend = -1;
@@ -281,26 +283,29 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options)
sizeof(struct virtio_net_hdr_mrg_rxbuf))) {
net->dev.features &= ~(1ULL << VIRTIO_NET_F_MRG_RXBUF);
}
- if (~net->dev.features & net->dev.backend_features) {
- fprintf(stderr, "vhost lacks feature mask 0x%" PRIx64
- " for backend\n",
- (uint64_t)(~net->dev.features & net->dev.backend_features));
+
+ if (virtio_features_andnot(missing_features,
+ net->dev.backend_features_ex,
+ net->dev.features_ex)) {
+ fprintf(stderr, "vhost lacks feature mask 0x" VIRTIO_FEATURES_FMT
+ " for backend\n", VIRTIO_FEATURES_PR(missing_features));
goto fail;
}
}
/* Set sane init value. Override when guest acks. */
if (options->get_acked_features) {
- features = options->get_acked_features(net->nc);
- if (~net->dev.features & features) {
- fprintf(stderr, "vhost lacks feature mask 0x%" PRIx64
- " for backend\n",
- (uint64_t)(~net->dev.features & features));
+ virtio_features_from_u64(features,
+ options->get_acked_features(net->nc));
+ if (virtio_features_andnot(missing_features, features,
+ net->dev.features_ex)) {
+ fprintf(stderr, "vhost lacks feature mask 0x" VIRTIO_FEATURES_FMT
+ " for backend\n", VIRTIO_FEATURES_PR(missing_features));
goto fail;
}
}
- vhost_net_ack_features(net, features);
+ vhost_net_ack_features_ex(net, features);
return net;
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
index 879781dad7..0225207491 100644
--- a/include/net/vhost_net.h
+++ b/include/net/vhost_net.h
@@ -2,6 +2,7 @@
#define VHOST_NET_H
#include "net/net.h"
+#include "hw/virtio/virtio-features.h"
#include "hw/virtio/vhost-backend.h"
struct vhost_net;
@@ -33,8 +34,26 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
void vhost_net_cleanup(VHostNetState *net);
-uint64_t vhost_net_get_features(VHostNetState *net, uint64_t features);
-void vhost_net_ack_features(VHostNetState *net, uint64_t features);
+void vhost_net_get_features_ex(VHostNetState *net, uint64_t *features);
+static inline uint64_t vhost_net_get_features(VHostNetState *net,
+ uint64_t features)
+{
+ uint64_t features_array[VIRTIO_FEATURES_NU64S];
+
+ virtio_features_from_u64(features_array, features);
+ vhost_net_get_features_ex(net, features_array);
+ return features_array[0];
+}
+
+void vhost_net_ack_features_ex(VHostNetState *net, const uint64_t *features);
+static inline void vhost_net_ack_features(VHostNetState *net,
+ uint64_t features)
+{
+ uint64_t features_array[VIRTIO_FEATURES_NU64S];
+
+ virtio_features_from_u64(features_array, features);
+ vhost_net_ack_features_ex(net, features_array);
+}
int vhost_net_get_config(struct vhost_net *net, uint8_t *config,
uint32_t config_len);
@@ -51,7 +70,15 @@ VHostNetState *get_vhost_net(NetClientState *nc);
int vhost_net_set_vring_enable(NetClientState *nc, int enable);
-uint64_t vhost_net_get_acked_features(VHostNetState *net);
+void vhost_net_get_acked_features_ex(VHostNetState *net, uint64_t *features);
+static inline uint64_t vhost_net_get_acked_features(VHostNetState *net)
+{
+ uint64_t features[VIRTIO_FEATURES_NU64S];
+
+ vhost_net_get_acked_features_ex(net, features);
+ assert(!virtio_features_use_ex(features));
+ return features[0];
+}
int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu);
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v6 12/14] virtio-net: implement extended features support
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (10 preceding siblings ...)
2025-09-12 13:07 ` [PATCH v6 11/14] vhost-net: " Paolo Abeni
@ 2025-09-12 13:07 ` Paolo Abeni
2025-09-12 13:07 ` [PATCH v6 13/14] net: implement tunnel probing Paolo Abeni
` (2 subsequent siblings)
14 siblings, 0 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:07 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Use the extended types and helpers to manipulate the virtio_net
features.
Note that offloads are still 64bits wide, as per specification,
and extended offloads will be mapped into such range.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- rebased on top of 6071d13c6a37
v3 -> v4:
- use new virtio_features macro names
v2 -> v3:
- rebased on top of 2deec9ab7d ("virtio-net: Move
virtio_net_get_features() down")
- _array -> _ex
v1 -> v2:
- uint128_t -> uint64_t[]
- more verbose macro definitions
---
hw/net/virtio-net.c | 140 +++++++++++++++++++--------------
include/hw/virtio/virtio-net.h | 2 +-
2 files changed, 83 insertions(+), 59 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index b86ba1fd27..89cf008401 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -90,6 +90,19 @@
VIRTIO_NET_RSS_HASH_TYPE_TCP_EX | \
VIRTIO_NET_RSS_HASH_TYPE_UDP_EX)
+/*
+ * Features starting from VIRTIO_NET_FEATURES_MAP_MIN bit correspond
+ * to guest offloads in the VIRTIO_NET_OFFLOAD_MAP range
+ */
+#define VIRTIO_NET_OFFLOAD_MAP_MIN 46
+#define VIRTIO_NET_OFFLOAD_MAP_LENGTH 4
+#define VIRTIO_NET_OFFLOAD_MAP MAKE_64BIT_MASK( \
+ VIRTIO_NET_OFFLOAD_MAP_MIN, \
+ VIRTIO_NET_OFFLOAD_MAP_LENGTH)
+#define VIRTIO_NET_FEATURES_MAP_MIN 65
+#define VIRTIO_NET_F2O_SHIFT (VIRTIO_NET_OFFLOAD_MAP_MIN - \
+ VIRTIO_NET_FEATURES_MAP_MIN + 64)
+
static const VirtIOFeature feature_sizes[] = {
{.flags = 1ULL << VIRTIO_NET_F_MAC,
.end = endof(struct virtio_net_config, mac)},
@@ -786,7 +799,14 @@ static void virtio_net_apply_guest_offloads(VirtIONet *n)
qemu_set_offload(qemu_get_queue(n->nic)->peer, &ol);
}
-static uint64_t virtio_net_guest_offloads_by_features(uint64_t features)
+static uint64_t virtio_net_features_to_offload(const uint64_t *features)
+{
+ return (features[0] & ~VIRTIO_NET_OFFLOAD_MAP) |
+ ((features[1] << VIRTIO_NET_F2O_SHIFT) & VIRTIO_NET_OFFLOAD_MAP);
+}
+
+static uint64_t
+virtio_net_guest_offloads_by_features(const uint64_t *features)
{
static const uint64_t guest_offloads_mask =
(1ULL << VIRTIO_NET_F_GUEST_CSUM) |
@@ -797,13 +817,13 @@ static uint64_t virtio_net_guest_offloads_by_features(uint64_t features)
(1ULL << VIRTIO_NET_F_GUEST_USO4) |
(1ULL << VIRTIO_NET_F_GUEST_USO6);
- return guest_offloads_mask & features;
+ return guest_offloads_mask & virtio_net_features_to_offload(features);
}
uint64_t virtio_net_supported_guest_offloads(const VirtIONet *n)
{
VirtIODevice *vdev = VIRTIO_DEVICE(n);
- return virtio_net_guest_offloads_by_features(vdev->guest_features);
+ return virtio_net_guest_offloads_by_features(vdev->guest_features_ex);
}
typedef struct {
@@ -882,34 +902,39 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
error_propagate(errp, err);
}
-static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features)
+static void virtio_net_set_features(VirtIODevice *vdev,
+ const uint64_t *in_features)
{
+ uint64_t features[VIRTIO_FEATURES_NU64S];
VirtIONet *n = VIRTIO_NET(vdev);
Error *err = NULL;
int i;
+ virtio_features_copy(features, in_features);
if (n->mtu_bypass_backend &&
!virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_MTU)) {
- features &= ~(1ULL << VIRTIO_NET_F_MTU);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_MTU);
}
virtio_net_set_multiqueue(n,
- virtio_has_feature(features, VIRTIO_NET_F_RSS) ||
- virtio_has_feature(features, VIRTIO_NET_F_MQ));
+ virtio_has_feature_ex(features,
+ VIRTIO_NET_F_RSS) ||
+ virtio_has_feature_ex(features,
+ VIRTIO_NET_F_MQ));
virtio_net_set_mrg_rx_bufs(n,
- virtio_has_feature(features,
+ virtio_has_feature_ex(features,
VIRTIO_NET_F_MRG_RXBUF),
- virtio_has_feature(features,
+ virtio_has_feature_ex(features,
VIRTIO_F_VERSION_1),
- virtio_has_feature(features,
+ virtio_has_feature_ex(features,
VIRTIO_NET_F_HASH_REPORT));
- n->rsc4_enabled = virtio_has_feature(features, VIRTIO_NET_F_RSC_EXT) &&
- virtio_has_feature(features, VIRTIO_NET_F_GUEST_TSO4);
- n->rsc6_enabled = virtio_has_feature(features, VIRTIO_NET_F_RSC_EXT) &&
- virtio_has_feature(features, VIRTIO_NET_F_GUEST_TSO6);
- n->rss_data.redirect = virtio_has_feature(features, VIRTIO_NET_F_RSS);
+ n->rsc4_enabled = virtio_has_feature_ex(features, VIRTIO_NET_F_RSC_EXT) &&
+ virtio_has_feature_ex(features, VIRTIO_NET_F_GUEST_TSO4);
+ n->rsc6_enabled = virtio_has_feature_ex(features, VIRTIO_NET_F_RSC_EXT) &&
+ virtio_has_feature_ex(features, VIRTIO_NET_F_GUEST_TSO6);
+ n->rss_data.redirect = virtio_has_feature_ex(features, VIRTIO_NET_F_RSS);
if (n->has_vnet_hdr) {
n->curr_guest_offloads =
@@ -923,7 +948,7 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features)
if (!get_vhost_net(nc->peer)) {
continue;
}
- vhost_net_ack_features(get_vhost_net(nc->peer), features);
+ vhost_net_ack_features_ex(get_vhost_net(nc->peer), features);
/*
* keep acked_features in NetVhostUserState up-to-date so it
@@ -932,12 +957,14 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features)
vhost_net_save_acked_features(nc->peer);
}
- if (virtio_has_feature(vdev->guest_features ^ features, VIRTIO_NET_F_CTRL_VLAN)) {
- bool vlan = virtio_has_feature(features, VIRTIO_NET_F_CTRL_VLAN);
+ if (virtio_has_feature_ex(features, VIRTIO_NET_F_CTRL_VLAN) !=
+ virtio_has_feature_ex(vdev->guest_features_ex,
+ VIRTIO_NET_F_CTRL_VLAN)) {
+ bool vlan = virtio_has_feature_ex(features, VIRTIO_NET_F_CTRL_VLAN);
memset(n->vlans, vlan ? 0 : 0xff, MAX_VLAN >> 3);
}
- if (virtio_has_feature(features, VIRTIO_NET_F_STANDBY)) {
+ if (virtio_has_feature_ex(features, VIRTIO_NET_F_STANDBY)) {
qapi_event_send_failover_negotiated(n->netclient_name);
qatomic_set(&n->failover_primary_hidden, false);
failover_add_primary(n, &err);
@@ -1902,10 +1929,10 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
virtio_error(vdev, "virtio-net unexpected empty queue: "
"i %zd mergeable %d offset %zd, size %zd, "
"guest hdr len %zd, host hdr len %zd "
- "guest features 0x%" PRIx64,
+ "guest features 0x" VIRTIO_FEATURES_FMT,
i, n->mergeable_rx_bufs, offset, size,
n->guest_hdr_len, n->host_hdr_len,
- vdev->guest_features);
+ VIRTIO_FEATURES_PR(vdev->guest_features_ex));
}
err = -1;
goto err;
@@ -3012,8 +3039,8 @@ static int virtio_net_pre_load_queues(VirtIODevice *vdev, uint32_t n)
return 0;
}
-static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features,
- Error **errp)
+static void virtio_net_get_features(VirtIODevice *vdev, uint64_t *features,
+ Error **errp)
{
VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc = qemu_get_queue(n->nic);
@@ -3027,68 +3054,67 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features,
(supported_hash_types & peer_hash_types) == supported_hash_types;
/* Firstly sync all virtio-net possible supported features */
- features |= n->host_features;
+ virtio_features_or(features, features, n->host_features_ex);
- virtio_add_feature(&features, VIRTIO_NET_F_MAC);
+ virtio_add_feature_ex(features, VIRTIO_NET_F_MAC);
if (!peer_has_vnet_hdr(n)) {
- virtio_clear_feature(&features, VIRTIO_NET_F_CSUM);
- virtio_clear_feature(&features, VIRTIO_NET_F_HOST_TSO4);
- virtio_clear_feature(&features, VIRTIO_NET_F_HOST_TSO6);
- virtio_clear_feature(&features, VIRTIO_NET_F_HOST_ECN);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_CSUM);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_TSO4);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_TSO6);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_ECN);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_CSUM);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_TSO4);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_TSO6);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_ECN);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_CSUM);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_TSO4);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_TSO6);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_ECN);
- virtio_clear_feature(&features, VIRTIO_NET_F_HOST_USO);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_USO4);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_USO6);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_USO);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO4);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO6);
- virtio_clear_feature(&features, VIRTIO_NET_F_HASH_REPORT);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HASH_REPORT);
}
if (!peer_has_vnet_hdr(n) || !peer_has_ufo(n)) {
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_UFO);
- virtio_clear_feature(&features, VIRTIO_NET_F_HOST_UFO);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_UFO);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_UFO);
}
-
if (!peer_has_uso(n)) {
- virtio_clear_feature(&features, VIRTIO_NET_F_HOST_USO);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_USO4);
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_USO6);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_USO);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO4);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO6);
}
if (!get_vhost_net(nc->peer)) {
if (!use_own_hash) {
- virtio_clear_feature(&features, VIRTIO_NET_F_HASH_REPORT);
- virtio_clear_feature(&features, VIRTIO_NET_F_RSS);
- } else if (virtio_has_feature(features, VIRTIO_NET_F_RSS)) {
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HASH_REPORT);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_RSS);
+ } else if (virtio_has_feature_ex(features, VIRTIO_NET_F_RSS)) {
virtio_net_load_ebpf(n, errp);
}
- return features;
+ return;
}
if (!use_peer_hash) {
- virtio_clear_feature(&features, VIRTIO_NET_F_HASH_REPORT);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HASH_REPORT);
if (!use_own_hash || !virtio_net_attach_ebpf_to_backend(n->nic, -1)) {
if (!virtio_net_load_ebpf(n, errp)) {
- return features;
+ return;
}
- virtio_clear_feature(&features, VIRTIO_NET_F_RSS);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_RSS);
}
}
- features = vhost_net_get_features(get_vhost_net(nc->peer), features);
- vdev->backend_features = features;
+ vhost_net_get_features_ex(get_vhost_net(nc->peer), features);
+ virtio_features_copy(vdev->backend_features_ex, features);
if (n->mtu_bypass_backend &&
(n->host_features & 1ULL << VIRTIO_NET_F_MTU)) {
- features |= (1ULL << VIRTIO_NET_F_MTU);
+ virtio_add_feature_ex(features, VIRTIO_NET_F_MTU);
}
/*
@@ -3103,10 +3129,8 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features,
* support it.
*/
if (!virtio_has_feature(vdev->backend_features, VIRTIO_NET_F_CTRL_VQ)) {
- virtio_clear_feature(&features, VIRTIO_NET_F_GUEST_ANNOUNCE);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_ANNOUNCE);
}
-
- return features;
}
static int virtio_net_post_load_device(void *opaque, int version_id)
@@ -4238,8 +4262,8 @@ static void virtio_net_class_init(ObjectClass *klass, const void *data)
vdc->unrealize = virtio_net_device_unrealize;
vdc->get_config = virtio_net_get_config;
vdc->set_config = virtio_net_set_config;
- vdc->get_features = virtio_net_get_features;
- vdc->set_features = virtio_net_set_features;
+ vdc->get_features_ex = virtio_net_get_features;
+ vdc->set_features_ex = virtio_net_set_features;
vdc->bad_features = virtio_net_bad_features;
vdc->reset = virtio_net_reset;
vdc->queue_reset = virtio_net_queue_reset;
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index 73fdefc0dc..5b8ab7bda7 100644
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -182,7 +182,7 @@ struct VirtIONet {
uint32_t has_vnet_hdr;
size_t host_hdr_len;
size_t guest_hdr_len;
- uint64_t host_features;
+ VIRTIO_DECLARE_FEATURES(host_features);
uint32_t rsc_timeout;
uint8_t rsc4_enabled;
uint8_t rsc6_enabled;
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* [PATCH v6 13/14] net: implement tunnel probing
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (11 preceding siblings ...)
2025-09-12 13:07 ` [PATCH v6 12/14] virtio-net: " Paolo Abeni
@ 2025-09-12 13:07 ` Paolo Abeni
2025-09-17 12:36 ` Stefano Garzarella
2025-09-12 13:07 ` [PATCH v6 14/14] net: implement UDP tunnel features offloading Paolo Abeni
2025-09-15 14:39 ` [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Lei Yang
14 siblings, 1 reply; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:07 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
Tap devices support GSO over UDP tunnel offload. Probe for such
feature in a similar manner to other offloads.
GSO over UDP tunnel needs to be enabled in addition to a "plain"
offload (TSO or USO).
No need to check separately for the outer header checksum offload:
ithe kernel is going to support both of them or none.
The new features are disabled by default to avoid compat issues,
and could be enabled, after that hw_compat_10_1 will be added,
together with the related compat entries.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--
v4 -> v5:
- disable features by default
- DEFINE_PROP_FEATURE -> VIRTIO_DEFINE_PROP_FEATURE
- reformatted props definitions
v3 -> v4:
- move DEFINE_PROP_FEATURE() in patch 4
v2 -> v3:
- use bool type for tap_probe_has_tunnel()
- rebased on top of 2deec9ab7d ("virtio-net: Move
virtio_net_get_features() down")
- _array -> _ex
v1 -> v2:
- peer_has_tunnel return a bool
- move TUN_F definition in net/tun-linux.h
---
hw/net/virtio-net.c | 41 +++++++++++++++++++++++++++++++++++++++++
include/net/net.h | 3 +++
net/net.c | 9 +++++++++
net/tap-bsd.c | 5 +++++
net/tap-linux.c | 11 +++++++++++
net/tap-linux.h | 9 +++++++++
net/tap-solaris.c | 5 +++++
net/tap-stub.c | 5 +++++
net/tap.c | 11 +++++++++++
net/tap_int.h | 1 +
10 files changed, 100 insertions(+)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 89cf008401..0abb8c8a62 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -649,6 +649,15 @@ static int peer_has_uso(VirtIONet *n)
return qemu_has_uso(qemu_get_queue(n->nic)->peer);
}
+static bool peer_has_tunnel(VirtIONet *n)
+{
+ if (!peer_has_vnet_hdr(n)) {
+ return false;
+ }
+
+ return qemu_has_tunnel(qemu_get_queue(n->nic)->peer);
+}
+
static void virtio_net_set_mrg_rx_bufs(VirtIONet *n, int mergeable_rx_bufs,
int version_1, int hash_report)
{
@@ -3073,6 +3082,13 @@ static void virtio_net_get_features(VirtIODevice *vdev, uint64_t *features,
virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO4);
virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO6);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO);
+ virtio_clear_feature_ex(features,
+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM);
+ virtio_clear_feature_ex(features,
+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM);
+
virtio_clear_feature_ex(features, VIRTIO_NET_F_HASH_REPORT);
}
@@ -3086,6 +3102,15 @@ static void virtio_net_get_features(VirtIODevice *vdev, uint64_t *features,
virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO6);
}
+ if (!peer_has_tunnel(n)) {
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO);
+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO);
+ virtio_clear_feature_ex(features,
+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM);
+ virtio_clear_feature_ex(features,
+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM);
+ }
+
if (!get_vhost_net(nc->peer)) {
if (!use_own_hash) {
virtio_clear_feature_ex(features, VIRTIO_NET_F_HASH_REPORT);
@@ -4248,6 +4273,22 @@ static const Property virtio_net_properties[] = {
rss_data.specified_hash_types,
VIRTIO_NET_HASH_REPORT_UDPv6_EX - 1,
ON_OFF_AUTO_AUTO),
+ VIRTIO_DEFINE_PROP_FEATURE("host_tunnel", VirtIONet,
+ host_features_ex,
+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO,
+ false),
+ VIRTIO_DEFINE_PROP_FEATURE("host_tunnel_csum", VirtIONet,
+ host_features_ex,
+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM,
+ false),
+ VIRTIO_DEFINE_PROP_FEATURE("guest_tunnel", VirtIONet,
+ host_features_ex,
+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO,
+ false),
+ VIRTIO_DEFINE_PROP_FEATURE("guest_tunnel_csum", VirtIONet,
+ host_features_ex,
+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM,
+ false),
};
static void virtio_net_class_init(ObjectClass *klass, const void *data)
diff --git a/include/net/net.h b/include/net/net.h
index 48ba333d02..9a9084690d 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -65,6 +65,7 @@ typedef void (NetClientDestructor)(NetClientState *);
typedef RxFilterInfo *(QueryRxFilter)(NetClientState *);
typedef bool (HasUfo)(NetClientState *);
typedef bool (HasUso)(NetClientState *);
+typedef bool (HasTunnel)(NetClientState *);
typedef bool (HasVnetHdr)(NetClientState *);
typedef bool (HasVnetHdrLen)(NetClientState *, int);
typedef void (SetOffload)(NetClientState *, const NetOffloads *);
@@ -95,6 +96,7 @@ typedef struct NetClientInfo {
NetPoll *poll;
HasUfo *has_ufo;
HasUso *has_uso;
+ HasTunnel *has_tunnel;
HasVnetHdr *has_vnet_hdr;
HasVnetHdrLen *has_vnet_hdr_len;
SetOffload *set_offload;
@@ -197,6 +199,7 @@ void qemu_set_info_str(NetClientState *nc,
void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6]);
bool qemu_has_ufo(NetClientState *nc);
bool qemu_has_uso(NetClientState *nc);
+bool qemu_has_tunnel(NetClientState *nc);
bool qemu_has_vnet_hdr(NetClientState *nc);
bool qemu_has_vnet_hdr_len(NetClientState *nc, int len);
void qemu_set_offload(NetClientState *nc, const NetOffloads *ol);
diff --git a/net/net.c b/net/net.c
index 63872b6855..9536184a0c 100644
--- a/net/net.c
+++ b/net/net.c
@@ -522,6 +522,15 @@ bool qemu_has_uso(NetClientState *nc)
return nc->info->has_uso(nc);
}
+bool qemu_has_tunnel(NetClientState *nc)
+{
+ if (!nc || !nc->info->has_tunnel) {
+ return false;
+ }
+
+ return nc->info->has_tunnel(nc);
+}
+
bool qemu_has_vnet_hdr(NetClientState *nc)
{
if (!nc || !nc->info->has_vnet_hdr) {
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 86b6edee94..751d4c819c 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -217,6 +217,11 @@ int tap_probe_has_uso(int fd)
return 0;
}
+bool tap_probe_has_tunnel(int fd)
+{
+ return false;
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
}
diff --git a/net/tap-linux.c b/net/tap-linux.c
index a1c58f74f5..e2628be798 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -196,6 +196,17 @@ int tap_probe_has_uso(int fd)
return 1;
}
+bool tap_probe_has_tunnel(int fd)
+{
+ unsigned offload;
+
+ offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_UDP_TUNNEL_GSO;
+ if (ioctl(fd, TUNSETOFFLOAD, offload) < 0) {
+ return false;
+ }
+ return true;
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
if (ioctl(fd, TUNSETVNETHDRSZ, &len) == -1) {
diff --git a/net/tap-linux.h b/net/tap-linux.h
index 9a58cecb7f..8cd6b5874b 100644
--- a/net/tap-linux.h
+++ b/net/tap-linux.h
@@ -53,4 +53,13 @@
#define TUN_F_USO4 0x20 /* I can handle USO for IPv4 packets */
#define TUN_F_USO6 0x40 /* I can handle USO for IPv6 packets */
+/* I can handle TSO/USO for UDP tunneled packets */
+#define TUN_F_UDP_TUNNEL_GSO 0x080
+
+/*
+ * I can handle TSO/USO for UDP tunneled packets requiring csum offload for
+ * the outer header
+ */
+#define TUN_F_UDP_TUNNEL_GSO_CSUM 0x100
+
#endif /* QEMU_TAP_LINUX_H */
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 833c066bee..ac1ae25761 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -222,6 +222,11 @@ int tap_probe_has_uso(int fd)
return 0;
}
+bool tap_probe_has_tunnel(int fd)
+{
+ return false;
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
}
diff --git a/net/tap-stub.c b/net/tap-stub.c
index 67d14ad4d5..f7a5e0c163 100644
--- a/net/tap-stub.c
+++ b/net/tap-stub.c
@@ -52,6 +52,11 @@ int tap_probe_has_uso(int fd)
return 0;
}
+bool tap_probe_has_tunnel(int fd)
+{
+ return false;
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
}
diff --git a/net/tap.c b/net/tap.c
index 72046a43aa..9f65e3fb3d 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -76,6 +76,7 @@ typedef struct TAPState {
bool using_vnet_hdr;
bool has_ufo;
bool has_uso;
+ bool has_tunnel;
bool enabled;
VHostNetState *vhost_net;
unsigned host_vnet_hdr_len;
@@ -246,6 +247,14 @@ static bool tap_has_uso(NetClientState *nc)
return s->has_uso;
}
+static bool tap_has_tunnel(NetClientState *nc)
+{
+ TAPState *s = DO_UPCAST(TAPState, nc, nc);
+
+ assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
+ return s->has_tunnel;
+}
+
static bool tap_has_vnet_hdr(NetClientState *nc)
{
TAPState *s = DO_UPCAST(TAPState, nc, nc);
@@ -374,6 +383,7 @@ static NetClientInfo net_tap_info = {
.cleanup = tap_cleanup,
.has_ufo = tap_has_ufo,
.has_uso = tap_has_uso,
+ .has_tunnel = tap_has_tunnel,
.has_vnet_hdr = tap_has_vnet_hdr,
.has_vnet_hdr_len = tap_has_vnet_hdr_len,
.set_offload = tap_set_offload,
@@ -403,6 +413,7 @@ static TAPState *net_tap_fd_init(NetClientState *peer,
s->using_vnet_hdr = false;
s->has_ufo = tap_probe_has_ufo(s->fd);
s->has_uso = tap_probe_has_uso(s->fd);
+ s->has_tunnel = tap_probe_has_tunnel(s->fd);
s->enabled = true;
tap_set_offload(&s->nc, &ol);
/*
diff --git a/net/tap_int.h b/net/tap_int.h
index f8bbe1cb0c..b76a05044b 100644
--- a/net/tap_int.h
+++ b/net/tap_int.h
@@ -38,6 +38,7 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp);
int tap_probe_vnet_hdr(int fd, Error **errp);
int tap_probe_has_ufo(int fd);
int tap_probe_has_uso(int fd);
+bool tap_probe_has_tunnel(int fd);
void tap_fd_set_offload(int fd, const NetOffloads *ol);
void tap_fd_set_vnet_hdr_len(int fd, int len);
int tap_fd_set_vnet_le(int fd, int vnet_is_le);
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 13/14] net: implement tunnel probing
2025-09-12 13:07 ` [PATCH v6 13/14] net: implement tunnel probing Paolo Abeni
@ 2025-09-17 12:36 ` Stefano Garzarella
0 siblings, 0 replies; 34+ messages in thread
From: Stefano Garzarella @ 2025-09-17 12:36 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster
On Fri, Sep 12, 2025 at 03:07:04PM +0200, Paolo Abeni wrote:
>Tap devices support GSO over UDP tunnel offload. Probe for such
>feature in a similar manner to other offloads.
>
>GSO over UDP tunnel needs to be enabled in addition to a "plain"
>offload (TSO or USO).
>
>No need to check separately for the outer header checksum offload:
>ithe kernel is going to support both of them or none.
s/ithe/the
but again no need to repost on my side, up to you.
Thanks,
Stefano
>
>The new features are disabled by default to avoid compat issues,
>and could be enabled, after that hw_compat_10_1 will be added,
>together with the related compat entries.
>
>Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
>Acked-by: Jason Wang <jasowang@redhat.com>
>Signed-off-by: Paolo Abeni <pabeni@redhat.com>
>--
>v4 -> v5:
> - disable features by default
> - DEFINE_PROP_FEATURE -> VIRTIO_DEFINE_PROP_FEATURE
> - reformatted props definitions
>
>v3 -> v4:
> - move DEFINE_PROP_FEATURE() in patch 4
>
>v2 -> v3:
> - use bool type for tap_probe_has_tunnel()
> - rebased on top of 2deec9ab7d ("virtio-net: Move
> virtio_net_get_features() down")
> - _array -> _ex
>
>v1 -> v2:
> - peer_has_tunnel return a bool
> - move TUN_F definition in net/tun-linux.h
>---
> hw/net/virtio-net.c | 41 +++++++++++++++++++++++++++++++++++++++++
> include/net/net.h | 3 +++
> net/net.c | 9 +++++++++
> net/tap-bsd.c | 5 +++++
> net/tap-linux.c | 11 +++++++++++
> net/tap-linux.h | 9 +++++++++
> net/tap-solaris.c | 5 +++++
> net/tap-stub.c | 5 +++++
> net/tap.c | 11 +++++++++++
> net/tap_int.h | 1 +
> 10 files changed, 100 insertions(+)
>
>diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
>index 89cf008401..0abb8c8a62 100644
>--- a/hw/net/virtio-net.c
>+++ b/hw/net/virtio-net.c
>@@ -649,6 +649,15 @@ static int peer_has_uso(VirtIONet *n)
> return qemu_has_uso(qemu_get_queue(n->nic)->peer);
> }
>
>+static bool peer_has_tunnel(VirtIONet *n)
>+{
>+ if (!peer_has_vnet_hdr(n)) {
>+ return false;
>+ }
>+
>+ return qemu_has_tunnel(qemu_get_queue(n->nic)->peer);
>+}
>+
> static void virtio_net_set_mrg_rx_bufs(VirtIONet *n, int mergeable_rx_bufs,
> int version_1, int hash_report)
> {
>@@ -3073,6 +3082,13 @@ static void virtio_net_get_features(VirtIODevice *vdev, uint64_t *features,
> virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO4);
> virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO6);
>
>+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO);
>+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO);
>+ virtio_clear_feature_ex(features,
>+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM);
>+ virtio_clear_feature_ex(features,
>+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM);
>+
> virtio_clear_feature_ex(features, VIRTIO_NET_F_HASH_REPORT);
> }
>
>@@ -3086,6 +3102,15 @@ static void virtio_net_get_features(VirtIODevice *vdev, uint64_t *features,
> virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_USO6);
> }
>
>+ if (!peer_has_tunnel(n)) {
>+ virtio_clear_feature_ex(features, VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO);
>+ virtio_clear_feature_ex(features, VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO);
>+ virtio_clear_feature_ex(features,
>+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM);
>+ virtio_clear_feature_ex(features,
>+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM);
>+ }
>+
> if (!get_vhost_net(nc->peer)) {
> if (!use_own_hash) {
> virtio_clear_feature_ex(features, VIRTIO_NET_F_HASH_REPORT);
>@@ -4248,6 +4273,22 @@ static const Property virtio_net_properties[] = {
> rss_data.specified_hash_types,
> VIRTIO_NET_HASH_REPORT_UDPv6_EX - 1,
> ON_OFF_AUTO_AUTO),
>+ VIRTIO_DEFINE_PROP_FEATURE("host_tunnel", VirtIONet,
>+ host_features_ex,
>+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO,
>+ false),
>+ VIRTIO_DEFINE_PROP_FEATURE("host_tunnel_csum", VirtIONet,
>+ host_features_ex,
>+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO_CSUM,
>+ false),
>+ VIRTIO_DEFINE_PROP_FEATURE("guest_tunnel", VirtIONet,
>+ host_features_ex,
>+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO,
>+ false),
>+ VIRTIO_DEFINE_PROP_FEATURE("guest_tunnel_csum", VirtIONet,
>+ host_features_ex,
>+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM,
>+ false),
> };
>
> static void virtio_net_class_init(ObjectClass *klass, const void *data)
>diff --git a/include/net/net.h b/include/net/net.h
>index 48ba333d02..9a9084690d 100644
>--- a/include/net/net.h
>+++ b/include/net/net.h
>@@ -65,6 +65,7 @@ typedef void (NetClientDestructor)(NetClientState *);
> typedef RxFilterInfo *(QueryRxFilter)(NetClientState *);
> typedef bool (HasUfo)(NetClientState *);
> typedef bool (HasUso)(NetClientState *);
>+typedef bool (HasTunnel)(NetClientState *);
> typedef bool (HasVnetHdr)(NetClientState *);
> typedef bool (HasVnetHdrLen)(NetClientState *, int);
> typedef void (SetOffload)(NetClientState *, const NetOffloads *);
>@@ -95,6 +96,7 @@ typedef struct NetClientInfo {
> NetPoll *poll;
> HasUfo *has_ufo;
> HasUso *has_uso;
>+ HasTunnel *has_tunnel;
> HasVnetHdr *has_vnet_hdr;
> HasVnetHdrLen *has_vnet_hdr_len;
> SetOffload *set_offload;
>@@ -197,6 +199,7 @@ void qemu_set_info_str(NetClientState *nc,
> void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6]);
> bool qemu_has_ufo(NetClientState *nc);
> bool qemu_has_uso(NetClientState *nc);
>+bool qemu_has_tunnel(NetClientState *nc);
> bool qemu_has_vnet_hdr(NetClientState *nc);
> bool qemu_has_vnet_hdr_len(NetClientState *nc, int len);
> void qemu_set_offload(NetClientState *nc, const NetOffloads *ol);
>diff --git a/net/net.c b/net/net.c
>index 63872b6855..9536184a0c 100644
>--- a/net/net.c
>+++ b/net/net.c
>@@ -522,6 +522,15 @@ bool qemu_has_uso(NetClientState *nc)
> return nc->info->has_uso(nc);
> }
>
>+bool qemu_has_tunnel(NetClientState *nc)
>+{
>+ if (!nc || !nc->info->has_tunnel) {
>+ return false;
>+ }
>+
>+ return nc->info->has_tunnel(nc);
>+}
>+
> bool qemu_has_vnet_hdr(NetClientState *nc)
> {
> if (!nc || !nc->info->has_vnet_hdr) {
>diff --git a/net/tap-bsd.c b/net/tap-bsd.c
>index 86b6edee94..751d4c819c 100644
>--- a/net/tap-bsd.c
>+++ b/net/tap-bsd.c
>@@ -217,6 +217,11 @@ int tap_probe_has_uso(int fd)
> return 0;
> }
>
>+bool tap_probe_has_tunnel(int fd)
>+{
>+ return false;
>+}
>+
> void tap_fd_set_vnet_hdr_len(int fd, int len)
> {
> }
>diff --git a/net/tap-linux.c b/net/tap-linux.c
>index a1c58f74f5..e2628be798 100644
>--- a/net/tap-linux.c
>+++ b/net/tap-linux.c
>@@ -196,6 +196,17 @@ int tap_probe_has_uso(int fd)
> return 1;
> }
>
>+bool tap_probe_has_tunnel(int fd)
>+{
>+ unsigned offload;
>+
>+ offload = TUN_F_CSUM | TUN_F_TSO4 | TUN_F_UDP_TUNNEL_GSO;
>+ if (ioctl(fd, TUNSETOFFLOAD, offload) < 0) {
>+ return false;
>+ }
>+ return true;
>+}
>+
> void tap_fd_set_vnet_hdr_len(int fd, int len)
> {
> if (ioctl(fd, TUNSETVNETHDRSZ, &len) == -1) {
>diff --git a/net/tap-linux.h b/net/tap-linux.h
>index 9a58cecb7f..8cd6b5874b 100644
>--- a/net/tap-linux.h
>+++ b/net/tap-linux.h
>@@ -53,4 +53,13 @@
> #define TUN_F_USO4 0x20 /* I can handle USO for IPv4 packets */
> #define TUN_F_USO6 0x40 /* I can handle USO for IPv6 packets */
>
>+/* I can handle TSO/USO for UDP tunneled packets */
>+#define TUN_F_UDP_TUNNEL_GSO 0x080
>+
>+/*
>+ * I can handle TSO/USO for UDP tunneled packets requiring csum offload for
>+ * the outer header
>+ */
>+#define TUN_F_UDP_TUNNEL_GSO_CSUM 0x100
>+
> #endif /* QEMU_TAP_LINUX_H */
>diff --git a/net/tap-solaris.c b/net/tap-solaris.c
>index 833c066bee..ac1ae25761 100644
>--- a/net/tap-solaris.c
>+++ b/net/tap-solaris.c
>@@ -222,6 +222,11 @@ int tap_probe_has_uso(int fd)
> return 0;
> }
>
>+bool tap_probe_has_tunnel(int fd)
>+{
>+ return false;
>+}
>+
> void tap_fd_set_vnet_hdr_len(int fd, int len)
> {
> }
>diff --git a/net/tap-stub.c b/net/tap-stub.c
>index 67d14ad4d5..f7a5e0c163 100644
>--- a/net/tap-stub.c
>+++ b/net/tap-stub.c
>@@ -52,6 +52,11 @@ int tap_probe_has_uso(int fd)
> return 0;
> }
>
>+bool tap_probe_has_tunnel(int fd)
>+{
>+ return false;
>+}
>+
> void tap_fd_set_vnet_hdr_len(int fd, int len)
> {
> }
>diff --git a/net/tap.c b/net/tap.c
>index 72046a43aa..9f65e3fb3d 100644
>--- a/net/tap.c
>+++ b/net/tap.c
>@@ -76,6 +76,7 @@ typedef struct TAPState {
> bool using_vnet_hdr;
> bool has_ufo;
> bool has_uso;
>+ bool has_tunnel;
> bool enabled;
> VHostNetState *vhost_net;
> unsigned host_vnet_hdr_len;
>@@ -246,6 +247,14 @@ static bool tap_has_uso(NetClientState *nc)
> return s->has_uso;
> }
>
>+static bool tap_has_tunnel(NetClientState *nc)
>+{
>+ TAPState *s = DO_UPCAST(TAPState, nc, nc);
>+
>+ assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
>+ return s->has_tunnel;
>+}
>+
> static bool tap_has_vnet_hdr(NetClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>@@ -374,6 +383,7 @@ static NetClientInfo net_tap_info = {
> .cleanup = tap_cleanup,
> .has_ufo = tap_has_ufo,
> .has_uso = tap_has_uso,
>+ .has_tunnel = tap_has_tunnel,
> .has_vnet_hdr = tap_has_vnet_hdr,
> .has_vnet_hdr_len = tap_has_vnet_hdr_len,
> .set_offload = tap_set_offload,
>@@ -403,6 +413,7 @@ static TAPState *net_tap_fd_init(NetClientState *peer,
> s->using_vnet_hdr = false;
> s->has_ufo = tap_probe_has_ufo(s->fd);
> s->has_uso = tap_probe_has_uso(s->fd);
>+ s->has_tunnel = tap_probe_has_tunnel(s->fd);
> s->enabled = true;
> tap_set_offload(&s->nc, &ol);
> /*
>diff --git a/net/tap_int.h b/net/tap_int.h
>index f8bbe1cb0c..b76a05044b 100644
>--- a/net/tap_int.h
>+++ b/net/tap_int.h
>@@ -38,6 +38,7 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp);
> int tap_probe_vnet_hdr(int fd, Error **errp);
> int tap_probe_has_ufo(int fd);
> int tap_probe_has_uso(int fd);
>+bool tap_probe_has_tunnel(int fd);
> void tap_fd_set_offload(int fd, const NetOffloads *ol);
> void tap_fd_set_vnet_hdr_len(int fd, int len);
> int tap_fd_set_vnet_le(int fd, int vnet_is_le);
>--
>2.51.0
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v6 14/14] net: implement UDP tunnel features offloading
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (12 preceding siblings ...)
2025-09-12 13:07 ` [PATCH v6 13/14] net: implement tunnel probing Paolo Abeni
@ 2025-09-12 13:07 ` Paolo Abeni
2025-09-15 14:39 ` [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Lei Yang
14 siblings, 0 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-12 13:07 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki, Jason Wang,
Sriram Yagnaraman, Michael S. Tsirkin, Stefano Garzarella,
Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione,
Eric Blake, Markus Armbruster
When any host or guest GSO over UDP tunnel offload is enabled the
virtio net header includes the additional tunnel-related fields,
update the size accordingly.
Push the GSO over UDP tunnel offloads all the way down to the tap
device extending the newly introduced NetFeatures struct, and
eventually enable the associated features.
As per virtio specification, to convert features bit to offload bit,
map the extended features into the reserved range.
Finally, make the vhost backend aware of the exact header layout, to
copy it correctly. The tunnel-related field are present if either
the guest or the host negotiated any UDP tunnel related feature:
add them to the kernel supported features list, to allow qemu
transfer to the backend the needed information.
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v3 -> v4:
- '|' -> '||'
v2 -> v3:
- rebased on top of "net: Consolidate vhost feature bits into vhost_net
structure"
- _array -> _ex
v1 -> v2:
- squashed vhost support into this patch
- dropped tun offload consistency checks; they are implemented in
the kernel side
- virtio_has_tnl_hdr ->virtio_has_tunnel_hdr
---
hw/net/virtio-net.c | 34 ++++++++++++++++++++++++++--------
include/net/net.h | 2 ++
net/net.c | 3 ++-
net/tap-linux.c | 6 ++++++
net/tap.c | 2 ++
5 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 0abb8c8a62..f021663f92 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -103,6 +103,12 @@
#define VIRTIO_NET_F2O_SHIFT (VIRTIO_NET_OFFLOAD_MAP_MIN - \
VIRTIO_NET_FEATURES_MAP_MIN + 64)
+static bool virtio_has_tunnel_hdr(const uint64_t *features)
+{
+ return virtio_has_feature_ex(features, VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO) ||
+ virtio_has_feature_ex(features, VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO);
+}
+
static const VirtIOFeature feature_sizes[] = {
{.flags = 1ULL << VIRTIO_NET_F_MAC,
.end = endof(struct virtio_net_config, mac)},
@@ -659,7 +665,8 @@ static bool peer_has_tunnel(VirtIONet *n)
}
static void virtio_net_set_mrg_rx_bufs(VirtIONet *n, int mergeable_rx_bufs,
- int version_1, int hash_report)
+ int version_1, int hash_report,
+ int tunnel)
{
int i;
NetClientState *nc;
@@ -667,9 +674,11 @@ static void virtio_net_set_mrg_rx_bufs(VirtIONet *n, int mergeable_rx_bufs,
n->mergeable_rx_bufs = mergeable_rx_bufs;
if (version_1) {
- n->guest_hdr_len = hash_report ?
- sizeof(struct virtio_net_hdr_v1_hash) :
- sizeof(struct virtio_net_hdr_mrg_rxbuf);
+ n->guest_hdr_len = tunnel ?
+ sizeof(struct virtio_net_hdr_v1_hash_tunnel) :
+ (hash_report ?
+ sizeof(struct virtio_net_hdr_v1_hash) :
+ sizeof(struct virtio_net_hdr_mrg_rxbuf));
n->rss_data.populate_hash = !!hash_report;
} else {
n->guest_hdr_len = n->mergeable_rx_bufs ?
@@ -803,6 +812,10 @@ static void virtio_net_apply_guest_offloads(VirtIONet *n)
.ufo = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_UFO)),
.uso4 = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO4)),
.uso6 = !!(n->curr_guest_offloads & (1ULL << VIRTIO_NET_F_GUEST_USO6)),
+ .tnl = !!(n->curr_guest_offloads &
+ (1ULL << VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_MAPPED)),
+ .tnl_csum = !!(n->curr_guest_offloads &
+ (1ULL << VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM_MAPPED)),
};
qemu_set_offload(qemu_get_queue(n->nic)->peer, &ol);
@@ -824,7 +837,9 @@ virtio_net_guest_offloads_by_features(const uint64_t *features)
(1ULL << VIRTIO_NET_F_GUEST_ECN) |
(1ULL << VIRTIO_NET_F_GUEST_UFO) |
(1ULL << VIRTIO_NET_F_GUEST_USO4) |
- (1ULL << VIRTIO_NET_F_GUEST_USO6);
+ (1ULL << VIRTIO_NET_F_GUEST_USO6) |
+ (1ULL << VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_MAPPED) |
+ (1ULL << VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO_CSUM_MAPPED);
return guest_offloads_mask & virtio_net_features_to_offload(features);
}
@@ -937,7 +952,8 @@ static void virtio_net_set_features(VirtIODevice *vdev,
virtio_has_feature_ex(features,
VIRTIO_F_VERSION_1),
virtio_has_feature_ex(features,
- VIRTIO_NET_F_HASH_REPORT));
+ VIRTIO_NET_F_HASH_REPORT),
+ virtio_has_tunnel_hdr(features));
n->rsc4_enabled = virtio_has_feature_ex(features, VIRTIO_NET_F_RSC_EXT) &&
virtio_has_feature_ex(features, VIRTIO_NET_F_GUEST_TSO4);
@@ -3163,13 +3179,15 @@ static int virtio_net_post_load_device(void *opaque, int version_id)
VirtIONet *n = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(n);
int i, link_down;
+ bool has_tunnel_hdr = virtio_has_tunnel_hdr(vdev->guest_features_ex);
trace_virtio_net_post_load_device();
virtio_net_set_mrg_rx_bufs(n, n->mergeable_rx_bufs,
virtio_vdev_has_feature(vdev,
VIRTIO_F_VERSION_1),
virtio_vdev_has_feature(vdev,
- VIRTIO_NET_F_HASH_REPORT));
+ VIRTIO_NET_F_HASH_REPORT),
+ has_tunnel_hdr);
/* MAC_TABLE_ENTRIES may be different from the saved image */
if (n->mac_table.in_use > MAC_TABLE_ENTRIES) {
@@ -3989,7 +4007,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
n->vqs[0].tx_waiting = 0;
n->tx_burst = n->net_conf.txburst;
- virtio_net_set_mrg_rx_bufs(n, 0, 0, 0);
+ virtio_net_set_mrg_rx_bufs(n, 0, 0, 0, 0);
n->promisc = 1; /* for compatibility */
n->mac_table.macs = g_malloc0(MAC_TABLE_ENTRIES * ETH_ALEN);
diff --git a/include/net/net.h b/include/net/net.h
index 9a9084690d..72b476ee1d 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -43,6 +43,8 @@ typedef struct NetOffloads {
bool ufo;
bool uso4;
bool uso6;
+ bool tnl;
+ bool tnl_csum;
} NetOffloads;
#define DEFINE_NIC_PROPERTIES(_state, _conf) \
diff --git a/net/net.c b/net/net.c
index 9536184a0c..27e0d27807 100644
--- a/net/net.c
+++ b/net/net.c
@@ -575,7 +575,8 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
assert(len == sizeof(struct virtio_net_hdr_mrg_rxbuf) ||
len == sizeof(struct virtio_net_hdr) ||
- len == sizeof(struct virtio_net_hdr_v1_hash));
+ len == sizeof(struct virtio_net_hdr_v1_hash) ||
+ len == sizeof(struct virtio_net_hdr_v1_hash_tunnel));
nc->vnet_hdr_len = len;
nc->info->set_vnet_hdr_len(nc, len);
diff --git a/net/tap-linux.c b/net/tap-linux.c
index e2628be798..8e275d2ea4 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -279,6 +279,12 @@ void tap_fd_set_offload(int fd, const NetOffloads *ol)
if (ol->uso6) {
offload |= TUN_F_USO6;
}
+ if (ol->tnl) {
+ offload |= TUN_F_UDP_TUNNEL_GSO;
+ }
+ if (ol->tnl_csum) {
+ offload |= TUN_F_UDP_TUNNEL_GSO_CSUM;
+ }
}
if (ioctl(fd, TUNSETOFFLOAD, offload) != 0) {
diff --git a/net/tap.c b/net/tap.c
index 9f65e3fb3d..dc2a2859ec 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -62,6 +62,8 @@ static const int kernel_feature_bits[] = {
VIRTIO_F_NOTIFICATION_DATA,
VIRTIO_NET_F_RSC_EXT,
VIRTIO_NET_F_HASH_REPORT,
+ VIRTIO_NET_F_GUEST_UDP_TUNNEL_GSO,
+ VIRTIO_NET_F_HOST_UDP_TUNNEL_GSO,
VHOST_INVALID_FEATURE_BIT
};
--
2.51.0
^ permalink raw reply related [flat|nested] 34+ messages in thread* Re: [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel
2025-09-12 13:06 [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Paolo Abeni
` (13 preceding siblings ...)
2025-09-12 13:07 ` [PATCH v6 14/14] net: implement UDP tunnel features offloading Paolo Abeni
@ 2025-09-15 14:39 ` Lei Yang
2025-09-19 9:09 ` Paolo Abeni
14 siblings, 1 reply; 34+ messages in thread
From: Lei Yang @ 2025-09-15 14:39 UTC (permalink / raw)
To: Paolo Abeni
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Michael S. Tsirkin,
Stefano Garzarella, Cornelia Huck, Luigi Rizzo, Giuseppe Lettieri,
Vincenzo Maffione, Eric Blake, Markus Armbruster
Tested this series of patches v6 with virtio-net regression tests,
everything works fine.
Tested-by: Lei Yang <leiyang@redhat.com>
On Fri, Sep 12, 2025 at 9:10 PM Paolo Abeni <pabeni@redhat.com> wrote:
>
> Some virtualized deployments use UDP tunnel pervasively and are impacted
> negatively by the lack of GSO support for such kind of traffic in the
> virtual NIC driver.
>
> The virtio_net specification recently introduced support for GSO over
> UDP tunnel, and the kernel side of the implementation has been merged
> into the net-next tree; this series updates the virtio implementation to
> support such a feature.
>
> Currently the qemu virtio support limits the feature space to 64 bits,
> while the virtio specification allows for a larger number of features.
> Specifically the GSO-over-UDP-tunnel-related virtio features use bits
> 65-69; the larger part of this series (patches 4-12) actually deals with
> extending the features space.
>
> The extended features are carried by fixed size uint64_t arrays,
> bringing the current maximum features number to 128.
>
> The patches use some syntactic sugar to try to minimize the otherwise
> very large code churn. Specifically the extended features are boundled
> in an union with 'legacy' features definition, allowing no changes in
> the virtio devices not needing the extended features set.
>
> The actual offload implementation is in patches 13 and 14 and boils down
> to propagating the new offload to the tun devices and the vhost backend.
>
> Patch 1 is a small pre-req refactor that ideally could enter the
> tree separately; it's presented here in the same series to help
> reviewers more easily getting the full picture, patch 2 updates to
> linux headers update script to deal with annotations recently introduce
> in the kernel and patch 3 is a needed linux headers update.
>
> Tested with basic stream transfer with all the possible permutations of
> host kernel/qemu/guest kernel with/without GSO over UDP tunnel support,
> vs snapshots creation and restore and vs migration.
>
> The new features are disabled by default to avoid compatibilty issues.
> They could be enabled with a later patch, together with the related
> compatiblity entries.
> ---
> v5 -> v6:
> - colleted ack-by/reviewed-by tags
> - re-included pre-req patch as per Michael's request
> - minor checkpatch and whitestaces fixes
>
> v5: https://lists.gnu.org/archive/html/qemu-devel/2025-08/msg02005.html
>
> v4 -> v5:
> - more sparse cleanup
> - dropped RFC tag
> - disable the new features by default
>
> v4: https://lists.gnu.org/archive/html/qemu-devel/2025-07/msg05513.html
>
> v3 -> v4:
> - more sparse cleanups
> - fix build failures on a couple of targets
> v3: https://lists.gnu.org/archive/html/qemu-devel/2025-07/msg04872.html
>
> v2 -> v3:
> - consolidated suffixes for new fields to '_ex'
> - avoid pre/post load trickery and relay on reset zeroing the features
> - cleaned-up virtio store implementation deduplicating a bit of code
> - many more cleanups, see the individual patches changelog for the
> details
> - I left patch 1 unmodified, still some hope we could live with that;)
> v2: https://lists.gnu.org/archive/html/qemu-devel/2025-07/msg03000.html
>
> Paolo Abeni (14):
> net: bundle all offloads in a single struct
> linux-headers: deal with counted_by annotation
> linux-headers: Update to Linux v6.17-rc1
> virtio: introduce extended features type
> virtio: serialize extended features state
> virtio: add support for negotiating extended features
> virtio-pci: implement support for extended features
> vhost: add support for negotiating extended features
> qmp: update virtio features map to support extended features
> vhost-backend: implement extended features support
> vhost-net: implement extended features support
> virtio-net: implement extended features support
> net: implement tunnel probing
> net: implement UDP tunnel features offloading
>
> hw/net/e1000e_core.c | 5 +-
> hw/net/igb_core.c | 5 +-
> hw/net/vhost_net-stub.c | 8 +-
> hw/net/vhost_net.c | 45 ++--
> hw/net/virtio-net.c | 234 ++++++++++++------
> hw/net/vmxnet3.c | 13 +-
> hw/virtio/vhost-backend.c | 62 ++++-
> hw/virtio/vhost.c | 68 +++--
> hw/virtio/virtio-bus.c | 11 +-
> hw/virtio/virtio-hmp-cmds.c | 3 +-
> hw/virtio/virtio-pci.c | 76 +++++-
> hw/virtio/virtio-qmp.c | 91 ++++---
> hw/virtio/virtio-qmp.h | 3 +-
> hw/virtio/virtio.c | 100 +++++---
> include/hw/virtio/vhost-backend.h | 6 +
> include/hw/virtio/vhost.h | 56 ++++-
> include/hw/virtio/virtio-features.h | 126 ++++++++++
> include/hw/virtio/virtio-net.h | 2 +-
> include/hw/virtio/virtio-pci.h | 2 +-
> include/hw/virtio/virtio.h | 11 +-
> include/net/net.h | 20 +-
> include/net/vhost_net.h | 33 ++-
> include/standard-headers/drm/drm_fourcc.h | 56 ++++-
> include/standard-headers/linux/ethtool.h | 4 +-
> .../linux/input-event-codes.h | 8 +
> include/standard-headers/linux/input.h | 1 +
> include/standard-headers/linux/pci_regs.h | 9 +
> include/standard-headers/linux/vhost_types.h | 5 +
> include/standard-headers/linux/virtio_net.h | 33 +++
> linux-headers/LICENSES/preferred/GPL-2.0 | 10 +-
> linux-headers/asm-arm64/unistd_64.h | 2 +
> linux-headers/asm-generic/unistd.h | 8 +-
> linux-headers/asm-loongarch/unistd_64.h | 2 +
> linux-headers/asm-mips/unistd_n32.h | 2 +
> linux-headers/asm-mips/unistd_n64.h | 2 +
> linux-headers/asm-mips/unistd_o32.h | 2 +
> linux-headers/asm-powerpc/kvm.h | 13 -
> linux-headers/asm-powerpc/unistd_32.h | 2 +
> linux-headers/asm-powerpc/unistd_64.h | 2 +
> linux-headers/asm-riscv/kvm.h | 1 +
> linux-headers/asm-riscv/unistd_32.h | 2 +
> linux-headers/asm-riscv/unistd_64.h | 2 +
> linux-headers/asm-s390/unistd_32.h | 2 +
> linux-headers/asm-s390/unistd_64.h | 2 +
> linux-headers/asm-x86/unistd_32.h | 2 +
> linux-headers/asm-x86/unistd_64.h | 2 +
> linux-headers/asm-x86/unistd_x32.h | 2 +
> linux-headers/linux/iommufd.h | 154 +++++++++++-
> linux-headers/linux/kvm.h | 2 +
> linux-headers/linux/vfio.h | 12 +-
> linux-headers/linux/vhost.h | 35 +++
> net/net.c | 17 +-
> net/netmap.c | 3 +-
> net/tap-bsd.c | 8 +-
> net/tap-linux.c | 38 ++-
> net/tap-linux.h | 9 +
> net/tap-solaris.c | 9 +-
> net/tap-stub.c | 8 +-
> net/tap.c | 21 +-
> net/tap_int.h | 5 +-
> qapi/virtio.json | 9 +-
> scripts/update-linux-headers.sh | 1 +
> 62 files changed, 1196 insertions(+), 291 deletions(-)
> create mode 100644 include/hw/virtio/virtio-features.h
>
> --
> 2.51.0
>
>
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel
2025-09-15 14:39 ` [PATCH v6 00/14] virtio: introduce support for GSO over UDP tunnel Lei Yang
@ 2025-09-19 9:09 ` Paolo Abeni
0 siblings, 0 replies; 34+ messages in thread
From: Paolo Abeni @ 2025-09-19 9:09 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: qemu-devel, Paolo Bonzini, Dmitry Fleytman, Akihiko Odaki,
Jason Wang, Sriram Yagnaraman, Stefano Garzarella, Cornelia Huck,
Luigi Rizzo, Giuseppe Lettieri, Vincenzo Maffione, Eric Blake,
Markus Armbruster, Lei Yang
Hi Michael,
On Fri, Sep 12, 2025 at 9:10 PM Paolo Abeni <pabeni@redhat.com> wrote:
> Some virtualized deployments use UDP tunnel pervasively and are impacted
> negatively by the lack of GSO support for such kind of traffic in the
> virtual NIC driver.
>
> The virtio_net specification recently introduced support for GSO over
> UDP tunnel, and the kernel side of the implementation has been merged
> into the net-next tree; this series updates the virtio implementation to
> support such a feature.
>
> Currently the qemu virtio support limits the feature space to 64 bits,
> while the virtio specification allows for a larger number of features.
> Specifically the GSO-over-UDP-tunnel-related virtio features use bits
> 65-69; the larger part of this series (patches 4-12) actually deals with
> extending the features space.
>
> The extended features are carried by fixed size uint64_t arrays,
> bringing the current maximum features number to 128.
>
> The patches use some syntactic sugar to try to minimize the otherwise
> very large code churn. Specifically the extended features are boundled
> in an union with 'legacy' features definition, allowing no changes in
> the virtio devices not needing the extended features set.
>
> The actual offload implementation is in patches 13 and 14 and boils down
> to propagating the new offload to the tun devices and the vhost backend.
>
> Patch 1 is a small pre-req refactor that ideally could enter the
> tree separately; it's presented here in the same series to help
> reviewers more easily getting the full picture, patch 2 updates to
> linux headers update script to deal with annotations recently introduce
> in the kernel and patch 3 is a needed linux headers update.
>
> Tested with basic stream transfer with all the possible permutations of
> host kernel/qemu/guest kernel with/without GSO over UDP tunnel support,
> vs snapshots creation and restore and vs migration.
>
> The new features are disabled by default to avoid compatibilty issues.
> They could be enabled with a later patch, together with the related
> compatiblity entries.
Does this iteration solve the merge issue? Any other action needed on my
side?
Thank you!
Paolo
^ permalink raw reply [flat|nested] 34+ messages in thread