From 9a3973e3a36bfd4dd8dbffe130a92649fc1b73d3 Mon Sep 17 00:00:00 2001 From: Benoît Ganne Date: Fri, 2 Oct 2020 19:36:57 +0200 Subject: vlib: fix trace number accounting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using classifier to filter traces, not all packets will be traced. In that case, we should only count traced packets. Type: fix Change-Id: I87d1e217b580ebff8c6ade7860eb43950420ae78 Signed-off-by: Benoît Ganne --- src/vnet/ethernet/p2p_ethernet_input.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'src/vnet/ethernet') diff --git a/src/vnet/ethernet/p2p_ethernet_input.c b/src/vnet/ethernet/p2p_ethernet_input.c index 7e5f7cadc0d..3e9589e0e19 100644 --- a/src/vnet/ethernet/p2p_ethernet_input.c +++ b/src/vnet/ethernet/p2p_ethernet_input.c @@ -119,11 +119,12 @@ VLIB_NODE_FN (p2p_ethernet_input_node) (vlib_main_t * vm, vnet_buffer (b0)->sw_if_index[VLIB_RX] = rx0; n_p2p_ethernet_packets += 1; - if (PREDICT_FALSE (n_trace > 0)) + if (PREDICT_FALSE + (n_trace > 0 + && vlib_trace_buffer (vm, node, next_index, b0, + 1 /* follow_chain */ ))) { p2p_ethernet_trace_t *t0; - vlib_trace_buffer (vm, node, next_index, b0, - 1 /* follow_chain */ ); vlib_set_trace_count (vm, node, --n_trace); t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); t0->sw_if_index = sw_if_index0; @@ -140,11 +141,12 @@ VLIB_NODE_FN (p2p_ethernet_input_node) (vlib_main_t * vm, vnet_buffer (b1)->sw_if_index[VLIB_RX] = rx1; n_p2p_ethernet_packets += 1; - if (PREDICT_FALSE (n_trace > 0)) + if (PREDICT_FALSE + (n_trace > 0 + && vlib_trace_buffer (vm, node, next_index, b1, + 1 /* follow_chain */ ))) { p2p_ethernet_trace_t *t1; - vlib_trace_buffer (vm, node, next_index, b1, - 1 /* follow_chain */ ); vlib_set_trace_count (vm, node, --n_trace); t1 = vlib_add_trace (vm, node, b1, sizeof (*t1)); t1->sw_if_index = sw_if_index1; @@ -195,11 +197,12 @@ VLIB_NODE_FN (p2p_ethernet_input_node) (vlib_main_t * vm, vnet_buffer (b0)->sw_if_index[VLIB_RX] = rx0; n_p2p_ethernet_packets += 1; - if (PREDICT_FALSE (n_trace > 0)) + if (PREDICT_FALSE + (n_trace > 0 + && vlib_trace_buffer (vm, node, next_index, b0, + 1 /* follow_chain */ ))) { p2p_ethernet_trace_t *t0; - vlib_trace_buffer (vm, node, next_index, b0, - 1 /* follow_chain */ ); vlib_set_trace_count (vm, node, --n_trace); t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); t0->sw_if_index = sw_if_index0; @@ -228,6 +231,7 @@ VLIB_NODE_FN (p2p_ethernet_input_node) (vlib_main_t * vm, vlib_node_increment_counter (vm, p2p_ethernet_input_node.index, P2PE_ERROR_HITS, n_p2p_ethernet_packets); + return frame->n_vectors; } -- cgit 1.2.3-korg