@@ -35,6 +35,47 @@ typedef struct NICConf {
int32_t bootindex;
} NICConf;
+#ifdef CONFIG_LINUX
+#ifndef TUNGETVNETHASHCAP
+#define TUNGETVNETHASHCAP _IO('T', 228)
+#define TUNSETVNETHASH _IOW('T', 229, unsigned int)
+
+struct tun_vnet_hash_cap {
+ uint16_t max_indirection_table_length;
+ uint32_t types;
+};
+
+#define TUN_VNET_HASH_RSS 0x01
+#define TUN_VNET_HASH_REPORT 0x02
+struct tun_vnet_hash {
+ uint8_t flags;
+ uint32_t types;
+ uint16_t indirection_table_mask;
+ uint16_t unclassified_queue;
+};
+#endif
+
+typedef struct tun_vnet_hash_cap NetVnetHashCap;
+typedef struct tun_vnet_hash NetVnetHash;
+#define NET_VNET_HASH_RSS TUN_VNET_HASH_RSS
+#define NET_VNET_HASH_REPORT TUN_VNET_HASH_REPORT
+#else
+#define NET_VNET_HASH_RSS 1
+#define NET_VNET_HASH_REPORT 2
+
+typedef struct NetVnetHashCap {
+ uint16_t max_indirection_table_length;
+ uint32_t types;
+} NetVnetHashCap;
+
+typedef struct NetVnetHash {
+ uint8_t flags;
+ uint32_t types;
+ uint16_t indirection_table_mask;
+ uint16_t unclassified_queue;
+} NetVnetHash;
+#endif
+
#define DEFINE_NIC_PROPERTIES(_state, _conf) \
DEFINE_PROP_MACADDR("mac", _state, _conf.macaddr), \
DEFINE_PROP_NETDEV("netdev", _state, _conf.peers)
@@ -61,6 +102,8 @@ typedef void (UsingVnetHdr)(NetClientState *, bool);
typedef void (SetOffload)(NetClientState *, int, int, int, int, int);
typedef int (GetVnetHdrLen)(NetClientState *);
typedef void (SetVnetHdrLen)(NetClientState *, int);
+typedef bool (GetVnetHashCap)(NetClientState *, NetVnetHashCap *);
+typedef void (SetVnetHash)(NetClientState *, const void *);
typedef int (SetVnetLE)(NetClientState *, bool);
typedef int (SetVnetBE)(NetClientState *, bool);
typedef struct SocketReadState SocketReadState;
@@ -93,6 +136,8 @@ typedef struct NetClientInfo {
SetVnetHdrLen *set_vnet_hdr_len;
SetVnetLE *set_vnet_le;
SetVnetBE *set_vnet_be;
+ GetVnetHashCap *get_vnet_hash_cap;
+ SetVnetHash *set_vnet_hash;
NetAnnounce *announce;
SetSteeringEBPF *set_steering_ebpf;
NetCheckPeerType *check_peer_type;
@@ -197,6 +242,8 @@ void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
int ecn, int ufo);
int qemu_get_vnet_hdr_len(NetClientState *nc);
void qemu_set_vnet_hdr_len(NetClientState *nc, int len);
+bool qemu_get_vnet_hash_cap(NetClientState *nc, NetVnetHashCap *cap);
+void qemu_set_vnet_hash(NetClientState *nc, const void *hash);
int qemu_set_vnet_le(NetClientState *nc, bool is_le);
int qemu_set_vnet_be(NetClientState *nc, bool is_be);
void qemu_macaddr_default_if_unset(MACAddr *macaddr);
@@ -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);
@@ -36,9 +37,11 @@ ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen);
void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp);
int tap_probe_vnet_hdr(int fd, Error **errp);
int tap_probe_vnet_hdr_len(int fd, int len);
+bool tap_probe_vnet_hash_cap(int fd, NetVnetHashCap *cap);
int tap_probe_has_ufo(int fd);
void tap_fd_set_offload(int fd, int csum, int tso4, int tso6, int ecn, int ufo);
void tap_fd_set_vnet_hdr_len(int fd, int len);
+void tap_fd_set_vnet_hash(int fd, const void *hash);
int tap_fd_set_vnet_le(int fd, int vnet_is_le);
int tap_fd_set_vnet_be(int fd, int vnet_is_be);
int tap_fd_enable(int fd);
@@ -562,6 +562,20 @@ void qemu_set_vnet_hdr_len(NetClientState *nc, int len)
nc->info->set_vnet_hdr_len(nc, len);
}
+bool qemu_get_vnet_hash_cap(NetClientState *nc, NetVnetHashCap *cap)
+{
+ if (!nc || !nc->info->get_vnet_hash_cap) {
+ return false;
+ }
+
+ return nc->info->get_vnet_hash_cap(nc, cap);
+}
+
+void qemu_set_vnet_hash(NetClientState *nc, const void *hash)
+{
+ nc->info->set_vnet_hash(nc, hash);
+}
+
int qemu_set_vnet_le(NetClientState *nc, bool is_le)
{
#if HOST_BIG_ENDIAN
@@ -217,10 +217,20 @@ int tap_probe_vnet_hdr_len(int fd, int len)
return 0;
}
+bool tap_probe_vnet_hash_cap(int fd, NetVnetHashCap *cap)
+{
+ return false;
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
}
+void tap_fd_set_vnet_hash(int fd, const void *hash)
+{
+ g_assert_not_reached();
+}
+
int tap_fd_set_vnet_le(int fd, int is_le)
{
return -EINVAL;
@@ -193,6 +193,11 @@ int tap_probe_vnet_hdr_len(int fd, int len)
return 1;
}
+bool tap_probe_vnet_hash_cap(int fd, NetVnetHashCap *cap)
+{
+ return !ioctl(fd, TUNGETVNETHASHCAP, cap);
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
if (ioctl(fd, TUNSETVNETHDRSZ, &len) == -1) {
@@ -202,6 +207,11 @@ void tap_fd_set_vnet_hdr_len(int fd, int len)
}
}
+void tap_fd_set_vnet_hash(int fd, const void *hash)
+{
+ assert(!ioctl(fd, TUNSETVNETHASH, hash));
+}
+
int tap_fd_set_vnet_le(int fd, int is_le)
{
int arg = is_le ? 1 : 0;
@@ -221,10 +221,20 @@ int tap_probe_vnet_hdr_len(int fd, int len)
return 0;
}
+bool tap_probe_vnet_hash_cap(int fd, NetVnetHashCap *cap)
+{
+ return false;
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
}
+void tap_fd_set_vnet_hash(int fd, const void *hash)
+{
+ g_assert_not_reached();
+}
+
int tap_fd_set_vnet_le(int fd, int is_le)
{
return -EINVAL;
@@ -52,10 +52,20 @@ int tap_probe_vnet_hdr_len(int fd, int len)
return 0;
}
+bool tap_probe_vnet_hash_cap(int fd, NetVnetHashCap *cap)
+{
+ return false;
+}
+
void tap_fd_set_vnet_hdr_len(int fd, int len)
{
}
+void tap_fd_set_vnet_hash(int fd, const void *hash)
+{
+ g_assert_not_reached();
+}
+
int tap_fd_set_vnet_le(int fd, int is_le)
{
return -EINVAL;
@@ -275,6 +275,18 @@ static void tap_set_vnet_hdr_len(NetClientState *nc, int len)
s->host_vnet_hdr_len = len;
}
+static bool tap_get_vnet_hash_cap(NetClientState *nc, NetVnetHashCap *cap)
+{
+ TAPState *s = DO_UPCAST(TAPState, nc, nc);
+ return tap_probe_vnet_hash_cap(s->fd, cap);
+}
+
+static void tap_set_vnet_hash(NetClientState *nc, const void *hash)
+{
+ TAPState *s = DO_UPCAST(TAPState, nc, nc);
+ return tap_fd_set_vnet_hash(s->fd, hash);
+}
+
static bool tap_get_using_vnet_hdr(NetClientState *nc)
{
TAPState *s = DO_UPCAST(TAPState, nc, nc);
@@ -391,6 +403,8 @@ static NetClientInfo net_tap_info = {
.set_offload = tap_set_offload,
.get_vnet_hdr_len = tap_get_vnet_hdr_len,
.set_vnet_hdr_len = tap_set_vnet_hdr_len,
+ .get_vnet_hash_cap = tap_get_vnet_hash_cap,
+ .set_vnet_hash = tap_set_vnet_hash,
.set_vnet_le = tap_set_vnet_le,
.set_vnet_be = tap_set_vnet_be,
.set_steering_ebpf = tap_set_steering_ebpf,
Offloading virtio-net hashing to the client can improve the performance since the performance can reuse the hash calculated for RSS for hash reporting as well. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- include/net/net.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ net/tap_int.h | 3 +++ net/net.c | 14 ++++++++++++++ net/tap-bsd.c | 10 ++++++++++ net/tap-linux.c | 10 ++++++++++ net/tap-solaris.c | 10 ++++++++++ net/tap-stub.c | 10 ++++++++++ net/tap.c | 14 ++++++++++++++ 8 files changed, 118 insertions(+)