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 --- extras/deprecated/ixge/ixge.c | 15 --------------- extras/deprecated/netmap/node.c | 1 - 2 files changed, 16 deletions(-) (limited to 'extras/deprecated') diff --git a/extras/deprecated/ixge/ixge.c b/extras/deprecated/ixge/ixge.c index f61db131f53..bb91a368488 100644 --- a/extras/deprecated/ixge/ixge.c +++ b/extras/deprecated/ixge/ixge.c @@ -1468,14 +1468,6 @@ ixge_rx_queue_no_wrap (ixge_main_t * xm, b0 = vlib_get_buffer (vm, bi0); b1 = vlib_get_buffer (vm, bi1); - /* - * Turn this on if you run into - * "bad monkey" contexts, and you want to know exactly - * which nodes they've visited... See main.c... - */ - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1); - CLIB_PREFETCH (b0->data, CLIB_CACHE_LINE_BYTES, LOAD); CLIB_PREFETCH (b1->data, CLIB_CACHE_LINE_BYTES, LOAD); @@ -1680,13 +1672,6 @@ ixge_rx_queue_no_wrap (ixge_main_t * xm, b0 = vlib_get_buffer (vm, bi0); - /* - * Turn this on if you run into - * "bad monkey" contexts, and you want to know exactly - * which nodes they've visited... - */ - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); - is_eop0 = (s20 & IXGE_RX_DESCRIPTOR_STATUS2_IS_END_OF_PACKET) != 0; ixge_rx_next_and_error_from_status_x1 (xd, s00, s20, &next0, &error0, &flags0); diff --git a/extras/deprecated/netmap/node.c b/extras/deprecated/netmap/node.c index bc55ecc8eb1..b0a68824b9c 100644 --- a/extras/deprecated/netmap/node.c +++ b/extras/deprecated/netmap/node.c @@ -198,7 +198,6 @@ netmap_device_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node, } /* trace */ - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (first_b0); if (PREDICT_FALSE (n_trace > 0)) { if (PREDICT_TRUE (first_b0 != 0)) -- cgit 1.2.3-korg