mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/net: improve tracing of eBPF RSS setup

Browse Source 
This adds more trace events to key eBPF RSS setup operations, and
also distinguishes events from multiple NIC instances.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2024-10-23 09:51:03 +01:00 committed by Jason Wang
parent f5cae19d10
commit ae311fb315
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/net/trace-events
View File

@ -394,9 +394,11 @@ virtio_net_announce_notify(void) ""
virtio_net_announce_timer(int round) "%d" virtio_net_announce_timer(int round) "%d"
virtio_net_handle_announce(int round) "%d" virtio_net_handle_announce(int round) "%d"
virtio_net_post_load_device(void) virtio_net_post_load_device(void)
virtio_net_rss_disable(void) virtio_net_rss_load(void *nic, size_t nfds, void *fds) "nic=%p nfds=%zu fds=%p"
virtio_net_rss_error(const char *msg, uint32_t value) "%s, value 0x%08x" virtio_net_rss_attach_ebpf(void *nic, int prog_fd) "nic=%p prog-fd=%d"
virtio_net_rss_enable(uint32_t p1, uint16_t p2, uint8_t p3) "hashes 0x%x, table of %d, key of %d" virtio_net_rss_disable(void *nic) "nic=%p"
virtio_net_rss_error(void *nic, const char *msg, uint32_t value) "nic=%p msg=%s, value 0x%08x"
virtio_net_rss_enable(void *nic, uint32_t p1, uint16_t p2, uint8_t p3) "nic=%p hashes 0x%x, table of %d, key of %d"
# tulip.c # tulip.c
tulip_reg_write(uint64_t addr, const char *name, int size, uint64_t val) "addr 0x%02"PRIx64" (%s) size %d value 0x%08"PRIx64 tulip_reg_write(uint64_t addr, const char *name, int size, uint64_t val) "addr 0x%02"PRIx64" (%s) size %d value 0x%08"PRIx64

9
hw/net/virtio-net.c
View File

@ -1241,6 +1241,7 @@ static bool virtio_net_attach_ebpf_to_backend(NICState *nic, int prog_fd)
return false; return false;
} }
trace_virtio_net_rss_attach_ebpf(nic, prog_fd);
return nc->info->set_steering_ebpf(nc, prog_fd); return nc->info->set_steering_ebpf(nc, prog_fd);
} }
@ -1297,12 +1298,13 @@ static void virtio_net_commit_rss_config(VirtIONet *n)
} }
} }
trace_virtio_net_rss_enable(n->rss_data.hash_types, trace_virtio_net_rss_enable(n,
n->rss_data.hash_types,
n->rss_data.indirections_len, n->rss_data.indirections_len,
sizeof(n->rss_data.key)); sizeof(n->rss_data.key));
} else { } else {
virtio_net_detach_ebpf_rss(n); virtio_net_detach_ebpf_rss(n);
trace_virtio_net_rss_disable(); trace_virtio_net_rss_disable(n);
} }
} }
@ -1353,6 +1355,7 @@ static bool virtio_net_load_ebpf(VirtIONet *n, Error **errp)
bool ret = false; bool ret = false;
if (virtio_net_attach_ebpf_to_backend(n->nic, -1)) { if (virtio_net_attach_ebpf_to_backend(n->nic, -1)) {
trace_virtio_net_rss_load(n, n->nr_ebpf_rss_fds, n->ebpf_rss_fds);
if (n->ebpf_rss_fds) { if (n->ebpf_rss_fds) {
ret = virtio_net_load_ebpf_fds(n, errp); ret = virtio_net_load_ebpf_fds(n, errp);
} else { } else {
@ -1484,7 +1487,7 @@ static uint16_t virtio_net_handle_rss(VirtIONet *n,
virtio_net_commit_rss_config(n); virtio_net_commit_rss_config(n);
return queue_pairs; return queue_pairs;
error: error:
trace_virtio_net_rss_error(err_msg, err_value); trace_virtio_net_rss_error(n, err_msg, err_value);
virtio_net_disable_rss(n); virtio_net_disable_rss(n);
return 0; return 0;
} }