diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-02-17 18:04:27 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-18 13:05:17 +0000 |
| commit | eba31ecebed1a7d168da17194cab7a8955761f2b (patch) | |
| tree | fe640b26f9dc98d7aaf5ff0ade2d643a1b86cbbe /src/plugins/dpdk/ipsec/esp_decrypt.c | |
| parent | 684586786e98bc779e269c0d879a2a4d3f1f4bce (diff) | |
IPSEC: move SA counters into the stats segment
1) stats are accessed via the stat segment which is more condusive to
monitoring
2) stats are accurate in the presence of multiple threads. There's no
guarantee that an SA is access from only one worker.
Change-Id: Id5e217ea253ddfc9480aaedb0d008dea031b1148
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/plugins/dpdk/ipsec/esp_decrypt.c')
| -rw-r--r-- | src/plugins/dpdk/ipsec/esp_decrypt.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/dpdk/ipsec/esp_decrypt.c b/src/plugins/dpdk/ipsec/esp_decrypt.c index cd35ee7576e..20040433420 100644 --- a/src/plugins/dpdk/ipsec/esp_decrypt.c +++ b/src/plugins/dpdk/ipsec/esp_decrypt.c @@ -97,7 +97,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame, int is_ip6) { - u32 n_left_from, *from, *to_next, next_index; + u32 n_left_from, *from, *to_next, next_index, thread_index; ipsec_main_t *im = &ipsec_main; u32 thread_idx = vlib_get_thread_index (); dpdk_crypto_main_t *dcm = &dpdk_crypto_main; @@ -114,6 +114,7 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm, from = vlib_frame_vector_args (from_frame); n_left_from = from_frame->n_vectors; + thread_index = vm->thread_index; ret = crypto_alloc_ops (numa, ops, n_left_from); if (ret) @@ -173,6 +174,8 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm, CLIB_PREFETCH (op, op_len, STORE); sa_index0 = vnet_buffer (b0)->ipsec.sad_index; + vlib_prefetch_combined_counter (&ipsec_sa_counters, + thread_index, sa_index0); if (sa_index0 != last_sa_index) { @@ -266,7 +269,9 @@ dpdk_esp_decrypt_inline (vlib_main_t * vm, priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT4_POST; /* FIXME multi-seg */ - sa0->total_data_size += b0->current_length; + vlib_increment_combined_counter + (&ipsec_sa_counters, thread_index, sa_index0, + 1, b0->current_length); res->ops[res->n_ops] = op; res->bi[res->n_ops] = bi0; |