| 1 | The following changes since commit 92f8c6fef13b31ba222c4d20ad8afd2b79c4c28e: | 1 | The following changes since commit 97c81ef4b8e203d9620fd46e7eb77004563e3675: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210525' into staging (2021-05-25 16:17:06 +0100) | 3 | Merge tag 'pull-9p-20230706' of https://github.com/cschoenebeck/qemu into staging (2023-07-06 18:19:42 +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 90322e646e87c1440661cb3ddbc0cc94309d8a4f: | 9 | for you to fetch changes up to da9f7f7769e8e65f6423095e978f9a375e33515c: |
| 10 | 10 | ||
| 11 | MAINTAINERS: Added eBPF maintainers information. (2021-06-04 15:25:46 +0800) | 11 | igb: Remove obsolete workaround for Windows (2023-07-07 16:35:12 +0800) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | 14 | ||
| 15 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
| 16 | Andrew Melnychenko (7): | 16 | Akihiko Odaki (2): |
| 17 | net/tap: Added TUNSETSTEERINGEBPF code. | 17 | e1000e: Add ICR clearing by corresponding IMS bit |
| 18 | net: Added SetSteeringEBPF method for NetClientState. | 18 | igb: Remove obsolete workaround for Windows |
| 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. | ||
| 24 | 19 | ||
| 25 | MAINTAINERS | 8 + | 20 | Bin Meng (9): |
| 26 | configure | 8 +- | 21 | hw/net: e1000: Remove the logic of padding short frames in the receive path |
| 27 | docs/devel/ebpf_rss.rst | 125 +++++++++ | 22 | hw/net: vmxnet3: Remove the logic of padding short frames in the receive path |
| 28 | docs/devel/index.rst | 1 + | 23 | hw/net: i82596: Remove the logic of padding short frames in the receive path |
| 29 | ebpf/ebpf_rss-stub.c | 40 +++ | 24 | hw/net: ne2000: Remove the logic of padding short frames in the receive path |
| 30 | ebpf/ebpf_rss.c | 165 ++++++++++++ | 25 | hw/net: pcnet: Remove the logic of padding short frames in the receive path |
| 31 | ebpf/ebpf_rss.h | 44 ++++ | 26 | hw/net: rtl8139: Remove the logic of padding short frames in the receive path |
| 32 | ebpf/meson.build | 1 + | 27 | hw/net: sungem: Remove the logic of padding short frames in the receive path |
| 33 | ebpf/rss.bpf.skeleton.h | 431 +++++++++++++++++++++++++++++++ | 28 | hw/net: sunhme: Remove the logic of padding short frames in the receive path |
| 34 | ebpf/trace-events | 4 + | 29 | hw/net: ftgmac100: Drop the small packet check in the receive path |
| 35 | ebpf/trace.h | 1 + | ||
| 36 | hw/net/vhost_net.c | 3 + | ||
| 37 | hw/net/virtio-net.c | 116 ++++++++- | ||
| 38 | include/hw/virtio/virtio-net.h | 4 + | ||
| 39 | include/net/net.h | 2 + | ||
| 40 | meson.build | 23 ++ | ||
| 41 | meson_options.txt | 2 + | ||
| 42 | net/tap-bsd.c | 5 + | ||
| 43 | net/tap-linux.c | 13 + | ||
| 44 | net/tap-linux.h | 1 + | ||
| 45 | net/tap-solaris.c | 5 + | ||
| 46 | net/tap-stub.c | 5 + | ||
| 47 | net/tap.c | 9 + | ||
| 48 | net/tap_int.h | 1 + | ||
| 49 | net/vhost-vdpa.c | 2 + | ||
| 50 | tools/ebpf/Makefile.ebpf | 21 ++ | ||
| 51 | tools/ebpf/rss.bpf.c | 571 +++++++++++++++++++++++++++++++++++++++++ | ||
| 52 | 27 files changed, 1607 insertions(+), 4 deletions(-) | ||
| 53 | create mode 100644 docs/devel/ebpf_rss.rst | ||
| 54 | create mode 100644 ebpf/ebpf_rss-stub.c | ||
| 55 | create mode 100644 ebpf/ebpf_rss.c | ||
| 56 | create mode 100644 ebpf/ebpf_rss.h | ||
| 57 | create mode 100644 ebpf/meson.build | ||
| 58 | create mode 100644 ebpf/rss.bpf.skeleton.h | ||
| 59 | create mode 100644 ebpf/trace-events | ||
| 60 | create mode 100644 ebpf/trace.h | ||
| 61 | create mode 100755 tools/ebpf/Makefile.ebpf | ||
| 62 | create mode 100644 tools/ebpf/rss.bpf.c | ||
| 63 | 30 | ||
| 31 | Laurent Vivier (4): | ||
| 32 | virtio-net: correctly report maximum tx_queue_size value | ||
| 33 | net: socket: prepare to cleanup net_init_socket() | ||
| 34 | net: socket: move fd type checking to its own function | ||
| 35 | net: socket: remove net_init_socket() | ||
| 64 | 36 | ||
| 37 | hw/net/e1000.c | 11 +---------- | ||
| 38 | hw/net/e1000e_core.c | 38 +++++++++++++++++++++++++++++++------ | ||
| 39 | hw/net/ftgmac100.c | 8 -------- | ||
| 40 | hw/net/i82596.c | 18 ------------------ | ||
| 41 | hw/net/igb_core.c | 7 +------ | ||
| 42 | hw/net/ne2000.c | 12 ------------ | ||
| 43 | hw/net/pcnet.c | 9 --------- | ||
| 44 | hw/net/rtl8139.c | 12 ------------ | ||
| 45 | hw/net/sungem.c | 14 -------------- | ||
| 46 | hw/net/sunhme.c | 11 ----------- | ||
| 47 | hw/net/trace-events | 1 + | ||
| 48 | hw/net/virtio-net.c | 4 ++-- | ||
| 49 | hw/net/vmxnet3.c | 10 ---------- | ||
| 50 | net/socket.c | 53 +++++++++++++++++++++++++++------------------------- | ||
| 51 | 14 files changed, 65 insertions(+), 143 deletions(-) | diff view generated by jsdifflib |
| 1 | From: Andrew Melnychenko <andrew@daynix.com> | 1 | From: Laurent Vivier <lvivier@redhat.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | When RSS is enabled the device tries to load the eBPF program | 3 | Maximum value for tx_queue_size depends on the backend type. |
| 4 | to select RX virtqueue in the TUN. If eBPF can be loaded | 4 | 1024 for vDPA/vhost-user, 256 for all the others. |
| 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 | 5 | ||
| 9 | Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com> | 6 | The value is returned by virtio_net_max_tx_queue_size() to set the |
| 10 | Signed-off-by: Andrew Melnychenko <andrew@daynix.com> | 7 | parameter: |
| 8 | |||
| 9 | n->net_conf.tx_queue_size = MIN(virtio_net_max_tx_queue_size(n), | ||
| 10 | n->net_conf.tx_queue_size); | ||
| 11 | |||
| 12 | But the parameter checking uses VIRTQUEUE_MAX_SIZE (1024). | ||
| 13 | |||
| 14 | So the parameter is silently ignored and ethtool reports a different | ||
| 15 | value than the one provided by the user. | ||
| 16 | |||
| 17 | ... -netdev tap,... -device virtio-net,tx_queue_size=1024 | ||
| 18 | |||
| 19 | # ethtool -g enp0s2 | ||
| 20 | Ring parameters for enp0s2: | ||
| 21 | Pre-set maximums: | ||
| 22 | RX: 256 | ||
| 23 | RX Mini: n/a | ||
| 24 | RX Jumbo: n/a | ||
| 25 | TX: 256 | ||
| 26 | Current hardware settings: | ||
| 27 | RX: 256 | ||
| 28 | RX Mini: n/a | ||
| 29 | RX Jumbo: n/a | ||
| 30 | TX: 256 | ||
| 31 | |||
| 32 | ... -netdev vhost-user,... -device virtio-net,tx_queue_size=2048 | ||
| 33 | |||
| 34 | Invalid tx_queue_size (= 2048), must be a power of 2 between 256 and 1024 | ||
| 35 | |||
| 36 | With this patch the correct maximum value is checked and displayed. | ||
| 37 | |||
| 38 | For vDPA/vhost-user: | ||
| 39 | |||
| 40 | Invalid tx_queue_size (= 2048), must be a power of 2 between 256 and 1024 | ||
| 41 | |||
| 42 | For all the others: | ||
| 43 | |||
| 44 | Invalid tx_queue_size (= 512), must be a power of 2 between 256 and 256 | ||
| 45 | |||
| 46 | Fixes: 2eef278b9e63 ("virtio-net: fix tx queue size for !vhost-user") | ||
| 47 | Cc: mst@redhat.com | ||
| 48 | Cc: qemu-stable@nongnu.org | ||
| 49 | Signed-off-by: Laurent Vivier <lvivier@redhat.com> | ||
| 11 | Signed-off-by: Jason Wang <jasowang@redhat.com> | 50 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 12 | --- | 51 | --- |
| 13 | hw/net/vhost_net.c | 3 ++ | 52 | hw/net/virtio-net.c | 4 ++-- |
| 14 | hw/net/virtio-net.c | 116 +++++++++++++++++++++++++++++++++++++++-- | 53 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | include/hw/virtio/virtio-net.h | 4 ++ | ||
| 16 | net/vhost-vdpa.c | 2 + | ||
| 17 | 4 files changed, 122 insertions(+), 3 deletions(-) | ||
| 18 | 54 | ||
| 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 | 55 | diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c |
| 41 | index XXXXXXX..XXXXXXX 100644 | 56 | index XXXXXXX..XXXXXXX 100644 |
| 42 | --- a/hw/net/virtio-net.c | 57 | --- a/hw/net/virtio-net.c |
| 43 | +++ b/hw/net/virtio-net.c | 58 | +++ b/hw/net/virtio-net.c |
| 44 | @@ -XXX,XX +XXX,XX @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features, | 59 | @@ -XXX,XX +XXX,XX @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) |
| 45 | return features; | ||
| 46 | } | 60 | } |
| 47 | 61 | ||
| 48 | - virtio_clear_feature(&features, VIRTIO_NET_F_RSS); | 62 | if (n->net_conf.tx_queue_size < VIRTIO_NET_TX_QUEUE_MIN_SIZE || |
| 49 | - virtio_clear_feature(&features, VIRTIO_NET_F_HASH_REPORT); | 63 | - n->net_conf.tx_queue_size > VIRTQUEUE_MAX_SIZE || |
| 50 | + if (!ebpf_rss_is_loaded(&n->ebpf_rss)) { | 64 | + n->net_conf.tx_queue_size > virtio_net_max_tx_queue_size(n) || |
| 51 | + virtio_clear_feature(&features, VIRTIO_NET_F_RSS); | 65 | !is_power_of_2(n->net_conf.tx_queue_size)) { |
| 52 | + } | 66 | error_setg(errp, "Invalid tx_queue_size (= %" PRIu16 "), " |
| 53 | features = vhost_net_get_features(get_vhost_net(nc->peer), features); | 67 | "must be a power of 2 between %d and %d", |
| 54 | vdev->backend_features = features; | 68 | n->net_conf.tx_queue_size, VIRTIO_NET_TX_QUEUE_MIN_SIZE, |
| 55 | 69 | - VIRTQUEUE_MAX_SIZE); | |
| 56 | @@ -XXX,XX +XXX,XX @@ static int virtio_net_handle_announce(VirtIONet *n, uint8_t cmd, | 70 | + virtio_net_max_tx_queue_size(n)); |
| 71 | virtio_cleanup(vdev); | ||
| 72 | return; | ||
| 57 | } | 73 | } |
| 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 - " | ||
| 182 | + "fallback to software RSS"); | ||
| 183 | + n->rss_data.enabled_software_rss = true; | ||
| 184 | + } | ||
| 185 | + } | ||
| 186 | + } | ||
| 187 | + | ||
| 188 | trace_virtio_net_rss_enable(n->rss_data.hash_types, | ||
| 189 | n->rss_data.indirections_len, | ||
| 190 | sizeof(n->rss_data.key)); | ||
| 191 | @@ -XXX,XX +XXX,XX @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) | ||
| 192 | n->qdev = dev; | ||
| 193 | |||
| 194 | net_rx_pkt_init(&n->rx_pkt, false); | ||
| 195 | + | ||
| 196 | + if (virtio_has_feature(n->host_features, VIRTIO_NET_F_RSS)) { | ||
| 197 | + virtio_net_load_ebpf(n); | ||
| 198 | + } | ||
| 199 | } | ||
| 200 | |||
| 201 | static void virtio_net_device_unrealize(DeviceState *dev) | ||
| 202 | @@ -XXX,XX +XXX,XX @@ static void virtio_net_device_unrealize(DeviceState *dev) | ||
| 203 | VirtIONet *n = VIRTIO_NET(dev); | ||
| 204 | int i, max_queues; | ||
| 205 | |||
| 206 | + if (virtio_has_feature(n->host_features, VIRTIO_NET_F_RSS)) { | ||
| 207 | + virtio_net_unload_ebpf(n); | ||
| 208 | + } | ||
| 209 | + | ||
| 210 | /* This will stop vhost backend if appropriate. */ | ||
| 211 | virtio_net_set_status(vdev, 0); | ||
| 212 | |||
| 213 | @@ -XXX,XX +XXX,XX @@ static void virtio_net_instance_init(Object *obj) | ||
| 214 | device_add_bootindex_property(obj, &n->nic_conf.bootindex, | ||
| 215 | "bootindex", "/ethernet-phy@0", | ||
| 216 | DEVICE(n)); | ||
| 217 | + | ||
| 218 | + ebpf_rss_init(&n->ebpf_rss); | ||
| 219 | } | ||
| 220 | |||
| 221 | static int virtio_net_pre_save(void *opaque) | ||
| 222 | diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h | ||
| 223 | index XXXXXXX..XXXXXXX 100644 | ||
| 224 | --- a/include/hw/virtio/virtio-net.h | ||
| 225 | +++ b/include/hw/virtio/virtio-net.h | ||
| 226 | @@ -XXX,XX +XXX,XX @@ | ||
| 227 | #include "qemu/option_int.h" | ||
| 228 | #include "qom/object.h" | ||
| 229 | |||
| 230 | +#include "ebpf/ebpf_rss.h" | ||
| 231 | + | ||
| 232 | #define TYPE_VIRTIO_NET "virtio-net-device" | ||
| 233 | OBJECT_DECLARE_SIMPLE_TYPE(VirtIONet, VIRTIO_NET) | ||
| 234 | |||
| 235 | @@ -XXX,XX +XXX,XX @@ typedef struct VirtioNetRscChain { | ||
| 236 | |||
| 237 | typedef struct VirtioNetRssData { | ||
| 238 | bool enabled; | ||
| 239 | + bool enabled_software_rss; | ||
| 240 | bool redirect; | ||
| 241 | bool populate_hash; | ||
| 242 | uint32_t hash_types; | ||
| 243 | @@ -XXX,XX +XXX,XX @@ struct VirtIONet { | ||
| 244 | Notifier migration_state; | ||
| 245 | VirtioNetRssData rss_data; | ||
| 246 | struct NetRxPkt *rx_pkt; | ||
| 247 | + struct EBPFRSSContext ebpf_rss; | ||
| 248 | }; | ||
| 249 | |||
| 250 | void virtio_net_set_netclient_name(VirtIONet *n, const char *name, | ||
| 251 | diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c | ||
| 252 | index XXXXXXX..XXXXXXX 100644 | ||
| 253 | --- a/net/vhost-vdpa.c | ||
| 254 | +++ b/net/vhost-vdpa.c | ||
| 255 | @@ -XXX,XX +XXX,XX @@ const int vdpa_feature_bits[] = { | ||
| 256 | VIRTIO_NET_F_MTU, | ||
| 257 | VIRTIO_F_IOMMU_PLATFORM, | ||
| 258 | VIRTIO_F_RING_PACKED, | ||
| 259 | + VIRTIO_NET_F_RSS, | ||
| 260 | + VIRTIO_NET_F_HASH_REPORT, | ||
| 261 | VIRTIO_NET_F_GUEST_ANNOUNCE, | ||
| 262 | VIRTIO_NET_F_STATUS, | ||
| 263 | VHOST_INVALID_FEATURE_BIT | ||
| 264 | -- | 74 | -- |
| 265 | 2.7.4 | 75 | 2.7.4 |
| 266 | |||
| 267 | diff view generated by jsdifflib |
| 1 | From: Andrew Melnychenko <andrew@daynix.com> | 1 | From: Bin Meng <bmeng@tinylab.org> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com> | 3 | Now that we have implemented unified short frames padding in the |
| 4 | Signed-off-by: Andrew Melnychenko <andrew@daynix.com> | 4 | QEMU networking codes, remove the same logic in the NIC codes. |
| 5 | |||
| 6 | This actually reverts commit 78aeb23eded2d0b765bf9145c71f80025b568acd. | ||
| 7 | |||
| 8 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 5 | Signed-off-by: Jason Wang <jasowang@redhat.com> | 9 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 6 | --- | 10 | --- |
| 7 | MAINTAINERS | 8 ++++++++ | 11 | hw/net/e1000.c | 11 +---------- |
| 8 | 1 file changed, 8 insertions(+) | 12 | 1 file changed, 1 insertion(+), 10 deletions(-) |
| 9 | 13 | ||
| 10 | diff --git a/MAINTAINERS b/MAINTAINERS | 14 | diff --git a/hw/net/e1000.c b/hw/net/e1000.c |
| 11 | index XXXXXXX..XXXXXXX 100644 | 15 | index XXXXXXX..XXXXXXX 100644 |
| 12 | --- a/MAINTAINERS | 16 | --- a/hw/net/e1000.c |
| 13 | +++ b/MAINTAINERS | 17 | +++ b/hw/net/e1000.c |
| 14 | @@ -XXX,XX +XXX,XX @@ F: include/hw/remote/proxy-memory-listener.h | 18 | @@ -XXX,XX +XXX,XX @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt) |
| 15 | F: hw/remote/iohub.c | 19 | uint16_t vlan_special = 0; |
| 16 | F: include/hw/remote/iohub.h | 20 | uint8_t vlan_status = 0; |
| 17 | 21 | uint8_t min_buf[ETH_ZLEN]; | |
| 18 | +EBPF: | 22 | - struct iovec min_iov; |
| 19 | +M: Jason Wang <jasowang@redhat.com> | 23 | uint8_t *filter_buf = iov->iov_base; |
| 20 | +R: Andrew Melnychenko <andrew@daynix.com> | 24 | size_t size = iov_size(iov, iovcnt); |
| 21 | +R: Yuri Benditovich <yuri.benditovich@daynix.com> | 25 | size_t iov_ofs = 0; |
| 22 | +S: Maintained | 26 | @@ -XXX,XX +XXX,XX @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt) |
| 23 | +F: ebpf/* | 27 | return 0; |
| 24 | +F: tools/ebpf/* | 28 | } |
| 25 | + | 29 | |
| 26 | Build and test automation | 30 | - /* Pad to minimum Ethernet frame length */ |
| 27 | ------------------------- | 31 | - if (size < sizeof(min_buf)) { |
| 28 | Build and test automation, general continuous integration | 32 | - iov_to_buf(iov, iovcnt, 0, min_buf, size); |
| 33 | - memset(&min_buf[size], 0, sizeof(min_buf) - size); | ||
| 34 | - min_iov.iov_base = filter_buf = min_buf; | ||
| 35 | - min_iov.iov_len = size = sizeof(min_buf); | ||
| 36 | - iovcnt = 1; | ||
| 37 | - iov = &min_iov; | ||
| 38 | - } else if (iov->iov_len < MAXIMUM_ETHERNET_HDR_LEN) { | ||
| 39 | + if (iov->iov_len < MAXIMUM_ETHERNET_HDR_LEN) { | ||
| 40 | /* This is very unlikely, but may happen. */ | ||
| 41 | iov_to_buf(iov, iovcnt, 0, min_buf, MAXIMUM_ETHERNET_HDR_LEN); | ||
| 42 | filter_buf = min_buf; | ||
| 29 | -- | 43 | -- |
| 30 | 2.7.4 | 44 | 2.7.4 |
| 31 | |||
| 32 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Bin Meng <bmeng@tinylab.org> | ||
| 1 | 2 | ||
| 3 | Now that we have implemented unified short frames padding in the | ||
| 4 | QEMU networking codes, remove the same logic in the NIC codes. | ||
| 5 | |||
| 6 | This actually reverts commit 40a87c6c9b11ef9c14e0301f76abf0eb2582f08e. | ||
| 7 | |||
| 8 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 9 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 10 | --- | ||
| 11 | hw/net/vmxnet3.c | 10 ---------- | ||
| 12 | 1 file changed, 10 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | ||
| 16 | --- a/hw/net/vmxnet3.c | ||
| 17 | +++ b/hw/net/vmxnet3.c | ||
| 18 | @@ -XXX,XX +XXX,XX @@ | ||
| 19 | |||
| 20 | #define PCI_DEVICE_ID_VMWARE_VMXNET3_REVISION 0x1 | ||
| 21 | #define VMXNET3_MSIX_BAR_SIZE 0x2000 | ||
| 22 | -#define MIN_BUF_SIZE 60 | ||
| 23 | |||
| 24 | /* Compatibility flags for migration */ | ||
| 25 | #define VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS_BIT 0 | ||
| 26 | @@ -XXX,XX +XXX,XX @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf, size_t size) | ||
| 27 | { | ||
| 28 | VMXNET3State *s = qemu_get_nic_opaque(nc); | ||
| 29 | size_t bytes_indicated; | ||
| 30 | - uint8_t min_buf[MIN_BUF_SIZE]; | ||
| 31 | |||
| 32 | if (!vmxnet3_can_receive(nc)) { | ||
| 33 | VMW_PKPRN("Cannot receive now"); | ||
| 34 | @@ -XXX,XX +XXX,XX @@ vmxnet3_receive(NetClientState *nc, const uint8_t *buf, size_t size) | ||
| 35 | size -= sizeof(struct virtio_net_hdr); | ||
| 36 | } | ||
| 37 | |||
| 38 | - /* Pad to minimum Ethernet frame length */ | ||
| 39 | - if (size < sizeof(min_buf)) { | ||
| 40 | - memcpy(min_buf, buf, size); | ||
| 41 | - memset(&min_buf[size], 0, sizeof(min_buf) - size); | ||
| 42 | - buf = min_buf; | ||
| 43 | - size = sizeof(min_buf); | ||
| 44 | - } | ||
| 45 | - | ||
| 46 | net_rx_pkt_set_packet_type(s->rx_pkt, | ||
| 47 | get_eth_packet_type(PKT_GET_ETH_HDR(buf))); | ||
| 48 | |||
| 49 | -- | ||
| 50 | 2.7.4 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Bin Meng <bmeng@tinylab.org> | ||
| 1 | 2 | ||
| 3 | Now that we have implemented unified short frames padding in the | ||
| 4 | QEMU networking codes, remove the same logic in the NIC codes. | ||
| 5 | |||
| 6 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 7 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 8 | --- | ||
| 9 | hw/net/i82596.c | 18 ------------------ | ||
| 10 | 1 file changed, 18 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/hw/net/i82596.c b/hw/net/i82596.c | ||
| 13 | index XXXXXXX..XXXXXXX 100644 | ||
| 14 | --- a/hw/net/i82596.c | ||
| 15 | +++ b/hw/net/i82596.c | ||
| 16 | @@ -XXX,XX +XXX,XX @@ enum commands { | ||
| 17 | #define I596_EOF 0x8000 | ||
| 18 | #define SIZE_MASK 0x3fff | ||
| 19 | |||
| 20 | -#define ETHER_TYPE_LEN 2 | ||
| 21 | -#define VLAN_TCI_LEN 2 | ||
| 22 | -#define VLAN_HLEN (ETHER_TYPE_LEN + VLAN_TCI_LEN) | ||
| 23 | - | ||
| 24 | /* various flags in the chip config registers */ | ||
| 25 | #define I596_PREFETCH (s->config[0] & 0x80) | ||
| 26 | #define I596_PROMISC (s->config[8] & 0x01) | ||
| 27 | @@ -XXX,XX +XXX,XX @@ bool i82596_can_receive(NetClientState *nc) | ||
| 28 | return true; | ||
| 29 | } | ||
| 30 | |||
| 31 | -#define MIN_BUF_SIZE 60 | ||
| 32 | - | ||
| 33 | ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) | ||
| 34 | { | ||
| 35 | I82596State *s = qemu_get_nic_opaque(nc); | ||
| 36 | @@ -XXX,XX +XXX,XX @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) | ||
| 37 | size_t bufsz = sz; /* length of data in buf */ | ||
| 38 | uint32_t crc; | ||
| 39 | uint8_t *crc_ptr; | ||
| 40 | - uint8_t buf1[MIN_BUF_SIZE + VLAN_HLEN]; | ||
| 41 | static const uint8_t broadcast_macaddr[6] = { | ||
| 42 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | ||
| 43 | |||
| 44 | @@ -XXX,XX +XXX,XX @@ ssize_t i82596_receive(NetClientState *nc, const uint8_t *buf, size_t sz) | ||
| 45 | } | ||
| 46 | } | ||
| 47 | |||
| 48 | - /* if too small buffer, then expand it */ | ||
| 49 | - if (len < MIN_BUF_SIZE + VLAN_HLEN) { | ||
| 50 | - memcpy(buf1, buf, len); | ||
| 51 | - memset(buf1 + len, 0, MIN_BUF_SIZE + VLAN_HLEN - len); | ||
| 52 | - buf = buf1; | ||
| 53 | - if (len < MIN_BUF_SIZE) { | ||
| 54 | - len = MIN_BUF_SIZE; | ||
| 55 | - } | ||
| 56 | - bufsz = len; | ||
| 57 | - } | ||
| 58 | - | ||
| 59 | /* Calculate the ethernet checksum (4 bytes) */ | ||
| 60 | len += 4; | ||
| 61 | crc = cpu_to_be32(crc32(~0, buf, sz)); | ||
| 62 | -- | ||
| 63 | 2.7.4 | diff view generated by jsdifflib |
| 1 | From: Andrew Melnychenko <andrew@daynix.com> | 1 | From: Bin Meng <bmeng@tinylab.org> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | For now, that method supported only by Linux TAP. | 3 | Now that we have implemented unified short frames padding in the |
| 4 | Linux TAP uses TUNSETSTEERINGEBPF ioctl. | 4 | QEMU networking codes, remove the same logic in the NIC codes. |
| 5 | 5 | ||
| 6 | Signed-off-by: Andrew Melnychenko <andrew@daynix.com> | 6 | Signed-off-by: Bin Meng <bmeng@tinylab.org> |
| 7 | Signed-off-by: Jason Wang <jasowang@redhat.com> | 7 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 8 | --- | 8 | --- |
| 9 | include/net/net.h | 2 ++ | 9 | hw/net/ne2000.c | 12 ------------ |
| 10 | net/tap-bsd.c | 5 +++++ | 10 | 1 file changed, 12 deletions(-) |
| 11 | net/tap-linux.c | 13 +++++++++++++ | ||
| 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(+) | ||
| 17 | 11 | ||
| 18 | diff --git a/include/net/net.h b/include/net/net.h | 12 | diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c |
| 19 | index XXXXXXX..XXXXXXX 100644 | 13 | index XXXXXXX..XXXXXXX 100644 |
| 20 | --- a/include/net/net.h | 14 | --- a/hw/net/ne2000.c |
| 21 | +++ b/include/net/net.h | 15 | +++ b/hw/net/ne2000.c |
| 22 | @@ -XXX,XX +XXX,XX @@ typedef int (SetVnetBE)(NetClientState *, bool); | 16 | @@ -XXX,XX +XXX,XX @@ static int ne2000_buffer_full(NE2000State *s) |
| 23 | typedef struct SocketReadState SocketReadState; | ||
| 24 | typedef void (SocketReadStateFinalize)(SocketReadState *rs); | ||
| 25 | typedef void (NetAnnounce)(NetClientState *); | ||
| 26 | +typedef bool (SetSteeringEBPF)(NetClientState *, int); | ||
| 27 | |||
| 28 | typedef struct NetClientInfo { | ||
| 29 | NetClientDriver type; | ||
| 30 | @@ -XXX,XX +XXX,XX @@ typedef struct NetClientInfo { | ||
| 31 | SetVnetLE *set_vnet_le; | ||
| 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; | ||
| 45 | } | ||
| 46 | + | ||
| 47 | +int tap_fd_set_steering_ebpf(int fd, int prog_fd) | ||
| 48 | +{ | ||
| 49 | + return -1; | ||
| 50 | +} | ||
| 51 | diff --git a/net/tap-linux.c b/net/tap-linux.c | ||
| 52 | index XXXXXXX..XXXXXXX 100644 | ||
| 53 | --- a/net/tap-linux.c | ||
| 54 | +++ b/net/tap-linux.c | ||
| 55 | @@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname) | ||
| 56 | pstrcpy(ifname, sizeof(ifr.ifr_name), ifr.ifr_name); | ||
| 57 | return 0; | 17 | return 0; |
| 58 | } | 18 | } |
| 59 | + | 19 | |
| 60 | +int tap_fd_set_steering_ebpf(int fd, int prog_fd) | 20 | -#define MIN_BUF_SIZE 60 |
| 61 | +{ | 21 | - |
| 62 | + if (ioctl(fd, TUNSETSTEERINGEBPF, (void *) &prog_fd) != 0) { | 22 | ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) |
| 63 | + error_report("Issue while setting TUNSETSTEERINGEBPF:" | ||
| 64 | + " %s with fd: %d, prog_fd: %d", | ||
| 65 | + strerror(errno), fd, prog_fd); | ||
| 66 | + | ||
| 67 | + return -1; | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + return 0; | ||
| 71 | +} | ||
| 72 | diff --git a/net/tap-solaris.c b/net/tap-solaris.c | ||
| 73 | index XXXXXXX..XXXXXXX 100644 | ||
| 74 | --- a/net/tap-solaris.c | ||
| 75 | +++ b/net/tap-solaris.c | ||
| 76 | @@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname) | ||
| 77 | { | 23 | { |
| 78 | return -1; | 24 | NE2000State *s = qemu_get_nic_opaque(nc); |
| 79 | } | 25 | size_t size = size_; |
| 80 | + | 26 | uint8_t *p; |
| 81 | +int tap_fd_set_steering_ebpf(int fd, int prog_fd) | 27 | unsigned int total_len, next, avail, len, index, mcast_idx; |
| 82 | +{ | 28 | - uint8_t buf1[60]; |
| 83 | + return -1; | 29 | static const uint8_t broadcast_macaddr[6] = |
| 84 | +} | 30 | { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; |
| 85 | diff --git a/net/tap-stub.c b/net/tap-stub.c | 31 | |
| 86 | index XXXXXXX..XXXXXXX 100644 | 32 | @@ -XXX,XX +XXX,XX @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) |
| 87 | --- a/net/tap-stub.c | 33 | } |
| 88 | +++ b/net/tap-stub.c | 34 | } |
| 89 | @@ -XXX,XX +XXX,XX @@ int tap_fd_get_ifname(int fd, char *ifname) | 35 | |
| 90 | { | 36 | - |
| 91 | return -1; | 37 | - /* if too small buffer, then expand it */ |
| 92 | } | 38 | - if (size < MIN_BUF_SIZE) { |
| 93 | + | 39 | - memcpy(buf1, buf, size); |
| 94 | +int tap_fd_set_steering_ebpf(int fd, int prog_fd) | 40 | - memset(buf1 + size, 0, MIN_BUF_SIZE - size); |
| 95 | +{ | 41 | - buf = buf1; |
| 96 | + return -1; | 42 | - size = MIN_BUF_SIZE; |
| 97 | +} | 43 | - } |
| 98 | diff --git a/net/tap.c b/net/tap.c | 44 | - |
| 99 | index XXXXXXX..XXXXXXX 100644 | 45 | index = s->curpag << 8; |
| 100 | --- a/net/tap.c | 46 | if (index >= NE2000_PMEM_END) { |
| 101 | +++ b/net/tap.c | 47 | index = s->start; |
| 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 */ | ||
| 136 | -- | 48 | -- |
| 137 | 2.7.4 | 49 | 2.7.4 |
| 138 | |||
| 139 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Bin Meng <bmeng@tinylab.org> | ||
| 1 | 2 | ||
| 3 | Now that we have implemented unified short frames padding in the | ||
| 4 | QEMU networking codes, remove the same logic in the NIC codes. | ||
| 5 | |||
| 6 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 7 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 8 | --- | ||
| 9 | hw/net/pcnet.c | 9 --------- | ||
| 10 | 1 file changed, 9 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c | ||
| 13 | index XXXXXXX..XXXXXXX 100644 | ||
| 14 | --- a/hw/net/pcnet.c | ||
| 15 | +++ b/hw/net/pcnet.c | ||
| 16 | @@ -XXX,XX +XXX,XX @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_) | ||
| 17 | { | ||
| 18 | PCNetState *s = qemu_get_nic_opaque(nc); | ||
| 19 | int is_padr = 0, is_bcast = 0, is_ladr = 0; | ||
| 20 | - uint8_t buf1[60]; | ||
| 21 | int remaining; | ||
| 22 | int crc_err = 0; | ||
| 23 | size_t size = size_; | ||
| 24 | @@ -XXX,XX +XXX,XX @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_) | ||
| 25 | printf("pcnet_receive size=%zu\n", size); | ||
| 26 | #endif | ||
| 27 | |||
| 28 | - /* if too small buffer, then expand it */ | ||
| 29 | - if (size < MIN_BUF_SIZE) { | ||
| 30 | - memcpy(buf1, buf, size); | ||
| 31 | - memset(buf1 + size, 0, MIN_BUF_SIZE - size); | ||
| 32 | - buf = buf1; | ||
| 33 | - size = MIN_BUF_SIZE; | ||
| 34 | - } | ||
| 35 | - | ||
| 36 | if (CSR_PROM(s) | ||
| 37 | || (is_padr=padr_match(s, buf, size)) | ||
| 38 | || (is_bcast=padr_bcast(s, buf, size)) | ||
| 39 | -- | ||
| 40 | 2.7.4 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Bin Meng <bmeng@tinylab.org> | ||
| 1 | 2 | ||
| 3 | Now that we have implemented unified short frames padding in the | ||
| 4 | QEMU networking codes, remove the same logic in the NIC codes. | ||
| 5 | |||
| 6 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 7 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 8 | --- | ||
| 9 | hw/net/rtl8139.c | 12 ------------ | ||
| 10 | 1 file changed, 12 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c | ||
| 13 | index XXXXXXX..XXXXXXX 100644 | ||
| 14 | --- a/hw/net/rtl8139.c | ||
| 15 | +++ b/hw/net/rtl8139.c | ||
| 16 | @@ -XXX,XX +XXX,XX @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t | ||
| 17 | |||
| 18 | uint32_t packet_header = 0; | ||
| 19 | |||
| 20 | - uint8_t buf1[MIN_BUF_SIZE + VLAN_HLEN]; | ||
| 21 | static const uint8_t broadcast_macaddr[6] = | ||
| 22 | { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; | ||
| 23 | |||
| 24 | @@ -XXX,XX +XXX,XX @@ static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf, size_t | ||
| 25 | } | ||
| 26 | } | ||
| 27 | |||
| 28 | - /* if too small buffer, then expand it | ||
| 29 | - * Include some tailroom in case a vlan tag is later removed. */ | ||
| 30 | - if (size < MIN_BUF_SIZE + VLAN_HLEN) { | ||
| 31 | - memcpy(buf1, buf, size); | ||
| 32 | - memset(buf1 + size, 0, MIN_BUF_SIZE + VLAN_HLEN - size); | ||
| 33 | - buf = buf1; | ||
| 34 | - if (size < MIN_BUF_SIZE) { | ||
| 35 | - size = MIN_BUF_SIZE; | ||
| 36 | - } | ||
| 37 | - } | ||
| 38 | - | ||
| 39 | if (rtl8139_cp_receiver_enabled(s)) | ||
| 40 | { | ||
| 41 | if (!rtl8139_cp_rx_valid(s)) { | ||
| 42 | -- | ||
| 43 | 2.7.4 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Bin Meng <bmeng@tinylab.org> | ||
| 1 | 2 | ||
| 3 | Now that we have implemented unified short frames padding in the | ||
| 4 | QEMU networking codes, remove the same logic in the NIC codes. | ||
| 5 | |||
| 6 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 7 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 8 | --- | ||
| 9 | hw/net/sungem.c | 14 -------------- | ||
| 10 | 1 file changed, 14 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/hw/net/sungem.c b/hw/net/sungem.c | ||
| 13 | index XXXXXXX..XXXXXXX 100644 | ||
| 14 | --- a/hw/net/sungem.c | ||
| 15 | +++ b/hw/net/sungem.c | ||
| 16 | @@ -XXX,XX +XXX,XX @@ static ssize_t sungem_receive(NetClientState *nc, const uint8_t *buf, | ||
| 17 | PCIDevice *d = PCI_DEVICE(s); | ||
| 18 | uint32_t mac_crc, done, kick, max_fsize; | ||
| 19 | uint32_t fcs_size, ints, rxdma_cfg, rxmac_cfg, csum, coff; | ||
| 20 | - uint8_t smallbuf[60]; | ||
| 21 | struct gem_rxd desc; | ||
| 22 | uint64_t dbase, baddr; | ||
| 23 | unsigned int rx_cond; | ||
| 24 | @@ -XXX,XX +XXX,XX @@ static ssize_t sungem_receive(NetClientState *nc, const uint8_t *buf, | ||
| 25 | return size; | ||
| 26 | } | ||
| 27 | |||
| 28 | - /* We don't drop too small frames since we get them in qemu, we pad | ||
| 29 | - * them instead. We should probably use the min frame size register | ||
| 30 | - * but I don't want to use a variable size staging buffer and I | ||
| 31 | - * know both MacOS and Linux use the default 64 anyway. We use 60 | ||
| 32 | - * here to account for the non-existent FCS. | ||
| 33 | - */ | ||
| 34 | - if (size < 60) { | ||
| 35 | - memcpy(smallbuf, buf, size); | ||
| 36 | - memset(&smallbuf[size], 0, 60 - size); | ||
| 37 | - buf = smallbuf; | ||
| 38 | - size = 60; | ||
| 39 | - } | ||
| 40 | - | ||
| 41 | /* Get MAC crc */ | ||
| 42 | mac_crc = net_crc32_le(buf, ETH_ALEN); | ||
| 43 | |||
| 44 | -- | ||
| 45 | 2.7.4 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Bin Meng <bmeng@tinylab.org> | ||
| 1 | 2 | ||
| 3 | Now that we have implemented unified short frames padding in the | ||
| 4 | QEMU networking codes, remove the same logic in the NIC codes. | ||
| 5 | |||
| 6 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 7 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 8 | --- | ||
| 9 | hw/net/sunhme.c | 11 ----------- | ||
| 10 | 1 file changed, 11 deletions(-) | ||
| 11 | |||
| 12 | diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c | ||
| 13 | index XXXXXXX..XXXXXXX 100644 | ||
| 14 | --- a/hw/net/sunhme.c | ||
| 15 | +++ b/hw/net/sunhme.c | ||
| 16 | @@ -XXX,XX +XXX,XX @@ static inline void sunhme_set_rx_ring_nr(SunHMEState *s, int i) | ||
| 17 | s->erxregs[HME_ERXI_RING >> 2] = ring; | ||
| 18 | } | ||
| 19 | |||
| 20 | -#define MIN_BUF_SIZE 60 | ||
| 21 | - | ||
| 22 | static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf, | ||
| 23 | size_t size) | ||
| 24 | { | ||
| 25 | @@ -XXX,XX +XXX,XX @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf, | ||
| 26 | dma_addr_t rb, addr; | ||
| 27 | uint32_t intstatus, status, buffer, buffersize, sum; | ||
| 28 | uint16_t csum; | ||
| 29 | - uint8_t buf1[60]; | ||
| 30 | int nr, cr, len, rxoffset, csum_offset; | ||
| 31 | |||
| 32 | trace_sunhme_rx_incoming(size); | ||
| 33 | @@ -XXX,XX +XXX,XX @@ static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf, | ||
| 34 | |||
| 35 | trace_sunhme_rx_filter_accept(); | ||
| 36 | |||
| 37 | - /* If too small buffer, then expand it */ | ||
| 38 | - if (size < MIN_BUF_SIZE) { | ||
| 39 | - memcpy(buf1, buf, size); | ||
| 40 | - memset(buf1 + size, 0, MIN_BUF_SIZE - size); | ||
| 41 | - buf = buf1; | ||
| 42 | - size = MIN_BUF_SIZE; | ||
| 43 | - } | ||
| 44 | - | ||
| 45 | rb = s->erxregs[HME_ERXI_RING >> 2] & HME_ERXI_RING_ADDR; | ||
| 46 | nr = sunhme_get_rx_ring_count(s); | ||
| 47 | cr = sunhme_get_rx_ring_nr(s); | ||
| 48 | -- | ||
| 49 | 2.7.4 | diff view generated by jsdifflib |
| 1 | From: Andrew Melnychenko <andrew@daynix.com> | 1 | From: Bin Meng <bmeng@tinylab.org> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com> | 3 | Now that we have implemented unified short frames padding in the |
| 4 | Signed-off-by: Andrew Melnychenko <andrew@daynix.com> | 4 | QEMU networking codes, the small packet check logic in the receive |
| 5 | path is no longer needed. | ||
| 6 | |||
| 7 | Suggested-by: Cédric Le Goater <clg@kaod.org> | ||
| 8 | Reviewed-by: Cédric Le Goater <clg@kaod.org> | ||
| 9 | Signed-off-by: Bin Meng <bmeng@tinylab.org> | ||
| 5 | Signed-off-by: Jason Wang <jasowang@redhat.com> | 10 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 6 | --- | 11 | --- |
| 7 | docs/devel/ebpf_rss.rst | 125 ++++++++++++++++++++++++++++++++++++++++++++++++ | 12 | hw/net/ftgmac100.c | 8 -------- |
| 8 | docs/devel/index.rst | 1 + | 13 | 1 file changed, 8 deletions(-) |
| 9 | 2 files changed, 126 insertions(+) | ||
| 10 | create mode 100644 docs/devel/ebpf_rss.rst | ||
| 11 | 14 | ||
| 12 | diff --git a/docs/devel/ebpf_rss.rst b/docs/devel/ebpf_rss.rst | 15 | diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c |
| 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 | 16 | index XXXXXXX..XXXXXXX 100644 |
| 145 | --- a/docs/devel/index.rst | 17 | --- a/hw/net/ftgmac100.c |
| 146 | +++ b/docs/devel/index.rst | 18 | +++ b/hw/net/ftgmac100.c |
| 147 | @@ -XXX,XX +XXX,XX @@ Contents: | 19 | @@ -XXX,XX +XXX,XX @@ static ssize_t ftgmac100_receive(NetClientState *nc, const uint8_t *buf, |
| 148 | qom | 20 | return -1; |
| 149 | block-coroutine-wrapper | 21 | } |
| 150 | multi-process | 22 | |
| 151 | + ebpf_rss | 23 | - /* TODO : Pad to minimum Ethernet frame length */ |
| 24 | - /* handle small packets. */ | ||
| 25 | - if (size < 10) { | ||
| 26 | - qemu_log_mask(LOG_GUEST_ERROR, "%s: dropped frame of %zd bytes\n", | ||
| 27 | - __func__, size); | ||
| 28 | - return size; | ||
| 29 | - } | ||
| 30 | - | ||
| 31 | if (!ftgmac100_filter(s, buf, size)) { | ||
| 32 | return size; | ||
| 33 | } | ||
| 152 | -- | 34 | -- |
| 153 | 2.7.4 | 35 | 2.7.4 |
| 154 | 36 | ||
| 155 | 37 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Laurent Vivier <lvivier@redhat.com> | ||
| 1 | 2 | ||
| 3 | Use directly net_socket_fd_init_stream() and net_socket_fd_init_dgram() | ||
| 4 | when the socket type is already known. | ||
| 5 | |||
| 6 | Reviewed-by: David Gibson <david@gibson.dropbear.id.au> | ||
| 7 | Signed-off-by: Laurent Vivier <lvivier@redhat.com> | ||
| 8 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 9 | --- | ||
| 10 | net/socket.c | 6 +++--- | ||
| 11 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/net/socket.c b/net/socket.c | ||
| 14 | index XXXXXXX..XXXXXXX 100644 | ||
| 15 | --- a/net/socket.c | ||
| 16 | +++ b/net/socket.c | ||
| 17 | @@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer, | ||
| 18 | break; | ||
| 19 | } | ||
| 20 | } | ||
| 21 | - s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp); | ||
| 22 | + s = net_socket_fd_init_stream(peer, model, name, fd, connected); | ||
| 23 | if (!s) { | ||
| 24 | return -1; | ||
| 25 | } | ||
| 26 | @@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer, | ||
| 27 | return -1; | ||
| 28 | } | ||
| 29 | |||
| 30 | - s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp); | ||
| 31 | + s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp); | ||
| 32 | if (!s) { | ||
| 33 | return -1; | ||
| 34 | } | ||
| 35 | @@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer, | ||
| 36 | } | ||
| 37 | qemu_socket_set_nonblock(fd); | ||
| 38 | |||
| 39 | - s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp); | ||
| 40 | + s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp); | ||
| 41 | if (!s) { | ||
| 42 | return -1; | ||
| 43 | } | ||
| 44 | -- | ||
| 45 | 2.7.4 | diff view generated by jsdifflib |
| 1 | From: Andrew Melnychenko <andrew@daynix.com> | 1 | From: Laurent Vivier <lvivier@redhat.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Added function that loads RSS eBPF program. | 3 | Reviewed-by: David Gibson <david@gibson.dropbear.id.au> |
| 4 | Added stub functions for RSS eBPF loader. | 4 | Signed-off-by: Laurent Vivier <lvivier@redhat.com> |
| 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> | 5 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 13 | --- | 6 | --- |
| 14 | configure | 8 +- | 7 | net/socket.c | 28 ++++++++++++++++++++-------- |
| 15 | ebpf/ebpf_rss-stub.c | 40 +++++ | 8 | 1 file changed, 20 insertions(+), 8 deletions(-) |
| 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 | 9 | ||
| 33 | diff --git a/configure b/configure | 10 | diff --git a/net/socket.c b/net/socket.c |
| 34 | index XXXXXXX..XXXXXXX 100755 | 11 | index XXXXXXX..XXXXXXX 100644 |
| 35 | --- a/configure | 12 | --- a/net/socket.c |
| 36 | +++ b/configure | 13 | +++ b/net/socket.c |
| 37 | @@ -XXX,XX +XXX,XX @@ vhost_vsock="$default_feature" | 14 | @@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer, |
| 38 | vhost_user="no" | 15 | return s; |
| 39 | vhost_user_blk_server="auto" | 16 | } |
| 40 | vhost_user_fs="$default_feature" | 17 | |
| 41 | +bpf="auto" | 18 | +static int net_socket_fd_check(int fd, Error **errp) |
| 42 | kvm="auto" | 19 | +{ |
| 43 | hax="auto" | 20 | + int so_type, optlen = sizeof(so_type); |
| 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 | spice-protocol spice-protocol | ||
| 63 | rbd rados block device (rbd) | ||
| 64 | @@ -XXX,XX +XXX,XX @@ if test "$skip_meson" = no; then | ||
| 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 | + | 21 | + |
| 91 | +#include "qemu/osdep.h" | 22 | + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type, |
| 92 | +#include "ebpf/ebpf_rss.h" | 23 | + (socklen_t *)&optlen) < 0) { |
| 93 | + | 24 | + error_setg(errp, "can't get socket option SO_TYPE"); |
| 94 | +void ebpf_rss_init(struct EBPFRSSContext *ctx) | 25 | + return -1; |
| 95 | +{ | 26 | + } |
| 96 | + | 27 | + if (so_type != SOCK_DGRAM && so_type != SOCK_STREAM) { |
| 28 | + error_setg(errp, "socket type=%d for fd=%d must be either" | ||
| 29 | + " SOCK_DGRAM or SOCK_STREAM", so_type, fd); | ||
| 30 | + return -1; | ||
| 31 | + } | ||
| 32 | + return so_type; | ||
| 97 | +} | 33 | +} |
| 98 | + | 34 | + |
| 99 | +bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx) | 35 | static NetSocketState *net_socket_fd_init(NetClientState *peer, |
| 100 | +{ | 36 | const char *model, const char *name, |
| 101 | + return false; | 37 | int fd, int is_connected, |
| 102 | +} | 38 | const char *mc, Error **errp) |
| 103 | + | 39 | { |
| 104 | +bool ebpf_rss_load(struct EBPFRSSContext *ctx) | 40 | - int so_type = -1, optlen=sizeof(so_type); |
| 105 | +{ | 41 | + int so_type; |
| 106 | + return false; | 42 | |
| 107 | +} | 43 | - if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type, |
| 108 | + | 44 | - (socklen_t *)&optlen)< 0) { |
| 109 | +bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config, | 45 | - error_setg(errp, "can't get socket option SO_TYPE"); |
| 110 | + uint16_t *indirections_table, uint8_t *toeplitz_key) | 46 | + so_type = net_socket_fd_check(fd, errp); |
| 111 | +{ | 47 | + if (so_type < 0) { |
| 112 | + return false; | 48 | close(fd); |
| 113 | +} | 49 | return NULL; |
| 114 | + | 50 | } |
| 115 | +void ebpf_rss_unload(struct EBPFRSSContext *ctx) | 51 | @@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init(NetClientState *peer, |
| 116 | +{ | 52 | mc, errp); |
| 117 | + | 53 | case SOCK_STREAM: |
| 118 | +} | 54 | return net_socket_fd_init_stream(peer, model, name, fd, is_connected); |
| 119 | diff --git a/ebpf/ebpf_rss.c b/ebpf/ebpf_rss.c | 55 | - default: |
| 120 | new file mode 100644 | 56 | - error_setg(errp, "socket type=%d for fd=%d must be either" |
| 121 | index XXXXXXX..XXXXXXX | 57 | - " SOCK_DGRAM or SOCK_STREAM", so_type, fd); |
| 122 | --- /dev/null | 58 | - close(fd); |
| 123 | +++ b/ebpf/ebpf_rss.c | 59 | } |
| 124 | @@ -XXX,XX +XXX,XX @@ | 60 | return NULL; |
| 125 | +/* | 61 | } |
| 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'), method: 'pkg-config') | ||
| 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 | -- | 62 | -- |
| 877 | 2.7.4 | 63 | 2.7.4 |
| 878 | |||
| 879 | diff view generated by jsdifflib |
New patch | |||
|---|---|---|---|
| 1 | From: Laurent Vivier <lvivier@redhat.com> | ||
| 1 | 2 | ||
| 3 | Move the file descriptor type checking before doing anything with it. | ||
| 4 | If it's not usable, don't close it as it could be in use by another | ||
| 5 | part of QEMU, only fail and report an error. | ||
| 6 | |||
| 7 | Reviewed-by: David Gibson <david@gibson.dropbear.id.au> | ||
| 8 | Signed-off-by: Laurent Vivier <lvivier@redhat.com> | ||
| 9 | Signed-off-by: Jason Wang <jasowang@redhat.com> | ||
| 10 | --- | ||
| 11 | net/socket.c | 43 +++++++++++++++++-------------------------- | ||
| 12 | 1 file changed, 17 insertions(+), 26 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/net/socket.c b/net/socket.c | ||
| 15 | index XXXXXXX..XXXXXXX 100644 | ||
| 16 | --- a/net/socket.c | ||
| 17 | +++ b/net/socket.c | ||
| 18 | @@ -XXX,XX +XXX,XX @@ static int net_socket_fd_check(int fd, Error **errp) | ||
| 19 | return so_type; | ||
| 20 | } | ||
| 21 | |||
| 22 | -static NetSocketState *net_socket_fd_init(NetClientState *peer, | ||
| 23 | - const char *model, const char *name, | ||
| 24 | - int fd, int is_connected, | ||
| 25 | - const char *mc, Error **errp) | ||
| 26 | -{ | ||
| 27 | - int so_type; | ||
| 28 | - | ||
| 29 | - so_type = net_socket_fd_check(fd, errp); | ||
| 30 | - if (so_type < 0) { | ||
| 31 | - close(fd); | ||
| 32 | - return NULL; | ||
| 33 | - } | ||
| 34 | - switch(so_type) { | ||
| 35 | - case SOCK_DGRAM: | ||
| 36 | - return net_socket_fd_init_dgram(peer, model, name, fd, is_connected, | ||
| 37 | - mc, errp); | ||
| 38 | - case SOCK_STREAM: | ||
| 39 | - return net_socket_fd_init_stream(peer, model, name, fd, is_connected); | ||
| 40 | - } | ||
| 41 | - return NULL; | ||
| 42 | -} | ||
| 43 | - | ||
| 44 | static void net_socket_accept(void *opaque) | ||
| 45 | { | ||
| 46 | NetSocketState *s = opaque; | ||
| 47 | @@ -XXX,XX +XXX,XX @@ int net_init_socket(const Netdev *netdev, const char *name, | ||
| 48 | } | ||
| 49 | |||
| 50 | if (sock->fd) { | ||
| 51 | - int fd, ret; | ||
| 52 | + int fd, ret, so_type; | ||
| 53 | |||
| 54 | fd = monitor_fd_param(monitor_cur(), sock->fd, errp); | ||
| 55 | if (fd == -1) { | ||
| 56 | return -1; | ||
| 57 | } | ||
| 58 | + so_type = net_socket_fd_check(fd, errp); | ||
| 59 | + if (so_type < 0) { | ||
| 60 | + return -1; | ||
| 61 | + } | ||
| 62 | ret = qemu_socket_try_set_nonblock(fd); | ||
| 63 | if (ret < 0) { | ||
| 64 | error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d", | ||
| 65 | name, fd); | ||
| 66 | return -1; | ||
| 67 | } | ||
| 68 | - if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast, | ||
| 69 | - errp)) { | ||
| 70 | - return -1; | ||
| 71 | + switch (so_type) { | ||
| 72 | + case SOCK_DGRAM: | ||
| 73 | + if (!net_socket_fd_init_dgram(peer, "socket", name, fd, 1, | ||
| 74 | + sock->mcast, errp)) { | ||
| 75 | + return -1; | ||
| 76 | + } | ||
| 77 | + break; | ||
| 78 | + case SOCK_STREAM: | ||
| 79 | + if (!net_socket_fd_init_stream(peer, "socket", name, fd, 1)) { | ||
| 80 | + return -1; | ||
| 81 | + } | ||
| 82 | + break; | ||
| 83 | } | ||
| 84 | return 0; | ||
| 85 | } | ||
| 86 | -- | ||
| 87 | 2.7.4 | diff view generated by jsdifflib |
| 1 | From: Andrew Melnychenko <andrew@daynix.com> | 1 | From: Akihiko Odaki <akihiko.odaki@daynix.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | RSS program and Makefile to build it. | 3 | The datasheet does not say what happens when interrupt was asserted |
| 4 | The bpftool used to generate '.h' file. | 4 | (ICR.INT_ASSERT=1) and auto mask is *not* active. |
| 5 | The data in that file may be loaded by libbpf. | 5 | However, section of 13.3.27 the PCIe* GbE Controllers Open Source |
| 6 | EBPF compilation is not required for building qemu. | 6 | Software Developer’s Manual, which were written for older devices, |
| 7 | You can use Makefile if you need to regenerate rss.bpf.skeleton.h. | 7 | namely 631xESB/632xESB, 82563EB/82564EB, 82571EB/82572EI & |
| 8 | 82573E/82573V/82573L, does say: | ||
| 9 | > If IMS = 0b, then the ICR register is always clear-on-read. If IMS is | ||
| 10 | > not 0b, but some ICR bit is set where the corresponding IMS bit is not | ||
| 11 | > set, then a read does not clear the ICR register. For example, if | ||
| 12 | > IMS = 10101010b and ICR = 01010101b, then a read to the ICR register | ||
| 13 | > does not clear it. If IMS = 10101010b and ICR = 0101011b, then a read | ||
| 14 | > to the ICR register clears it entirely (ICR.INT_ASSERTED = 1b). | ||
| 8 | 15 | ||
| 9 | Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com> | 16 | Linux does no longer activate auto mask since commit |
| 17 | 0a8047ac68e50e4ccbadcfc6b6b070805b976885 and the real hardware clears | ||
| 18 | ICR even in such a case so we also should do so. | ||
| 19 | |||
| 20 | Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1707441 | ||
| 10 | Signed-off-by: Andrew Melnychenko <andrew@daynix.com> | 21 | Signed-off-by: Andrew Melnychenko <andrew@daynix.com> |
| 22 | Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> | ||
| 11 | Signed-off-by: Jason Wang <jasowang@redhat.com> | 23 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 12 | --- | 24 | --- |
| 13 | tools/ebpf/Makefile.ebpf | 21 ++ | 25 | hw/net/e1000e_core.c | 38 ++++++++++++++++++++++++++++++++------ |
| 14 | tools/ebpf/rss.bpf.c | 571 +++++++++++++++++++++++++++++++++++++++++++++++ | 26 | hw/net/trace-events | 1 + |
| 15 | 2 files changed, 592 insertions(+) | 27 | 2 files changed, 33 insertions(+), 6 deletions(-) |
| 16 | create mode 100755 tools/ebpf/Makefile.ebpf | ||
| 17 | create mode 100644 tools/ebpf/rss.bpf.c | ||
| 18 | 28 | ||
| 19 | diff --git a/tools/ebpf/Makefile.ebpf b/tools/ebpf/Makefile.ebpf | 29 | diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c |
| 20 | new file mode 100755 | 30 | index XXXXXXX..XXXXXXX 100644 |
| 21 | index XXXXXXX..XXXXXXX | 31 | --- a/hw/net/e1000e_core.c |
| 22 | --- /dev/null | 32 | +++ b/hw/net/e1000e_core.c |
| 23 | +++ b/tools/ebpf/Makefile.ebpf | 33 | @@ -XXX,XX +XXX,XX @@ e1000e_mac_icr_read(E1000ECore *core, int index) |
| 24 | @@ -XXX,XX +XXX,XX @@ | 34 | e1000e_lower_interrupts(core, ICR, 0xffffffff); |
| 25 | +OBJS = rss.bpf.o | 35 | } |
| 26 | + | 36 | |
| 27 | +LLC ?= llc | 37 | - if ((core->mac[ICR] & E1000_ICR_ASSERTED) && |
| 28 | +CLANG ?= clang | 38 | - (core->mac[CTRL_EXT] & E1000_CTRL_EXT_IAME)) { |
| 29 | +INC_FLAGS = `$(CLANG) -print-file-name=include` | 39 | - trace_e1000e_irq_icr_clear_iame(); |
| 30 | +EXTRA_CFLAGS ?= -O2 -emit-llvm -fno-stack-protector | 40 | - e1000e_lower_interrupts(core, ICR, 0xffffffff); |
| 31 | + | 41 | - trace_e1000e_irq_icr_process_iame(); |
| 32 | +all: $(OBJS) | 42 | - e1000e_lower_interrupts(core, IMS, core->mac[IAM]); |
| 33 | + | 43 | + if (core->mac[ICR] & E1000_ICR_ASSERTED) { |
| 34 | +.PHONY: clean | 44 | + if (core->mac[CTRL_EXT] & E1000_CTRL_EXT_IAME) { |
| 35 | + | 45 | + trace_e1000e_irq_icr_clear_iame(); |
| 36 | +clean: | 46 | + e1000e_lower_interrupts(core, ICR, 0xffffffff); |
| 37 | + rm -f $(OBJS) | 47 | + trace_e1000e_irq_icr_process_iame(); |
| 38 | + | 48 | + e1000e_lower_interrupts(core, IMS, core->mac[IAM]); |
| 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 | ||
| 209 | + * https://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xhtml | ||
| 210 | + * we expect that there are would be no more than 11 extensions in IPv6 header, | ||
| 211 | + * also there is 27 TLV options for Destination and Hop-by-hop extensions. | ||
| 212 | + * Need to choose reasonable amount of maximum extensions/options we may | ||
| 213 | + * check to find ext src/dst. | ||
| 214 | + */ | ||
| 215 | +#define IP6_EXTENSIONS_COUNT 11 | ||
| 216 | +#define IP6_OPTIONS_COUNT 30 | ||
| 217 | + | ||
| 218 | +static inline int parse_ipv6_ext(struct __sk_buff *skb, | ||
| 219 | + struct packet_hash_info_t *info, | ||
| 220 | + __u8 *l4_protocol, size_t *l4_offset) | ||
| 221 | +{ | ||
| 222 | + int err = 0; | ||
| 223 | + | ||
| 224 | + if (!ip6_extension_header_type(*l4_protocol)) { | ||
| 225 | + return 0; | ||
| 226 | + } | ||
| 227 | + | ||
| 228 | + struct ipv6_opt_hdr ext_hdr = {}; | ||
| 229 | + | ||
| 230 | + for (unsigned int i = 0; i < IP6_EXTENSIONS_COUNT; ++i) { | ||
| 231 | + | ||
| 232 | + err = bpf_skb_load_bytes_relative(skb, *l4_offset, &ext_hdr, | ||
| 233 | + sizeof(ext_hdr), BPF_HDR_START_NET); | ||
| 234 | + if (err) { | ||
| 235 | + goto error; | ||
| 236 | + } | 49 | + } |
| 237 | + | 50 | + |
| 238 | + if (*l4_protocol == IPPROTO_ROUTING) { | 51 | + /* |
| 239 | + struct ipv6_rt_hdr ext_rt = {}; | 52 | + * The datasheet does not say what happens when interrupt was asserted |
| 240 | + | 53 | + * (ICR.INT_ASSERT=1) and auto mask is *not* active. |
| 241 | + err = bpf_skb_load_bytes_relative(skb, *l4_offset, &ext_rt, | 54 | + * However, section of 13.3.27 the PCIe* GbE Controllers Open Source |
| 242 | + sizeof(ext_rt), BPF_HDR_START_NET); | 55 | + * Software Developer’s Manual, which were written for older devices, |
| 243 | + if (err) { | 56 | + * namely 631xESB/632xESB, 82563EB/82564EB, 82571EB/82572EI & |
| 244 | + goto error; | 57 | + * 82573E/82573V/82573L, does say: |
| 245 | + } | 58 | + * > If IMS = 0b, then the ICR register is always clear-on-read. If IMS |
| 246 | + | 59 | + * > is not 0b, but some ICR bit is set where the corresponding IMS bit |
| 247 | + if ((ext_rt.type == IPV6_SRCRT_TYPE_2) && | 60 | + * > is not set, then a read does not clear the ICR register. For |
| 248 | + (ext_rt.hdrlen == sizeof(struct in6_addr) / 8) && | 61 | + * > example, if IMS = 10101010b and ICR = 01010101b, then a read to the |
| 249 | + (ext_rt.segments_left == 1)) { | 62 | + * > ICR register does not clear it. If IMS = 10101010b and |
| 250 | + | 63 | + * > ICR = 0101011b, then a read to the ICR register clears it entirely |
| 251 | + err = bpf_skb_load_bytes_relative(skb, | 64 | + * > (ICR.INT_ASSERTED = 1b). |
| 252 | + *l4_offset + offsetof(struct rt2_hdr, addr), | 65 | + * |
| 253 | + &info->in6_ext_dst, sizeof(info->in6_ext_dst), | 66 | + * Linux does no longer activate auto mask since commit |
| 254 | + BPF_HDR_START_NET); | 67 | + * 0a8047ac68e50e4ccbadcfc6b6b070805b976885 and the real hardware |
| 255 | + if (err) { | 68 | + * clears ICR even in such a case so we also should do so. |
| 256 | + goto error; | 69 | + */ |
| 257 | + } | 70 | + if (core->mac[ICR] & core->mac[IMS]) { |
| 258 | + | 71 | + trace_e1000e_irq_icr_clear_icr_bit_ims(core->mac[ICR], |
| 259 | + info->is_ipv6_ext_dst = 1; | 72 | + core->mac[IMS]); |
| 260 | + } | 73 | + e1000e_lower_interrupts(core, ICR, 0xffffffff); |
| 261 | + | ||
| 262 | + } else if (*l4_protocol == IPPROTO_DSTOPTS) { | ||
| 263 | + struct ipv6_opt_t { | ||
| 264 | + __u8 type; | ||
| 265 | + __u8 length; | ||
| 266 | + } __attribute__((packed)) opt = {}; | ||
| 267 | + | ||
| 268 | + size_t opt_offset = sizeof(ext_hdr); | ||
| 269 | + | ||
| 270 | + for (unsigned int j = 0; j < IP6_OPTIONS_COUNT; ++j) { | ||
| 271 | + err = bpf_skb_load_bytes_relative(skb, *l4_offset + opt_offset, | ||
| 272 | + &opt, sizeof(opt), BPF_HDR_START_NET); | ||
| 273 | + if (err) { | ||
| 274 | + goto error; | ||
| 275 | + } | ||
| 276 | + | ||
| 277 | + if (opt.type == IPV6_TLV_HAO) { | ||
| 278 | + err = bpf_skb_load_bytes_relative(skb, | ||
| 279 | + *l4_offset + opt_offset | ||
| 280 | + + offsetof(struct ipv6_destopt_hao, addr), | ||
| 281 | + &info->in6_ext_src, sizeof(info->in6_ext_src), | ||
| 282 | + BPF_HDR_START_NET); | ||
| 283 | + if (err) { | ||
| 284 | + goto error; | ||
| 285 | + } | ||
| 286 | + | ||
| 287 | + info->is_ipv6_ext_src = 1; | ||
| 288 | + break; | ||
| 289 | + } | ||
| 290 | + | ||
| 291 | + opt_offset += (opt.type == IPV6_TLV_PAD1) ? | ||
| 292 | + 1 : opt.length + sizeof(opt); | ||
| 293 | + | ||
| 294 | + if (opt_offset + 1 >= ext_hdr.hdrlen * 8) { | ||
| 295 | + break; | ||
| 296 | + } | ||
| 297 | + } | ||
| 298 | + } else if (*l4_protocol == IPPROTO_FRAGMENT) { | ||
| 299 | + info->is_fragmented = true; | ||
| 300 | + } | 74 | + } |
| 301 | + | 75 | } |
| 302 | + *l4_protocol = ext_hdr.nexthdr; | 76 | |
| 303 | + *l4_offset += (ext_hdr.hdrlen + 1) * 8; | 77 | return ret; |
| 304 | + | 78 | diff --git a/hw/net/trace-events b/hw/net/trace-events |
| 305 | + if (!ip6_extension_header_type(ext_hdr.nexthdr)) { | 79 | index XXXXXXX..XXXXXXX 100644 |
| 306 | + return 0; | 80 | --- a/hw/net/trace-events |
| 307 | + } | 81 | +++ b/hw/net/trace-events |
| 308 | + } | 82 | @@ -XXX,XX +XXX,XX @@ e1000e_irq_read_ims(uint32_t ims) "Current IMS: 0x%x" |
| 309 | + | 83 | e1000e_irq_icr_clear_nonmsix_icr_read(void) "Clearing ICR on read due to non MSI-X int" |
| 310 | + return 0; | 84 | e1000e_irq_icr_clear_zero_ims(void) "Clearing ICR on read due to zero IMS" |
| 311 | +error: | 85 | e1000e_irq_icr_clear_iame(void) "Clearing ICR on read due to IAME" |
| 312 | + return err; | 86 | +e1000e_irq_icr_clear_icr_bit_ims(uint32_t icr, uint32_t ims) "Clearing ICR on read due corresponding IMS bit: 0x%x & 0x%x" |
| 313 | +} | 87 | e1000e_irq_iam_clear_eiame(uint32_t iam, uint32_t cause) "Clearing IMS due to EIAME, IAM: 0x%X, cause: 0x%X" |
| 314 | + | 88 | e1000e_irq_icr_clear_eiac(uint32_t icr, uint32_t eiac) "Clearing ICR bits due to EIAC, ICR: 0x%X, EIAC: 0x%X" |
| 315 | +static __be16 parse_eth_type(struct __sk_buff *skb) | 89 | e1000e_irq_ims_clear_set_imc(uint32_t val) "Clearing IMS bits due to IMC write 0x%x" |
| 316 | +{ | ||
| 317 | + unsigned int offset = 12; | ||
| 318 | + __be16 ret = 0; | ||
| 319 | + int err = 0; | ||
| 320 | + | ||
| 321 | + err = bpf_skb_load_bytes_relative(skb, offset, &ret, sizeof(ret), | ||
| 322 | + BPF_HDR_START_MAC); | ||
| 323 | + if (err) { | ||
| 324 | + return 0; | ||
| 325 | + } | ||
| 326 | + | ||
| 327 | + switch (bpf_ntohs(ret)) { | ||
| 328 | + case ETH_P_8021AD: | ||
| 329 | + offset += 4; | ||
| 330 | + case ETH_P_8021Q: | ||
| 331 | + offset += 4; | ||
| 332 | + err = bpf_skb_load_bytes_relative(skb, offset, &ret, sizeof(ret), | ||
| 333 | + BPF_HDR_START_MAC); | ||
| 334 | + default: | ||
| 335 | + break; | ||
| 336 | + } | ||
| 337 | + | ||
| 338 | + if (err) { | ||
| 339 | + return 0; | ||
| 340 | + } | ||
| 341 | + | ||
| 342 | + return ret; | ||
| 343 | +} | ||
| 344 | + | ||
| 345 | +static inline int parse_packet(struct __sk_buff *skb, | ||
| 346 | + struct packet_hash_info_t *info) | ||
| 347 | +{ | ||
| 348 | + int err = 0; | ||
| 349 | + | ||
| 350 | + if (!info || !skb) { | ||
| 351 | + return -1; | ||
| 352 | + } | ||
| 353 | + | ||
| 354 | + size_t l4_offset = 0; | ||
| 355 | + __u8 l4_protocol = 0; | ||
| 356 | + __u16 l3_protocol = bpf_ntohs(parse_eth_type(skb)); | ||
| 357 | + if (l3_protocol == 0) { | ||
| 358 | + err = -1; | ||
| 359 | + goto error; | ||
| 360 | + } | ||
| 361 | + | ||
| 362 | + if (l3_protocol == ETH_P_IP) { | ||
| 363 | + info->is_ipv4 = 1; | ||
| 364 | + | ||
| 365 | + struct iphdr ip = {}; | ||
| 366 | + err = bpf_skb_load_bytes_relative(skb, 0, &ip, sizeof(ip), | ||
| 367 | + BPF_HDR_START_NET); | ||
| 368 | + if (err) { | ||
| 369 | + goto error; | ||
| 370 | + } | ||
| 371 | + | ||
| 372 | + info->in_src = ip.saddr; | ||
| 373 | + info->in_dst = ip.daddr; | ||
| 374 | + info->is_fragmented = !!ip.frag_off; | ||
| 375 | + | ||
| 376 | + l4_protocol = ip.protocol; | ||
| 377 | + l4_offset = ip.ihl * 4; | ||
| 378 | + } else if (l3_protocol == ETH_P_IPV6) { | ||
| 379 | + info->is_ipv6 = 1; | ||
| 380 | + | ||
| 381 | + struct ipv6hdr ip6 = {}; | ||
| 382 | + err = bpf_skb_load_bytes_relative(skb, 0, &ip6, sizeof(ip6), | ||
| 383 | + BPF_HDR_START_NET); | ||
| 384 | + if (err) { | ||
| 385 | + goto error; | ||
| 386 | + } | ||
| 387 | + | ||
| 388 | + info->in6_src = ip6.saddr; | ||
| 389 | + info->in6_dst = ip6.daddr; | ||
| 390 | + | ||
| 391 | + l4_protocol = ip6.nexthdr; | ||
| 392 | + l4_offset = sizeof(ip6); | ||
| 393 | + | ||
| 394 | + err = parse_ipv6_ext(skb, info, &l4_protocol, &l4_offset); | ||
| 395 | + if (err) { | ||
| 396 | + goto error; | ||
| 397 | + } | ||
| 398 | + } | ||
| 399 | + | ||
| 400 | + if (l4_protocol != 0 && !info->is_fragmented) { | ||
| 401 | + if (l4_protocol == IPPROTO_TCP) { | ||
| 402 | + info->is_tcp = 1; | ||
| 403 | + | ||
| 404 | + struct tcphdr tcp = {}; | ||
| 405 | + err = bpf_skb_load_bytes_relative(skb, l4_offset, &tcp, sizeof(tcp), | ||
| 406 | + BPF_HDR_START_NET); | ||
| 407 | + if (err) { | ||
| 408 | + goto error; | ||
| 409 | + } | ||
| 410 | + | ||
| 411 | + info->src_port = tcp.source; | ||
| 412 | + info->dst_port = tcp.dest; | ||
| 413 | + } else if (l4_protocol == IPPROTO_UDP) { /* TODO: add udplite? */ | ||
| 414 | + info->is_udp = 1; | ||
| 415 | + | ||
| 416 | + struct udphdr udp = {}; | ||
| 417 | + err = bpf_skb_load_bytes_relative(skb, l4_offset, &udp, sizeof(udp), | ||
| 418 | + BPF_HDR_START_NET); | ||
| 419 | + if (err) { | ||
| 420 | + goto error; | ||
| 421 | + } | ||
| 422 | + | ||
| 423 | + info->src_port = udp.source; | ||
| 424 | + info->dst_port = udp.dest; | ||
| 425 | + } | ||
| 426 | + } | ||
| 427 | + | ||
| 428 | + return 0; | ||
| 429 | + | ||
| 430 | +error: | ||
| 431 | + return err; | ||
| 432 | +} | ||
| 433 | + | ||
| 434 | +static inline __u32 calculate_rss_hash(struct __sk_buff *skb, | ||
| 435 | + struct rss_config_t *config, struct toeplitz_key_data_t *toe) | ||
| 436 | +{ | ||
| 437 | + __u8 rss_input[HASH_CALCULATION_BUFFER_SIZE] = {}; | ||
| 438 | + size_t bytes_written = 0; | ||
| 439 | + __u32 result = 0; | ||
| 440 | + int err = 0; | ||
| 441 | + struct packet_hash_info_t packet_info = {}; | ||
| 442 | + | ||
| 443 | + err = parse_packet(skb, &packet_info); | ||
| 444 | + if (err) { | ||
| 445 | + return 0; | ||
| 446 | + } | ||
| 447 | + | ||
| 448 | + if (packet_info.is_ipv4) { | ||
| 449 | + if (packet_info.is_tcp && | ||
| 450 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCPv4) { | ||
| 451 | + | ||
| 452 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 453 | + &packet_info.in_src, | ||
| 454 | + sizeof(packet_info.in_src)); | ||
| 455 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 456 | + &packet_info.in_dst, | ||
| 457 | + sizeof(packet_info.in_dst)); | ||
| 458 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 459 | + &packet_info.src_port, | ||
| 460 | + sizeof(packet_info.src_port)); | ||
| 461 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 462 | + &packet_info.dst_port, | ||
| 463 | + sizeof(packet_info.dst_port)); | ||
| 464 | + } else if (packet_info.is_udp && | ||
| 465 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDPv4) { | ||
| 466 | + | ||
| 467 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 468 | + &packet_info.in_src, | ||
| 469 | + sizeof(packet_info.in_src)); | ||
| 470 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 471 | + &packet_info.in_dst, | ||
| 472 | + sizeof(packet_info.in_dst)); | ||
| 473 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 474 | + &packet_info.src_port, | ||
| 475 | + sizeof(packet_info.src_port)); | ||
| 476 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 477 | + &packet_info.dst_port, | ||
| 478 | + sizeof(packet_info.dst_port)); | ||
| 479 | + } else if (config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IPv4) { | ||
| 480 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 481 | + &packet_info.in_src, | ||
| 482 | + sizeof(packet_info.in_src)); | ||
| 483 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 484 | + &packet_info.in_dst, | ||
| 485 | + sizeof(packet_info.in_dst)); | ||
| 486 | + } | ||
| 487 | + } else if (packet_info.is_ipv6) { | ||
| 488 | + if (packet_info.is_tcp && | ||
| 489 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCPv6) { | ||
| 490 | + | ||
| 491 | + if (packet_info.is_ipv6_ext_src && | ||
| 492 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCP_EX) { | ||
| 493 | + | ||
| 494 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 495 | + &packet_info.in6_ext_src, | ||
| 496 | + sizeof(packet_info.in6_ext_src)); | ||
| 497 | + } else { | ||
| 498 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 499 | + &packet_info.in6_src, | ||
| 500 | + sizeof(packet_info.in6_src)); | ||
| 501 | + } | ||
| 502 | + if (packet_info.is_ipv6_ext_dst && | ||
| 503 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_TCP_EX) { | ||
| 504 | + | ||
| 505 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 506 | + &packet_info.in6_ext_dst, | ||
| 507 | + sizeof(packet_info.in6_ext_dst)); | ||
| 508 | + } else { | ||
| 509 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 510 | + &packet_info.in6_dst, | ||
| 511 | + sizeof(packet_info.in6_dst)); | ||
| 512 | + } | ||
| 513 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 514 | + &packet_info.src_port, | ||
| 515 | + sizeof(packet_info.src_port)); | ||
| 516 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 517 | + &packet_info.dst_port, | ||
| 518 | + sizeof(packet_info.dst_port)); | ||
| 519 | + } else if (packet_info.is_udp && | ||
| 520 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDPv6) { | ||
| 521 | + | ||
| 522 | + if (packet_info.is_ipv6_ext_src && | ||
| 523 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDP_EX) { | ||
| 524 | + | ||
| 525 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 526 | + &packet_info.in6_ext_src, | ||
| 527 | + sizeof(packet_info.in6_ext_src)); | ||
| 528 | + } else { | ||
| 529 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 530 | + &packet_info.in6_src, | ||
| 531 | + sizeof(packet_info.in6_src)); | ||
| 532 | + } | ||
| 533 | + if (packet_info.is_ipv6_ext_dst && | ||
| 534 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_UDP_EX) { | ||
| 535 | + | ||
| 536 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 537 | + &packet_info.in6_ext_dst, | ||
| 538 | + sizeof(packet_info.in6_ext_dst)); | ||
| 539 | + } else { | ||
| 540 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 541 | + &packet_info.in6_dst, | ||
| 542 | + sizeof(packet_info.in6_dst)); | ||
| 543 | + } | ||
| 544 | + | ||
| 545 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 546 | + &packet_info.src_port, | ||
| 547 | + sizeof(packet_info.src_port)); | ||
| 548 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 549 | + &packet_info.dst_port, | ||
| 550 | + sizeof(packet_info.dst_port)); | ||
| 551 | + | ||
| 552 | + } else if (config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IPv6) { | ||
| 553 | + if (packet_info.is_ipv6_ext_src && | ||
| 554 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IP_EX) { | ||
| 555 | + | ||
| 556 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 557 | + &packet_info.in6_ext_src, | ||
| 558 | + sizeof(packet_info.in6_ext_src)); | ||
| 559 | + } else { | ||
| 560 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 561 | + &packet_info.in6_src, | ||
| 562 | + sizeof(packet_info.in6_src)); | ||
| 563 | + } | ||
| 564 | + if (packet_info.is_ipv6_ext_dst && | ||
| 565 | + config->hash_types & VIRTIO_NET_RSS_HASH_TYPE_IP_EX) { | ||
| 566 | + | ||
| 567 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 568 | + &packet_info.in6_ext_dst, | ||
| 569 | + sizeof(packet_info.in6_ext_dst)); | ||
| 570 | + } else { | ||
| 571 | + net_rx_rss_add_chunk(rss_input, &bytes_written, | ||
| 572 | + &packet_info.in6_dst, | ||
| 573 | + sizeof(packet_info.in6_dst)); | ||
| 574 | + } | ||
| 575 | + } | ||
| 576 | + } | ||
| 577 | + | ||
| 578 | + if (bytes_written) { | ||
| 579 | + net_toeplitz_add(&result, rss_input, bytes_written, toe); | ||
| 580 | + } | ||
| 581 | + | ||
| 582 | + return result; | ||
| 583 | +} | ||
| 584 | + | ||
| 585 | +SEC("tun_rss_steering") | ||
| 586 | +int tun_rss_steering_prog(struct __sk_buff *skb) | ||
| 587 | +{ | ||
| 588 | + | ||
| 589 | + struct rss_config_t *config; | ||
| 590 | + struct toeplitz_key_data_t *toe; | ||
| 591 | + | ||
| 592 | + __u32 key = 0; | ||
| 593 | + __u32 hash = 0; | ||
| 594 | + | ||
| 595 | + config = bpf_map_lookup_elem(&tap_rss_map_configurations, &key); | ||
| 596 | + toe = bpf_map_lookup_elem(&tap_rss_map_toeplitz_key, &key); | ||
| 597 | + | ||
| 598 | + if (config && toe) { | ||
| 599 | + if (!config->redirect) { | ||
| 600 | + return config->default_queue; | ||
| 601 | + } | ||
| 602 | + | ||
| 603 | + hash = calculate_rss_hash(skb, config, toe); | ||
| 604 | + if (hash) { | ||
| 605 | + __u32 table_idx = hash % config->indirections_len; | ||
| 606 | + __u16 *queue = 0; | ||
| 607 | + | ||
| 608 | + queue = bpf_map_lookup_elem(&tap_rss_map_indirection_table, | ||
| 609 | + &table_idx); | ||
| 610 | + | ||
| 611 | + if (queue) { | ||
| 612 | + return *queue; | ||
| 613 | + } | ||
| 614 | + } | ||
| 615 | + | ||
| 616 | + return config->default_queue; | ||
| 617 | + } | ||
| 618 | + | ||
| 619 | + return -1; | ||
| 620 | +} | ||
| 621 | + | ||
| 622 | +char _license[] SEC("license") = "GPL v2"; | ||
| 623 | -- | 90 | -- |
| 624 | 2.7.4 | 91 | 2.7.4 |
| 625 | 92 | ||
| 626 | 93 | diff view generated by jsdifflib |
| 1 | From: Andrew Melnychenko <andrew@daynix.com> | 1 | From: Akihiko Odaki <akihiko.odaki@daynix.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Additional code that will be used for eBPF setting steering routine. | 3 | I confirmed it works with Windows even without this workaround. It is |
| 4 | likely to be a mistake so remove it. | ||
| 4 | 5 | ||
| 5 | Signed-off-by: Andrew Melnychenko <andrew@daynix.com> | 6 | Fixes: 3a977deebe ("Intrdocue igb device emulation") |
| 7 | Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> | ||
| 6 | Signed-off-by: Jason Wang <jasowang@redhat.com> | 8 | Signed-off-by: Jason Wang <jasowang@redhat.com> |
| 7 | --- | 9 | --- |
| 8 | net/tap-linux.h | 1 + | 10 | hw/net/igb_core.c | 7 +------ |
| 9 | 1 file changed, 1 insertion(+) | 11 | 1 file changed, 1 insertion(+), 6 deletions(-) |
| 10 | 12 | ||
| 11 | diff --git a/net/tap-linux.h b/net/tap-linux.h | 13 | diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c |
| 12 | index XXXXXXX..XXXXXXX 100644 | 14 | index XXXXXXX..XXXXXXX 100644 |
| 13 | --- a/net/tap-linux.h | 15 | --- a/hw/net/igb_core.c |
| 14 | +++ b/net/tap-linux.h | 16 | +++ b/hw/net/igb_core.c |
| 15 | @@ -XXX,XX +XXX,XX @@ | 17 | @@ -XXX,XX +XXX,XX @@ static uint32_t igb_get_status(IGBCore *core, int index) |
| 16 | #define TUNSETQUEUE _IOW('T', 217, int) | 18 | res |= E1000_STATUS_IOV_MODE; |
| 17 | #define TUNSETVNETLE _IOW('T', 220, int) | 19 | } |
| 18 | #define TUNSETVNETBE _IOW('T', 222, int) | 20 | |
| 19 | +#define TUNSETSTEERINGEBPF _IOR('T', 224, int) | 21 | - /* |
| 20 | 22 | - * Windows driver 12.18.9.23 resets if E1000_STATUS_GIO_MASTER_ENABLE is | |
| 21 | #endif | 23 | - * left set after E1000_CTRL_LRST is set. |
| 24 | - */ | ||
| 25 | - if (!(core->mac[CTRL] & E1000_CTRL_GIO_MASTER_DISABLE) && | ||
| 26 | - !(core->mac[CTRL] & E1000_CTRL_LRST)) { | ||
| 27 | + if (!(core->mac[CTRL] & E1000_CTRL_GIO_MASTER_DISABLE)) { | ||
| 28 | res |= E1000_STATUS_GIO_MASTER_ENABLE; | ||
| 29 | } | ||
| 22 | 30 | ||
| 23 | -- | 31 | -- |
| 24 | 2.7.4 | 32 | 2.7.4 |
| 25 | |||
| 26 | diff view generated by jsdifflib |