[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 03/11] net: Move virtio-net header length assertion
From: |
Akihiko Odaki |
Subject: |
[PATCH v3 03/11] net: Move virtio-net header length assertion |
Date: |
Thu, 12 Oct 2023 00:39:34 +0900 |
The virtio-net header length assertion should happen for any clients.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
net/net.c | 5 +++++
net/tap.c | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/net/net.c b/net/net.c
index 1bb4f33a63..6d2fa8d40f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -56,6 +56,7 @@
#include "net/filter.h"
#include "qapi/string-output-visitor.h"
#include "qapi/qobject-input-visitor.h"
+#include "standard-headers/linux/virtio_net.h"
/* Net bridge is currently not supported for W32. */
#if !defined(_WIN32)
@@ -540,6 +541,10 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
return;
}
+ assert(len == sizeof(struct virtio_net_hdr_mrg_rxbuf) ||
+ len == sizeof(struct virtio_net_hdr) ||
+ len == sizeof(struct virtio_net_hdr_v1_hash));
+
nc->vnet_hdr_len = len;
nc->info->set_vnet_hdr_len(nc, len);
}
diff --git a/net/tap.c b/net/tap.c
index 4667933ffe..57389cacc3 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -263,9 +263,6 @@ static void tap_set_vnet_hdr_len(NetClientState *nc, int
len)
TAPState *s = DO_UPCAST(TAPState, nc, nc);
assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
- assert(len == sizeof(struct virtio_net_hdr_mrg_rxbuf) ||
- len == sizeof(struct virtio_net_hdr) ||
- len == sizeof(struct virtio_net_hdr_v1_hash));
tap_fd_set_vnet_hdr_len(s->fd, len);
s->host_vnet_hdr_len = len;
--
2.42.0
[PATCH v3 02/11] tap: Remove qemu_using_vnet_hdr(), Akihiko Odaki, 2023/10/11
[PATCH v3 05/11] tap: Shrink zeroed virtio-net header, Akihiko Odaki, 2023/10/11
[PATCH v3 06/11] virtio-net: Copy header only when necessary, Akihiko Odaki, 2023/10/11
[PATCH v3 09/11] virtio-net: Return an error when vhost cannot enable RSS, Akihiko Odaki, 2023/10/11
[PATCH v3 10/11] virtio-net: Do not clear VIRTIO_NET_F_RSS, Akihiko Odaki, 2023/10/11
[PATCH v3 03/11] net: Move virtio-net header length assertion,
Akihiko Odaki <=
[PATCH v3 04/11] net: Remove receive_raw(), Akihiko Odaki, 2023/10/11
[PATCH v3 07/11] virtio-net: Disable RSS on reset, Akihiko Odaki, 2023/10/11
[PATCH v3 08/11] virtio-net: Unify the logic to update NIC state for RSS, Akihiko Odaki, 2023/10/11
[PATCH v3 11/11] ebpf: Fix RSS error handling, Akihiko Odaki, 2023/10/11