Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ipsec: compress ipsec_sa_t so data used by dataplane code fits in cacheline
[vpp.git]
/
src
/
plugins
/
dpdk
/
ipsec
/
esp_decrypt.c
diff --git
a/src/plugins/dpdk/ipsec/esp_decrypt.c
b/src/plugins/dpdk/ipsec/esp_decrypt.c
index
265877f
..
dcc276f
100644
(file)
--- 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)
{
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;
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;
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)
ret = crypto_alloc_ops (numa, ops, n_left_from);
if (ret)
@@
-165,12
+166,16
@@
dpdk_esp_decrypt_inline (vlib_main_t * vm,
ASSERT (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED);
dpdk_op_priv_t *priv = crypto_op_get_priv (op);
ASSERT (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED);
dpdk_op_priv_t *priv = crypto_op_get_priv (op);
+ /* store bi in op private */
+ priv->bi = bi0;
u16 op_len =
sizeof (op[0]) + sizeof (op[0].sym[0]) + sizeof (priv[0]);
CLIB_PREFETCH (op, op_len, STORE);
sa_index0 = vnet_buffer (b0)->ipsec.sad_index;
u16 op_len =
sizeof (op[0]) + sizeof (op[0].sym[0]) + sizeof (priv[0]);
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)
{
if (sa_index0 != last_sa_index)
{
@@
-229,13
+234,13
@@
dpdk_esp_decrypt_inline (vlib_main_t * vm,
}
/* anti-replay check */
}
/* anti-replay check */
- if (
sa0->use_anti_replay
)
+ if (
ipsec_sa_is_set_USE_ANTI_REPLAY (sa0)
)
{
int rv = 0;
seq = clib_net_to_host_u32 (esp0->seq);
{
int rv = 0;
seq = clib_net_to_host_u32 (esp0->seq);
- if (PREDICT_TRUE (
sa0->use_esn
))
+ if (PREDICT_TRUE (
ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa0)
))
rv = esp_replay_check_esn (sa0, seq);
else
rv = esp_replay_check (sa0, seq);
rv = esp_replay_check_esn (sa0, seq);
else
rv = esp_replay_check (sa0, seq);
@@
-264,7
+269,9
@@
dpdk_esp_decrypt_inline (vlib_main_t * vm,
priv->next = DPDK_CRYPTO_INPUT_NEXT_DECRYPT4_POST;
/* FIXME multi-seg */
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;
res->ops[res->n_ops] = op;
res->bi[res->n_ops] = bi0;
@@
-332,7
+339,7
@@
dpdk_esp_decrypt_inline (vlib_main_t * vm,
clib_memcpy_fast (aad, esp0, 8);
/* _aad[3] should always be 0 */
clib_memcpy_fast (aad, esp0, 8);
/* _aad[3] should always be 0 */
- if (PREDICT_FALSE (
sa0->use_esn
))
+ if (PREDICT_FALSE (
ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa0)
))
_aad[2] = clib_host_to_net_u32 (sa0->seq_hi);
else
_aad[2] = 0;
_aad[2] = clib_host_to_net_u32 (sa0->seq_hi);
else
_aad[2] = 0;
@@
-341,7
+348,7
@@
dpdk_esp_decrypt_inline (vlib_main_t * vm,
{
auth_len = sizeof (esp_header_t) + iv_size + payload_len;
{
auth_len = sizeof (esp_header_t) + iv_size + payload_len;
- if (
sa0->use_esn
)
+ if (
ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa0)
)
{
clib_memcpy_fast (priv->icv, digest, trunc_size);
u32 *_digest = (u32 *) digest;
{
clib_memcpy_fast (priv->icv, digest, trunc_size);
u32 *_digest = (u32 *) digest;
@@
-553,18
+560,19
@@
dpdk_esp_decrypt_post_inline (vlib_main_t * vm,
iv_size = cipher_alg->iv_len;
iv_size = cipher_alg->iv_len;
- if (
sa0->use_anti_replay
)
+ if (
ipsec_sa_is_set_USE_ANTI_REPLAY (sa0)
)
{
u32 seq;
seq = clib_host_to_net_u32 (esp0->seq);
{
u32 seq;
seq = clib_host_to_net_u32 (esp0->seq);
- if (PREDICT_TRUE (
sa0->use_esn
))
+ if (PREDICT_TRUE (
ipsec_sa_is_set_USE_EXTENDED_SEQ_NUM (sa0)
))
esp_replay_advance_esn (sa0, seq);
else
esp_replay_advance (sa0, seq);
}
/* if UDP encapsulation is used adjust the address of the IP header */
esp_replay_advance_esn (sa0, seq);
else
esp_replay_advance (sa0, seq);
}
/* if UDP encapsulation is used adjust the address of the IP header */
- if (sa0->udp_encap && (b0->flags & VNET_BUFFER_F_IS_IP4))
+ if (ipsec_sa_is_set_UDP_ENCAP (sa0)
+ && (b0->flags & VNET_BUFFER_F_IS_IP4))
{
udp_encap_adv = sizeof (udp_header_t);
}
{
udp_encap_adv = sizeof (udp_header_t);
}
@@
-592,11
+600,11
@@
dpdk_esp_decrypt_post_inline (vlib_main_t * vm,
goto trace;
}
#endif
goto trace;
}
#endif
- if (
sa0->is_tunnel
)
+ if (
ipsec_sa_is_set_IS_TUNNEL (sa0)
)
{
if (f0->next_header == IP_PROTOCOL_IP_IN_IP)
next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
{
if (f0->next_header == IP_PROTOCOL_IP_IN_IP)
next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
- else if (
sa0->is_tunnel_ip6
+ else if (
ipsec_sa_is_set_IS_TUNNEL_V6 (sa0)
&& f0->next_header == IP_PROTOCOL_IPV6)
next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
else
&& f0->next_header == IP_PROTOCOL_IPV6)
next0 = ESP_DECRYPT_NEXT_IP6_INPUT;
else
@@
-622,7
+630,7
@@
dpdk_esp_decrypt_post_inline (vlib_main_t * vm,
u16 ih4_len = ip4_header_bytes (ih4);
vlib_buffer_advance (b0, -ih4_len - udp_encap_adv);
next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
u16 ih4_len = ip4_header_bytes (ih4);
vlib_buffer_advance (b0, -ih4_len - udp_encap_adv);
next0 = ESP_DECRYPT_NEXT_IP4_INPUT;
- if (!
sa0->udp_encap
)
+ if (!
ipsec_sa_is_set_UDP_ENCAP (sa0)
)
{
oh4 = vlib_buffer_get_current (b0);
memmove (oh4, ih4, ih4_len);
{
oh4 = vlib_buffer_get_current (b0);
memmove (oh4, ih4, ih4_len);