vlib: fix trace number accounting

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 <bganne@cisco.com>

2 files changed, 31 insertions, 22 deletions

diff --git a/src/plugins/dpdk/device/node.c b/src/plugins/dpdk/device/node.c
index 256c399ea32..e7d836fe0f8 100644
--- a/src/plugins/dpdk/device/node.c
+++ b/src/plugins/dpdk/device/node.c
@@ -417,21 +417,28 @@ dpdk_device_input (vlib_main_t * vm, dpdk_main_t * dm, dpdk_device_t * xd,
 	  b0 = vlib_get_buffer (vm, buffers[0]);
 	  if (single_next == 0)
 	    next_index = next[0];
-	  vlib_trace_buffer (vm, node, next_index, b0, /* follow_chain */ 0);
-
-	  dpdk_rx_trace_t *t0 = vlib_add_trace (vm, node, b0, sizeof t0[0]);
-	  t0->queue_index = queue_id;
-	  t0->device_index = xd->device_index;
-	  t0->buffer_index = vlib_get_buffer_index (vm, b0);
-
-	  clib_memcpy_fast (&t0->mb, mb[0], sizeof t0->mb);
-	  clib_memcpy_fast (&t0->buffer, b0,
-			    sizeof b0[0] - sizeof b0->pre_data);
-	  clib_memcpy_fast (t0->buffer.pre_data, b0->data,
-			    sizeof t0->buffer.pre_data);
-	  clib_memcpy_fast (&t0->data, mb[0]->buf_addr + mb[0]->data_off,
-			    sizeof t0->data);
-	  n_trace--;
+
+	  if (PREDICT_TRUE
+	      (vlib_trace_buffer
+	       (vm, node, next_index, b0, /* follow_chain */ 0)))
+	    {
+
+	      dpdk_rx_trace_t *t0 =
+		vlib_add_trace (vm, node, b0, sizeof t0[0]);
+	      t0->queue_index = queue_id;
+	      t0->device_index = xd->device_index;
+	      t0->buffer_index = vlib_get_buffer_index (vm, b0);
+
+	      clib_memcpy_fast (&t0->mb, mb[0], sizeof t0->mb);
+	      clib_memcpy_fast (&t0->buffer, b0,
+				sizeof b0[0] - sizeof b0->pre_data);
+	      clib_memcpy_fast (t0->buffer.pre_data, b0->data,
+				sizeof t0->buffer.pre_data);
+	      clib_memcpy_fast (&t0->data, mb[0]->buf_addr + mb[0]->data_off,
+				sizeof t0->data);
+	      n_trace--;
+	    }
+
 	  n_left--;
 	  buffers++;
 	  mb++;
diff --git a/src/plugins/dpdk/ipsec/crypto_node.c b/src/plugins/dpdk/ipsec/crypto_node.c
index 76e57a3228a..893848c05b6 100644
--- a/src/plugins/dpdk/ipsec/crypto_node.c
+++ b/src/plugins/dpdk/ipsec/crypto_node.c
@@ -106,14 +106,16 @@ dpdk_crypto_input_trace (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 	  b0 = vlib_get_buffer (vm, bi);
 
-	  vlib_trace_buffer (vm, node, next, b0, /* follow_chain */ 0);
+	  if (PREDICT_TRUE
+	      (vlib_trace_buffer (vm, node, next, b0, /* follow_chain */ 0)))
+	    {
+	      dpdk_crypto_input_trace_t *tr =
+		vlib_add_trace (vm, node, b0, sizeof (*tr));
+	      tr->dev_id = dev_id;
+	      tr->next_index = next;
+	      n_trace--;
+	    }
 
-	  dpdk_crypto_input_trace_t *tr =
-	    vlib_add_trace (vm, node, b0, sizeof (*tr));
-	  tr->dev_id = dev_id;
-	  tr->next_index = next;
-
-	  n_trace--;
 	  n_left--;
 	  nexts++;
 	  bis++;