Add trace points to simplify debugging migration.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
net/tap.c | 10 ++++++++++
net/trace-events | 6 ++++++
2 files changed, 16 insertions(+)
diff --git a/net/tap.c b/net/tap.c
index 2530627a9a..151fb73820 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -43,6 +43,7 @@
#include "qemu/main-loop.h"
#include "qemu/sockets.h"
#include "hw/virtio/vhost.h"
+#include "trace.h"
#include "net/tap.h"
@@ -148,6 +149,9 @@ static ssize_t tap_receive_iov(NetClientState *nc, const struct iovec *iov,
g_autofree struct iovec *iov_copy = NULL;
struct virtio_net_hdr hdr = { };
+ trace_tap_receive_iov(s->using_vnet_hdr, s->host_vnet_hdr_len, iovcnt,
+ iov->iov_len);
+
if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
iov_copy = g_new(struct iovec, iovcnt + 1);
iov_copy[0].iov_base = &hdr;
@@ -199,6 +203,8 @@ static void tap_send(void *opaque)
break;
}
+ trace_tap_send_packet(s->using_vnet_hdr, s->host_vnet_hdr_len, size);
+
if (s->host_vnet_hdr_len && size <= s->host_vnet_hdr_len) {
/* Invalid packet */
break;
@@ -980,6 +986,8 @@ int tap_enable(NetClientState *nc)
TAPState *s = DO_UPCAST(TAPState, nc, nc);
int ret;
+ trace_tap_enable();
+
if (s->enabled) {
return 0;
} else {
@@ -997,6 +1005,8 @@ int tap_disable(NetClientState *nc)
TAPState *s = DO_UPCAST(TAPState, nc, nc);
int ret;
+ trace_tap_disable();
+
if (s->enabled == 0) {
return 0;
} else {
diff --git a/net/trace-events b/net/trace-events
index cda960f42b..a8921763ab 100644
--- a/net/trace-events
+++ b/net/trace-events
@@ -29,3 +29,9 @@ vhost_vdpa_set_address_space_id(void *v, unsigned vq_group, unsigned asid_num) "
vhost_vdpa_net_load_cmd(void *s, uint8_t class, uint8_t cmd, int data_num, int data_size) "vdpa state: %p class: %u cmd: %u sg_num: %d size: %d"
vhost_vdpa_net_load_cmd_retval(void *s, uint8_t class, uint8_t cmd, int r) "vdpa state: %p class: %u cmd: %u retval: %d"
vhost_vdpa_net_load_mq(void *s, int ncurqps) "vdpa state: %p current_qpairs: %d"
+
+# tap.c
+tap_receive_iov(bool using_vnet_hdr, uint32_t host_vnet_hdr_len, int iovcnt, size_t iov_len) "using_vnet_hdr:%d host_vnet_hdr_len:%u iovcnt:%d iov_len:%zu"
+tap_send_packet(bool using_vnet_hdr, uint32_t host_vnet_hdr_len, int size) "using_vnet_hdr:%d host_vnet_hdr_len:%u size:%d"
+tap_enable(void) ""
+tap_disable(void) ""
--
2.48.1