[PULL 0/2] Net patches
[PULL 00/10] Net patches
1
The following changes since commit 90218a9a393c7925f330e7dcc08658e2a01d3bd4:
1
The following changes since commit d90f154867ec0ec22fd719164b88716e8fd48672:
2
2
3
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-21' into staging (2020-07-21 10:24:38 +0100)
3
Merge remote-tracking branch 'remotes/dg-gitlab/tags/ppc-for-6.1-20210504' into staging (2021-05-05 20:29:14 +0100)
4
4
5
are available in the git repository at:
5
are available in the git repository at:
6
6
7
https://github.com/jasowang/qemu.git tags/net-pull-request
7
https://github.com/jasowang/qemu.git tags/net-pull-request
8
8
9
for you to fetch changes up to 5519724a13664b43e225ca05351c60b4468e4555:
9
for you to fetch changes up to 2bdeb0c2564c36b218ac73e21d7a6f6accb49091:
10
10
11
hw/net/xgmac: Fix buffer overflow in xgmac_enet_send() (2020-07-21 21:30:39 +0800)
11
tap-bsd: Remove special casing for older OpenBSD releases (2021-05-08 13:59:12 +0800)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
14
15
----------------------------------------------------------------
15
----------------------------------------------------------------
16
Andrew (1):
16
Andrew Melnychenko (7):
17
hw/net: Added plen fix for IPv6
17
net/tap: Added TUNSETSTEERINGEBPF code.
18
net: Added SetSteeringEBPF method for NetClientState.
19
ebpf: Added eBPF RSS program.
20
ebpf: Added eBPF RSS loader.
21
virtio-net: Added eBPF RSS to virtio-net.
22
docs: Added eBPF documentation.
23
MAINTAINERS: Added eBPF maintainers information.
18
24
19
Mauro Matteo Cascella (1):
25
Brad Smith (1):
20
hw/net/xgmac: Fix buffer overflow in xgmac_enet_send()
26
tap-bsd: Remove special casing for older OpenBSD releases
21
27
22
hw/net/net_tx_pkt.c | 23 +++++++++++++++++++++++
28
Guenter Roeck (1):
23
hw/net/net_tx_pkt.h | 14 ++++++++++++++
29
hw/net/imx_fec: return 0xffff when accessing non-existing PHY
24
hw/net/xgmac.c | 14 ++++++++++++--
30
25
include/net/eth.h | 1 +
31
Laurent Vivier (1):
26
4 files changed, 50 insertions(+), 2 deletions(-)
32
virtio-net: failover: add missing remove_migration_state_change_notifier()
33
34
MAINTAINERS | 8 +
35
configure | 8 +-
36
docs/devel/ebpf_rss.rst | 125 +++++++++
37
docs/devel/index.rst | 1 +
38
ebpf/ebpf_rss-stub.c | 40 +++
39
ebpf/ebpf_rss.c | 165 ++++++++++++
40
ebpf/ebpf_rss.h | 44 ++++
41
ebpf/meson.build | 1 +
42
ebpf/rss.bpf.skeleton.h | 431 +++++++++++++++++++++++++++++++
43
ebpf/trace-events | 4 +
44
ebpf/trace.h | 1 +
45
hw/net/imx_fec.c | 8 +-
46
hw/net/trace-events | 2 +
47
hw/net/vhost_net.c | 3 +
48
hw/net/virtio-net.c | 116 ++++++++-
49
include/hw/virtio/virtio-net.h | 4 +
50
include/net/net.h | 2 +
51
meson.build | 23 ++
52
meson_options.txt | 2 +
53
net/tap-bsd.c | 13 +-
54
net/tap-linux.c | 13 +
55
net/tap-linux.h | 1 +
56
net/tap-solaris.c | 5 +
57
net/tap-stub.c | 5 +
58
net/tap.c | 9 +
59
net/tap_int.h | 1 +
60
net/vhost-vdpa.c | 2 +
61
tools/ebpf/Makefile.ebpf | 21 ++
62
tools/ebpf/rss.bpf.c | 569 +++++++++++++++++++++++++++++++++++++++++
63
29 files changed, 1610 insertions(+), 17 deletions(-)
64
create mode 100644 docs/devel/ebpf_rss.rst
65
create mode 100644 ebpf/ebpf_rss-stub.c
66
create mode 100644 ebpf/ebpf_rss.c
67
create mode 100644 ebpf/ebpf_rss.h
68
create mode 100644 ebpf/meson.build
69
create mode 100644 ebpf/rss.bpf.skeleton.h
70
create mode 100644 ebpf/trace-events
71
create mode 100644 ebpf/trace.h
72
create mode 100755 tools/ebpf/Makefile.ebpf
73
create mode 100644 tools/ebpf/rss.bpf.c
27
74
28
75
76
diff view generated by jsdifflib
New patch
[PULL 01/10] net/tap: Added TUNSETSTEERINGEBPF code.
1
From: Andrew Melnychenko <andrew@daynix.com>
1
2
3
Additional code that will be used for eBPF setting steering routine.
4
5
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
6
Signed-off-by: Jason Wang <jasowang@redhat.com>
7
---
8
net/tap-linux.h | 1 +
9
1 file changed, 1 insertion(+)
10
11
diff --git a/net/tap-linux.h b/net/tap-linux.h
12
index XXXXXXX..XXXXXXX 100644
13
--- a/net/tap-linux.h
14
+++ b/net/tap-linux.h
15
@@ -XXX,XX +XXX,XX @@
16
#define TUNSETQUEUE _IOW('T', 217, int)
17
#define TUNSETVNETLE _IOW('T', 220, int)
18
#define TUNSETVNETBE _IOW('T', 222, int)
19
+#define TUNSETSTEERINGEBPF _IOR('T', 224, int)
20
21
#endif
22
23
--
24
2.7.4
25
26
diff view generated by jsdifflib
[PULL 1/2] hw/net: Added plen fix for IPv6
[PULL 02/10] net: Added SetSteeringEBPF method for NetClientState.
1
From: Andrew <andrew@daynix.com>
1
From: Andrew Melnychenko <andrew@daynix.com>
2
2
3
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1708065
3
For now, that method supported only by Linux TAP.
4
With network backend with 'virtual header' - there was an issue
4
Linux TAP uses TUNSETSTEERINGEBPF ioctl.
5
in 'plen' field. Overall, during TSO, 'plen' would be changed,
6
but with 'vheader' this field should be set to the size of the
7
payload itself instead of '0'.
8
5
9
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
6
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
10
Signed-off-by: Jason Wang <jasowang@redhat.com>
7
Signed-off-by: Jason Wang <jasowang@redhat.com>
11
---
8
---
12
hw/net/net_tx_pkt.c | 23 +++++++++++++++++++++++
9
include/net/net.h | 2 ++
13
hw/net/net_tx_pkt.h | 14 ++++++++++++++
10
net/tap-bsd.c | 5 +++++
14
include/net/eth.h | 1 +
11
net/tap-linux.c | 13 +++++++++++++
15
3 files changed, 38 insertions(+)
12
net/tap-solaris.c | 5 +++++
13
net/tap-stub.c | 5 +++++
14
net/tap.c | 9 +++++++++
15
net/tap_int.h | 1 +
16
7 files changed, 40 insertions(+)
16
17
17
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
18
diff --git a/include/net/net.h b/include/net/net.h
18
index XXXXXXX..XXXXXXX 100644
19
index XXXXXXX..XXXXXXX 100644
19
--- a/hw/net/net_tx_pkt.c
20
--- a/include/net/net.h
20
+++ b/hw/net/net_tx_pkt.c
21
+++ b/include/net/net.h
21
@@ -XXX,XX +XXX,XX @@ bool net_tx_pkt_send(struct NetTxPkt *pkt, NetClientState *nc)
22
@@ -XXX,XX +XXX,XX @@ typedef int (SetVnetBE)(NetClientState *, bool);
22
23
typedef struct SocketReadState SocketReadState;
23
if (pkt->has_virt_hdr ||
24
typedef void (SocketReadStateFinalize)(SocketReadState *rs);
24
pkt->virt_hdr.gso_type == VIRTIO_NET_HDR_GSO_NONE) {
25
typedef void (NetAnnounce)(NetClientState *);
25
+ net_tx_pkt_fix_ip6_payload_len(pkt);
26
+typedef bool (SetSteeringEBPF)(NetClientState *, int);
26
net_tx_pkt_sendv(pkt, nc, pkt->vec,
27
27
pkt->payload_frags + NET_TX_PKT_PL_START_FRAG);
28
typedef struct NetClientInfo {
28
return true;
29
NetClientDriver type;
29
@@ -XXX,XX +XXX,XX @@ bool net_tx_pkt_send_loopback(struct NetTxPkt *pkt, NetClientState *nc)
30
@@ -XXX,XX +XXX,XX @@ typedef struct NetClientInfo {
30
31
SetVnetLE *set_vnet_le;
31
return res;
32
SetVnetBE *set_vnet_be;
33
NetAnnounce *announce;
34
+ SetSteeringEBPF *set_steering_ebpf;
35
} NetClientInfo;
36
37
struct NetClientState {
38
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
39
index XXXXXXX..XXXXXXX 100644
40
--- a/net/tap-bsd.c
41
+++ b/net/tap-bsd.c
42
@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)
43
{
44
return -1;
32
}
45
}
33
+
46
+
34
+void net_tx_pkt_fix_ip6_payload_len(struct NetTxPkt *pkt)
47
+int tap_fd_set_steering_ebpf(int fd, int prog_fd)
35
+{
48
+{
36
+ struct iovec *l2 = &pkt->vec[NET_TX_PKT_L2HDR_FRAG];
49
+ return -1;
37
+ if (eth_get_l3_proto(l2, 1, l2->iov_len) == ETH_P_IPV6) {
50
+}
38
+ struct ip6_header *ip6 = (struct ip6_header *) pkt->l3_hdr;
51
diff --git a/net/tap-linux.c b/net/tap-linux.c
39
+ /*
52
index XXXXXXX..XXXXXXX 100644
40
+ * TODO: if qemu would support >64K packets - add jumbo option check
53
--- a/net/tap-linux.c
41
+ * something like that:
54
+++ b/net/tap-linux.c
42
+ * 'if (ip6->ip6_plen == 0 && !has_jumbo_option(ip6)) {'
55
@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)
43
+ */
56
pstrcpy(ifname, sizeof(ifr.ifr_name), ifr.ifr_name);
44
+ if (ip6->ip6_plen == 0) {
57
return 0;
45
+ if (pkt->payload_len <= ETH_MAX_IP_DGRAM_LEN) {
58
}
46
+ ip6->ip6_plen = htons(pkt->payload_len);
59
+
47
+ }
60
+int tap_fd_set_steering_ebpf(int fd, int prog_fd)
48
+ /*
61
+{
49
+ * TODO: if qemu would support >64K packets
62
+ if (ioctl(fd, TUNSETSTEERINGEBPF, (void *) &prog_fd) != 0) {
50
+ * add jumbo option for packets greater then 65,535 bytes
63
+ error_report("Issue while setting TUNSETSTEERINGEBPF:"
51
+ */
64
+ " %s with fd: %d, prog_fd: %d",
52
+ }
65
+ strerror(errno), fd, prog_fd);
66
+
67
+ return -1;
53
+ }
68
+ }
69
+
70
+ return 0;
54
+}
71
+}
55
diff --git a/hw/net/net_tx_pkt.h b/hw/net/net_tx_pkt.h
72
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
56
index XXXXXXX..XXXXXXX 100644
73
index XXXXXXX..XXXXXXX 100644
57
--- a/hw/net/net_tx_pkt.h
74
--- a/net/tap-solaris.c
58
+++ b/hw/net/net_tx_pkt.h
75
+++ b/net/tap-solaris.c
59
@@ -XXX,XX +XXX,XX @@ bool net_tx_pkt_parse(struct NetTxPkt *pkt);
76
@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)
60
*/
77
{
61
bool net_tx_pkt_has_fragments(struct NetTxPkt *pkt);
78
return -1;
62
79
}
63
+/**
64
+ * Fix IPv6 'plen' field.
65
+ * If ipv6 payload length field is 0 - then there should be Hop-by-Hop
66
+ * option for packets greater than 65,535.
67
+ * For packets with a payload less than 65,535: fix 'plen' field.
68
+ * For backends with vheader, we need just one packet with proper
69
+ * payload size. For now, qemu drops every packet with size greater 64K
70
+ * (see net_tx_pkt_send()) so, there is no reason to add jumbo option to ip6
71
+ * hop-by-hop extension if it's missed
72
+ *
73
+ * @pkt packet
74
+ */
75
+void net_tx_pkt_fix_ip6_payload_len(struct NetTxPkt *pkt);
76
+
80
+
77
#endif
81
+int tap_fd_set_steering_ebpf(int fd, int prog_fd)
78
diff --git a/include/net/eth.h b/include/net/eth.h
82
+{
83
+ return -1;
84
+}
85
diff --git a/net/tap-stub.c b/net/tap-stub.c
79
index XXXXXXX..XXXXXXX 100644
86
index XXXXXXX..XXXXXXX 100644
80
--- a/include/net/eth.h
87
--- a/net/tap-stub.c
81
+++ b/include/net/eth.h
88
+++ b/net/tap-stub.c
82
@@ -XXX,XX +XXX,XX @@ struct tcp_hdr {
89
@@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname)
83
90
{
84
#define ip6_nxt ip6_ctlun.ip6_un1.ip6_un1_nxt
91
return -1;
85
#define ip6_ecn_acc ip6_ctlun.ip6_un3.ip6_un3_ecn
92
}
86
+#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen
93
+
87
94
+int tap_fd_set_steering_ebpf(int fd, int prog_fd)
88
#define PKT_GET_ETH_HDR(p) \
95
+{
89
((struct eth_header *)(p))
96
+ return -1;
97
+}
98
diff --git a/net/tap.c b/net/tap.c
99
index XXXXXXX..XXXXXXX 100644
100
--- a/net/tap.c
101
+++ b/net/tap.c
102
@@ -XXX,XX +XXX,XX @@ static void tap_poll(NetClientState *nc, bool enable)
103
tap_write_poll(s, enable);
104
}
105
106
+static bool tap_set_steering_ebpf(NetClientState *nc, int prog_fd)
107
+{
108
+ TAPState *s = DO_UPCAST(TAPState, nc, nc);
109
+ assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
110
+
111
+ return tap_fd_set_steering_ebpf(s->fd, prog_fd) == 0;
112
+}
113
+
114
int tap_get_fd(NetClientState *nc)
115
{
116
TAPState *s = DO_UPCAST(TAPState, nc, nc);
117
@@ -XXX,XX +XXX,XX @@ static NetClientInfo net_tap_info = {
118
.set_vnet_hdr_len = tap_set_vnet_hdr_len,
119
.set_vnet_le = tap_set_vnet_le,
120
.set_vnet_be = tap_set_vnet_be,
121
+ .set_steering_ebpf = tap_set_steering_ebpf,
122
};
123
124
static TAPState *net_tap_fd_init(NetClientState *peer,
125
diff --git a/net/tap_int.h b/net/tap_int.h
126
index XXXXXXX..XXXXXXX 100644
127
--- a/net/tap_int.h
128
+++ b/net/tap_int.h
129
@@ -XXX,XX +XXX,XX @@ int tap_fd_set_vnet_be(int fd, int vnet_is_be);
130
int tap_fd_enable(int fd);
131
int tap_fd_disable(int fd);
132
int tap_fd_get_ifname(int fd, char *ifname);
133
+int tap_fd_set_steering_ebpf(int fd, int prog_fd);
134
135
#endif /* NET_TAP_INT_H */
90
--
136
--
91
2.5.0
137
2.7.4
92
138
93
139
diff view generated by jsdifflib
New patch
[PULL 03/10] ebpf: Added eBPF RSS program.
1
From: Andrew Melnychenko <andrew@daynix.com>
1
2
3
RSS program and Makefile to build it.
4
The bpftool used to generate '.h' file.
5
The data in that file may be loaded by libbpf.
6
EBPF compilation is not required for building qemu.
7
You can use Makefile if you need to regenerate rss.bpf.skeleton.h.
8
9
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
10
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
11
Signed-off-by: Jason Wang <jasowang@redhat.com>
12
---
13
tools/ebpf/Makefile.ebpf | 21 ++
14
tools/ebpf/rss.bpf.c | 569 +++++++++++++++++++++++++++++++++++++++++++++++
15
2 files changed, 590 insertions(+)
16
create mode 100755 tools/ebpf/Makefile.ebpf
17
create mode 100644 tools/ebpf/rss.bpf.c
18
19
diff --git a/tools/ebpf/Makefile.ebpf b/tools/ebpf/Makefile.ebpf
20
new file mode 100755
21
index XXXXXXX..XXXXXXX
22
--- /dev/null
23
+++ b/tools/ebpf/Makefile.ebpf
24
@@ -XXX,XX +XXX,XX @@
25
+OBJS = rss.bpf.o
26
+
27
+LLC ?= llc
28
+CLANG ?= clang
29
+INC_FLAGS = `$(CLANG) -print-file-name=include`
30
+EXTRA_CFLAGS ?= -O2 -emit-llvm -fno-stack-protector
31
+
32
+all: $(OBJS)
33
+
34
+.PHONY: clean
35
+
36
+clean:
37
+    rm -f $(OBJS)
38
+
39
+$(OBJS): %.o:%.c
40
+    $(CLANG) $(INC_FLAGS) \
41
+ -D__KERNEL__ -D__ASM_SYSREG_H \
42
+ -I../include $(LINUXINCLUDE) \
43
+ $(EXTRA_CFLAGS) -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@
44
+    bpftool gen skeleton rss.bpf.o > rss.bpf.skeleton.h
45
+    cp rss.bpf.skeleton.h ../../ebpf/
46
diff --git a/tools/ebpf/rss.bpf.c b/tools/ebpf/rss.bpf.c
47
new file mode 100644
48
index XXXXXXX..XXXXXXX
49
--- /dev/null
50
+++ b/tools/ebpf/rss.bpf.c
51
@@ -XXX,XX +XXX,XX @@
52
+/*
53
+ * eBPF RSS program
54
+ *
55
+ * Developed by Daynix Computing LTD (http://www.daynix.com)
56
+ *
57
+ * Authors:
58
+ * Andrew Melnychenko <andrew@daynix.com>
59
+ * Yuri Benditovich <yuri.benditovich@daynix.com>
60
+ *
61
+ * This work is licensed under the terms of the GNU GPL, version 2. See
62
+ * the COPYING file in the top-level directory.
63
+ *
64
+ * Prepare:
65
+ * Requires llvm, clang, bpftool, linux kernel tree
66
+ *
67
+ * Build rss.bpf.skeleton.h:
68
+ * make -f Makefile.ebpf clean all
69
+ */
70
+
71
+#include <stddef.h>
72
+#include <stdbool.h>
73
+#include <linux/bpf.h>
74
+
75
+#include <linux/in.h>
76
+#include <linux/if_ether.h>
77
+#include <linux/ip.h>
78
+#include <linux/ipv6.h>
79
+
80
+#include <linux/udp.h>
81
+#include <linux/tcp.h>
82
+
83
+#include <bpf/bpf_helpers.h>
84
+#include <bpf/bpf_endian.h>
85
+#include <linux/virtio_net.h>
86
+
87
+#define INDIRECTION_TABLE_SIZE 128
88
+#define HASH_CALCULATION_BUFFER_SIZE 36
89
+
90
+struct rss_config_t {
91
+ __u8 redirect;
92
+ __u8 populate_hash;
93
+ __u32 hash_types;
94
+ __u16 indirections_len;
95
+ __u16 default_queue;
96
+} __attribute__((packed));
97
+
98
+struct toeplitz_key_data_t {
99
+ __u32 leftmost_32_bits;
100
+ __u8 next_byte[HASH_CALCULATION_BUFFER_SIZE];
101
+};
102
+
103
+struct packet_hash_info_t {
104
+ __u8 is_ipv4;
105
+ __u8 is_ipv6;
106
+ __u8 is_udp;
107
+ __u8 is_tcp;
108
+ __u8 is_ipv6_ext_src;
109
+ __u8 is_ipv6_ext_dst;
110
+ __u8 is_fragmented;
111
+
112
+ __u16 src_port;
113
+ __u16 dst_port;
114
+
115
+ union {
116
+ struct {
117
+ __be32 in_src;
118
+ __be32 in_dst;
119
+ };
120
+
121
+ struct {
122
+ struct in6_addr in6_src;
123
+ struct in6_addr in6_dst;
124
+ struct in6_addr in6_ext_src;
125
+ struct in6_addr in6_ext_dst;
126
+ };
127
+ };
128
+};
129
+
130
+struct bpf_map_def SEC("maps")
131
+tap_rss_map_configurations = {
132
+ .type = BPF_MAP_TYPE_ARRAY,
133
+ .key_size = sizeof(__u32),
134
+ .value_size = sizeof(struct rss_config_t),
135
+ .max_entries = 1,
136
+};
137
+
138
+struct bpf_map_def SEC("maps")
139
+tap_rss_map_toeplitz_key = {
140
+ .type = BPF_MAP_TYPE_ARRAY,
141
+ .key_size = sizeof(__u32),
142
+ .value_size = sizeof(struct toeplitz_key_data_t),
143
+ .max_entries = 1,
144
+};
145
+
146
+struct bpf_map_def SEC("maps")
147
+tap_rss_map_indirection_table = {
148
+ .type = BPF_MAP_TYPE_ARRAY,
149
+ .key_size = sizeof(__u32),
150
+ .value_size = sizeof(__u16),
151
+ .max_entries = INDIRECTION_TABLE_SIZE,
152
+};
153
+
154
+static inline void net_rx_rss_add_chunk(__u8 *rss_input, size_t *bytes_written,
155
+ const void *ptr, size_t size) {
156
+ __builtin_memcpy(&rss_input[*bytes_written], ptr, size);
157
+ *bytes_written += size;
158
+}
159
+
160
+static inline
161
+void net_toeplitz_add(__u32 *result,
162
+ __u8 *input,
163
+ __u32 len
164
+ , struct toeplitz_key_data_t *key) {
165
+
166
+ __u32 accumulator = *result;
167
+ __u32 leftmost_32_bits = key->leftmost_32_bits;
168
+ __u32 byte;
169
+
170
+ for (byte = 0; byte < HASH_CALCULATION_BUFFER_SIZE; byte++) {
171
+ __u8 input_byte = input[byte];
172
+ __u8 key_byte = key->next_byte[byte];
173
+ __u8 bit;
174
+
175
+ for (bit = 0; bit < 8; bit++) {
176
+ if (input_byte & (1 << 7)) {
177
+ accumulator ^= leftmost_32_bits;
178
+ }
179
+
180
+ leftmost_32_bits =
181
+ (leftmost_32_bits << 1) | ((key_byte & (1 << 7)) >> 7);
182
+
183
+ input_byte <<= 1;
184
+ key_byte <<= 1;
185
+ }
186
+ }
187
+
188
+ *result = accumulator;
189
+}
190
+
191
+
192
+static inline int ip6_extension_header_type(__u8 hdr_type)
193
+{
194
+ switch (hdr_type) {
195
+ case IPPROTO_HOPOPTS:
196
+ case IPPROTO_ROUTING:
197
+ case IPPROTO_FRAGMENT:
198
+ case IPPROTO_ICMPV6:
199
+ case IPPROTO_NONE:
200
+ case IPPROTO_DSTOPTS:
201
+ case IPPROTO_MH:
202
+ return 1;
203
+ default:
204
+ return 0;
205
+ }
206
+}
207
+/*
208
+ * According to https://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xhtml
209
+ * we suspect that there are would be no more than 11 extensions in IPv6 header,
210
+ * also there is 27 TLV options for Destination and Hop-by-hop extensions.
211
+ * Need to choose reasonable amount of maximum extensions/options we may check to find
212
+ * ext src/dst.
213
+ */
214
+#define IP6_EXTENSIONS_COUNT 11
215
+#define IP6_OPTIONS_COUNT 30
216
+
217
+static inline int parse_ipv6_ext(struct __sk_buff *skb,
218
+ struct packet_hash_info_t *info,
219
+ __u8 *l4_protocol, size_t *l4_offset)
220
+{
221
+ int err = 0;
222
+
223
+ if (!ip6_extension_header_type(*l4_protocol)) {
224
+ return 0;
225
+ }
226
+
227
+ struct ipv6_opt_hdr ext_hdr = {};
228
+
229
+ for (unsigned int i = 0; i < IP6_EXTENSIONS_COUNT; ++i) {
230
+
231
+ err = bpf_skb_load_bytes_relative(skb, *l4_offset, &ext_hdr,
232
+ sizeof(ext_hdr), BPF_HDR_START_NET);
233
+ if (err) {
234
+ goto error;
235
+ }
236
+
237
+ if (*l4_protocol == IPPROTO_ROUTING) {
238
+ struct ipv6_rt_hdr ext_rt = {};
239
+
240
+ err = bpf_skb_load_bytes_relative(skb, *l4_offset, &ext_rt,
241
+ sizeof(ext_rt), BPF_HDR_START_NET);
242
+ if (err) {
243
+ goto error;
244
+ }
245
+
246
+ if ((ext_rt.type == IPV6_SRCRT_TYPE_2) &&
247
+ (ext_rt.hdrlen == sizeof(struct in6_addr) / 8) &&
248
+ (ext_rt.segments_left == 1)) {
249
+
250
+ err = bpf_skb_load_bytes_relative(skb,
251
+ *l4_offset + offsetof(struct rt2_hdr, addr),
252
+ &info->in6_ext_dst, sizeof(info->in6_ext_dst),
253
+ BPF_HDR_START_NET);
254
+ if (err) {
255
+ goto error;
256
+ }
257
+
258
+ info->is_ipv6_ext_dst = 1;
259
+ }
260
+
261
+ } else if (*l4_protocol == IPPROTO_DSTOPTS) {
262
+ struct ipv6_opt_t {
263
+ __u8 type;
264
+ __u8 length;
265
+ } __attribute__((packed)) opt = {};
266
+
267
+ size_t opt_offset = sizeof(ext_hdr);
268
+
269
+ for (unsigned int j = 0; j < IP6_OPTIONS_COUNT; ++j) {
270
+ err = bpf_skb_load_bytes_relative(skb, *l4_offset + opt_offset,
271
+ &opt, sizeof(opt), BPF_HDR_START_NET);
272
+ if (err) {
273
+ goto error;
274
+ }
275
+
276
+ if (opt.type == IPV6_TLV_HAO) {
277
+ err = bpf_skb_load_bytes_relative(skb,
278
+ *l4_offset + opt_offset + offsetof(struct ipv6_destopt_hao, addr),
279
+ &info->in6_ext_src, sizeof(info->in6_ext_src),
280
+ BPF_HDR_START_NET);
281
+ if (err) {
282
+ goto error;
283
+ }
284
+
285
+ info->is_ipv6_ext_src = 1;
286
+ break;
287
+ }
288
+
289
+ opt_offset += (opt.type == IPV6_TLV_PAD1) ?
290
+ 1 : opt.length + sizeof(opt);
291
+
292
+ if (opt_offset + 1 >= ext_hdr.hdrlen * 8) {
293
+ break;
294
+ }
295
+ }
296
+ } else if (*l4_protocol == IPPROTO_FRAGMENT) {
297
+ info->is_fragmented = true;
298
+ }
299
+
300
+ *l4_protocol = ext_hdr.nexthdr;
301
+ *l4_offset += (ext_hdr.hdrlen + 1) * 8;
302
+
303
+ if (!ip6_extension_header_type(ext_hdr.nexthdr)) {
304
+ return 0;
305
+ }
306
+ }
307
+
308
+ return 0;
309
+error:
310
+ return err;
311
+}
312
+
313
+static __be16 parse_eth_type(struct __sk_buff *skb)
314
+{
315
+ unsigned int offset = 12;
316
+ __be16 ret = 0;
317
+ int err = 0;
318
+
319
+ err = bpf_skb_load_bytes_relative(skb, offset, &ret, sizeof(ret),
320
+ BPF_HDR_START_MAC);
321
+ if (err) {
322
+ return 0;
323
+ }
324
+
325
+ switch (bpf_ntohs(ret)) {
326
+ case ETH_P_8021AD:
327
+ offset += 4;
328
+ case ETH_P_8021Q:
329
+ offset += 4;
330
+ err = bpf_skb_load_bytes_relative(skb, offset, &ret, sizeof(ret),
331
+ BPF_HDR_START_MAC);
332
+ default:
333
+ break;
334
+ }
335
+
336
+ if (err) {
337
+ return 0;
338
+ }
339
+
340
+ return ret;
341
+}
342
+
343
+static inline int parse_packet(struct __sk_buff *skb,
344
+ struct packet_hash_info_t *info)
345
+{
346
+ int err = 0;
347
+
348
+ if (!info || !skb) {
349
+ return -1;
350
+ }
351
+
352
+ size_t l4_offset = 0;
353
+ __u8 l4_protocol = 0;
354
+ __u16 l3_protocol = bpf_ntohs(parse_eth_type(skb));
355
+ if (l3_protocol == 0) {
356
+ err = -1;
357
+ goto error;
358
+ }
359
+
360
+ if (l3_protocol == ETH_P_IP) {
361
+ info->is_ipv4 = 1;
362
+
363
+ struct iphdr ip = {};
364
+ err = bpf_skb_load_bytes_relative(skb, 0, &ip, sizeof(ip),
365
+ BPF_HDR_START_NET);
366
+ if (err) {
367
+ goto error;
368
+ }
369
+
370
+ info->in_src = ip.saddr;
371
+ info->in_dst = ip.daddr;
372
+ info->is_fragmented = !!ip.frag_off;
373
+
374
+ l4_protocol = ip.protocol;
375
+ l4_offset = ip.ihl * 4;
376
+ } else if (l3_protocol == ETH_P_IPV6) {
377
+ info->is_ipv6 = 1;
378
+
379
+ struct ipv6hdr ip6 = {};
380
+ err = bpf_skb_load_bytes_relative(skb, 0, &ip6, sizeof(ip6),
381
+ BPF_HDR_START_NET);
382
+ if (err) {
383
+ goto error;
384
+ }
385
+
386
+ info->in6_src = ip6.saddr;
387
+ info->in6_dst = ip6.daddr;
388
+
389
+ l4_protocol = ip6.nexthdr;
390
+ l4_offset = sizeof(ip6);
391
+
392
+ err = parse_ipv6_ext(skb, info, &l4_protocol, &l4_offset);
393
+ if (err) {
394
+ goto error;
395
+ }
396
+ }
397
+
398
+ if (l4_protocol != 0 && !info->is_fragmented) {
399
+ if (l4_protocol == IPPROTO_TCP) {
400
+ info->is_tcp = 1;
401
+
402
+ struct tcphdr tcp = {};
403
+ err = bpf_skb_load_bytes_relative(skb, l4_offset, &tcp, sizeof(tcp),
404
+ BPF_HDR_START_NET);
405
+ if (err) {
406
+ goto error;
407
+ }
408
+
409
+ info->src_port = tcp.source;
410
+ info->dst_port = tcp.dest;
411
+ } else if (l4_protocol == IPPROTO_UDP) { /* TODO: add udplite? */
412
+ info->is_udp = 1;
413
+
414
+ struct udphdr udp = {};
415
+ err = bpf_skb_load_bytes_relative(skb, l4_offset, &udp, sizeof(udp),
416
+ BPF_HDR_START_NET);
417
+ if (err) {
418
+ goto error;
419
+ }
420
+
421
+ info->src_port = udp.source;
422
+ info->dst_port = udp.dest;
423
+ }
424
+ }
425
+
426
+ return 0;
427
+
428
+error:
429
+ return err;
430
+}
431
+
432
+static inline __u32 calculate_rss_hash(struct __sk_buff *skb,
433
+ struct rss_config_t *config, struct toeplitz_key_data_t *toe)
434
+{
435
+ __u8 rss_input[HASH_CALCULATION_BUFFER_SIZE] = {};
436
+ size_t bytes_written = 0;
437
+ __u32 result = 0;
438
+ int err = 0;
439
+ struct packet_hash_info_t packet_info = {};
440
+
441
+ err = parse_packet(skb, &packet_info);
442
+ if (err) {
443
+ return 0;
444
+ }
445
+
446
+ if (packet_info.is_ipv4) {
447
+ if (packet_info.is_tcp &&
448
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCPv4) {
449
+
450
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
451
+ &packet_info.in_src,
452
+ sizeof(packet_info.in_src));
453
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
454
+ &packet_info.in_dst,
455
+ sizeof(packet_info.in_dst));
456
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
457
+ &packet_info.src_port,
458
+ sizeof(packet_info.src_port));
459
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
460
+ &packet_info.dst_port,
461
+ sizeof(packet_info.dst_port));
462
+ } else if (packet_info.is_udp &&
463
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDPv4) {
464
+
465
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
466
+ &packet_info.in_src,
467
+ sizeof(packet_info.in_src));
468
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
469
+ &packet_info.in_dst,
470
+ sizeof(packet_info.in_dst));
471
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
472
+ &packet_info.src_port,
473
+ sizeof(packet_info.src_port));
474
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
475
+ &packet_info.dst_port,
476
+ sizeof(packet_info.dst_port));
477
+ } else if (config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IPv4) {
478
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
479
+ &packet_info.in_src,
480
+ sizeof(packet_info.in_src));
481
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
482
+ &packet_info.in_dst,
483
+ sizeof(packet_info.in_dst));
484
+ }
485
+ } else if (packet_info.is_ipv6) {
486
+ if (packet_info.is_tcp &&
487
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCPv6) {
488
+
489
+ if (packet_info.is_ipv6_ext_src &&
490
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCP_EX) {
491
+
492
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
493
+ &packet_info.in6_ext_src,
494
+ sizeof(packet_info.in6_ext_src));
495
+ } else {
496
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
497
+ &packet_info.in6_src,
498
+ sizeof(packet_info.in6_src));
499
+ }
500
+ if (packet_info.is_ipv6_ext_dst &&
501
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCP_EX) {
502
+
503
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
504
+ &packet_info.in6_ext_dst,
505
+ sizeof(packet_info.in6_ext_dst));
506
+ } else {
507
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
508
+ &packet_info.in6_dst,
509
+ sizeof(packet_info.in6_dst));
510
+ }
511
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
512
+ &packet_info.src_port,
513
+ sizeof(packet_info.src_port));
514
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
515
+ &packet_info.dst_port,
516
+ sizeof(packet_info.dst_port));
517
+ } else if (packet_info.is_udp &&
518
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDPv6) {
519
+
520
+ if (packet_info.is_ipv6_ext_src &&
521
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDP_EX) {
522
+
523
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
524
+ &packet_info.in6_ext_src,
525
+ sizeof(packet_info.in6_ext_src));
526
+ } else {
527
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
528
+ &packet_info.in6_src,
529
+ sizeof(packet_info.in6_src));
530
+ }
531
+ if (packet_info.is_ipv6_ext_dst &&
532
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDP_EX) {
533
+
534
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
535
+ &packet_info.in6_ext_dst,
536
+ sizeof(packet_info.in6_ext_dst));
537
+ } else {
538
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
539
+ &packet_info.in6_dst,
540
+ sizeof(packet_info.in6_dst));
541
+ }
542
+
543
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
544
+ &packet_info.src_port,
545
+ sizeof(packet_info.src_port));
546
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
547
+ &packet_info.dst_port,
548
+ sizeof(packet_info.dst_port));
549
+
550
+ } else if (config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IPv6) {
551
+ if (packet_info.is_ipv6_ext_src &&
552
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IP_EX) {
553
+
554
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
555
+ &packet_info.in6_ext_src,
556
+ sizeof(packet_info.in6_ext_src));
557
+ } else {
558
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
559
+ &packet_info.in6_src,
560
+ sizeof(packet_info.in6_src));
561
+ }
562
+ if (packet_info.is_ipv6_ext_dst &&
563
+ config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IP_EX) {
564
+
565
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
566
+ &packet_info.in6_ext_dst,
567
+ sizeof(packet_info.in6_ext_dst));
568
+ } else {
569
+ net_rx_rss_add_chunk(rss_input, &bytes_written,
570
+ &packet_info.in6_dst,
571
+ sizeof(packet_info.in6_dst));
572
+ }
573
+ }
574
+ }
575
+
576
+ if (bytes_written) {
577
+ net_toeplitz_add(&result, rss_input, bytes_written, toe);
578
+ }
579
+
580
+ return result;
581
+}
582
+
583
+SEC("tun_rss_steering")
584
+int tun_rss_steering_prog(struct __sk_buff *skb)
585
+{
586
+
587
+ struct rss_config_t *config;
588
+ struct toeplitz_key_data_t *toe;
589
+
590
+ __u32 key = 0;
591
+ __u32 hash = 0;
592
+
593
+ config = bpf_map_lookup_elem(&tap_rss_map_configurations, &key);
594
+ toe = bpf_map_lookup_elem(&tap_rss_map_toeplitz_key, &key);
595
+
596
+ if (config && toe) {
597
+ if (!config->redirect) {
598
+ return config->default_queue;
599
+ }
600
+
601
+ hash = calculate_rss_hash(skb, config, toe);
602
+ if (hash) {
603
+ __u32 table_idx = hash % config->indirections_len;
604
+ __u16 *queue = 0;
605
+
606
+ queue = bpf_map_lookup_elem(&tap_rss_map_indirection_table,
607
+ &table_idx);
608
+
609
+ if (queue) {
610
+ return *queue;
611
+ }
612
+ }
613
+
614
+ return config->default_queue;
615
+ }
616
+
617
+ return -1;
618
+}
619
+
620
+char _license[] SEC("license") = "GPL v2";
621
--
622
2.7.4
623
624
diff view generated by jsdifflib
New patch
[PULL 04/10] ebpf: Added eBPF RSS loader.
1
From: Andrew Melnychenko <andrew@daynix.com>
1
2
3
Added function that loads RSS eBPF program.
4
Added stub functions for RSS eBPF loader.
5
Added meson and configuration options.
6
7
By default, eBPF feature enabled if libbpf is present in the build system.
8
libbpf checked in configuration shell script and meson script.
9
10
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
11
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
12
Signed-off-by: Jason Wang <jasowang@redhat.com>
13
---
14
configure | 8 +-
15
ebpf/ebpf_rss-stub.c | 40 +++++
16
ebpf/ebpf_rss.c | 165 ++++++++++++++++++
17
ebpf/ebpf_rss.h | 44 +++++
18
ebpf/meson.build | 1 +
19
ebpf/rss.bpf.skeleton.h | 431 ++++++++++++++++++++++++++++++++++++++++++++++++
20
ebpf/trace-events | 4 +
21
ebpf/trace.h | 1 +
22
meson.build | 23 +++
23
meson_options.txt | 2 +
24
10 files changed, 718 insertions(+), 1 deletion(-)
25
create mode 100644 ebpf/ebpf_rss-stub.c
26
create mode 100644 ebpf/ebpf_rss.c
27
create mode 100644 ebpf/ebpf_rss.h
28
create mode 100644 ebpf/meson.build
29
create mode 100644 ebpf/rss.bpf.skeleton.h
30
create mode 100644 ebpf/trace-events
31
create mode 100644 ebpf/trace.h
32
33
diff --git a/configure b/configure
34
index XXXXXXX..XXXXXXX 100755
35
--- a/configure
36
+++ b/configure
37
@@ -XXX,XX +XXX,XX @@ vhost_vsock="$default_feature"
38
vhost_user="no"
39
vhost_user_blk_server="auto"
40
vhost_user_fs="$default_feature"
41
+bpf="auto"
42
kvm="auto"
43
hax="auto"
44
hvf="auto"
45
@@ -XXX,XX +XXX,XX @@ for opt do
46
;;
47
--enable-membarrier) membarrier="yes"
48
;;
49
+ --disable-bpf) bpf="disabled"
50
+ ;;
51
+ --enable-bpf) bpf="enabled"
52
+ ;;
53
--disable-blobs) blobs="false"
54
;;
55
--with-pkgversion=*) pkgversion="$optarg"
56
@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available
57
vhost-user vhost-user backend support
58
vhost-user-blk-server vhost-user-blk server support
59
vhost-vdpa vhost-vdpa kernel backend support
60
+ bpf BPF kernel support
61
spice spice
62
rbd rados block device (rbd)
63
libiscsi iscsi support
64
@@ -XXX,XX +XXX,XX @@ NINJA=$ninja $meson setup \
65
-Dattr=$attr -Ddefault_devices=$default_devices \
66
-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
67
-Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \
68
- -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \
69
+ -Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi -Dbpf=$bpf\
70
$(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \
71
    -Dtcg_interpreter=$tcg_interpreter \
72
$cross_arg \
73
diff --git a/ebpf/ebpf_rss-stub.c b/ebpf/ebpf_rss-stub.c
74
new file mode 100644
75
index XXXXXXX..XXXXXXX
76
--- /dev/null
77
+++ b/ebpf/ebpf_rss-stub.c
78
@@ -XXX,XX +XXX,XX @@
79
+/*
80
+ * eBPF RSS stub file
81
+ *
82
+ * Developed by Daynix Computing LTD (http://www.daynix.com)
83
+ *
84
+ * Authors:
85
+ * Yuri Benditovich <yuri.benditovich@daynix.com>
86
+ *
87
+ * This work is licensed under the terms of the GNU GPL, version 2. See
88
+ * the COPYING file in the top-level directory.
89
+ */
90
+
91
+#include "qemu/osdep.h"
92
+#include "ebpf/ebpf_rss.h"
93
+
94
+void ebpf_rss_init(struct EBPFRSSContext *ctx)
95
+{
96
+
97
+}
98
+
99
+bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx)
100
+{
101
+ return false;
102
+}
103
+
104
+bool ebpf_rss_load(struct EBPFRSSContext *ctx)
105
+{
106
+ return false;
107
+}
108
+
109
+bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config,
110
+ uint16_t *indirections_table, uint8_t *toeplitz_key)
111
+{
112
+ return false;
113
+}
114
+
115
+void ebpf_rss_unload(struct EBPFRSSContext *ctx)
116
+{
117
+
118
+}
119
diff --git a/ebpf/ebpf_rss.c b/ebpf/ebpf_rss.c
120
new file mode 100644
121
index XXXXXXX..XXXXXXX
122
--- /dev/null
123
+++ b/ebpf/ebpf_rss.c
124
@@ -XXX,XX +XXX,XX @@
125
+/*
126
+ * eBPF RSS loader
127
+ *
128
+ * Developed by Daynix Computing LTD (http://www.daynix.com)
129
+ *
130
+ * Authors:
131
+ * Andrew Melnychenko <andrew@daynix.com>
132
+ * Yuri Benditovich <yuri.benditovich@daynix.com>
133
+ *
134
+ * This work is licensed under the terms of the GNU GPL, version 2. See
135
+ * the COPYING file in the top-level directory.
136
+ */
137
+
138
+#include "qemu/osdep.h"
139
+#include "qemu/error-report.h"
140
+
141
+#include <bpf/libbpf.h>
142
+#include <bpf/bpf.h>
143
+
144
+#include "hw/virtio/virtio-net.h" /* VIRTIO_NET_RSS_MAX_TABLE_LEN */
145
+
146
+#include "ebpf/ebpf_rss.h"
147
+#include "ebpf/rss.bpf.skeleton.h"
148
+#include "trace.h"
149
+
150
+void ebpf_rss_init(struct EBPFRSSContext *ctx)
151
+{
152
+ if (ctx != NULL) {
153
+ ctx->obj = NULL;
154
+ }
155
+}
156
+
157
+bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx)
158
+{
159
+ return ctx != NULL && ctx->obj != NULL;
160
+}
161
+
162
+bool ebpf_rss_load(struct EBPFRSSContext *ctx)
163
+{
164
+ struct rss_bpf *rss_bpf_ctx;
165
+
166
+ if (ctx == NULL) {
167
+ return false;
168
+ }
169
+
170
+ rss_bpf_ctx = rss_bpf__open();
171
+ if (rss_bpf_ctx == NULL) {
172
+ trace_ebpf_error("eBPF RSS", "can not open eBPF RSS object");
173
+ goto error;
174
+ }
175
+
176
+ bpf_program__set_socket_filter(rss_bpf_ctx->progs.tun_rss_steering_prog);
177
+
178
+ if (rss_bpf__load(rss_bpf_ctx)) {
179
+ trace_ebpf_error("eBPF RSS", "can not load RSS program");
180
+ goto error;
181
+ }
182
+
183
+ ctx->obj = rss_bpf_ctx;
184
+ ctx->program_fd = bpf_program__fd(
185
+ rss_bpf_ctx->progs.tun_rss_steering_prog);
186
+ ctx->map_configuration = bpf_map__fd(
187
+ rss_bpf_ctx->maps.tap_rss_map_configurations);
188
+ ctx->map_indirections_table = bpf_map__fd(
189
+ rss_bpf_ctx->maps.tap_rss_map_indirection_table);
190
+ ctx->map_toeplitz_key = bpf_map__fd(
191
+ rss_bpf_ctx->maps.tap_rss_map_toeplitz_key);
192
+
193
+ return true;
194
+error:
195
+ rss_bpf__destroy(rss_bpf_ctx);
196
+ ctx->obj = NULL;
197
+
198
+ return false;
199
+}
200
+
201
+static bool ebpf_rss_set_config(struct EBPFRSSContext *ctx,
202
+ struct EBPFRSSConfig *config)
203
+{
204
+ uint32_t map_key = 0;
205
+
206
+ if (!ebpf_rss_is_loaded(ctx)) {
207
+ return false;
208
+ }
209
+ if (bpf_map_update_elem(ctx->map_configuration,
210
+ &map_key, config, 0) < 0) {
211
+ return false;
212
+ }
213
+ return true;
214
+}
215
+
216
+static bool ebpf_rss_set_indirections_table(struct EBPFRSSContext *ctx,
217
+ uint16_t *indirections_table,
218
+ size_t len)
219
+{
220
+ uint32_t i = 0;
221
+
222
+ if (!ebpf_rss_is_loaded(ctx) || indirections_table == NULL ||
223
+ len > VIRTIO_NET_RSS_MAX_TABLE_LEN) {
224
+ return false;
225
+ }
226
+
227
+ for (; i < len; ++i) {
228
+ if (bpf_map_update_elem(ctx->map_indirections_table, &i,
229
+ indirections_table + i, 0) < 0) {
230
+ return false;
231
+ }
232
+ }
233
+ return true;
234
+}
235
+
236
+static bool ebpf_rss_set_toepliz_key(struct EBPFRSSContext *ctx,
237
+ uint8_t *toeplitz_key)
238
+{
239
+ uint32_t map_key = 0;
240
+
241
+ /* prepare toeplitz key */
242
+ uint8_t toe[VIRTIO_NET_RSS_MAX_KEY_SIZE] = {};
243
+
244
+ if (!ebpf_rss_is_loaded(ctx) || toeplitz_key == NULL) {
245
+ return false;
246
+ }
247
+ memcpy(toe, toeplitz_key, VIRTIO_NET_RSS_MAX_KEY_SIZE);
248
+ *(uint32_t *)toe = ntohl(*(uint32_t *)toe);
249
+
250
+ if (bpf_map_update_elem(ctx->map_toeplitz_key, &map_key, toe,
251
+ 0) < 0) {
252
+ return false;
253
+ }
254
+ return true;
255
+}
256
+
257
+bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config,
258
+ uint16_t *indirections_table, uint8_t *toeplitz_key)
259
+{
260
+ if (!ebpf_rss_is_loaded(ctx) || config == NULL ||
261
+ indirections_table == NULL || toeplitz_key == NULL) {
262
+ return false;
263
+ }
264
+
265
+ if (!ebpf_rss_set_config(ctx, config)) {
266
+ return false;
267
+ }
268
+
269
+ if (!ebpf_rss_set_indirections_table(ctx, indirections_table,
270
+ config->indirections_len)) {
271
+ return false;
272
+ }
273
+
274
+ if (!ebpf_rss_set_toepliz_key(ctx, toeplitz_key)) {
275
+ return false;
276
+ }
277
+
278
+ return true;
279
+}
280
+
281
+void ebpf_rss_unload(struct EBPFRSSContext *ctx)
282
+{
283
+ if (!ebpf_rss_is_loaded(ctx)) {
284
+ return;
285
+ }
286
+
287
+ rss_bpf__destroy(ctx->obj);
288
+ ctx->obj = NULL;
289
+}
290
diff --git a/ebpf/ebpf_rss.h b/ebpf/ebpf_rss.h
291
new file mode 100644
292
index XXXXXXX..XXXXXXX
293
--- /dev/null
294
+++ b/ebpf/ebpf_rss.h
295
@@ -XXX,XX +XXX,XX @@
296
+/*
297
+ * eBPF RSS header
298
+ *
299
+ * Developed by Daynix Computing LTD (http://www.daynix.com)
300
+ *
301
+ * Authors:
302
+ * Andrew Melnychenko <andrew@daynix.com>
303
+ * Yuri Benditovich <yuri.benditovich@daynix.com>
304
+ *
305
+ * This work is licensed under the terms of the GNU GPL, version 2. See
306
+ * the COPYING file in the top-level directory.
307
+ */
308
+
309
+#ifndef QEMU_EBPF_RSS_H
310
+#define QEMU_EBPF_RSS_H
311
+
312
+struct EBPFRSSContext {
313
+ void *obj;
314
+ int program_fd;
315
+ int map_configuration;
316
+ int map_toeplitz_key;
317
+ int map_indirections_table;
318
+};
319
+
320
+struct EBPFRSSConfig {
321
+ uint8_t redirect;
322
+ uint8_t populate_hash;
323
+ uint32_t hash_types;
324
+ uint16_t indirections_len;
325
+ uint16_t default_queue;
326
+} __attribute__((packed));
327
+
328
+void ebpf_rss_init(struct EBPFRSSContext *ctx);
329
+
330
+bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx);
331
+
332
+bool ebpf_rss_load(struct EBPFRSSContext *ctx);
333
+
334
+bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config,
335
+ uint16_t *indirections_table, uint8_t *toeplitz_key);
336
+
337
+void ebpf_rss_unload(struct EBPFRSSContext *ctx);
338
+
339
+#endif /* QEMU_EBPF_RSS_H */
340
diff --git a/ebpf/meson.build b/ebpf/meson.build
341
new file mode 100644
342
index XXXXXXX..XXXXXXX
343
--- /dev/null
344
+++ b/ebpf/meson.build
345
@@ -0,0 +1 @@
346
+common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
347
diff --git a/ebpf/rss.bpf.skeleton.h b/ebpf/rss.bpf.skeleton.h
348
new file mode 100644
349
index XXXXXXX..XXXXXXX
350
--- /dev/null
351
+++ b/ebpf/rss.bpf.skeleton.h
352
@@ -XXX,XX +XXX,XX @@
353
+/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */
354
+
355
+/* THIS FILE IS AUTOGENERATED! */
356
+#ifndef __RSS_BPF_SKEL_H__
357
+#define __RSS_BPF_SKEL_H__
358
+
359
+#include <stdlib.h>
360
+#include <bpf/libbpf.h>
361
+
362
+struct rss_bpf {
363
+    struct bpf_object_skeleton *skeleton;
364
+    struct bpf_object *obj;
365
+    struct {
366
+        struct bpf_map *tap_rss_map_configurations;
367
+        struct bpf_map *tap_rss_map_indirection_table;
368
+        struct bpf_map *tap_rss_map_toeplitz_key;
369
+    } maps;
370
+    struct {
371
+        struct bpf_program *tun_rss_steering_prog;
372
+    } progs;
373
+    struct {
374
+        struct bpf_link *tun_rss_steering_prog;
375
+    } links;
376
+};
377
+
378
+static void
379
+rss_bpf__destroy(struct rss_bpf *obj)
380
+{
381
+    if (!obj)
382
+        return;
383
+    if (obj->skeleton)
384
+        bpf_object__destroy_skeleton(obj->skeleton);
385
+    free(obj);
386
+}
387
+
388
+static inline int
389
+rss_bpf__create_skeleton(struct rss_bpf *obj);
390
+
391
+static inline struct rss_bpf *
392
+rss_bpf__open_opts(const struct bpf_object_open_opts *opts)
393
+{
394
+    struct rss_bpf *obj;
395
+
396
+    obj = (struct rss_bpf *)calloc(1, sizeof(*obj));
397
+    if (!obj)
398
+        return NULL;
399
+    if (rss_bpf__create_skeleton(obj))
400
+        goto err;
401
+    if (bpf_object__open_skeleton(obj->skeleton, opts))
402
+        goto err;
403
+
404
+    return obj;
405
+err:
406
+    rss_bpf__destroy(obj);
407
+    return NULL;
408
+}
409
+
410
+static inline struct rss_bpf *
411
+rss_bpf__open(void)
412
+{
413
+    return rss_bpf__open_opts(NULL);
414
+}
415
+
416
+static inline int
417
+rss_bpf__load(struct rss_bpf *obj)
418
+{
419
+    return bpf_object__load_skeleton(obj->skeleton);
420
+}
421
+
422
+static inline struct rss_bpf *
423
+rss_bpf__open_and_load(void)
424
+{
425
+    struct rss_bpf *obj;
426
+
427
+    obj = rss_bpf__open();
428
+    if (!obj)
429
+        return NULL;
430
+    if (rss_bpf__load(obj)) {
431
+        rss_bpf__destroy(obj);
432
+        return NULL;
433
+    }
434
+    return obj;
435
+}
436
+
437
+static inline int
438
+rss_bpf__attach(struct rss_bpf *obj)
439
+{
440
+    return bpf_object__attach_skeleton(obj->skeleton);
441
+}
442
+
443
+static inline void
444
+rss_bpf__detach(struct rss_bpf *obj)
445
+{
446
+    return bpf_object__detach_skeleton(obj->skeleton);
447
+}
448
+
449
+static inline int
450
+rss_bpf__create_skeleton(struct rss_bpf *obj)
451
+{
452
+    struct bpf_object_skeleton *s;
453
+
454
+    s = (struct bpf_object_skeleton *)calloc(1, sizeof(*s));
455
+    if (!s)
456
+        return -1;
457
+    obj->skeleton = s;
458
+
459
+    s->sz = sizeof(*s);
460
+    s->name = "rss_bpf";
461
+    s->obj = &obj->obj;
462
+
463
+    /* maps */
464
+    s->map_cnt = 3;
465
+    s->map_skel_sz = sizeof(*s->maps);
466
+    s->maps = (struct bpf_map_skeleton *)calloc(s->map_cnt, s->map_skel_sz);
467
+    if (!s->maps)
468
+        goto err;
469
+
470
+    s->maps[0].name = "tap_rss_map_configurations";
471
+    s->maps[0].map = &obj->maps.tap_rss_map_configurations;
472
+
473
+    s->maps[1].name = "tap_rss_map_indirection_table";
474
+    s->maps[1].map = &obj->maps.tap_rss_map_indirection_table;
475
+
476
+    s->maps[2].name = "tap_rss_map_toeplitz_key";
477
+    s->maps[2].map = &obj->maps.tap_rss_map_toeplitz_key;
478
+
479
+    /* programs */
480
+    s->prog_cnt = 1;
481
+    s->prog_skel_sz = sizeof(*s->progs);
482
+    s->progs = (struct bpf_prog_skeleton *)calloc(s->prog_cnt, s->prog_skel_sz);
483
+    if (!s->progs)
484
+        goto err;
485
+
486
+    s->progs[0].name = "tun_rss_steering_prog";
487
+    s->progs[0].prog = &obj->progs.tun_rss_steering_prog;
488
+    s->progs[0].link = &obj->links.tun_rss_steering_prog;
489
+
490
+    s->data_sz = 8088;
491
+    s->data = (void *)"\
492
+\x7f\x45\x4c\x46\x02\x01\x01\0\0\0\0\0\0\0\0\0\x01\0\xf7\0\x01\0\0\0\0\0\0\0\0\
493
+\0\0\0\0\0\0\0\0\0\0\0\x18\x1d\0\0\0\0\0\0\0\0\0\0\x40\0\0\0\0\0\x40\0\x0a\0\
494
+\x01\0\xbf\x18\0\0\0\0\0\0\xb7\x01\0\0\0\0\0\0\x63\x1a\x4c\xff\0\0\0\0\xbf\xa7\
495
+\0\0\0\0\0\0\x07\x07\0\0\x4c\xff\xff\xff\x18\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
496
+\xbf\x72\0\0\0\0\0\0\x85\0\0\0\x01\0\0\0\xbf\x06\0\0\0\0\0\0\x18\x01\0\0\0\0\0\
497
+\0\0\0\0\0\0\0\0\0\xbf\x72\0\0\0\0\0\0\x85\0\0\0\x01\0\0\0\xbf\x07\0\0\0\0\0\0\
498
+\x18\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\x15\x06\x66\x02\0\0\0\0\xbf\x79\0\0\
499
+\0\0\0\0\x15\x09\x64\x02\0\0\0\0\x71\x61\0\0\0\0\0\0\x55\x01\x01\0\0\0\0\0\x05\
500
+\0\x5d\x02\0\0\0\0\xb7\x01\0\0\0\0\0\0\x63\x1a\xc0\xff\0\0\0\0\x7b\x1a\xb8\xff\
501
+\0\0\0\0\x7b\x1a\xb0\xff\0\0\0\0\x7b\x1a\xa8\xff\0\0\0\0\x7b\x1a\xa0\xff\0\0\0\
502
+\0\x63\x1a\x98\xff\0\0\0\0\x7b\x1a\x90\xff\0\0\0\0\x7b\x1a\x88\xff\0\0\0\0\x7b\
503
+\x1a\x80\xff\0\0\0\0\x7b\x1a\x78\xff\0\0\0\0\x7b\x1a\x70\xff\0\0\0\0\x7b\x1a\
504
+\x68\xff\0\0\0\0\x7b\x1a\x60\xff\0\0\0\0\x7b\x1a\x58\xff\0\0\0\0\x7b\x1a\x50\
505
+\xff\0\0\0\0\x15\x08\x4c\x02\0\0\0\0\x6b\x1a\xd0\xff\0\0\0\0\xbf\xa3\0\0\0\0\0\
506
+\0\x07\x03\0\0\xd0\xff\xff\xff\xbf\x81\0\0\0\0\0\0\xb7\x02\0\0\x0c\0\0\0\xb7\
507
+\x04\0\0\x02\0\0\0\xb7\x05\0\0\0\0\0\0\x85\0\0\0\x44\0\0\0\x67\0\0\0\x20\0\0\0\
508
+\x77\0\0\0\x20\0\0\0\x55\0\x11\0\0\0\0\0\xb7\x02\0\0\x10\0\0\0\x69\xa1\xd0\xff\
509
+\0\0\0\0\xbf\x13\0\0\0\0\0\0\xdc\x03\0\0\x10\0\0\0\x15\x03\x02\0\0\x81\0\0\x55\
510
+\x03\x0c\0\xa8\x88\0\0\xb7\x02\0\0\x14\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\
511
+\xd0\xff\xff\xff\xbf\x81\0\0\0\0\0\0\xb7\x04\0\0\x02\0\0\0\xb7\x05\0\0\0\0\0\0\
512
+\x85\0\0\0\x44\0\0\0\x69\xa1\xd0\xff\0\0\0\0\x67\0\0\0\x20\0\0\0\x77\0\0\0\x20\
513
+\0\0\0\x15\0\x01\0\0\0\0\0\x05\0\x2f\x02\0\0\0\0\x15\x01\x2e\x02\0\0\0\0\x7b\
514
+\x9a\x30\xff\0\0\0\0\x15\x01\x57\0\x86\xdd\0\0\x55\x01\x3b\0\x08\0\0\0\x7b\x7a\
515
+\x20\xff\0\0\0\0\xb7\x07\0\0\x01\0\0\0\x73\x7a\x50\xff\0\0\0\0\xb7\x01\0\0\0\0\
516
+\0\0\x63\x1a\xe0\xff\0\0\0\0\x7b\x1a\xd8\xff\0\0\0\0\x7b\x1a\xd0\xff\0\0\0\0\
517
+\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\xd0\xff\xff\xff\xbf\x81\0\0\0\0\0\0\xb7\x02\0\
518
+\0\0\0\0\0\xb7\x04\0\0\x14\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\0\0\0\x67\
519
+\0\0\0\x20\0\0\0\x77\0\0\0\x20\0\0\0\x55\0\x1a\x02\0\0\0\0\x69\xa1\xd6\xff\0\0\
520
+\0\0\x55\x01\x01\0\0\0\0\0\xb7\x07\0\0\0\0\0\0\x61\xa1\xdc\xff\0\0\0\0\x63\x1a\
521
+\x5c\xff\0\0\0\0\x61\xa1\xe0\xff\0\0\0\0\x63\x1a\x60\xff\0\0\0\0\x73\x7a\x56\
522
+\xff\0\0\0\0\x71\xa9\xd9\xff\0\0\0\0\x71\xa1\xd0\xff\0\0\0\0\x67\x01\0\0\x02\0\
523
+\0\0\x57\x01\0\0\x3c\0\0\0\x7b\x1a\x40\xff\0\0\0\0\x79\xa7\x20\xff\0\0\0\0\xbf\
524
+\x91\0\0\0\0\0\0\x57\x01\0\0\xff\0\0\0\x15\x01\x19\0\0\0\0\0\x71\xa1\x56\xff\0\
525
+\0\0\0\x55\x01\x17\0\0\0\0\0\x57\x09\0\0\xff\0\0\0\x15\x09\x7a\x01\x11\0\0\0\
526
+\x55\x09\x14\0\x06\0\0\0\xb7\x01\0\0\x01\0\0\0\x73\x1a\x53\xff\0\0\0\0\xb7\x01\
527
+\0\0\0\0\0\0\x63\x1a\xe0\xff\0\0\0\0\x7b\x1a\xd8\xff\0\0\0\0\x7b\x1a\xd0\xff\0\
528
+\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\xd0\xff\xff\xff\xbf\x81\0\0\0\0\0\0\x79\
529
+\xa2\x40\xff\0\0\0\0\xb7\x04\0\0\x14\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\
530
+\0\0\0\x67\0\0\0\x20\0\0\0\x77\0\0\0\x20\0\0\0\x55\0\xf4\x01\0\0\0\0\x69\xa1\
531
+\xd0\xff\0\0\0\0\x6b\x1a\x58\xff\0\0\0\0\x69\xa1\xd2\xff\0\0\0\0\x6b\x1a\x5a\
532
+\xff\0\0\0\0\x71\xa1\x50\xff\0\0\0\0\x15\x01\xd4\0\0\0\0\0\x71\x62\x03\0\0\0\0\
533
+\0\x67\x02\0\0\x08\0\0\0\x71\x61\x02\0\0\0\0\0\x4f\x12\0\0\0\0\0\0\x71\x63\x04\
534
+\0\0\0\0\0\x71\x61\x05\0\0\0\0\0\x67\x01\0\0\x08\0\0\0\x4f\x31\0\0\0\0\0\0\x67\
535
+\x01\0\0\x10\0\0\0\x4f\x21\0\0\0\0\0\0\x71\xa2\x53\xff\0\0\0\0\x79\xa0\x30\xff\
536
+\0\0\0\0\x15\x02\x06\x01\0\0\0\0\xbf\x12\0\0\0\0\0\0\x57\x02\0\0\x02\0\0\0\x15\
537
+\x02\x03\x01\0\0\0\0\x61\xa1\x5c\xff\0\0\0\0\x63\x1a\xa0\xff\0\0\0\0\x61\xa1\
538
+\x60\xff\0\0\0\0\x63\x1a\xa4\xff\0\0\0\0\x69\xa1\x58\xff\0\0\0\0\x6b\x1a\xa8\
539
+\xff\0\0\0\0\x69\xa1\x5a\xff\0\0\0\0\x6b\x1a\xaa\xff\0\0\0\0\x05\0\x65\x01\0\0\
540
+\0\0\xb7\x01\0\0\x01\0\0\0\x73\x1a\x51\xff\0\0\0\0\xb7\x01\0\0\0\0\0\0\x7b\x1a\
541
+\xf0\xff\0\0\0\0\x7b\x1a\xe8\xff\0\0\0\0\x7b\x1a\xe0\xff\0\0\0\0\x7b\x1a\xd8\
542
+\xff\0\0\0\0\x7b\x1a\xd0\xff\0\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\xd0\xff\
543
+\xff\xff\xb7\x01\0\0\x28\0\0\0\x7b\x1a\x40\xff\0\0\0\0\xbf\x81\0\0\0\0\0\0\xb7\
544
+\x02\0\0\0\0\0\0\xb7\x04\0\0\x28\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\0\0\
545
+\0\x67\0\0\0\x20\0\0\0\x77\0\0\0\x20\0\0\0\x55\0\x10\x01\0\0\0\0\x79\xa1\xe0\
546
+\xff\0\0\0\0\x63\x1a\x64\xff\0\0\0\0\x77\x01\0\0\x20\0\0\0\x63\x1a\x68\xff\0\0\
547
+\0\0\x79\xa1\xd8\xff\0\0\0\0\x63\x1a\x5c\xff\0\0\0\0\x77\x01\0\0\x20\0\0\0\x63\
548
+\x1a\x60\xff\0\0\0\0\x79\xa1\xe8\xff\0\0\0\0\x63\x1a\x6c\xff\0\0\0\0\x77\x01\0\
549
+\0\x20\0\0\0\x63\x1a\x70\xff\0\0\0\0\x79\xa1\xf0\xff\0\0\0\0\x63\x1a\x74\xff\0\
550
+\0\0\0\x77\x01\0\0\x20\0\0\0\x63\x1a\x78\xff\0\0\0\0\x71\xa9\xd6\xff\0\0\0\0\
551
+\x25\x09\xff\0\x3c\0\0\0\xb7\x01\0\0\x01\0\0\0\x6f\x91\0\0\0\0\0\0\x18\x02\0\0\
552
+\x01\0\0\0\0\0\0\0\0\x18\0\x1c\x5f\x21\0\0\0\0\0\0\x55\x01\x01\0\0\0\0\0\x05\0\
553
+\xf8\0\0\0\0\0\xb7\x01\0\0\0\0\0\0\x6b\x1a\xfe\xff\0\0\0\0\xb7\x01\0\0\x28\0\0\
554
+\0\x7b\x1a\x40\xff\0\0\0\0\xbf\xa1\0\0\0\0\0\0\x07\x01\0\0\x8c\xff\xff\xff\x7b\
555
+\x1a\x18\xff\0\0\0\0\xbf\xa1\0\0\0\0\0\0\x07\x01\0\0\x7c\xff\xff\xff\x7b\x1a\
556
+\x10\xff\0\0\0\0\xb7\x01\0\0\0\0\0\0\x7b\x1a\x28\xff\0\0\0\0\x7b\x7a\x20\xff\0\
557
+\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\xfe\xff\xff\xff\xbf\x81\0\0\0\0\0\0\x79\
558
+\xa2\x40\xff\0\0\0\0\xb7\x04\0\0\x02\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\
559
+\0\0\0\x67\0\0\0\x20\0\0\0\x77\0\0\0\x20\0\0\0\x15\0\x01\0\0\0\0\0\x05\0\x90\
560
+\x01\0\0\0\0\xbf\x91\0\0\0\0\0\0\x15\x01\x23\0\x3c\0\0\0\x15\x01\x59\0\x2c\0\0\
561
+\0\x55\x01\x5a\0\x2b\0\0\0\xb7\x01\0\0\0\0\0\0\x63\x1a\xf8\xff\0\0\0\0\xbf\xa3\
562
+\0\0\0\0\0\0\x07\x03\0\0\xf8\xff\xff\xff\xbf\x81\0\0\0\0\0\0\x79\xa2\x40\xff\0\
563
+\0\0\0\xb7\x04\0\0\x04\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\0\0\0\xbf\x01\
564
+\0\0\0\0\0\0\x67\x01\0\0\x20\0\0\0\x77\x01\0\0\x20\0\0\0\x55\x01\x03\x01\0\0\0\
565
+\0\x71\xa1\xfa\xff\0\0\0\0\x55\x01\x4b\0\x02\0\0\0\x71\xa1\xf9\xff\0\0\0\0\x55\
566
+\x01\x49\0\x02\0\0\0\x71\xa1\xfb\xff\0\0\0\0\x55\x01\x47\0\x01\0\0\0\x79\xa2\
567
+\x40\xff\0\0\0\0\x07\x02\0\0\x08\0\0\0\xbf\x81\0\0\0\0\0\0\x79\xa3\x18\xff\0\0\
568
+\0\0\xb7\x04\0\0\x10\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\0\0\0\xbf\x01\0\
569
+\0\0\0\0\0\x67\x01\0\0\x20\0\0\0\x77\x01\0\0\x20\0\0\0\x55\x01\xf2\0\0\0\0\0\
570
+\xb7\x01\0\0\x01\0\0\0\x73\x1a\x55\xff\0\0\0\0\x05\0\x39\0\0\0\0\0\xb7\x01\0\0\
571
+\0\0\0\0\x6b\x1a\xf8\xff\0\0\0\0\xb7\x09\0\0\x02\0\0\0\xb7\x07\0\0\x1e\0\0\0\
572
+\x05\0\x0e\0\0\0\0\0\x79\xa2\x38\xff\0\0\0\0\x0f\x29\0\0\0\0\0\0\xbf\x92\0\0\0\
573
+\0\0\0\x07\x02\0\0\x01\0\0\0\x71\xa3\xff\xff\0\0\0\0\x67\x03\0\0\x03\0\0\0\x2d\
574
+\x23\x02\0\0\0\0\0\x79\xa7\x20\xff\0\0\0\0\x05\0\x2b\0\0\0\0\0\x07\x07\0\0\xff\
575
+\xff\xff\xff\xbf\x72\0\0\0\0\0\0\x67\x02\0\0\x20\0\0\0\x77\x02\0\0\x20\0\0\0\
576
+\x15\x02\xf9\xff\0\0\0\0\x7b\x9a\x38\xff\0\0\0\0\x79\xa1\x40\xff\0\0\0\0\x0f\
577
+\x19\0\0\0\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\xf8\xff\xff\xff\xbf\x81\0\0\0\
578
+\0\0\0\xbf\x92\0\0\0\0\0\0\xb7\x04\0\0\x02\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\
579
+\0\x44\0\0\0\xbf\x01\0\0\0\0\0\0\x67\x01\0\0\x20\0\0\0\x77\x01\0\0\x20\0\0\0\
580
+\x55\x01\x94\0\0\0\0\0\x71\xa2\xf8\xff\0\0\0\0\x55\x02\x0f\0\xc9\0\0\0\x07\x09\
581
+\0\0\x02\0\0\0\xbf\x81\0\0\0\0\0\0\xbf\x92\0\0\0\0\0\0\x79\xa3\x10\xff\0\0\0\0\
582
+\xb7\x04\0\0\x10\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\0\0\0\xbf\x01\0\0\0\
583
+\0\0\0\x67\x01\0\0\x20\0\0\0\x77\x01\0\0\x20\0\0\0\x55\x01\x87\0\0\0\0\0\xb7\
584
+\x01\0\0\x01\0\0\0\x73\x1a\x54\xff\0\0\0\0\x79\xa7\x20\xff\0\0\0\0\x05\0\x07\0\
585
+\0\0\0\0\xb7\x09\0\0\x01\0\0\0\x15\x02\xd1\xff\0\0\0\0\x71\xa9\xf9\xff\0\0\0\0\
586
+\x07\x09\0\0\x02\0\0\0\x05\0\xce\xff\0\0\0\0\xb7\x01\0\0\x01\0\0\0\x73\x1a\x56\
587
+\xff\0\0\0\0\x71\xa1\xff\xff\0\0\0\0\x67\x01\0\0\x03\0\0\0\x79\xa2\x40\xff\0\0\
588
+\0\0\x0f\x12\0\0\0\0\0\0\x07\x02\0\0\x08\0\0\0\x7b\x2a\x40\xff\0\0\0\0\x71\xa9\
589
+\xfe\xff\0\0\0\0\x25\x09\x0e\0\x3c\0\0\0\xb7\x01\0\0\x01\0\0\0\x6f\x91\0\0\0\0\
590
+\0\0\x18\x02\0\0\x01\0\0\0\0\0\0\0\0\x18\0\x1c\x5f\x21\0\0\0\0\0\0\x55\x01\x01\
591
+\0\0\0\0\0\x05\0\x07\0\0\0\0\0\x79\xa1\x28\xff\0\0\0\0\x07\x01\0\0\x01\0\0\0\
592
+\x7b\x1a\x28\xff\0\0\0\0\x67\x01\0\0\x20\0\0\0\x77\x01\0\0\x20\0\0\0\x55\x01\
593
+\x82\xff\x0b\0\0\0\x05\0\x10\xff\0\0\0\0\x15\x09\xf8\xff\x87\0\0\0\x05\0\xfd\
594
+\xff\0\0\0\0\x71\xa1\x51\xff\0\0\0\0\x79\xa0\x30\xff\0\0\0\0\x15\x01\x17\x01\0\
595
+\0\0\0\x71\x62\x03\0\0\0\0\0\x67\x02\0\0\x08\0\0\0\x71\x61\x02\0\0\0\0\0\x4f\
596
+\x12\0\0\0\0\0\0\x71\x63\x04\0\0\0\0\0\x71\x61\x05\0\0\0\0\0\x67\x01\0\0\x08\0\
597
+\0\0\x4f\x31\0\0\0\0\0\0\x67\x01\0\0\x10\0\0\0\x4f\x21\0\0\0\0\0\0\x71\xa2\x53\
598
+\xff\0\0\0\0\x15\x02\x3d\0\0\0\0\0\xbf\x12\0\0\0\0\0\0\x57\x02\0\0\x10\0\0\0\
599
+\x15\x02\x3a\0\0\0\0\0\xbf\xa2\0\0\0\0\0\0\x07\x02\0\0\x5c\xff\xff\xff\x71\xa4\
600
+\x54\xff\0\0\0\0\xbf\x23\0\0\0\0\0\0\x15\x04\x02\0\0\0\0\0\xbf\xa3\0\0\0\0\0\0\
601
+\x07\x03\0\0\x7c\xff\xff\xff\x67\x01\0\0\x38\0\0\0\xc7\x01\0\0\x38\0\0\0\x65\
602
+\x01\x01\0\xff\xff\xff\xff\xbf\x32\0\0\0\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\
603
+\x6c\xff\xff\xff\x71\xa5\x55\xff\0\0\0\0\xbf\x34\0\0\0\0\0\0\x15\x05\x02\0\0\0\
604
+\0\0\xbf\xa4\0\0\0\0\0\0\x07\x04\0\0\x8c\xff\xff\xff\x65\x01\x01\0\xff\xff\xff\
605
+\xff\xbf\x43\0\0\0\0\0\0\x61\x21\x04\0\0\0\0\0\x67\x01\0\0\x20\0\0\0\x61\x24\0\
606
+\0\0\0\0\0\x4f\x41\0\0\0\0\0\0\x7b\x1a\xa0\xff\0\0\0\0\x61\x21\x08\0\0\0\0\0\
607
+\x61\x22\x0c\0\0\0\0\0\x67\x02\0\0\x20\0\0\0\x4f\x12\0\0\0\0\0\0\x7b\x2a\xa8\
608
+\xff\0\0\0\0\x61\x31\0\0\0\0\0\0\x61\x32\x04\0\0\0\0\0\x61\x34\x08\0\0\0\0\0\
609
+\x61\x33\x0c\0\0\0\0\0\x69\xa5\x5a\xff\0\0\0\0\x6b\x5a\xc2\xff\0\0\0\0\x69\xa5\
610
+\x58\xff\0\0\0\0\x6b\x5a\xc0\xff\0\0\0\0\x67\x03\0\0\x20\0\0\0\x4f\x43\0\0\0\0\
611
+\0\0\x7b\x3a\xb8\xff\0\0\0\0\x67\x02\0\0\x20\0\0\0\x4f\x12\0\0\0\0\0\0\x7b\x2a\
612
+\xb0\xff\0\0\0\0\x05\0\x6b\0\0\0\0\0\x71\xa2\x52\xff\0\0\0\0\x15\x02\x04\0\0\0\
613
+\0\0\xbf\x12\0\0\0\0\0\0\x57\x02\0\0\x04\0\0\0\x15\x02\x01\0\0\0\0\0\x05\0\xf7\
614
+\xfe\0\0\0\0\x57\x01\0\0\x01\0\0\0\x15\x01\xd3\0\0\0\0\0\x61\xa1\x5c\xff\0\0\0\
615
+\0\x63\x1a\xa0\xff\0\0\0\0\x61\xa1\x60\xff\0\0\0\0\x63\x1a\xa4\xff\0\0\0\0\x05\
616
+\0\x5e\0\0\0\0\0\x71\xa2\x52\xff\0\0\0\0\x15\x02\x1e\0\0\0\0\0\xbf\x12\0\0\0\0\
617
+\0\0\x57\x02\0\0\x20\0\0\0\x15\x02\x1b\0\0\0\0\0\xbf\xa2\0\0\0\0\0\0\x07\x02\0\
618
+\0\x5c\xff\xff\xff\x71\xa4\x54\xff\0\0\0\0\xbf\x23\0\0\0\0\0\0\x15\x04\x02\0\0\
619
+\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\x7c\xff\xff\xff\x57\x01\0\0\0\x01\0\0\
620
+\x15\x01\x01\0\0\0\0\0\xbf\x32\0\0\0\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\x03\0\0\x6c\
621
+\xff\xff\xff\x71\xa5\x55\xff\0\0\0\0\xbf\x34\0\0\0\0\0\0\x15\x05\x02\0\0\0\0\0\
622
+\xbf\xa4\0\0\0\0\0\0\x07\x04\0\0\x8c\xff\xff\xff\x15\x01\xc3\xff\0\0\0\0\x05\0\
623
+\xc1\xff\0\0\0\0\xb7\x09\0\0\x3c\0\0\0\x79\xa7\x20\xff\0\0\0\0\x67\0\0\0\x20\0\
624
+\0\0\x77\0\0\0\x20\0\0\0\x15\0\xa5\xfe\0\0\0\0\x05\0\xb0\0\0\0\0\0\x15\x09\x07\
625
+\xff\x87\0\0\0\x05\0\xa2\xfe\0\0\0\0\xbf\x12\0\0\0\0\0\0\x57\x02\0\0\x08\0\0\0\
626
+\x15\x02\xab\0\0\0\0\0\xbf\xa2\0\0\0\0\0\0\x07\x02\0\0\x5c\xff\xff\xff\x71\xa4\
627
+\x54\xff\0\0\0\0\xbf\x23\0\0\0\0\0\0\x15\x04\x02\0\0\0\0\0\xbf\xa3\0\0\0\0\0\0\
628
+\x07\x03\0\0\x7c\xff\xff\xff\x57\x01\0\0\x40\0\0\0\x15\x01\x01\0\0\0\0\0\xbf\
629
+\x32\0\0\0\0\0\0\x61\x23\x04\0\0\0\0\0\x67\x03\0\0\x20\0\0\0\x61\x24\0\0\0\0\0\
630
+\0\x4f\x43\0\0\0\0\0\0\x7b\x3a\xa0\xff\0\0\0\0\x61\x23\x08\0\0\0\0\0\x61\x22\
631
+\x0c\0\0\0\0\0\x67\x02\0\0\x20\0\0\0\x4f\x32\0\0\0\0\0\0\x7b\x2a\xa8\xff\0\0\0\
632
+\0\x15\x01\x1c\0\0\0\0\0\x71\xa1\x55\xff\0\0\0\0\x15\x01\x1a\0\0\0\0\0\x61\xa1\
633
+\x98\xff\0\0\0\0\x67\x01\0\0\x20\0\0\0\x61\xa2\x94\xff\0\0\0\0\x4f\x21\0\0\0\0\
634
+\0\0\x7b\x1a\xb8\xff\0\0\0\0\x61\xa1\x90\xff\0\0\0\0\x67\x01\0\0\x20\0\0\0\x61\
635
+\xa2\x8c\xff\0\0\0\0\x05\0\x19\0\0\0\0\0\xb7\x01\0\0\x01\0\0\0\x73\x1a\x52\xff\
636
+\0\0\0\0\xb7\x01\0\0\0\0\0\0\x7b\x1a\xd0\xff\0\0\0\0\xbf\xa3\0\0\0\0\0\0\x07\
637
+\x03\0\0\xd0\xff\xff\xff\xbf\x81\0\0\0\0\0\0\x79\xa2\x40\xff\0\0\0\0\xb7\x04\0\
638
+\0\x08\0\0\0\xb7\x05\0\0\x01\0\0\0\x85\0\0\0\x44\0\0\0\x67\0\0\0\x20\0\0\0\x77\
639
+\0\0\0\x20\0\0\0\x55\0\x7d\0\0\0\0\0\x05\0\x88\xfe\0\0\0\0\xb7\x09\0\0\x2b\0\0\
640
+\0\x05\0\xc6\xff\0\0\0\0\x61\xa1\x78\xff\0\0\0\0\x67\x01\0\0\x20\0\0\0\x61\xa2\
641
+\x74\xff\0\0\0\0\x4f\x21\0\0\0\0\0\0\x7b\x1a\xb8\xff\0\0\0\0\x61\xa1\x70\xff\0\
642
+\0\0\0\x67\x01\0\0\x20\0\0\0\x61\xa2\x6c\xff\0\0\0\0\x4f\x21\0\0\0\0\0\0\x7b\
643
+\x1a\xb0\xff\0\0\0\0\xb7\x01\0\0\0\0\0\0\x07\x07\0\0\x04\0\0\0\x61\x03\0\0\0\0\
644
+\0\0\xb7\x05\0\0\0\0\0\0\x05\0\x4e\0\0\0\0\0\xaf\x52\0\0\0\0\0\0\xbf\x75\0\0\0\
645
+\0\0\0\x0f\x15\0\0\0\0\0\0\x71\x55\0\0\0\0\0\0\x67\x03\0\0\x01\0\0\0\xbf\x50\0\
646
+\0\0\0\0\0\x77\0\0\0\x07\0\0\0\x4f\x03\0\0\0\0\0\0\xbf\x40\0\0\0\0\0\0\x67\0\0\
647
+\0\x39\0\0\0\xc7\0\0\0\x3f\0\0\0\x5f\x30\0\0\0\0\0\0\xaf\x02\0\0\0\0\0\0\xbf\
648
+\x50\0\0\0\0\0\0\x77\0\0\0\x06\0\0\0\x57\0\0\0\x01\0\0\0\x67\x03\0\0\x01\0\0\0\
649
+\x4f\x03\0\0\0\0\0\0\xbf\x40\0\0\0\0\0\0\x67\0\0\0\x3a\0\0\0\xc7\0\0\0\x3f\0\0\
650
+\0\x5f\x30\0\0\0\0\0\0\xaf\x02\0\0\0\0\0\0\x67\x03\0\0\x01\0\0\0\xbf\x50\0\0\0\
651
+\0\0\0\x77\0\0\0\x05\0\0\0\x57\0\0\0\x01\0\0\0\x4f\x03\0\0\0\0\0\0\xbf\x40\0\0\
652
+\0\0\0\0\x67\0\0\0\x3b\0\0\0\xc7\0\0\0\x3f\0\0\0\x5f\x30\0\0\0\0\0\0\xaf\x02\0\
653
+\0\0\0\0\0\x67\x03\0\0\x01\0\0\0\xbf\x50\0\0\0\0\0\0\x77\0\0\0\x04\0\0\0\x57\0\
654
+\0\0\x01\0\0\0\x4f\x03\0\0\0\0\0\0\xbf\x40\0\0\0\0\0\0\x67\0\0\0\x3c\0\0\0\xc7\
655
+\0\0\0\x3f\0\0\0\x5f\x30\0\0\0\0\0\0\xaf\x02\0\0\0\0\0\0\xbf\x50\0\0\0\0\0\0\
656
+\x77\0\0\0\x03\0\0\0\x57\0\0\0\x01\0\0\0\x67\x03\0\0\x01\0\0\0\x4f\x03\0\0\0\0\
657
+\0\0\xbf\x40\0\0\0\0\0\0\x67\0\0\0\x3d\0\0\0\xc7\0\0\0\x3f\0\0\0\x5f\x30\0\0\0\
658
+\0\0\0\xaf\x02\0\0\0\0\0\0\xbf\x50\0\0\0\0\0\0\x77\0\0\0\x02\0\0\0\x57\0\0\0\
659
+\x01\0\0\0\x67\x03\0\0\x01\0\0\0\x4f\x03\0\0\0\0\0\0\xbf\x40\0\0\0\0\0\0\x67\0\
660
+\0\0\x3e\0\0\0\xc7\0\0\0\x3f\0\0\0\x5f\x30\0\0\0\0\0\0\xaf\x02\0\0\0\0\0\0\xbf\
661
+\x50\0\0\0\0\0\0\x77\0\0\0\x01\0\0\0\x57\0\0\0\x01\0\0\0\x67\x03\0\0\x01\0\0\0\
662
+\x4f\x03\0\0\0\0\0\0\x57\x04\0\0\x01\0\0\0\x87\x04\0\0\0\0\0\0\x5f\x34\0\0\0\0\
663
+\0\0\xaf\x42\0\0\0\0\0\0\x57\x05\0\0\x01\0\0\0\x67\x03\0\0\x01\0\0\0\x4f\x53\0\
664
+\0\0\0\0\0\x07\x01\0\0\x01\0\0\0\xbf\x25\0\0\0\0\0\0\x15\x01\x0b\0\x24\0\0\0\
665
+\xbf\xa2\0\0\0\0\0\0\x07\x02\0\0\xa0\xff\xff\xff\x0f\x12\0\0\0\0\0\0\x71\x24\0\
666
+\0\0\0\0\0\xbf\x40\0\0\0\0\0\0\x67\0\0\0\x38\0\0\0\xc7\0\0\0\x38\0\0\0\xb7\x02\
667
+\0\0\0\0\0\0\x65\0\xa9\xff\xff\xff\xff\xff\xbf\x32\0\0\0\0\0\0\x05\0\xa7\xff\0\
668
+\0\0\0\xbf\x21\0\0\0\0\0\0\x67\x01\0\0\x20\0\0\0\x77\x01\0\0\x20\0\0\0\x15\x01\
669
+\x0e\0\0\0\0\0\x71\x63\x06\0\0\0\0\0\x71\x64\x07\0\0\0\0\0\x67\x04\0\0\x08\0\0\
670
+\0\x4f\x34\0\0\0\0\0\0\x3f\x41\0\0\0\0\0\0\x2f\x41\0\0\0\0\0\0\x1f\x12\0\0\0\0\
671
+\0\0\x63\x2a\x50\xff\0\0\0\0\xbf\xa2\0\0\0\0\0\0\x07\x02\0\0\x50\xff\xff\xff\
672
+\x18\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x85\0\0\0\x01\0\0\0\x55\0\x05\0\0\0\0\0\
673
+\x71\x61\x08\0\0\0\0\0\x71\x60\x09\0\0\0\0\0\x67\0\0\0\x08\0\0\0\x4f\x10\0\0\0\
674
+\0\0\0\x95\0\0\0\0\0\0\0\x69\0\0\0\0\0\0\0\x05\0\xfd\xff\0\0\0\0\x02\0\0\0\x04\
675
+\0\0\0\x0a\0\0\0\x01\0\0\0\0\0\0\0\x02\0\0\0\x04\0\0\0\x28\0\0\0\x01\0\0\0\0\0\
676
+\0\0\x02\0\0\0\x04\0\0\0\x02\0\0\0\x80\0\0\0\0\0\0\0\x47\x50\x4c\x20\x76\x32\0\
677
+\0\0\0\0\0\x10\0\0\0\0\0\0\0\x01\x7a\x52\0\x08\x7c\x0b\x01\x0c\0\0\0\x18\0\0\0\
678
+\x18\0\0\0\0\0\0\0\0\0\0\0\xd8\x13\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
679
+\0\0\0\0\0\0\0\0\0\0\0\0\xa0\0\0\0\x04\0\xf1\xff\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
680
+\0\x60\x02\0\0\0\0\x03\0\x20\x02\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x3f\x02\0\0\0\0\
681
+\x03\0\xd0\x0f\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xed\x01\0\0\0\0\x03\0\x10\x10\0\0\0\
682
+\0\0\0\0\0\0\0\0\0\0\0\xd4\x01\0\0\0\0\x03\0\x20\x10\0\0\0\0\0\0\0\0\0\0\0\0\0\
683
+\0\xa3\x01\0\0\0\0\x03\0\xb8\x12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x63\x01\0\0\0\0\
684
+\x03\0\x48\x10\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x2a\x01\0\0\0\0\x03\0\x10\x13\0\0\0\
685
+\0\0\0\0\0\0\0\0\0\0\0\xe1\0\0\0\0\0\x03\0\xa0\x13\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
686
+\x2e\x02\0\0\0\0\x03\0\x28\x02\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x68\x02\0\0\0\0\x03\
687
+\0\xc0\x13\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x36\x02\0\0\0\0\x03\0\xc8\x13\0\0\0\0\0\
688
+\0\0\0\0\0\0\0\0\0\x22\x01\0\0\0\0\x03\0\xe8\x02\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
689
+\x02\x01\0\0\0\0\x03\0\x40\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xd9\0\0\0\0\0\x03\0\
690
+\xf8\x04\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x26\x02\0\0\0\0\x03\0\x20\x0e\0\0\0\0\0\0\
691
+\0\0\0\0\0\0\0\0\xcc\x01\0\0\0\0\x03\0\x60\x06\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x9b\
692
+\x01\0\0\0\0\x03\0\xc8\x06\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x5b\x01\0\0\0\0\x03\0\
693
+\x20\x07\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x7c\x01\0\0\0\0\x03\0\x48\x08\0\0\0\0\0\0\
694
+\0\0\0\0\0\0\0\0\x53\x01\0\0\0\0\x03\0\xb8\x08\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1a\
695
+\x01\0\0\0\0\x03\0\xe0\x08\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x84\x01\0\0\0\0\x03\0\
696
+\xb8\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1e\x02\0\0\0\0\x03\0\xd8\x09\0\0\0\0\0\0\0\
697
+\0\0\0\0\0\0\0\xc4\x01\0\0\0\0\x03\0\x70\x08\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x93\
698
+\x01\0\0\0\0\x03\0\xa8\x08\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x74\x01\0\0\0\0\x03\0\
699
+\xf0\x0d\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x4b\x01\0\0\0\0\x03\0\0\x0a\0\0\0\0\0\0\0\
700
+\0\0\0\0\0\0\0\x12\x01\0\0\0\0\x03\0\x10\x0a\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xfa\0\
701
+\0\0\0\0\x03\0\xc0\x0a\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x58\x02\0\0\0\0\x03\0\x88\
702
+\x0a\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x16\x02\0\0\0\0\x03\0\xb8\x0a\0\0\0\0\0\0\0\0\
703
+\0\0\0\0\0\0\xe5\x01\0\0\0\0\x03\0\xc0\x0f\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xbc\x01\
704
+\0\0\0\0\x03\0\0\x0e\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x8b\x01\0\0\0\0\x03\0\x18\x0e\
705
+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xd1\0\0\0\0\0\x03\0\0\x04\0\0\0\0\0\0\0\0\0\0\0\0\
706
+\0\0\x50\x02\0\0\0\0\x03\0\x20\x04\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x0e\x02\0\0\0\0\
707
+\x03\0\x48\x0f\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6c\x01\0\0\0\0\x03\0\xb0\x04\0\0\0\
708
+\0\0\0\0\0\0\0\0\0\0\0\x43\x01\0\0\0\0\x03\0\xc8\x0c\0\0\0\0\0\0\0\0\0\0\0\0\0\
709
+\0\xc9\0\0\0\0\0\x03\0\xf8\x0c\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x06\x02\0\0\0\0\x03\
710
+\0\xd0\x0a\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x3b\x01\0\0\0\0\x03\0\x98\x0b\0\0\0\0\0\
711
+\0\0\0\0\0\0\0\0\0\xf2\0\0\0\0\0\x03\0\xb8\x0b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x48\
712
+\x02\0\0\0\0\x03\0\xf0\x0b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xfe\x01\0\0\0\0\x03\0\
713
+\xf8\x0b\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xdd\x01\0\0\0\0\x03\0\0\x0c\0\0\0\0\0\0\0\
714
+\0\0\0\0\0\0\0\xb4\x01\0\0\0\0\x03\0\x30\x0d\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x0a\
715
+\x01\0\0\0\0\x03\0\x90\x0d\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xc1\0\0\0\0\0\x03\0\xa8\
716
+\x0d\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xba\0\0\0\0\0\x03\0\xd0\x01\0\0\0\0\0\0\0\0\0\
717
+\0\0\0\0\0\xf6\x01\0\0\0\0\x03\0\xe0\x0d\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xac\x01\0\
718
+\0\0\0\x03\0\x30\x0e\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x33\x01\0\0\0\0\x03\0\x80\x0e\
719
+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xea\0\0\0\0\0\x03\0\x98\x0e\0\0\0\0\0\0\0\0\0\0\0\
720
+\0\0\0\0\0\0\0\x03\0\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6b\0\0\0\x11\0\x06\
721
+\0\0\0\0\0\0\0\0\0\x07\0\0\0\0\0\0\0\x25\0\0\0\x11\0\x05\0\0\0\0\0\0\0\0\0\x14\
722
+\0\0\0\0\0\0\0\x82\0\0\0\x11\0\x05\0\x28\0\0\0\0\0\0\0\x14\0\0\0\0\0\0\0\x01\0\
723
+\0\0\x11\0\x05\0\x14\0\0\0\0\0\0\0\x14\0\0\0\0\0\0\0\x40\0\0\0\x12\0\x03\0\0\0\
724
+\0\0\0\0\0\0\xd8\x13\0\0\0\0\0\0\x28\0\0\0\0\0\0\0\x01\0\0\0\x3a\0\0\0\x50\0\0\
725
+\0\0\0\0\0\x01\0\0\0\x3c\0\0\0\x80\x13\0\0\0\0\0\0\x01\0\0\0\x3b\0\0\0\x1c\0\0\
726
+\0\0\0\0\0\x01\0\0\0\x38\0\0\0\0\x74\x61\x70\x5f\x72\x73\x73\x5f\x6d\x61\x70\
727
+\x5f\x74\x6f\x65\x70\x6c\x69\x74\x7a\x5f\x6b\x65\x79\0\x2e\x74\x65\x78\x74\0\
728
+\x6d\x61\x70\x73\0\x74\x61\x70\x5f\x72\x73\x73\x5f\x6d\x61\x70\x5f\x63\x6f\x6e\
729
+\x66\x69\x67\x75\x72\x61\x74\x69\x6f\x6e\x73\0\x74\x75\x6e\x5f\x72\x73\x73\x5f\
730
+\x73\x74\x65\x65\x72\x69\x6e\x67\x5f\x70\x72\x6f\x67\0\x2e\x72\x65\x6c\x74\x75\
731
+\x6e\x5f\x72\x73\x73\x5f\x73\x74\x65\x65\x72\x69\x6e\x67\0\x5f\x6c\x69\x63\x65\
732
+\x6e\x73\x65\0\x2e\x72\x65\x6c\x2e\x65\x68\x5f\x66\x72\x61\x6d\x65\0\x74\x61\
733
+\x70\x5f\x72\x73\x73\x5f\x6d\x61\x70\x5f\x69\x6e\x64\x69\x72\x65\x63\x74\x69\
734
+\x6f\x6e\x5f\x74\x61\x62\x6c\x65\0\x72\x73\x73\x2e\x62\x70\x66\x2e\x63\0\x2e\
735
+\x73\x74\x72\x74\x61\x62\0\x2e\x73\x79\x6d\x74\x61\x62\0\x4c\x42\x42\x30\x5f\
736
+\x39\0\x4c\x42\x42\x30\x5f\x38\x39\0\x4c\x42\x42\x30\x5f\x36\x39\0\x4c\x42\x42\
737
+\x30\x5f\x35\x39\0\x4c\x42\x42\x30\x5f\x31\x39\0\x4c\x42\x42\x30\x5f\x31\x30\
738
+\x39\0\x4c\x42\x42\x30\x5f\x39\x38\0\x4c\x42\x42\x30\x5f\x37\x38\0\x4c\x42\x42\
739
+\x30\x5f\x34\x38\0\x4c\x42\x42\x30\x5f\x31\x38\0\x4c\x42\x42\x30\x5f\x38\x37\0\
740
+\x4c\x42\x42\x30\x5f\x34\x37\0\x4c\x42\x42\x30\x5f\x33\x37\0\x4c\x42\x42\x30\
741
+\x5f\x31\x37\0\x4c\x42\x42\x30\x5f\x31\x30\x37\0\x4c\x42\x42\x30\x5f\x39\x36\0\
742
+\x4c\x42\x42\x30\x5f\x37\x36\0\x4c\x42\x42\x30\x5f\x36\x36\0\x4c\x42\x42\x30\
743
+\x5f\x34\x36\0\x4c\x42\x42\x30\x5f\x33\x36\0\x4c\x42\x42\x30\x5f\x32\x36\0\x4c\
744
+\x42\x42\x30\x5f\x31\x30\x36\0\x4c\x42\x42\x30\x5f\x36\x35\0\x4c\x42\x42\x30\
745
+\x5f\x34\x35\0\x4c\x42\x42\x30\x5f\x33\x35\0\x4c\x42\x42\x30\x5f\x34\0\x4c\x42\
746
+\x42\x30\x5f\x35\x34\0\x4c\x42\x42\x30\x5f\x34\x34\0\x4c\x42\x42\x30\x5f\x32\
747
+\x34\0\x4c\x42\x42\x30\x5f\x31\x30\x34\0\x4c\x42\x42\x30\x5f\x39\x33\0\x4c\x42\
748
+\x42\x30\x5f\x38\x33\0\x4c\x42\x42\x30\x5f\x35\x33\0\x4c\x42\x42\x30\x5f\x34\
749
+\x33\0\x4c\x42\x42\x30\x5f\x32\x33\0\x4c\x42\x42\x30\x5f\x31\x30\x33\0\x4c\x42\
750
+\x42\x30\x5f\x38\x32\0\x4c\x42\x42\x30\x5f\x35\x32\0\x4c\x42\x42\x30\x5f\x31\
751
+\x30\x32\0\x4c\x42\x42\x30\x5f\x39\x31\0\x4c\x42\x42\x30\x5f\x38\x31\0\x4c\x42\
752
+\x42\x30\x5f\x37\x31\0\x4c\x42\x42\x30\x5f\x36\x31\0\x4c\x42\x42\x30\x5f\x35\
753
+\x31\0\x4c\x42\x42\x30\x5f\x34\x31\0\x4c\x42\x42\x30\x5f\x32\x31\0\x4c\x42\x42\
754
+\x30\x5f\x31\x31\0\x4c\x42\x42\x30\x5f\x31\x31\x31\0\x4c\x42\x42\x30\x5f\x31\
755
+\x30\x31\0\x4c\x42\x42\x30\x5f\x38\x30\0\x4c\x42\x42\x30\x5f\x36\x30\0\x4c\x42\
756
+\x42\x30\x5f\x35\x30\0\x4c\x42\x42\x30\x5f\x31\x30\0\x4c\x42\x42\x30\x5f\x31\
757
+\x31\x30\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
758
+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xaa\
759
+\0\0\0\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\xa0\x1a\0\0\0\0\0\0\x71\x02\0\
760
+\0\0\0\0\0\0\0\0\0\0\0\0\0\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1a\0\0\0\x01\0\0\
761
+\0\x06\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x40\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
762
+\0\0\0\0\x04\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x5a\0\0\0\x01\0\0\0\x06\0\0\0\0\0\0\
763
+\0\0\0\0\0\0\0\0\0\x40\0\0\0\0\0\0\0\xd8\x13\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x08\0\
764
+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x56\0\0\0\x09\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
765
+\0\x60\x1a\0\0\0\0\0\0\x30\0\0\0\0\0\0\0\x09\0\0\0\x03\0\0\0\x08\0\0\0\0\0\0\0\
766
+\x10\0\0\0\0\0\0\0\x20\0\0\0\x01\0\0\0\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x18\
767
+\x14\0\0\0\0\0\0\x3c\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x04\0\0\0\0\0\0\0\0\0\0\0\0\
768
+\0\0\0\x6c\0\0\0\x01\0\0\0\x03\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x54\x14\0\0\0\0\0\
769
+\0\x07\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x01\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x78\0\0\
770
+\0\x01\0\0\0\x02\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x60\x14\0\0\0\0\0\0\x30\0\0\0\0\
771
+\0\0\0\0\0\0\0\0\0\0\0\x08\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x74\0\0\0\x09\0\0\0\0\
772
+\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x90\x1a\0\0\0\0\0\0\x10\0\0\0\0\0\0\0\x09\0\0\0\
773
+\x07\0\0\0\x08\0\0\0\0\0\0\0\x10\0\0\0\0\0\0\0\xb2\0\0\0\x02\0\0\0\0\0\0\0\0\0\
774
+\0\0\0\0\0\0\0\0\0\0\x90\x14\0\0\0\0\0\0\xd0\x05\0\0\0\0\0\0\x01\0\0\0\x39\0\0\
775
+\0\x08\0\0\0\0\0\0\0\x18\0\0\0\0\0\0\0";
776
+
777
+    return 0;
778
+err:
779
+    bpf_object__destroy_skeleton(s);
780
+    return -1;
781
+}
782
+
783
+#endif /* __RSS_BPF_SKEL_H__ */
784
diff --git a/ebpf/trace-events b/ebpf/trace-events
785
new file mode 100644
786
index XXXXXXX..XXXXXXX
787
--- /dev/null
788
+++ b/ebpf/trace-events
789
@@ -XXX,XX +XXX,XX @@
790
+# See docs/devel/tracing.txt for syntax documentation.
791
+
792
+# ebpf-rss.c
793
+ebpf_error(const char *s1, const char *s2) "error in %s: %s"
794
diff --git a/ebpf/trace.h b/ebpf/trace.h
795
new file mode 100644
796
index XXXXXXX..XXXXXXX
797
--- /dev/null
798
+++ b/ebpf/trace.h
799
@@ -0,0 +1 @@
800
+#include "trace/trace-ebpf.h"
801
diff --git a/meson.build b/meson.build
802
index XXXXXXX..XXXXXXX 100644
803
--- a/meson.build
804
+++ b/meson.build
805
@@ -XXX,XX +XXX,XX @@ if not get_option('fuse_lseek').disabled()
806
endif
807
endif
808
809
+# libbpf
810
+libbpf = dependency('libbpf', required: get_option('bpf'))
811
+if libbpf.found() and not cc.links('''
812
+ #include <bpf/libbpf.h>
813
+ int main(void)
814
+ {
815
+ bpf_object__destroy_skeleton(NULL);
816
+ return 0;
817
+ }''', dependencies: libbpf)
818
+ libbpf = not_found
819
+ if get_option('bpf').enabled()
820
+ error('libbpf skeleton test failed')
821
+ else
822
+ warning('libbpf skeleton test failed, disabling')
823
+ endif
824
+endif
825
+
826
if get_option('cfi')
827
cfi_flags=[]
828
# Check for dependency on LTO
829
@@ -XXX,XX +XXX,XX @@ endif
830
config_host_data.set('CONFIG_GTK', gtk.found())
831
config_host_data.set('CONFIG_LIBATTR', have_old_libattr)
832
config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found())
833
+config_host_data.set('CONFIG_EBPF', libbpf.found())
834
config_host_data.set('CONFIG_LIBISCSI', libiscsi.found())
835
config_host_data.set('CONFIG_LIBNFS', libnfs.found())
836
config_host_data.set('CONFIG_RBD', rbd.found())
837
@@ -XXX,XX +XXX,XX @@ if have_system
838
'backends',
839
'backends/tpm',
840
'chardev',
841
+ 'ebpf',
842
'hw/9pfs',
843
'hw/acpi',
844
'hw/adc',
845
@@ -XXX,XX +XXX,XX @@ subdir('accel')
846
subdir('plugins')
847
subdir('bsd-user')
848
subdir('linux-user')
849
+subdir('ebpf')
850
+
851
+common_ss.add(libbpf)
852
853
bsd_user_ss.add(files('gdbstub.c'))
854
specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
855
@@ -XXX,XX +XXX,XX @@ summary_info += {'RDMA support': config_host.has_key('CONFIG_RDMA')}
856
summary_info += {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA')}
857
summary_info += {'fdt support': fdt_opt == 'disabled' ? false : fdt_opt}
858
summary_info += {'libcap-ng support': libcap_ng.found()}
859
+summary_info += {'bpf support': libbpf.found()}
860
# TODO: add back protocol and server version
861
summary_info += {'spice support': config_host.has_key('CONFIG_SPICE')}
862
summary_info += {'rbd support': rbd.found()}
863
diff --git a/meson_options.txt b/meson_options.txt
864
index XXXXXXX..XXXXXXX 100644
865
--- a/meson_options.txt
866
+++ b/meson_options.txt
867
@@ -XXX,XX +XXX,XX @@ option('bzip2', type : 'feature', value : 'auto',
868
description: 'bzip2 support for DMG images')
869
option('cap_ng', type : 'feature', value : 'auto',
870
description: 'cap_ng support')
871
+option('bpf', type : 'feature', value : 'auto',
872
+ description: 'eBPF support')
873
option('cocoa', type : 'feature', value : 'auto',
874
description: 'Cocoa user interface (macOS only)')
875
option('curl', type : 'feature', value : 'auto',
876
--
877
2.7.4
878
879
diff view generated by jsdifflib
New patch
[PULL 05/10] virtio-net: Added eBPF RSS to virtio-net.
1
1
From: Andrew Melnychenko <andrew@daynix.com>
2
3
When RSS is enabled the device tries to load the eBPF program
4
to select RX virtqueue in the TUN. If eBPF can be loaded
5
the RSS will function also with vhost (works with kernel 5.8 and later).
6
Software RSS is used as a fallback with vhost=off when eBPF can't be loaded
7
or when hash population requested by the guest.
8
9
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
10
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
11
Signed-off-by: Jason Wang <jasowang@redhat.com>
12
---
13
hw/net/vhost_net.c | 3 ++
14
hw/net/virtio-net.c | 115 +++++++++++++++++++++++++++++++++++++++--
15
include/hw/virtio/virtio-net.h | 4 ++
16
net/vhost-vdpa.c | 2 +
17
4 files changed, 121 insertions(+), 3 deletions(-)
18
19
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
20
index XXXXXXX..XXXXXXX 100644
21
--- a/hw/net/vhost_net.c
22
+++ b/hw/net/vhost_net.c
23
@@ -XXX,XX +XXX,XX @@ static const int kernel_feature_bits[] = {
24
VIRTIO_NET_F_MTU,
25
VIRTIO_F_IOMMU_PLATFORM,
26
VIRTIO_F_RING_PACKED,
27
+ VIRTIO_NET_F_HASH_REPORT,
28
VHOST_INVALID_FEATURE_BIT
29
};
30
31
@@ -XXX,XX +XXX,XX @@ static const int user_feature_bits[] = {
32
VIRTIO_NET_F_MTU,
33
VIRTIO_F_IOMMU_PLATFORM,
34
VIRTIO_F_RING_PACKED,
35
+ VIRTIO_NET_F_RSS,
36
+ VIRTIO_NET_F_HASH_REPORT,
37
38
/* This bit implies RARP isn't sent by QEMU out of band */
39
VIRTIO_NET_F_GUEST_ANNOUNCE,
40
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
41
index XXXXXXX..XXXXXXX 100644
42
--- a/hw/net/virtio-net.c
43
+++ b/hw/net/virtio-net.c
44
@@ -XXX,XX +XXX,XX @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features,
45
return features;
46
}
47
48
- virtio_clear_feature(&features, VIRTIO_NET_F_RSS);
49
- virtio_clear_feature(&features, VIRTIO_NET_F_HASH_REPORT);
50
+ if (!ebpf_rss_is_loaded(&n->ebpf_rss)) {
51
+ virtio_clear_feature(&features, VIRTIO_NET_F_RSS);
52
+ }
53
features = vhost_net_get_features(get_vhost_net(nc->peer), features);
54
vdev->backend_features = features;
55
56
@@ -XXX,XX +XXX,XX @@ static int virtio_net_handle_announce(VirtIONet *n, uint8_t cmd,
57
}
58
}
59
60
+static void virtio_net_detach_epbf_rss(VirtIONet *n);
61
+
62
static void virtio_net_disable_rss(VirtIONet *n)
63
{
64
if (n->rss_data.enabled) {
65
trace_virtio_net_rss_disable();
66
}
67
n->rss_data.enabled = false;
68
+
69
+ virtio_net_detach_epbf_rss(n);
70
+}
71
+
72
+static bool virtio_net_attach_ebpf_to_backend(NICState *nic, int prog_fd)
73
+{
74
+ NetClientState *nc = qemu_get_peer(qemu_get_queue(nic), 0);
75
+ if (nc == NULL || nc->info->set_steering_ebpf == NULL) {
76
+ return false;
77
+ }
78
+
79
+ return nc->info->set_steering_ebpf(nc, prog_fd);
80
+}
81
+
82
+static void rss_data_to_rss_config(struct VirtioNetRssData *data,
83
+ struct EBPFRSSConfig *config)
84
+{
85
+ config->redirect = data->redirect;
86
+ config->populate_hash = data->populate_hash;
87
+ config->hash_types = data->hash_types;
88
+ config->indirections_len = data->indirections_len;
89
+ config->default_queue = data->default_queue;
90
+}
91
+
92
+static bool virtio_net_attach_epbf_rss(VirtIONet *n)
93
+{
94
+ struct EBPFRSSConfig config = {};
95
+
96
+ if (!ebpf_rss_is_loaded(&n->ebpf_rss)) {
97
+ return false;
98
+ }
99
+
100
+ rss_data_to_rss_config(&n->rss_data, &config);
101
+
102
+ if (!ebpf_rss_set_all(&n->ebpf_rss, &config,
103
+ n->rss_data.indirections_table, n->rss_data.key)) {
104
+ return false;
105
+ }
106
+
107
+ if (!virtio_net_attach_ebpf_to_backend(n->nic, n->ebpf_rss.program_fd)) {
108
+ return false;
109
+ }
110
+
111
+ return true;
112
+}
113
+
114
+static void virtio_net_detach_epbf_rss(VirtIONet *n)
115
+{
116
+ virtio_net_attach_ebpf_to_backend(n->nic, -1);
117
+}
118
+
119
+static bool virtio_net_load_ebpf(VirtIONet *n)
120
+{
121
+ if (!virtio_net_attach_ebpf_to_backend(n->nic, -1)) {
122
+ /* backend does't support steering ebpf */
123
+ return false;
124
+ }
125
+
126
+ return ebpf_rss_load(&n->ebpf_rss);
127
+}
128
+
129
+static void virtio_net_unload_ebpf(VirtIONet *n)
130
+{
131
+ virtio_net_attach_ebpf_to_backend(n->nic, -1);
132
+ ebpf_rss_unload(&n->ebpf_rss);
133
}
134
135
static uint16_t virtio_net_handle_rss(VirtIONet *n,
136
@@ -XXX,XX +XXX,XX @@ static uint16_t virtio_net_handle_rss(VirtIONet *n,
137
goto error;
138
}
139
n->rss_data.enabled = true;
140
+
141
+ if (!n->rss_data.populate_hash) {
142
+ if (!virtio_net_attach_epbf_rss(n)) {
143
+ /* EBPF must be loaded for vhost */
144
+ if (get_vhost_net(qemu_get_queue(n->nic)->peer)) {
145
+ warn_report("Can't load eBPF RSS for vhost");
146
+ goto error;
147
+ }
148
+ /* fallback to software RSS */
149
+ warn_report("Can't load eBPF RSS - fallback to software RSS");
150
+ n->rss_data.enabled_software_rss = true;
151
+ }
152
+ } else {
153
+ /* use software RSS for hash populating */
154
+ /* and detach eBPF if was loaded before */
155
+ virtio_net_detach_epbf_rss(n);
156
+ n->rss_data.enabled_software_rss = true;
157
+ }
158
+
159
trace_virtio_net_rss_enable(n->rss_data.hash_types,
160
n->rss_data.indirections_len,
161
temp.b);
162
@@ -XXX,XX +XXX,XX @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
163
return -1;
164
}
165
166
- if (!no_rss && n->rss_data.enabled) {
167
+ if (!no_rss && n->rss_data.enabled && n->rss_data.enabled_software_rss) {
168
int index = virtio_net_process_rss(nc, buf, size);
169
if (index >= 0) {
170
NetClientState *nc2 = qemu_get_subqueue(n->nic, index);
171
@@ -XXX,XX +XXX,XX @@ static int virtio_net_post_load_device(void *opaque, int version_id)
172
}
173
174
if (n->rss_data.enabled) {
175
+ n->rss_data.enabled_software_rss = n->rss_data.populate_hash;
176
+ if (!n->rss_data.populate_hash) {
177
+ if (!virtio_net_attach_epbf_rss(n)) {
178
+ if (get_vhost_net(qemu_get_queue(n->nic)->peer)) {
179
+ warn_report("Can't post-load eBPF RSS for vhost");
180
+ } else {
181
+ warn_report("Can't post-load eBPF RSS - fallback to software RSS");
182
+ n->rss_data.enabled_software_rss = true;
183
+ }
184
+ }
185
+ }
186
+
187
trace_virtio_net_rss_enable(n->rss_data.hash_types,
188
n->rss_data.indirections_len,
189
sizeof(n->rss_data.key));
190
@@ -XXX,XX +XXX,XX @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
191
n->qdev = dev;
192
193
net_rx_pkt_init(&n->rx_pkt, false);
194
+
195
+ if (virtio_has_feature(n->host_features, VIRTIO_NET_F_RSS)) {
196
+ virtio_net_load_ebpf(n);
197
+ }
198
}
199
200
static void virtio_net_device_unrealize(DeviceState *dev)
201
@@ -XXX,XX +XXX,XX @@ static void virtio_net_device_unrealize(DeviceState *dev)
202
VirtIONet *n = VIRTIO_NET(dev);
203
int i, max_queues;
204
205
+ if (virtio_has_feature(n->host_features, VIRTIO_NET_F_RSS)) {
206
+ virtio_net_unload_ebpf(n);
207
+ }
208
+
209
/* This will stop vhost backend if appropriate. */
210
virtio_net_set_status(vdev, 0);
211
212
@@ -XXX,XX +XXX,XX @@ static void virtio_net_instance_init(Object *obj)
213
device_add_bootindex_property(obj, &n->nic_conf.bootindex,
214
"bootindex", "/ethernet-phy@0",
215
DEVICE(n));
216
+
217
+ ebpf_rss_init(&n->ebpf_rss);
218
}
219
220
static int virtio_net_pre_save(void *opaque)
221
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
222
index XXXXXXX..XXXXXXX 100644
223
--- a/include/hw/virtio/virtio-net.h
224
+++ b/include/hw/virtio/virtio-net.h
225
@@ -XXX,XX +XXX,XX @@
226
#include "qemu/option_int.h"
227
#include "qom/object.h"
228
229
+#include "ebpf/ebpf_rss.h"
230
+
231
#define TYPE_VIRTIO_NET "virtio-net-device"
232
OBJECT_DECLARE_SIMPLE_TYPE(VirtIONet, VIRTIO_NET)
233
234
@@ -XXX,XX +XXX,XX @@ typedef struct VirtioNetRscChain {
235
236
typedef struct VirtioNetRssData {
237
bool enabled;
238
+ bool enabled_software_rss;
239
bool redirect;
240
bool populate_hash;
241
uint32_t hash_types;
242
@@ -XXX,XX +XXX,XX @@ struct VirtIONet {
243
Notifier migration_state;
244
VirtioNetRssData rss_data;
245
struct NetRxPkt *rx_pkt;
246
+ struct EBPFRSSContext ebpf_rss;
247
};
248
249
void virtio_net_set_netclient_name(VirtIONet *n, const char *name,
250
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
251
index XXXXXXX..XXXXXXX 100644
252
--- a/net/vhost-vdpa.c
253
+++ b/net/vhost-vdpa.c
254
@@ -XXX,XX +XXX,XX @@ const int vdpa_feature_bits[] = {
255
VIRTIO_NET_F_MTU,
256
VIRTIO_F_IOMMU_PLATFORM,
257
VIRTIO_F_RING_PACKED,
258
+ VIRTIO_NET_F_RSS,
259
+ VIRTIO_NET_F_HASH_REPORT,
260
VIRTIO_NET_F_GUEST_ANNOUNCE,
261
VIRTIO_NET_F_STATUS,
262
VHOST_INVALID_FEATURE_BIT
263
--
264
2.7.4
265
266
diff view generated by jsdifflib
New patch
[PULL 06/10] docs: Added eBPF documentation.
1
From: Andrew Melnychenko <andrew@daynix.com>
1
2
3
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
4
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
5
Signed-off-by: Jason Wang <jasowang@redhat.com>
6
---
7
docs/devel/ebpf_rss.rst | 125 ++++++++++++++++++++++++++++++++++++++++++++++++
8
docs/devel/index.rst | 1 +
9
2 files changed, 126 insertions(+)
10
create mode 100644 docs/devel/ebpf_rss.rst
11
12
diff --git a/docs/devel/ebpf_rss.rst b/docs/devel/ebpf_rss.rst
13
new file mode 100644
14
index XXXXXXX..XXXXXXX
15
--- /dev/null
16
+++ b/docs/devel/ebpf_rss.rst
17
@@ -XXX,XX +XXX,XX @@
18
+===========================
19
+eBPF RSS virtio-net support
20
+===========================
21
+
22
+RSS(Receive Side Scaling) is used to distribute network packets to guest virtqueues
23
+by calculating packet hash. Usually every queue is processed then by a specific guest CPU core.
24
+
25
+For now there are 2 RSS implementations in qemu:
26
+- 'in-qemu' RSS (functions if qemu receives network packets, i.e. vhost=off)
27
+- eBPF RSS (can function with also with vhost=on)
28
+
29
+eBPF support (CONFIG_EBPF) is enabled by 'configure' script.
30
+To enable eBPF RSS support use './configure --enable-bpf'.
31
+
32
+If steering BPF is not set for kernel's TUN module, the TUN uses automatic selection
33
+of rx virtqueue based on lookup table built according to calculated symmetric hash
34
+of transmitted packets.
35
+If steering BPF is set for TUN the BPF code calculates the hash of packet header and
36
+returns the virtqueue number to place the packet to.
37
+
38
+Simplified decision formula:
39
+
40
+.. code:: C
41
+
42
+ queue_index = indirection_table[hash(<packet data>)%<indirection_table size>]
43
+
44
+
45
+Not for all packets, the hash can/should be calculated.
46
+
47
+Note: currently, eBPF RSS does not support hash reporting.
48
+
49
+eBPF RSS turned on by different combinations of vhost-net, vitrio-net and tap configurations:
50
+
51
+- eBPF is used:
52
+
53
+ tap,vhost=off & virtio-net-pci,rss=on,hash=off
54
+
55
+- eBPF is used:
56
+
57
+ tap,vhost=on & virtio-net-pci,rss=on,hash=off
58
+
59
+- 'in-qemu' RSS is used:
60
+
61
+ tap,vhost=off & virtio-net-pci,rss=on,hash=on
62
+
63
+- eBPF is used, hash population feature is not reported to the guest:
64
+
65
+ tap,vhost=on & virtio-net-pci,rss=on,hash=on
66
+
67
+If CONFIG_EBPF is not set then only 'in-qemu' RSS is supported.
68
+Also 'in-qemu' RSS, as a fallback, is used if the eBPF program failed to load or set to TUN.
69
+
70
+RSS eBPF program
71
+----------------
72
+
73
+RSS program located in ebpf/rss.bpf.skeleton.h generated by bpftool.
74
+So the program is part of the qemu binary.
75
+Initially, the eBPF program was compiled by clang and source code located at tools/ebpf/rss.bpf.c.
76
+Prerequisites to recompile the eBPF program (regenerate ebpf/rss.bpf.skeleton.h):
77
+
78
+ llvm, clang, kernel source tree, bpftool
79
+ Adjust Makefile.ebpf to reflect the location of the kernel source tree
80
+
81
+ $ cd tools/ebpf
82
+ $ make -f Makefile.ebpf
83
+
84
+Current eBPF RSS implementation uses 'bounded loops' with 'backward jump instructions' which present in the last kernels.
85
+Overall eBPF RSS works on kernels 5.8+.
86
+
87
+eBPF RSS implementation
88
+-----------------------
89
+
90
+eBPF RSS loading functionality located in ebpf/ebpf_rss.c and ebpf/ebpf_rss.h.
91
+
92
+The `struct EBPFRSSContext` structure that holds 4 file descriptors:
93
+
94
+- ctx - pointer of the libbpf context.
95
+- program_fd - file descriptor of the eBPF RSS program.
96
+- map_configuration - file descriptor of the 'configuration' map. This map contains one element of 'struct EBPFRSSConfig'. This configuration determines eBPF program behavior.
97
+- map_toeplitz_key - file descriptor of the 'Toeplitz key' map. One element of the 40byte key prepared for the hashing algorithm.
98
+- map_indirections_table - 128 elements of queue indexes.
99
+
100
+`struct EBPFRSSConfig` fields:
101
+
102
+- redirect - "boolean" value, should the hash be calculated, on false - `default_queue` would be used as the final decision.
103
+- populate_hash - for now, not used. eBPF RSS doesn't support hash reporting.
104
+- hash_types - binary mask of different hash types. See `VIRTIO_NET_RSS_HASH_TYPE_*` defines. If for packet hash should not be calculated - `default_queue` would be used.
105
+- indirections_len - length of the indirections table, maximum 128.
106
+- default_queue - the queue index that used for packet that shouldn't be hashed. For some packets, the hash can't be calculated(g.e ARP).
107
+
108
+Functions:
109
+
110
+- `ebpf_rss_init()` - sets ctx to NULL, which indicates that EBPFRSSContext is not loaded.
111
+- `ebpf_rss_load()` - creates 3 maps and loads eBPF program from the rss.bpf.skeleton.h. Returns 'true' on success. After that, program_fd can be used to set steering for TAP.
112
+- `ebpf_rss_set_all()` - sets values for eBPF maps. `indirections_table` length is in EBPFRSSConfig. `toeplitz_key` is VIRTIO_NET_RSS_MAX_KEY_SIZE aka 40 bytes array.
113
+- `ebpf_rss_unload()` - close all file descriptors and set ctx to NULL.
114
+
115
+Simplified eBPF RSS workflow:
116
+
117
+.. code:: C
118
+
119
+ struct EBPFRSSConfig config;
120
+ config.redirect = 1;
121
+ config.hash_types = VIRTIO_NET_RSS_HASH_TYPE_UDPv4 | VIRTIO_NET_RSS_HASH_TYPE_TCPv4;
122
+ config.indirections_len = VIRTIO_NET_RSS_MAX_TABLE_LEN;
123
+ config.default_queue = 0;
124
+
125
+ uint16_t table[VIRTIO_NET_RSS_MAX_TABLE_LEN] = {...};
126
+ uint8_t key[VIRTIO_NET_RSS_MAX_KEY_SIZE] = {...};
127
+
128
+ struct EBPFRSSContext ctx;
129
+ ebpf_rss_init(&ctx);
130
+ ebpf_rss_load(&ctx);
131
+ ebpf_rss_set_all(&ctx, &config, table, key);
132
+ if (net_client->info->set_steering_ebpf != NULL) {
133
+ net_client->info->set_steering_ebpf(net_client, ctx->program_fd);
134
+ }
135
+ ...
136
+ ebpf_unload(&ctx);
137
+
138
+
139
+NetClientState SetSteeringEBPF()
140
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
141
+
142
+For now, `set_steering_ebpf()` method supported by Linux TAP NetClientState. The method requires an eBPF program file descriptor as an argument.
143
diff --git a/docs/devel/index.rst b/docs/devel/index.rst
144
index XXXXXXX..XXXXXXX 100644
145
--- a/docs/devel/index.rst
146
+++ b/docs/devel/index.rst
147
@@ -XXX,XX +XXX,XX @@ Contents:
148
qom
149
block-coroutine-wrapper
150
multi-process
151
+ ebpf_rss
152
--
153
2.7.4
154
155
diff view generated by jsdifflib
New patch
[PULL 07/10] MAINTAINERS: Added eBPF maintainers information.
1
From: Andrew Melnychenko <andrew@daynix.com>
1
2
3
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
4
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
5
Signed-off-by: Jason Wang <jasowang@redhat.com>
6
---
7
MAINTAINERS | 8 ++++++++
8
1 file changed, 8 insertions(+)
9
10
diff --git a/MAINTAINERS b/MAINTAINERS
11
index XXXXXXX..XXXXXXX 100644
12
--- a/MAINTAINERS
13
+++ b/MAINTAINERS
14
@@ -XXX,XX +XXX,XX @@ F: include/hw/remote/proxy-memory-listener.h
15
F: hw/remote/iohub.c
16
F: include/hw/remote/iohub.h
17
18
+EBPF:
19
+M: Jason Wang <jasowang@redhat.com>
20
+R: Andrew Melnychenko <andrew@daynix.com>
21
+R: Yuri Benditovich <yuri.benditovich@daynix.com>
22
+S: Maintained
23
+F: ebpf/*
24
+F: tools/ebpf/*
25
+
26
Build and test automation
27
-------------------------
28
Build and test automation, general continuous integration
29
--
30
2.7.4
31
32
diff view generated by jsdifflib
New patch
[PULL 08/10] hw/net/imx_fec: return 0xffff when accessing non-existing PHY
1
From: Guenter Roeck <linux@roeck-us.net>
1
2
3
If a PHY does not exist, attempts to read from it should return 0xffff.
4
Otherwise the Linux kernel will believe that a PHY is there and select
5
the non-existing PHY. This in turn will result in network errors later
6
on since the real PHY is not selected or configured.
7
8
Since reading from or writing to a non-existing PHY is not an emulation
9
error, replace guest error messages with traces.
10
11
Fixes: 461c51ad4275 ("Add a phy-num property to the i.MX FEC emulator")
12
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
13
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
14
Tested-by: Bin Meng <bmeng.cn@gmail.com>
15
Reviewed-by: Philippe Mathieu-Daud茅 <f4bug@amsat.org>
16
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
17
Signed-off-by: Jason Wang <jasowang@redhat.com>
18
---
19
hw/net/imx_fec.c | 8 +++-----
20
hw/net/trace-events | 2 ++
21
2 files changed, 5 insertions(+), 5 deletions(-)
22
23
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
24
index XXXXXXX..XXXXXXX 100644
25
--- a/hw/net/imx_fec.c
26
+++ b/hw/net/imx_fec.c
27
@@ -XXX,XX +XXX,XX @@ static uint32_t imx_phy_read(IMXFECState *s, int reg)
28
uint32_t phy = reg / 32;
29
30
if (phy != s->phy_num) {
31
- qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n",
32
- TYPE_IMX_FEC, __func__, phy);
33
- return 0;
34
+ trace_imx_phy_read_num(phy, s->phy_num);
35
+ return 0xffff;
36
}
37
38
reg %= 32;
39
@@ -XXX,XX +XXX,XX @@ static void imx_phy_write(IMXFECState *s, int reg, uint32_t val)
40
uint32_t phy = reg / 32;
41
42
if (phy != s->phy_num) {
43
- qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n",
44
- TYPE_IMX_FEC, __func__, phy);
45
+ trace_imx_phy_write_num(phy, s->phy_num);
46
return;
47
}
48
49
diff --git a/hw/net/trace-events b/hw/net/trace-events
50
index XXXXXXX..XXXXXXX 100644
51
--- a/hw/net/trace-events
52
+++ b/hw/net/trace-events
53
@@ -XXX,XX +XXX,XX @@ i82596_channel_attention(void *s) "%p: Received CHANNEL ATTENTION"
54
55
# imx_fec.c
56
imx_phy_read(uint32_t val, int phy, int reg) "0x%04"PRIx32" <= phy[%d].reg[%d]"
57
+imx_phy_read_num(int phy, int configured) "read request from unconfigured phy %d (configured %d)"
58
imx_phy_write(uint32_t val, int phy, int reg) "0x%04"PRIx32" => phy[%d].reg[%d]"
59
+imx_phy_write_num(int phy, int configured) "write request to unconfigured phy %d (configured %d)"
60
imx_phy_update_link(const char *s) "%s"
61
imx_phy_reset(void) ""
62
imx_fec_read_bd(uint64_t addr, int flags, int len, int data) "tx_bd 0x%"PRIx64" flags 0x%04x len %d data 0x%08x"
63
--
64
2.7.4
65
66
diff view generated by jsdifflib
New patch
[PULL 09/10] virtio-net: failover: add missing remove_migration_state_change_notifier()
1
From: Laurent Vivier <lvivier@redhat.com>
1
2
3
In the failover case configuration, virtio_net_device_realize() uses an
4
add_migration_state_change_notifier() to add a state notifier, but this
5
notifier is not removed by the unrealize function when the virtio-net
6
card is unplugged.
7
8
If the card is unplugged and a migration is started, the notifier is
9
called and as it is not valid anymore QEMU crashes.
10
11
This patch fixes the problem by adding the
12
remove_migration_state_change_notifier() in virtio_net_device_unrealize().
13
14
The problem can be reproduced with:
15
16
$ qemu-system-x86_64 -enable-kvm -m 1g -M q35 \
17
-device pcie-root-port,slot=4,id=root1 \
18
-device pcie-root-port,slot=5,id=root2 \
19
-device virtio-net-pci,id=net1,mac=52:54:00:6f:55:cc,failover=on,bus=root1 \
20
-monitor stdio disk.qcow2
21
(qemu) device_del net1
22
(qemu) migrate "exec:gzip -c > STATEFILE.gz"
23
24
Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
25
0x0000000000000000 in ?? ()
26
(gdb) bt
27
#0 0x0000000000000000 in ()
28
#1 0x0000555555d726d7 in notifier_list_notify (...)
29
at .../util/notify.c:39
30
#2 0x0000555555842c1a in migrate_fd_connect (...)
31
at .../migration/migration.c:3975
32
#3 0x0000555555950f7d in migration_channel_connect (...)
33
error@entry=0x0) at .../migration/channel.c:107
34
#4 0x0000555555910922 in exec_start_outgoing_migration (...)
35
at .../migration/exec.c:42
36
37
Reported-by: Igor Mammedov <imammedo@redhat.com>
38
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
39
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
40
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
41
Signed-off-by: Jason Wang <jasowang@redhat.com>
42
---
43
hw/net/virtio-net.c | 1 +
44
1 file changed, 1 insertion(+)
45
46
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
47
index XXXXXXX..XXXXXXX 100644
48
--- a/hw/net/virtio-net.c
49
+++ b/hw/net/virtio-net.c
50
@@ -XXX,XX +XXX,XX @@ static void virtio_net_device_unrealize(DeviceState *dev)
51
52
if (n->failover) {
53
device_listener_unregister(&n->primary_listener);
54
+ remove_migration_state_change_notifier(&n->migration_state);
55
}
56
57
max_queues = n->multiqueue ? n->max_queues : 1;
58
--
59
2.7.4
60
61
diff view generated by jsdifflib
[PULL 2/2] hw/net/xgmac: Fix buffer overflow in xgmac_enet_send()
[PULL 10/10] tap-bsd: Remove special casing for older OpenBSD releases
1
From: Mauro Matteo Cascella <mcascell@redhat.com>
1
From: Brad Smith <brad@comstyle.com>
2
2
3
A buffer overflow issue was reported by Mr. Ziming Zhang, CC'd here. It
3
OpenBSD added support for tap(4) 10 releases ago.
4
occurs while sending an Ethernet frame due to missing break statements
5
and improper checking of the buffer size.
6
4
7
Reported-by: Ziming Zhang <ezrakiez@gmail.com>
5
Remove the special casing for older releases.
8
Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
6
9
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
7
Signed-off-by: Brad Smith <brad@comstyle.com>
10
Signed-off-by: Jason Wang <jasowang@redhat.com>
8
Signed-off-by: Jason Wang <jasowang@redhat.com>
11
---
9
---
12
hw/net/xgmac.c | 14 ++++++++++++--
10
net/tap-bsd.c | 8 --------
13
1 file changed, 12 insertions(+), 2 deletions(-)
11
1 file changed, 8 deletions(-)
14
12
15
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
13
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
16
index XXXXXXX..XXXXXXX 100644
14
index XXXXXXX..XXXXXXX 100644
17
--- a/hw/net/xgmac.c
15
--- a/net/tap-bsd.c
18
+++ b/hw/net/xgmac.c
16
+++ b/net/tap-bsd.c
19
@@ -XXX,XX +XXX,XX @@ static void xgmac_enet_send(XgmacState *s)
17
@@ -XXX,XX +XXX,XX @@
18
#include <net/if_tap.h>
19
#endif
20
21
-#if defined(__OpenBSD__)
22
-#include <sys/param.h>
23
-#endif
24
-
25
#ifndef __FreeBSD__
26
int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
27
int vnet_hdr_required, int mq_required, Error **errp)
28
@@ -XXX,XX +XXX,XX @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
29
if (*ifname) {
30
snprintf(dname, sizeof dname, "/dev/%s", ifname);
31
} else {
32
-#if defined(__OpenBSD__) && OpenBSD < 201605
33
- snprintf(dname, sizeof dname, "/dev/tun%d", i);
34
-#else
35
snprintf(dname, sizeof dname, "/dev/tap%d", i);
36
-#endif
20
}
37
}
21
len = (bd.buffer1_size & 0xfff) + (bd.buffer2_size & 0xfff);
38
TFR(fd = open(dname, O_RDWR));
22
39
if (fd >= 0) {
23
+ /*
24
+ * FIXME: these cases of malformed tx descriptors (bad sizes)
25
+ * should probably be reported back to the guest somehow
26
+ * rather than simply silently stopping processing, but we
27
+ * don't know what the hardware does in this situation.
28
+ * This will only happen for buggy guests anyway.
29
+ */
30
if ((bd.buffer1_size & 0xfff) > 2048) {
31
DEBUGF_BRK("qemu:%s:ERROR...ERROR...ERROR... -- "
32
"xgmac buffer 1 len on send > 2048 (0x%x)\n",
33
__func__, bd.buffer1_size & 0xfff);
34
+ break;
35
}
36
if ((bd.buffer2_size & 0xfff) != 0) {
37
DEBUGF_BRK("qemu:%s:ERROR...ERROR...ERROR... -- "
38
"xgmac buffer 2 len on send != 0 (0x%x)\n",
39
__func__, bd.buffer2_size & 0xfff);
40
+ break;
41
}
42
- if (len >= sizeof(frame)) {
43
+ if (frame_size + len >= sizeof(frame)) {
44
DEBUGF_BRK("qemu:%s: buffer overflow %d read into %zu "
45
- "buffer\n" , __func__, len, sizeof(frame));
46
+ "buffer\n" , __func__, frame_size + len, sizeof(frame));
47
DEBUGF_BRK("qemu:%s: buffer1.size=%d; buffer2.size=%d\n",
48
__func__, bd.buffer1_size, bd.buffer2_size);
49
+ break;
50
}
51
52
cpu_physical_memory_read(bd.buffer1_addr, ptr, len);
53
--
40
--
54
2.5.0
41
2.7.4
55
42
56
43
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.