The following changes since commit 92f8c6fef13b31ba222c4d20ad8afd2b79c4c28e:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210525' into staging (2021-05-25 16:17:06 +0100)

for you to fetch changes up to 90322e646e87c1440661cb3ddbc0cc94309d8a4f:

MAINTAINERS: Added eBPF maintainers information. (2021-06-04 15:25:46 +0800)

----------------------------------------------------------------

Andrew Melnychenko (7):

net/tap: Added TUNSETSTEERINGEBPF code.

net: Added SetSteeringEBPF method for NetClientState.

ebpf: Added eBPF RSS program.

ebpf: Added eBPF RSS loader.

virtio-net: Added eBPF RSS to virtio-net.

docs: Added eBPF documentation.

MAINTAINERS: Added eBPF maintainers information.

MAINTAINERS | 8 +

configure | 8 +-

docs/devel/ebpf_rss.rst | 125 +++++++++

docs/devel/index.rst | 1 +

ebpf/ebpf_rss-stub.c | 40 +++

ebpf/ebpf_rss.c | 165 ++++++++++++

ebpf/ebpf_rss.h | 44 ++++

ebpf/meson.build | 1 +

ebpf/rss.bpf.skeleton.h | 431 +++++++++++++++++++++++++++++++

ebpf/trace-events | 4 +

ebpf/trace.h | 1 +

hw/net/vhost_net.c | 3 +

hw/net/virtio-net.c | 116 ++++++++-

include/hw/virtio/virtio-net.h | 4 +

include/net/net.h | 2 +

meson.build | 23 ++

meson_options.txt | 2 +

net/tap-bsd.c | 5 +

net/tap-linux.c | 13 +

net/tap-linux.h | 1 +

net/tap-solaris.c | 5 +

net/tap-stub.c | 5 +

net/tap.c | 9 +

net/tap_int.h | 1 +

net/vhost-vdpa.c | 2 +

tools/ebpf/Makefile.ebpf | 21 ++

tools/ebpf/rss.bpf.c | 571 +++++++++++++++++++++++++++++++++++++++++

27 files changed, 1607 insertions(+), 4 deletions(-)

create mode 100644 docs/devel/ebpf_rss.rst

create mode 100644 ebpf/ebpf_rss-stub.c

create mode 100644 ebpf/ebpf_rss.c

create mode 100644 ebpf/ebpf_rss.h

create mode 100644 ebpf/meson.build

create mode 100644 ebpf/rss.bpf.skeleton.h

create mode 100644 ebpf/trace-events

create mode 100644 ebpf/trace.h

create mode 100755 tools/ebpf/Makefile.ebpf

create mode 100644 tools/ebpf/rss.bpf.c

From: Andrew Melnychenko <andrew@daynix.com>

Additional code that will be used for eBPF setting steering routine.

Signed-off-by: Andrew Melnychenko <andrew@daynix.com>

net/tap-linux.h | 1 +

1 file changed, 1 insertion(+)

diff --git a/net/tap-linux.h b/net/tap-linux.h

--- a/net/tap-linux.h

+++ b/net/tap-linux.h

@@ -XXX,XX +XXX,XX @@

#define TUNSETQUEUE _IOW('T', 217, int)

#define TUNSETVNETLE _IOW('T', 220, int)

#define TUNSETVNETBE _IOW('T', 222, int)

+#define TUNSETSTEERINGEBPF _IOR('T', 224, int)

#endif

From: Andrew Melnychenko <andrew@daynix.com>

For now, that method supported only by Linux TAP.

Linux TAP uses TUNSETSTEERINGEBPF ioctl.

Signed-off-by: Andrew Melnychenko <andrew@daynix.com>

include/net/net.h | 2 ++

net/tap-bsd.c | 5 +++++

net/tap-linux.c | 13 +++++++++++++

net/tap-solaris.c | 5 +++++

net/tap-stub.c | 5 +++++

net/tap.c | 9 +++++++++

net/tap_int.h | 1 +

7 files changed, 40 insertions(+)

diff --git a/include/net/net.h b/include/net/net.h

--- a/include/net/net.h

+++ b/include/net/net.h

@@ -XXX,XX +XXX,XX @@ typedef int (SetVnetBE)(NetClientState *, bool);

typedef struct SocketReadState SocketReadState;

typedef void (SocketReadStateFinalize)(SocketReadState *rs);

typedef void (NetAnnounce)(NetClientState *);

+typedef bool (SetSteeringEBPF)(NetClientState *, int);

typedef struct NetClientInfo {

NetClientDriver type;

@@ -XXX,XX +XXX,XX @@ typedef struct NetClientInfo {

SetVnetLE *set_vnet_le;

SetVnetBE *set_vnet_be;

NetAnnounce *announce;

+ SetSteeringEBPF *set_steering_ebpf;

} NetClientInfo;

struct NetClientState {

diff --git a/net/tap-bsd.c b/net/tap-bsd.c

index XXXXXXX..XXXXXXX 100644

--- a/net/tap-bsd.c

+++ b/net/tap-bsd.c

@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)

{

return -1;

+

+int tap_fd_set_steering_ebpf(int fd, int prog_fd)

+ return -1;

+}

diff --git a/net/tap-linux.c b/net/tap-linux.c

index XXXXXXX..XXXXXXX 100644

--- a/net/tap-linux.c

+++ b/net/tap-linux.c

@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)

pstrcpy(ifname, sizeof(ifr.ifr_name), ifr.ifr_name);

return 0;

}

+int tap_fd_set_steering_ebpf(int fd, int prog_fd)

+{

+ if (ioctl(fd, TUNSETSTEERINGEBPF, (void *) &prog_fd) != 0) {

+ error_report("Issue while setting TUNSETSTEERINGEBPF:"

+ " %s with fd: %d, prog_fd: %d",

+ strerror(errno), fd, prog_fd);

+

+ return -1;

+ }

+

+ return 0;

+}

diff --git a/net/tap-solaris.c b/net/tap-solaris.c

index XXXXXXX..XXXXXXX 100644

--- a/net/tap-solaris.c

+++ b/net/tap-solaris.c

@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)

{

return -1;

}

+

+int tap_fd_set_steering_ebpf(int fd, int prog_fd)

+{

+ return -1;

+}

diff --git a/net/tap-stub.c b/net/tap-stub.c

index XXXXXXX..XXXXXXX 100644

--- a/net/tap-stub.c

+++ b/net/tap-stub.c

@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)

{

return -1;

}

+

+int tap_fd_set_steering_ebpf(int fd, int prog_fd)

+{

+ return -1;

+}

diff --git a/net/tap.c b/net/tap.c

index XXXXXXX..XXXXXXX 100644

--- a/net/tap.c

+++ b/net/tap.c

@@ -XXX,XX +XXX,XX @@ static void tap_poll(NetClientState *nc, bool enable)

tap_write_poll(s, enable);

}

+static bool tap_set_steering_ebpf(NetClientState *nc, int prog_fd)

+{

+ TAPState *s = DO_UPCAST(TAPState, nc, nc);

+ assert(nc->info->type == NET_CLIENT_DRIVER_TAP);

+

+ return tap_fd_set_steering_ebpf(s->fd, prog_fd) == 0;

int tap_get_fd(NetClientState *nc)

{

TAPState *s = DO_UPCAST(TAPState, nc, nc);

@@ -XXX,XX +XXX,XX @@ static NetClientInfo net_tap_info = {

.set_vnet_hdr_len = tap_set_vnet_hdr_len,

.set_vnet_le = tap_set_vnet_le,

.set_vnet_be = tap_set_vnet_be,

+ .set_steering_ebpf = tap_set_steering_ebpf,

From: Andrew Melnychenko <andrew@daynix.com>

Added function that loads RSS eBPF program.

Added stub functions for RSS eBPF loader.

Added meson and configuration options.

By default, eBPF feature enabled if libbpf is present in the build system.

libbpf checked in configuration shell script and meson script.

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>

Signed-off-by: Andrew Melnychenko <andrew@daynix.com>

configure | 8 +-

ebpf/ebpf_rss-stub.c | 40 +++++

ebpf/ebpf_rss.c | 165 ++++++++++++++++++

ebpf/ebpf_rss.h | 44 +++++

ebpf/meson.build | 1 +

ebpf/rss.bpf.skeleton.h | 431 ++++++++++++++++++++++++++++++++++++++++++++++++

ebpf/trace-events | 4 +

ebpf/trace.h | 1 +

meson.build | 23 +++

meson_options.txt | 2 +

10 files changed, 718 insertions(+), 1 deletion(-)

create mode 100644 ebpf/ebpf_rss-stub.c

create mode 100644 ebpf/ebpf_rss.c

create mode 100644 ebpf/ebpf_rss.h

create mode 100644 ebpf/meson.build

create mode 100644 ebpf/rss.bpf.skeleton.h

create mode 100644 ebpf/trace-events

create mode 100644 ebpf/trace.h

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ vhost_vsock="$default_feature"

vhost_user="no"

vhost_user_blk_server="auto"

vhost_user_fs="$default_feature"

+bpf="auto"

kvm="auto"

hax="auto"

hvf="auto"

@@ -XXX,XX +XXX,XX @@ for opt do

;;

--enable-membarrier) membarrier="yes"

;;

+ --disable-bpf) bpf="disabled"

+ ;;

+ --enable-bpf) bpf="enabled"

+ ;;

--disable-blobs) blobs="false"

;;

--with-pkgversion=*) pkgversion="$optarg"

@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available

vhost-user vhost-user backend support

vhost-user-blk-server vhost-user-blk server support

vhost-vdpa vhost-vdpa kernel backend support

+ bpf BPF kernel support

spice spice

spice-protocol spice-protocol

rbd rados block device (rbd)

@@ -XXX,XX +XXX,XX @@ if test "$skip_meson" = no; then

-Dattr=$attr -Ddefault_devices=$default_devices \

-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \

-Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \

- -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \

+ -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi -Dbpf=$bpf\

$(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \

    -Dtcg_interpreter=$tcg_interpreter \

$cross_arg \

diff --git a/ebpf/ebpf_rss-stub.c b/ebpf/ebpf_rss-stub.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/ebpf/ebpf_rss-stub.c

@@ -XXX,XX +XXX,XX @@

+/*

+ * eBPF RSS stub file

+ *

+ * Developed by Daynix Computing LTD (http://www.daynix.com)

+ *

+ * Authors:

+ * Yuri Benditovich <yuri.benditovich@daynix.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2. See

+ * the COPYING file in the top-level directory.

+ */

+

+#include "qemu/osdep.h"

+#include "ebpf/ebpf_rss.h"

+

+void ebpf_rss_init(struct EBPFRSSContext *ctx)

+{

+

+}

+

+bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx)

+{

+ return false;

+}

+

+bool ebpf_rss_load(struct EBPFRSSContext *ctx)

+{

+ return false;

+}

+

+bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config,

+ uint16_t *indirections_table, uint8_t *toeplitz_key)

+{

+ return false;

+}

+

+void ebpf_rss_unload(struct EBPFRSSContext *ctx)

+{

+

+}

diff --git a/ebpf/ebpf_rss.c b/ebpf/ebpf_rss.c

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/ebpf/ebpf_rss.c

@@ -XXX,XX +XXX,XX @@

+/*

+ * eBPF RSS loader

+ *

+ * Developed by Daynix Computing LTD (http://www.daynix.com)

+ *

+ * Authors:

+ * Andrew Melnychenko <andrew@daynix.com>

+ * Yuri Benditovich <yuri.benditovich@daynix.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2. See

+ * the COPYING file in the top-level directory.

+ */

+

+#include "qemu/osdep.h"

+#include "qemu/error-report.h"

+

+#include <bpf/libbpf.h>

+#include <bpf/bpf.h>

+

+#include "hw/virtio/virtio-net.h" /* VIRTIO_NET_RSS_MAX_TABLE_LEN */

+

+#include "ebpf/ebpf_rss.h"

+#include "ebpf/rss.bpf.skeleton.h"

+#include "trace.h"

+

+void ebpf_rss_init(struct EBPFRSSContext *ctx)

+{

+ if (ctx != NULL) {

+ ctx->obj = NULL;

+ }

+}

+

+bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx)

+{

+ return ctx != NULL && ctx->obj != NULL;

+}

+

+bool ebpf_rss_load(struct EBPFRSSContext *ctx)

+{

+ struct rss_bpf *rss_bpf_ctx;

+

+ if (ctx == NULL) {

+ return false;

+ }

+

+ rss_bpf_ctx = rss_bpf__open();

+ if (rss_bpf_ctx == NULL) {

+ trace_ebpf_error("eBPF RSS", "can not open eBPF RSS object");

+ goto error;

+ }

+

+ bpf_program__set_socket_filter(rss_bpf_ctx->progs.tun_rss_steering_prog);

+

+ if (rss_bpf__load(rss_bpf_ctx)) {

+ trace_ebpf_error("eBPF RSS", "can not load RSS program");

+ goto error;

+ }

+

+ ctx->obj = rss_bpf_ctx;

+ ctx->program_fd = bpf_program__fd(

+ rss_bpf_ctx->progs.tun_rss_steering_prog);

+ ctx->map_configuration = bpf_map__fd(

+ rss_bpf_ctx->maps.tap_rss_map_configurations);

+ ctx->map_indirections_table = bpf_map__fd(

+ rss_bpf_ctx->maps.tap_rss_map_indirection_table);

+ ctx->map_toeplitz_key = bpf_map__fd(

+ rss_bpf_ctx->maps.tap_rss_map_toeplitz_key);

+

+ return true;

+error:

+ rss_bpf__destroy(rss_bpf_ctx);

+ ctx->obj = NULL;

+

+ return false;

+}

+

+static bool ebpf_rss_set_config(struct EBPFRSSContext *ctx,

+ struct EBPFRSSConfig *config)

+{

+ uint32_t map_key = 0;

+

+ if (!ebpf_rss_is_loaded(ctx)) {

+ return false;

+ }

+ if (bpf_map_update_elem(ctx->map_configuration,

+ &map_key, config, 0) < 0) {

+ return false;

+ }

+ return true;

+}

+

+static bool ebpf_rss_set_indirections_table(struct EBPFRSSContext *ctx,

+ uint16_t *indirections_table,

+ size_t len)

+{

+ uint32_t i = 0;

+

+ if (!ebpf_rss_is_loaded(ctx) || indirections_table == NULL ||

+ len > VIRTIO_NET_RSS_MAX_TABLE_LEN) {

+ return false;

+ }

+

+ for (; i < len; ++i) {

+ if (bpf_map_update_elem(ctx->map_indirections_table, &i,

+ indirections_table + i, 0) < 0) {

+ return false;

+ }

+ }

+ return true;

+}

+

+static bool ebpf_rss_set_toepliz_key(struct EBPFRSSContext *ctx,

+ uint8_t *toeplitz_key)

+{

+ uint32_t map_key = 0;

+

+ /* prepare toeplitz key */

+ uint8_t toe[VIRTIO_NET_RSS_MAX_KEY_SIZE] = {};

+

+ if (!ebpf_rss_is_loaded(ctx) || toeplitz_key == NULL) {

+ return false;

+ }

+ memcpy(toe, toeplitz_key, VIRTIO_NET_RSS_MAX_KEY_SIZE);

+ *(uint32_t *)toe = ntohl(*(uint32_t *)toe);

+

+ if (bpf_map_update_elem(ctx->map_toeplitz_key, &map_key, toe,

+ 0) < 0) {

+ return false;

+ }

+ return true;

+}

+

+bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config,

+ uint16_t *indirections_table, uint8_t *toeplitz_key)

+{

+ if (!ebpf_rss_is_loaded(ctx) || config == NULL ||

+ indirections_table == NULL || toeplitz_key == NULL) {

+ return false;

+ }

+

+ if (!ebpf_rss_set_config(ctx, config)) {

+ return false;

+ }

+

+ if (!ebpf_rss_set_indirections_table(ctx, indirections_table,

+ config->indirections_len)) {

+ return false;

+ }

+

+ if (!ebpf_rss_set_toepliz_key(ctx, toeplitz_key)) {

+ return false;

+ }

+

+ return true;

+}

+

+void ebpf_rss_unload(struct EBPFRSSContext *ctx)

+{

+ if (!ebpf_rss_is_loaded(ctx)) {

+ return;

+ }

+

+ rss_bpf__destroy(ctx->obj);

+ ctx->obj = NULL;

+}

diff --git a/ebpf/ebpf_rss.h b/ebpf/ebpf_rss.h

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/ebpf/ebpf_rss.h

@@ -XXX,XX +XXX,XX @@

+/*

+ * eBPF RSS header

+ *

+ * Developed by Daynix Computing LTD (http://www.daynix.com)

+ *

+ * Authors:

+ * Andrew Melnychenko <andrew@daynix.com>

+ * Yuri Benditovich <yuri.benditovich@daynix.com>

+ *

+ * This work is licensed under the terms of the GNU GPL, version 2. See

+ * the COPYING file in the top-level directory.

+ */

+

+#ifndef QEMU_EBPF_RSS_H

+#define QEMU_EBPF_RSS_H

+

+struct EBPFRSSContext {

+ void *obj;

+ int program_fd;

+ int map_configuration;

+ int map_toeplitz_key;

+ int map_indirections_table;

+};

+

+struct EBPFRSSConfig {

+ uint8_t redirect;

+ uint8_t populate_hash;

+ uint32_t hash_types;

+ uint16_t indirections_len;

+ uint16_t default_queue;

+} __attribute__((packed));

+

+void ebpf_rss_init(struct EBPFRSSContext *ctx);

+

+bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx);

+

+bool ebpf_rss_load(struct EBPFRSSContext *ctx);

+

+bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config,

+ uint16_t *indirections_table, uint8_t *toeplitz_key);

+

+void ebpf_rss_unload(struct EBPFRSSContext *ctx);

+

+#endif /* QEMU_EBPF_RSS_H */

diff --git a/ebpf/meson.build b/ebpf/meson.build

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/ebpf/meson.build

@@ -0,0 +1 @@

+common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))

diff --git a/ebpf/rss.bpf.skeleton.h b/ebpf/rss.bpf.skeleton.h

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/ebpf/rss.bpf.skeleton.h

@@ -XXX,XX +XXX,XX @@

+/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */

+

+/* THIS FILE IS AUTOGENERATED! */

+#ifndef __RSS_BPF_SKEL_H__

+#define __RSS_BPF_SKEL_H__

+

+#include <stdlib.h>

+#include <bpf/libbpf.h>

+

+struct rss_bpf {

+    struct bpf_object_skeleton *skeleton;

+    struct bpf_object *obj;

+    struct {

+        struct bpf_map *tap_rss_map_configurations;

+        struct bpf_map *tap_rss_map_indirection_table;

+        struct bpf_map *tap_rss_map_toeplitz_key;

+    } maps;

+    struct {

+        struct bpf_program *tun_rss_steering_prog;

+    } progs;

+    struct {

+        struct bpf_link *tun_rss_steering_prog;

+    } links;

+};

+

+static void

+rss_bpf__destroy(struct rss_bpf *obj)

+{

+    if (!obj)

+        return;

+    if (obj->skeleton)

+        bpf_object__destroy_skeleton(obj->skeleton);

+    free(obj);

+}

+

+static inline int

+rss_bpf__create_skeleton(struct rss_bpf *obj);

+

+static inline struct rss_bpf *

+rss_bpf__open_opts(const struct bpf_object_open_opts *opts)