[PATCH RFC v5 1/5] net: Allow configuring virtio hashing

[Akihiko Odaki <akihiko.odaki@daynix.com>]

This adds functions to configure virtio hashing and implements it
for Linux's tap. vDPA will have empty functions as configuring virtio
hashing is done with the load().

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 include/net/net.h | 13 +++++++++++++
 net/tap-linux.h   |  3 +++
 net/tap_int.h     |  3 +++
 net/net.c         | 11 +++++++++++
 net/tap-bsd.c     | 10 ++++++++++
 net/tap-linux.c   | 11 +++++++++++
 net/tap-solaris.c | 10 ++++++++++
 net/tap-stub.c    | 10 ++++++++++
 net/tap.c         | 15 +++++++++++++++
 net/vhost-vdpa.c  | 13 +++++++++++++
 10 files changed, 99 insertions(+)

diff --git a/include/net/net.h b/include/net/net.h
index 545f4339cec8..779cee7f4a22 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -35,6 +35,12 @@ typedef struct NICConf {
     int32_t bootindex;
 } NICConf;
 
+typedef struct NetVnetRss {
+    uint32_t hash_types;
+    uint16_t indirection_table_mask;
+    uint16_t unclassified_queue;
+} NetVnetRss;
+
 #define DEFINE_NIC_PROPERTIES(_state, _conf)                            \
     DEFINE_PROP_MACADDR("mac",   _state, _conf.macaddr),                \
     DEFINE_PROP_NETDEV("netdev", _state, _conf.peers)
@@ -61,6 +67,8 @@ typedef void (SetOffload)(NetClientState *, int, int, int, int, int, int, int);
 typedef int (GetVnetHdrLen)(NetClientState *);
 typedef void (SetVnetHdrLen)(NetClientState *, int);
 typedef bool (GetVnetHashSupportedTypes)(NetClientState *, uint32_t *);
+typedef void (SetVnetAutomq)(NetClientState *, uint32_t);
+typedef void (SetVnetRss)(NetClientState *, const NetVnetRss *, bool);
 typedef int (SetVnetLE)(NetClientState *, bool);
 typedef int (SetVnetBE)(NetClientState *, bool);
 typedef struct SocketReadState SocketReadState;
@@ -91,6 +99,8 @@ typedef struct NetClientInfo {
     SetVnetLE *set_vnet_le;
     SetVnetBE *set_vnet_be;
     GetVnetHashSupportedTypes *get_vnet_hash_supported_types;
+    SetVnetAutomq *set_vnet_automq;
+    SetVnetRss *set_vnet_rss;
     NetAnnounce *announce;
     SetSteeringEBPF *set_steering_ebpf;
     NetCheckPeerType *check_peer_type;
@@ -192,6 +202,9 @@ void qemu_set_offload(NetClientState *nc, int csum, int tso4, int tso6,
 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);
+void qemu_set_vnet_automq(NetClientState *nc, uint32_t hash_types);
+void qemu_set_vnet_rss(NetClientState *nc, const NetVnetRss *rss,
+                       bool hash_report);
 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);
diff --git a/net/tap-linux.h b/net/tap-linux.h
index 9a58cecb7f47..5bca6cab1867 100644
--- a/net/tap-linux.h
+++ b/net/tap-linux.h
@@ -32,6 +32,9 @@
 #define TUNSETVNETLE _IOW('T', 220, int)
 #define TUNSETVNETBE _IOW('T', 222, int)
 #define TUNSETSTEERINGEBPF _IOR('T', 224, int)
+#define TUNSETVNETREPORTINGAUTOMQ _IOR('T', 229, __u32)
+#define TUNSETVNETREPORTINGRSS _IOR('T', 230, NetVnetRss)
+#define TUNSETVNETRSS _IOR('T', 231, struct NetVnetRss)
 
 #endif
 
diff --git a/net/tap_int.h b/net/tap_int.h
index 8857ff299d22..248d1efa51a0 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);
@@ -40,6 +41,8 @@ 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_vnet_hdr_len(int fd, int len);
+void tap_fd_set_vnet_automq(int fd, uint32_t hash_types);
+void tap_fd_set_vnet_rss(int fd, const NetVnetRss *rss, bool hash_report);
 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);
diff --git a/net/net.c b/net/net.c
index d0ae3db0d864..7e21e1a373ab 100644
--- a/net/net.c
+++ b/net/net.c
@@ -582,6 +582,17 @@ bool qemu_get_vnet_hash_supported_types(NetClientState *nc, uint32_t *types)
     return nc->info->get_vnet_hash_supported_types(nc, types);
 }
 
+void qemu_set_vnet_automq(NetClientState *nc, uint32_t hash_types)
+{
+    nc->info->set_vnet_automq(nc, hash_types);
+}
+
+void qemu_set_vnet_rss(NetClientState *nc, const NetVnetRss *rss,
+                       bool hash_report)
+{
+    nc->info->set_vnet_rss(nc, rss, hash_report);
+}
+
 int qemu_set_vnet_le(NetClientState *nc, bool is_le)
 {
 #if HOST_BIG_ENDIAN
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index b4c84441ba8b..8ed384f02c5b 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -221,6 +221,16 @@ void tap_fd_set_vnet_hdr_len(int fd, int len)
 {
 }
 
+void tap_fd_set_vnet_automq(int fd, uint32_t hash_types)
+{
+    g_assert_not_reached();
+}
+
+void tap_fd_set_vnet_rss(int fd, const NetVnetRss *rss, bool hash_report)
+{
+    g_assert_not_reached();
+}
+
 int tap_fd_set_vnet_le(int fd, int is_le)
 {
     return -EINVAL;
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 22ec2f45d2b7..d0adb168e977 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -205,6 +205,17 @@ void tap_fd_set_vnet_hdr_len(int fd, int len)
     }
 }
 
+void tap_fd_set_vnet_automq(int fd, uint32_t hash_types)
+{
+    assert(!ioctl(fd, TUNSETVNETREPORTINGAUTOMQ, &hash_types));
+}
+
+void tap_fd_set_vnet_rss(int fd, const NetVnetRss *rss, bool hash_report)
+{
+    unsigned int cmd = hash_report ? TUNSETVNETREPORTINGRSS : TUNSETVNETRSS;
+    assert(!ioctl(fd, cmd, rss));
+}
+
 int tap_fd_set_vnet_le(int fd, int is_le)
 {
     int arg = is_le ? 1 : 0;
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index 51b7830bef1d..bc76a030e7f9 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -225,6 +225,16 @@ void tap_fd_set_vnet_hdr_len(int fd, int len)
 {
 }
 
+void tap_fd_set_vnet_automq(int fd, uint32_t hash_types)
+{
+    g_assert_not_reached();
+}
+
+void tap_fd_set_vnet_rss(int fd, const NetVnetRss *rss, bool hash_report)
+{
+    g_assert_not_reached();
+}
+
 int tap_fd_set_vnet_le(int fd, int is_le)
 {
     return -EINVAL;
diff --git a/net/tap-stub.c b/net/tap-stub.c
index 38673434cbd6..511ddfc707eb 100644
--- a/net/tap-stub.c
+++ b/net/tap-stub.c
@@ -56,6 +56,16 @@ void tap_fd_set_vnet_hdr_len(int fd, int len)
 {
 }
 
+void tap_fd_set_vnet_automq(int fd, uint32_t hash_types)
+{
+    g_assert_not_reached();
+}
+
+void tap_fd_set_vnet_rss(int fd, const NetVnetRss *rss, bool hash_report)
+{
+    g_assert_not_reached();
+}
+
 int tap_fd_set_vnet_le(int fd, int is_le)
 {
     return -EINVAL;
diff --git a/net/tap.c b/net/tap.c
index ae1c7e398321..e93f5f951057 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -248,6 +248,19 @@ static void tap_set_vnet_hdr_len(NetClientState *nc, int len)
     s->using_vnet_hdr = true;
 }
 
+static void tap_set_vnet_automq(NetClientState *nc, uint32_t hash_types)
+{
+    TAPState *s = DO_UPCAST(TAPState, nc, nc);
+    return tap_fd_set_vnet_automq(s->fd, hash_types);
+}
+
+static void tap_set_vnet_rss(NetClientState *nc, const NetVnetRss *rss,
+                             bool hash_report)
+{
+    TAPState *s = DO_UPCAST(TAPState, nc, nc);
+    return tap_fd_set_vnet_rss(s->fd, rss, hash_report);
+}
+
 static int tap_set_vnet_le(NetClientState *nc, bool is_le)
 {
     TAPState *s = DO_UPCAST(TAPState, nc, nc);
@@ -344,6 +357,8 @@ static NetClientInfo net_tap_info = {
     .has_vnet_hdr_len = tap_has_vnet_hdr_len,
     .set_offload = tap_set_offload,
     .set_vnet_hdr_len = tap_set_vnet_hdr_len,
+    .set_vnet_automq = tap_set_vnet_automq,
+    .set_vnet_rss = tap_set_vnet_rss,
     .set_vnet_le = tap_set_vnet_le,
     .set_vnet_be = tap_set_vnet_be,
     .set_steering_ebpf = tap_set_steering_ebpf,
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 149c0f7f1766..43822f1f79da 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -271,6 +271,15 @@ static bool vhost_vdpa_get_vnet_hash_supported_types(NetClientState *nc,
     return true;
 }
 
+static void vhost_vdpa_set_vnet_automq(NetClientState *nc, uint32_t hash_types)
+{
+}
+
+static void vhost_vdpa_set_vnet_rss(NetClientState *nc, const NetVnetRss *rss,
+                                    bool hash_report)
+{
+}
+
 static bool vhost_vdpa_has_ufo(NetClientState *nc)
 {
     assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
@@ -461,6 +470,8 @@ static NetClientInfo net_vhost_vdpa_info = {
         .cleanup = vhost_vdpa_cleanup,
         .has_vnet_hdr = vhost_vdpa_has_vnet_hdr,
         .get_vnet_hash_supported_types = vhost_vdpa_get_vnet_hash_supported_types,
+        .set_vnet_automq = vhost_vdpa_set_vnet_automq,
+        .set_vnet_rss = vhost_vdpa_set_vnet_rss,
         .has_ufo = vhost_vdpa_has_ufo,
         .set_vnet_le = vhost_vdpa_set_vnet_le,
         .check_peer_type = vhost_vdpa_check_peer_type,
@@ -1335,6 +1346,8 @@ static NetClientInfo net_vhost_vdpa_cvq_info = {
     .cleanup = vhost_vdpa_cleanup,
     .has_vnet_hdr = vhost_vdpa_has_vnet_hdr,
     .get_vnet_hash_supported_types = vhost_vdpa_get_vnet_hash_supported_types,
+    .set_vnet_automq = vhost_vdpa_set_vnet_automq,
+    .set_vnet_rss = vhost_vdpa_set_vnet_rss,
     .has_ufo = vhost_vdpa_has_ufo,
     .check_peer_type = vhost_vdpa_check_peer_type,
 };

-- 
2.49.0