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/bonding/device.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'src/vnet/bonding/device.c') diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c index bc185867c10..7ce5ad87bd7 100644 --- a/src/vnet/bonding/device.c +++ b/src/vnet/bonding/device.c @@ -651,25 +651,28 @@ bond_tx_trace (vlib_main_t * vm, vlib_node_runtime_t * node, bond_if_t * bif, while (n_trace > 0 && n_left > 0) { - bond_packet_trace_t *t0; - ethernet_header_t *eth; - u32 next0 = 0; - - vlib_trace_buffer (vm, node, next0, b[0], 0 /* follow_chain */ ); - vlib_set_trace_count (vm, node, --n_trace); - t0 = vlib_add_trace (vm, node, b[0], sizeof (*t0)); - eth = vlib_buffer_get_current (b[0]); - t0->ethernet = *eth; - t0->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX]; - if (!h) + if (PREDICT_TRUE + (vlib_trace_buffer (vm, node, 0, b[0], 0 /* follow_chain */ ))) { - t0->bond_sw_if_index = *vec_elt_at_index (bif->active_members, 0); - } - else - { - t0->bond_sw_if_index = - *vec_elt_at_index (bif->active_members, h[0]); - h++; + bond_packet_trace_t *t0; + ethernet_header_t *eth; + + vlib_set_trace_count (vm, node, --n_trace); + t0 = vlib_add_trace (vm, node, b[0], sizeof (*t0)); + eth = vlib_buffer_get_current (b[0]); + t0->ethernet = *eth; + t0->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX]; + if (!h) + { + t0->bond_sw_if_index = + *vec_elt_at_index (bif->active_members, 0); + } + else + { + t0->bond_sw_if_index = + *vec_elt_at_index (bif->active_members, h[0]); + h++; + } } b++; n_left--; -- cgit 1.2.3-korg