From f89bbbe300dad7bc479db535e7822199f98aca30 Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Thu, 4 Mar 2021 14:31:03 +0100 Subject: vlib: refactor trajectory trace debug feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit trajectory trace has been broken for a while because we used to save the buffer trajectory in a vector pointed to in opaque2. This does not work well when opaque2 is copied (eg. because of a clone) as 2 buffers end up sharing the same vector. This dedicates a full cacheline in the buffer metadata instead when trajectory is compiled in. No dynamic allocation, no sharing, no tears. Type: refactor Change-Id: I6a028ca1b48d38f393a36979e5e452c2dd48ad3f Signed-off-by: Benoît Ganne --- src/vnet/bonding/device.c | 7 ------- src/vnet/bonding/node.c | 7 ------- 2 files changed, 14 deletions(-) (limited to 'src/vnet/bonding') diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c index c69d5a40145..8a0c1092251 100644 --- a/src/vnet/bonding/device.c +++ b/src/vnet/bonding/device.c @@ -422,11 +422,6 @@ bond_tx_inline (vlib_main_t * vm, bond_if_t * bif, vlib_buffer_t ** b, CLIB_PREFETCH (pb[3]->data, CLIB_CACHE_LINE_BYTES, LOAD); } - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[1]); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[2]); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[3]); - if (lb_alg == BOND_LB_L2) { h[0] = bond_lb_l2 (b[0]); @@ -474,8 +469,6 @@ bond_tx_inline (vlib_main_t * vm, bond_if_t * bif, vlib_buffer_t ** b, while (n_left > 0) { - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]); - if (bif->lb == BOND_LB_L2) h[0] = bond_lb_l2 (b[0]); else if (bif->lb == BOND_LB_L34) diff --git a/src/vnet/bonding/node.c b/src/vnet/bonding/node.c index d49894fcb74..21a968177fe 100644 --- a/src/vnet/bonding/node.c +++ b/src/vnet/bonding/node.c @@ -328,11 +328,6 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm, &n_rx_packets, &n_rx_bytes); } - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[1]); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[2]); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[3]); - /* next */ n_left -= 4; b += 4; @@ -352,8 +347,6 @@ VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm, bond_sw_if_idx_rewrite (vm, node, b[0], bond_sw_if_index, &n_rx_packets, &n_rx_bytes); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]); - /* next */ n_left -= 1; b += 1; -- cgit 1.2.3-korg