X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fesp_encrypt.c;h=bd6e7641f4a88cdbddf1e58e37b3cd72dcfcf16a;hb=4a58e49cf;hp=47c079d95d2a0848d979432d02aa815fd1c6cede;hpb=6afaae156a9ab9de79474367d8873407f3b12a71;p=vpp.git diff --git a/src/vnet/ipsec/esp_encrypt.c b/src/vnet/ipsec/esp_encrypt.c index 47c079d95d2..bd6e7641f4a 100644 --- a/src/vnet/ipsec/esp_encrypt.c +++ b/src/vnet/ipsec/esp_encrypt.c @@ -18,18 +18,22 @@ #include #include #include -#include #include #include +#include #include +#include -#define foreach_esp_encrypt_next \ -_(DROP, "error-drop") \ -_(IP4_LOOKUP, "ip4-lookup") \ -_(IP6_LOOKUP, "ip6-lookup") \ -_(INTERFACE_OUTPUT, "interface-output") +#define foreach_esp_encrypt_next \ + _ (DROP4, "ip4-drop") \ + _ (DROP6, "ip6-drop") \ + _ (DROP_MPLS, "mpls-drop") \ + _ (HANDOFF4, "handoff4") \ + _ (HANDOFF6, "handoff6") \ + _ (HANDOFF_MPLS, "handoff-mpls") \ + _ (INTERFACE_OUTPUT, "interface-output") #define _(v, s) ESP_ENCRYPT_NEXT_##v, typedef enum @@ -41,10 +45,11 @@ typedef enum #define foreach_esp_encrypt_error \ _(RX_PKTS, "ESP pkts received") \ + _(POST_RX_PKTS, "ESP-post pkts received") \ _(SEQ_CYCLED, "sequence number cycled (packet dropped)") \ _(CRYPTO_ENGINE_ERROR, "crypto engine error (packet dropped)") \ - _(CHAINED_BUFFER, "chained buffers (packet dropped)") \ - _(NO_TRAILER_SPACE, "no trailer space (packet dropped)") + _(CRYPTO_QUEUE_FULL, "crypto queue full (packet dropped)") \ + _(NO_BUFFERS, "no buffers (packet dropped)") \ typedef enum { @@ -71,6 +76,11 @@ typedef struct ipsec_integ_alg_t integ_alg; } esp_encrypt_trace_t; +typedef struct +{ + u32 next_index; +} esp_encrypt_post_trace_t; + /* packet trace format function */ static u8 * format_esp_encrypt_trace (u8 * s, va_list * args) @@ -89,26 +99,60 @@ format_esp_encrypt_trace (u8 * s, va_list * args) return s; } +static u8 * +format_esp_post_encrypt_trace (u8 * s, va_list * args) +{ + CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); + CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); + esp_encrypt_post_trace_t *t = va_arg (*args, esp_encrypt_post_trace_t *); + + s = format (s, "esp-post: next node index %u", t->next_index); + return s; +} + /* pad packet in input buffer */ static_always_inline u8 * -esp_add_footer_and_icv (vlib_buffer_t * b, u8 block_size, u8 icv_sz) +esp_add_footer_and_icv (vlib_main_t * vm, vlib_buffer_t ** last, + u8 esp_align, u8 icv_sz, + u16 * next, vlib_node_runtime_t * node, + u16 buffer_data_size, uword total_len) { static const u8 pad_data[ESP_MAX_BLOCK_SIZE] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, - 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x00, 0x00, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x00, }; - u16 min_length = b->current_length + sizeof (esp_footer_t); - u16 new_length = round_pow2 (min_length, block_size); + u16 min_length = total_len + sizeof (esp_footer_t); + u16 new_length = round_pow2 (min_length, esp_align); u8 pad_bytes = new_length - min_length; - esp_footer_t *f = (esp_footer_t *) (vlib_buffer_get_current (b) + - new_length - sizeof (esp_footer_t)); + esp_footer_t *f = (esp_footer_t *) (vlib_buffer_get_current (last[0]) + + last[0]->current_length + pad_bytes); + u16 tail_sz = sizeof (esp_footer_t) + pad_bytes + icv_sz; - if (pad_bytes) - clib_memcpy_fast ((u8 *) f - pad_bytes, pad_data, ESP_MAX_BLOCK_SIZE); + if (last[0]->current_length + tail_sz > buffer_data_size) + { + u32 tmp_bi = 0; + if (vlib_buffer_alloc (vm, &tmp_bi, 1) != 1) + return 0; + + vlib_buffer_t *tmp = vlib_get_buffer (vm, tmp_bi); + last[0]->next_buffer = tmp_bi; + last[0]->flags |= VLIB_BUFFER_NEXT_PRESENT; + f = (esp_footer_t *) (vlib_buffer_get_current (tmp) + pad_bytes); + tmp->current_length += tail_sz; + last[0] = tmp; + } + else + last[0]->current_length += tail_sz; f->pad_length = pad_bytes; - b->current_length = new_length + icv_sz; + if (pad_bytes) + { + ASSERT (pad_bytes <= ESP_MAX_BLOCK_SIZE); + pad_bytes = clib_min (ESP_MAX_BLOCK_SIZE, pad_bytes); + clib_memcpy_fast ((u8 *) f - pad_bytes, pad_data, pad_bytes); + } + return &f->next_header; } @@ -164,17 +208,19 @@ ext_hdr_is_pre_esp (u8 nexthdr) } static_always_inline u8 -esp_get_ip6_hdr_len (ip6_header_t * ip6) +esp_get_ip6_hdr_len (ip6_header_t * ip6, ip6_ext_header_t ** ext_hdr) { /* this code assumes that HbH, route and frag headers will be before others, if that is not the case, they will end up encrypted */ - u8 len = sizeof (ip6_header_t); ip6_ext_header_t *p; /* if next packet doesn't have ext header */ if (ext_hdr_is_pre_esp (ip6->protocol) == 0) - return len; + { + *ext_hdr = NULL; + return len; + } p = (void *) (ip6 + 1); len += ip6_ext_header_len (p); @@ -185,25 +231,43 @@ esp_get_ip6_hdr_len (ip6_header_t * ip6) p = ip6_ext_next_header (p); } + *ext_hdr = p; return len; } -static_always_inline int -esp_trailer_icv_overflow (vlib_node_runtime_t * node, vlib_buffer_t * b, - u16 * next, u16 buffer_data_size) +static_always_inline void +esp_process_chained_ops (vlib_main_t * vm, vlib_node_runtime_t * node, + vnet_crypto_op_t * ops, vlib_buffer_t * b[], + u16 * nexts, vnet_crypto_op_chunk_t * chunks, + u16 drop_next) { - if (b->current_data + b->current_length <= buffer_data_size) - return 0; + u32 n_fail, n_ops = vec_len (ops); + vnet_crypto_op_t *op = ops; + + if (n_ops == 0) + return; + + n_fail = n_ops - vnet_crypto_process_chained_ops (vm, op, chunks, n_ops); - b->current_length -= buffer_data_size - b->current_data; - b->error = node->errors[ESP_ENCRYPT_ERROR_NO_TRAILER_SPACE]; - next[0] = ESP_ENCRYPT_NEXT_DROP; - return 1; + while (n_fail) + { + ASSERT (op - ops < n_ops); + + if (op->status != VNET_CRYPTO_OP_STATUS_COMPLETED) + { + u32 bi = op->user_data; + b[bi]->error = node->errors[ESP_ENCRYPT_ERROR_CRYPTO_ENGINE_ERROR]; + nexts[bi] = drop_next; + n_fail--; + } + op++; + } } static_always_inline void esp_process_ops (vlib_main_t * vm, vlib_node_runtime_t * node, - vnet_crypto_op_t * ops, vlib_buffer_t * b[], u16 * nexts) + vnet_crypto_op_t * ops, vlib_buffer_t * b[], u16 * nexts, + u16 drop_next) { u32 n_fail, n_ops = vec_len (ops); vnet_crypto_op_t *op = ops; @@ -221,7 +285,7 @@ esp_process_ops (vlib_main_t * vm, vlib_node_runtime_t * node, { u32 bi = op->user_data; b[bi]->error = node->errors[ESP_ENCRYPT_ERROR_CRYPTO_ENGINE_ERROR]; - nexts[bi] = ESP_ENCRYPT_NEXT_DROP; + nexts[bi] = drop_next; n_fail--; } op++; @@ -236,9 +300,266 @@ typedef struct STATIC_ASSERT_SIZEOF (esp_gcm_nonce_t, 12); +static_always_inline u32 +esp_encrypt_chain_crypto (vlib_main_t * vm, ipsec_per_thread_data_t * ptd, + ipsec_sa_t * sa0, vlib_buffer_t * b, + vlib_buffer_t * lb, u8 icv_sz, u8 * start, + u32 start_len, u16 * n_ch) +{ + vnet_crypto_op_chunk_t *ch; + vlib_buffer_t *cb = b; + u32 n_chunks = 1; + u32 total_len; + vec_add2 (ptd->chunks, ch, 1); + total_len = ch->len = start_len; + ch->src = ch->dst = start; + cb = vlib_get_buffer (vm, cb->next_buffer); + + while (1) + { + vec_add2 (ptd->chunks, ch, 1); + n_chunks += 1; + if (lb == cb) + total_len += ch->len = cb->current_length - icv_sz; + else + total_len += ch->len = cb->current_length; + ch->src = ch->dst = vlib_buffer_get_current (cb); + + if (!(cb->flags & VLIB_BUFFER_NEXT_PRESENT)) + break; + + cb = vlib_get_buffer (vm, cb->next_buffer); + } + + if (n_ch) + *n_ch = n_chunks; + + return total_len; +} + +static_always_inline u32 +esp_encrypt_chain_integ (vlib_main_t * vm, ipsec_per_thread_data_t * ptd, + ipsec_sa_t * sa0, vlib_buffer_t * b, + vlib_buffer_t * lb, u8 icv_sz, u8 * start, + u32 start_len, u8 * digest, u16 * n_ch) +{ + vnet_crypto_op_chunk_t *ch; + vlib_buffer_t *cb = b; + u32 n_chunks = 1; + u32 total_len; + vec_add2 (ptd->chunks, ch, 1); + total_len = ch->len = start_len; + ch->src = start; + cb = vlib_get_buffer (vm, cb->next_buffer); + + while (1) + { + vec_add2 (ptd->chunks, ch, 1); + n_chunks += 1; + if (lb == cb) + { + total_len += ch->len = cb->current_length - icv_sz; + if (ipsec_sa_is_set_USE_ESN (sa0)) + { + u32 seq_hi = clib_net_to_host_u32 (sa0->seq_hi); + clib_memcpy_fast (digest, &seq_hi, sizeof (seq_hi)); + ch->len += sizeof (seq_hi); + total_len += sizeof (seq_hi); + } + } + else + total_len += ch->len = cb->current_length; + ch->src = vlib_buffer_get_current (cb); + + if (!(cb->flags & VLIB_BUFFER_NEXT_PRESENT)) + break; + + cb = vlib_get_buffer (vm, cb->next_buffer); + } + + if (n_ch) + *n_ch = n_chunks; + + return total_len; +} + +always_inline void +esp_prepare_sync_op (vlib_main_t * vm, ipsec_per_thread_data_t * ptd, + vnet_crypto_op_t ** crypto_ops, + vnet_crypto_op_t ** integ_ops, ipsec_sa_t * sa0, + u8 * payload, u16 payload_len, u8 iv_sz, u8 icv_sz, + vlib_buffer_t ** bufs, vlib_buffer_t ** b, + vlib_buffer_t * lb, u32 hdr_len, esp_header_t * esp, + esp_gcm_nonce_t * nonce) +{ + if (sa0->crypto_enc_op_id) + { + vnet_crypto_op_t *op; + vec_add2_aligned (crypto_ops[0], op, 1, CLIB_CACHE_LINE_BYTES); + vnet_crypto_op_init (op, sa0->crypto_enc_op_id); + + op->src = op->dst = payload; + op->key_index = sa0->crypto_key_index; + op->len = payload_len - icv_sz; + op->user_data = b - bufs; + + if (ipsec_sa_is_set_IS_AEAD (sa0)) + { + /* + * construct the AAD in a scratch space in front + * of the IP header. + */ + op->aad = payload - hdr_len - sizeof (esp_aead_t); + op->aad_len = esp_aad_fill (op->aad, esp, sa0); + + op->tag = payload + op->len; + op->tag_len = 16; + + u64 *iv = (u64 *) (payload - iv_sz); + nonce->salt = sa0->salt; + nonce->iv = *iv = clib_host_to_net_u64 (sa0->gcm_iv_counter++); + op->iv = (u8 *) nonce; + } + else + { + op->iv = payload - iv_sz; + op->flags = VNET_CRYPTO_OP_FLAG_INIT_IV; + } + + if (lb != b[0]) + { + /* is chained */ + op->flags |= VNET_CRYPTO_OP_FLAG_CHAINED_BUFFERS; + op->chunk_index = vec_len (ptd->chunks); + op->tag = vlib_buffer_get_tail (lb) - icv_sz; + esp_encrypt_chain_crypto (vm, ptd, sa0, b[0], lb, icv_sz, payload, + payload_len, &op->n_chunks); + } + } + + if (sa0->integ_op_id) + { + vnet_crypto_op_t *op; + vec_add2_aligned (integ_ops[0], op, 1, CLIB_CACHE_LINE_BYTES); + vnet_crypto_op_init (op, sa0->integ_op_id); + op->src = payload - iv_sz - sizeof (esp_header_t); + op->digest = payload + payload_len - icv_sz; + op->key_index = sa0->integ_key_index; + op->digest_len = icv_sz; + op->len = payload_len - icv_sz + iv_sz + sizeof (esp_header_t); + op->user_data = b - bufs; + + if (lb != b[0]) + { + /* is chained */ + op->flags |= VNET_CRYPTO_OP_FLAG_CHAINED_BUFFERS; + op->chunk_index = vec_len (ptd->chunks); + op->digest = vlib_buffer_get_tail (lb) - icv_sz; + + esp_encrypt_chain_integ (vm, ptd, sa0, b[0], lb, icv_sz, + payload - iv_sz - sizeof (esp_header_t), + payload_len + iv_sz + + sizeof (esp_header_t), op->digest, + &op->n_chunks); + } + else if (ipsec_sa_is_set_USE_ESN (sa0)) + { + u32 seq_hi = clib_net_to_host_u32 (sa0->seq_hi); + clib_memcpy_fast (op->digest, &seq_hi, sizeof (seq_hi)); + op->len += sizeof (seq_hi); + } + } +} + +static_always_inline int +esp_prepare_async_frame (vlib_main_t * vm, ipsec_per_thread_data_t * ptd, + vnet_crypto_async_frame_t ** async_frame, + ipsec_sa_t * sa, vlib_buffer_t * b, + esp_header_t * esp, u8 * payload, u32 payload_len, + u8 iv_sz, u8 icv_sz, u32 bi, u16 next, u32 hdr_len, + u16 async_next, vlib_buffer_t * lb) +{ + esp_post_data_t *post = esp_post_data (b); + u8 *tag, *iv, *aad = 0; + u8 flag = 0; + u32 key_index; + i16 crypto_start_offset, integ_start_offset = 0; + u16 crypto_total_len, integ_total_len; + + post->next_index = next; + + /* crypto */ + crypto_start_offset = payload - b->data; + crypto_total_len = integ_total_len = payload_len - icv_sz; + tag = payload + crypto_total_len; + + /* aead */ + if (ipsec_sa_is_set_IS_AEAD (sa)) + { + esp_gcm_nonce_t *nonce; + u64 *pkt_iv = (u64 *) (payload - iv_sz); + + aad = payload - hdr_len - sizeof (esp_aead_t); + esp_aad_fill (aad, esp, sa); + nonce = (esp_gcm_nonce_t *) (aad - sizeof (*nonce)); + nonce->salt = sa->salt; + nonce->iv = *pkt_iv = clib_host_to_net_u64 (sa->gcm_iv_counter++); + iv = (u8 *) nonce; + key_index = sa->crypto_key_index; + + if (lb != b) + { + /* chain */ + flag |= VNET_CRYPTO_OP_FLAG_CHAINED_BUFFERS; + tag = vlib_buffer_get_tail (lb) - icv_sz; + crypto_total_len = esp_encrypt_chain_crypto (vm, ptd, sa, b, lb, + icv_sz, payload, + payload_len, 0); + } + goto out; + } + + /* cipher then hash */ + iv = payload - iv_sz; + integ_start_offset = crypto_start_offset - iv_sz - sizeof (esp_header_t); + integ_total_len += iv_sz + sizeof (esp_header_t); + flag |= VNET_CRYPTO_OP_FLAG_INIT_IV; + key_index = sa->linked_key_index; + + if (b != lb) + { + flag |= VNET_CRYPTO_OP_FLAG_CHAINED_BUFFERS; + crypto_total_len = esp_encrypt_chain_crypto (vm, ptd, sa, b, lb, + icv_sz, payload, + payload_len, 0); + tag = vlib_buffer_get_tail (lb) - icv_sz; + integ_total_len = esp_encrypt_chain_integ (vm, ptd, sa, b, lb, icv_sz, + payload - iv_sz - + sizeof (esp_header_t), + payload_len + iv_sz + + sizeof (esp_header_t), + tag, 0); + } + else if (ipsec_sa_is_set_USE_ESN (sa) && !ipsec_sa_is_set_IS_AEAD (sa)) + { + u32 seq_hi = clib_net_to_host_u32 (sa->seq_hi); + clib_memcpy_fast (tag, &seq_hi, sizeof (seq_hi)); + integ_total_len += sizeof (seq_hi); + } + +out: + return vnet_crypto_async_add_to_frame (vm, async_frame, key_index, + crypto_total_len, + integ_total_len - crypto_total_len, + crypto_start_offset, + integ_start_offset, bi, async_next, + iv, tag, aad, flag); +} + always_inline uword -esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame, int is_ip6, int is_tun) +esp_encrypt_inline (vlib_main_t *vm, vlib_node_runtime_t *node, + vlib_frame_t *frame, vnet_link_t lt, int is_tun, + u16 async_next) { ipsec_main_t *im = &ipsec_main; ipsec_per_thread_data_t *ptd = vec_elt_at_index (im->ptd, vm->thread_index); @@ -251,12 +572,33 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, u16 buffer_data_size = vlib_buffer_get_default_data_size (vm); u32 current_sa_index = ~0, current_sa_packets = 0; u32 current_sa_bytes = 0, spi = 0; - u8 block_sz = 0, iv_sz = 0, icv_sz = 0; + u8 esp_align = 4, iv_sz = 0, icv_sz = 0; ipsec_sa_t *sa0 = 0; + vlib_buffer_t *lb; + vnet_crypto_op_t **crypto_ops = &ptd->crypto_ops; + vnet_crypto_op_t **integ_ops = &ptd->integ_ops; + vnet_crypto_async_frame_t *async_frame = 0; + int is_async = im->async_mode; + vnet_crypto_async_op_id_t last_async_op = ~0; + u16 drop_next = + (lt == VNET_LINK_IP6 ? ESP_ENCRYPT_NEXT_DROP6 : + (lt == VNET_LINK_IP4 ? ESP_ENCRYPT_NEXT_DROP4 : + ESP_ENCRYPT_NEXT_DROP_MPLS)); + u16 handoff_next = (lt == VNET_LINK_IP6 ? + ESP_ENCRYPT_NEXT_HANDOFF6 : + (lt == VNET_LINK_IP4 ? ESP_ENCRYPT_NEXT_HANDOFF4 : + ESP_ENCRYPT_NEXT_HANDOFF_MPLS)); + u16 n_async_drop = 0; vlib_get_buffers (vm, from, b, n_left); - vec_reset_length (ptd->crypto_ops); - vec_reset_length (ptd->integ_ops); + if (!is_async) + { + vec_reset_length (ptd->crypto_ops); + vec_reset_length (ptd->integ_ops); + vec_reset_length (ptd->chained_crypto_ops); + vec_reset_length (ptd->chained_integ_ops); + } + vec_reset_length (ptd->chunks); while (n_left > 0) { @@ -264,7 +606,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, dpo_id_t *dpo; esp_header_t *esp; u8 *payload, *next_hdr_ptr; - u16 payload_len; + u16 payload_len, payload_len_total, n_bufs; u32 hdr_len; if (n_left > 2) @@ -275,16 +617,17 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, CLIB_PREFETCH (p, CLIB_CACHE_LINE_BYTES, LOAD); p -= CLIB_CACHE_LINE_BYTES; CLIB_PREFETCH (p, CLIB_CACHE_LINE_BYTES, LOAD); + /* speculate that the trailer goes in the first buffer */ + CLIB_PREFETCH (vlib_buffer_get_tail (b[1]), + CLIB_CACHE_LINE_BYTES, LOAD); } if (is_tun) { /* we are on a ipsec tunnel's feature arc */ - u32 next0; - sa_index0 = *(u32 *) vnet_feature_next_with_data (&next0, b[0], - sizeof - (sa_index0)); - next[0] = next0; + vnet_buffer (b[0])->ipsec.sad_index = + sa_index0 = ipsec_tun_protect_get_sa_out + (vnet_buffer (b[0])->ip.adj_index[VLIB_TX]); } else sa_index0 = vnet_buffer (b[0])->ipsec.sad_index; @@ -299,24 +642,71 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, current_sa_packets = current_sa_bytes = 0; sa0 = pool_elt_at_index (im->sad, sa_index0); + + /* fetch the second cacheline ASAP */ + CLIB_PREFETCH (sa0->cacheline1, CLIB_CACHE_LINE_BYTES, LOAD); + current_sa_index = sa_index0; spi = clib_net_to_host_u32 (sa0->spi); - block_sz = sa0->crypto_block_size; + esp_align = sa0->esp_block_align; icv_sz = sa0->integ_icv_size; iv_sz = sa0->crypto_iv_size; + + /* submit frame when op_id is different then the old one */ + if (is_async && sa0->crypto_async_enc_op_id != last_async_op) + { + if (async_frame && async_frame->n_elts) + { + if (vnet_crypto_async_submit_open_frame (vm, async_frame)) + esp_async_recycle_failed_submit (async_frame, b, from, + nexts, &n_async_drop, + drop_next, + ESP_ENCRYPT_ERROR_CRYPTO_ENGINE_ERROR); + } + async_frame = + vnet_crypto_async_get_frame (vm, sa0->crypto_async_enc_op_id); + last_async_op = sa0->crypto_async_enc_op_id; + } + } + + if (PREDICT_FALSE (~0 == sa0->encrypt_thread_index)) + { + /* this is the first packet to use this SA, claim the SA + * for this thread. this could happen simultaneously on + * another thread */ + clib_atomic_cmp_and_swap (&sa0->encrypt_thread_index, ~0, + ipsec_sa_assign_thread (thread_index)); + } + + if (PREDICT_FALSE (thread_index != sa0->encrypt_thread_index)) + { + esp_set_next_index (is_async, from, nexts, from[b - bufs], + &n_async_drop, handoff_next, next); + goto trace; } - if (vlib_buffer_chain_linearize (vm, b[0]) != 1) + lb = b[0]; + n_bufs = vlib_buffer_chain_linearize (vm, b[0]); + if (n_bufs == 0) { - b[0]->error = node->errors[ESP_ENCRYPT_ERROR_CHAINED_BUFFER]; - next[0] = ESP_ENCRYPT_NEXT_DROP; + b[0]->error = node->errors[ESP_ENCRYPT_ERROR_NO_BUFFERS]; + esp_set_next_index (is_async, from, nexts, from[b - bufs], + &n_async_drop, drop_next, next); goto trace; } + if (n_bufs > 1) + { + /* find last buffer in the chain */ + while (lb->flags & VLIB_BUFFER_NEXT_PRESENT) + lb = vlib_get_buffer (vm, lb->next_buffer); + } + if (PREDICT_FALSE (esp_seq_advance (sa0))) { b[0]->error = node->errors[ESP_ENCRYPT_ERROR_SEQ_CYCLED]; - next[0] = ESP_ENCRYPT_NEXT_DROP; + esp_set_next_index (is_async, from, nexts, from[b - bufs], + &n_async_drop, drop_next, next); goto trace; } @@ -326,11 +716,21 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, if (ipsec_sa_is_set_IS_TUNNEL (sa0)) { payload = vlib_buffer_get_current (b[0]); - next_hdr_ptr = esp_add_footer_and_icv (b[0], block_sz, icv_sz); + next_hdr_ptr = esp_add_footer_and_icv (vm, &lb, esp_align, icv_sz, + next, node, + buffer_data_size, + vlib_buffer_length_in_chain + (vm, b[0])); + if (!next_hdr_ptr) + { + b[0]->error = node->errors[ESP_ENCRYPT_ERROR_NO_BUFFERS]; + esp_set_next_index (is_async, from, nexts, from[b - bufs], + &n_async_drop, drop_next, next); + goto trace; + } + b[0]->flags &= ~VLIB_BUFFER_TOTAL_LENGTH_VALID; payload_len = b[0]->current_length; - - if (esp_trailer_icv_overflow (node, b[0], next, buffer_data_size)) - goto trace; + payload_len_total = vlib_buffer_length_in_chain (vm, b[0]); /* ESP header */ hdr_len += sizeof (*esp); @@ -341,7 +741,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, { hdr_len += sizeof (udp_header_t); esp_fill_udp_hdr (sa0, (udp_header_t *) (payload - hdr_len), - payload_len + hdr_len); + payload_len_total + hdr_len); } /* IP header */ @@ -351,10 +751,33 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, u16 len = sizeof (ip6_header_t); hdr_len += len; ip6 = (ip6_header_t *) (payload - hdr_len); - clib_memcpy_fast (ip6, &sa0->ip6_hdr, len); - *next_hdr_ptr = (is_ip6 ? - IP_PROTOCOL_IPV6 : IP_PROTOCOL_IP_IN_IP); - len = payload_len + hdr_len - len; + clib_memcpy_fast (ip6, &sa0->ip6_hdr, sizeof (ip6_header_t)); + + if (VNET_LINK_IP6 == lt) + { + *next_hdr_ptr = IP_PROTOCOL_IPV6; + tunnel_encap_fixup_6o6 (sa0->tunnel_flags, + (const ip6_header_t *) payload, + ip6); + } + else if (VNET_LINK_IP4 == lt) + { + *next_hdr_ptr = IP_PROTOCOL_IP_IN_IP; + tunnel_encap_fixup_4o6 (sa0->tunnel_flags, + (const ip4_header_t *) payload, + ip6); + } + else if (VNET_LINK_MPLS == lt) + { + *next_hdr_ptr = IP_PROTOCOL_MPLS_IN_IP; + tunnel_encap_fixup_mplso6 ( + sa0->tunnel_flags, (const mpls_unicast_header_t *) payload, + ip6); + } + else + ASSERT (0); + + len = payload_len_total + hdr_len - len; ip6->payload_length = clib_net_to_host_u16 (len); } else @@ -363,10 +786,33 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, u16 len = sizeof (ip4_header_t); hdr_len += len; ip4 = (ip4_header_t *) (payload - hdr_len); - clib_memcpy_fast (ip4, &sa0->ip4_hdr, len); - *next_hdr_ptr = (is_ip6 ? - IP_PROTOCOL_IPV6 : IP_PROTOCOL_IP_IN_IP); - len = payload_len + hdr_len; + clib_memcpy_fast (ip4, &sa0->ip4_hdr, sizeof (ip4_header_t)); + + if (VNET_LINK_IP6 == lt) + { + *next_hdr_ptr = IP_PROTOCOL_IPV6; + tunnel_encap_fixup_6o4_w_chksum (sa0->tunnel_flags, + (const ip6_header_t *) + payload, ip4); + } + else if (VNET_LINK_IP4 == lt) + { + *next_hdr_ptr = IP_PROTOCOL_IP_IN_IP; + tunnel_encap_fixup_4o4_w_chksum (sa0->tunnel_flags, + (const ip4_header_t *) + payload, ip4); + } + else if (VNET_LINK_MPLS == lt) + { + *next_hdr_ptr = IP_PROTOCOL_MPLS_IN_IP; + tunnel_encap_fixup_mplso4_w_chksum ( + sa0->tunnel_flags, (const mpls_unicast_header_t *) payload, + ip4); + } + else + ASSERT (0); + + len = payload_len_total + hdr_len; esp_update_ip4_hdr (ip4, len, /* is_transport */ 0, 0); } @@ -376,24 +822,39 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, next[0] = dpo->dpoi_next_node; vnet_buffer (b[0])->ip.adj_index[VLIB_TX] = dpo->dpoi_index; } + else + next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT; } else /* transport mode */ { u8 *l2_hdr, l2_len, *ip_hdr, ip_len; + ip6_ext_header_t *ext_hdr; udp_header_t *udp = 0; + u16 udp_len = 0; u8 *old_ip_hdr = vlib_buffer_get_current (b[0]); - ip_len = is_ip6 ? - esp_get_ip6_hdr_len ((ip6_header_t *) old_ip_hdr) : - ip4_header_bytes ((ip4_header_t *) old_ip_hdr); + ip_len = + (VNET_LINK_IP6 == lt ? + esp_get_ip6_hdr_len ((ip6_header_t *) old_ip_hdr, &ext_hdr) : + ip4_header_bytes ((ip4_header_t *) old_ip_hdr)); vlib_buffer_advance (b[0], ip_len); payload = vlib_buffer_get_current (b[0]); - next_hdr_ptr = esp_add_footer_and_icv (b[0], block_sz, icv_sz); - payload_len = b[0]->current_length; + next_hdr_ptr = esp_add_footer_and_icv (vm, &lb, esp_align, icv_sz, + next, node, + buffer_data_size, + vlib_buffer_length_in_chain + (vm, b[0])); + if (!next_hdr_ptr) + { + esp_set_next_index (is_async, from, nexts, from[b - bufs], + &n_async_drop, drop_next, next); + goto trace; + } - if (esp_trailer_icv_overflow (node, b[0], next, buffer_data_size)) - goto trace; + b[0]->flags &= ~VLIB_BUFFER_TOTAL_LENGTH_VALID; + payload_len = b[0]->current_length; + payload_len_total = vlib_buffer_length_in_chain (vm, b[0]); /* ESP header */ hdr_len += sizeof (*esp); @@ -423,98 +884,98 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, else l2_len = 0; - clib_memcpy_le64 (ip_hdr, old_ip_hdr, ip_len); - - if (is_ip6) + if (VNET_LINK_IP6 == lt) { - ip6_header_t *ip6 = (ip6_header_t *) (ip_hdr); - *next_hdr_ptr = ip6->protocol; - ip6->protocol = IP_PROTOCOL_IPSEC_ESP; + ip6_header_t *ip6 = (ip6_header_t *) (old_ip_hdr); + if (PREDICT_TRUE (NULL == ext_hdr)) + { + *next_hdr_ptr = ip6->protocol; + ip6->protocol = IP_PROTOCOL_IPSEC_ESP; + } + else + { + *next_hdr_ptr = ext_hdr->next_hdr; + ext_hdr->next_hdr = IP_PROTOCOL_IPSEC_ESP; + } ip6->payload_length = - clib_host_to_net_u16 (payload_len + hdr_len - l2_len - - ip_len); + clib_host_to_net_u16 (payload_len_total + hdr_len - l2_len - + sizeof (ip6_header_t)); } - else + else if (VNET_LINK_IP4 == lt) { u16 len; - ip4_header_t *ip4 = (ip4_header_t *) (ip_hdr); + ip4_header_t *ip4 = (ip4_header_t *) (old_ip_hdr); *next_hdr_ptr = ip4->protocol; - len = payload_len + hdr_len - l2_len; + len = payload_len_total + hdr_len - l2_len; if (udp) { esp_update_ip4_hdr (ip4, len, /* is_transport */ 1, 1); - esp_fill_udp_hdr (sa0, udp, len - ip_len); + udp_len = len - ip_len; } else esp_update_ip4_hdr (ip4, len, /* is_transport */ 1, 0); } - if (!is_tun) - next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT; + clib_memcpy_le64 (ip_hdr, old_ip_hdr, ip_len); + + if (udp) + { + esp_fill_udp_hdr (sa0, udp, udp_len); + } + + next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT; + } + + if (lb != b[0]) + { + crypto_ops = &ptd->chained_crypto_ops; + integ_ops = &ptd->chained_integ_ops; + } + else + { + crypto_ops = &ptd->crypto_ops; + integ_ops = &ptd->integ_ops; } esp->spi = spi; esp->seq = clib_net_to_host_u32 (sa0->seq); - if (sa0->crypto_enc_op_id) + if (is_async) { - vnet_crypto_op_t *op; - vec_add2_aligned (ptd->crypto_ops, op, 1, CLIB_CACHE_LINE_BYTES); - vnet_crypto_op_init (op, sa0->crypto_enc_op_id); - op->src = op->dst = payload; - op->key_index = sa0->crypto_key_index; - op->len = payload_len - icv_sz; - op->user_data = b - bufs; - - if (ipsec_sa_is_set_IS_AEAD (sa0)) + if (PREDICT_FALSE (sa0->crypto_async_enc_op_id == 0)) { - /* - * construct the AAD in a scratch space in front - * of the IP header. - */ - op->aad = payload - hdr_len - sizeof (esp_aead_t); - - esp_aad_fill (op, esp, sa0); - - op->tag = payload + op->len; - op->tag_len = 16; - - u64 *iv = (u64 *) (payload - iv_sz); - nonce->salt = sa0->salt; - nonce->iv = *iv = clib_host_to_net_u64 (sa0->gcm_iv_counter++); - op->iv = (u8 *) nonce; - nonce++; + esp_set_next_index (is_async, from, nexts, from[b - bufs], + &n_async_drop, drop_next, next); + goto trace; } - else + + if (esp_prepare_async_frame (vm, ptd, &async_frame, sa0, b[0], esp, + payload, payload_len, iv_sz, + icv_sz, from[b - bufs], next[0], + hdr_len, async_next, lb)) { - op->iv = payload - iv_sz; - op->flags = VNET_CRYPTO_OP_FLAG_INIT_IV; + /* The fail only caused by submission, free the whole frame. */ + if (async_frame->n_elts) + esp_async_recycle_failed_submit (async_frame, b, from, nexts, + &n_async_drop, drop_next, + ESP_ENCRYPT_ERROR_CRYPTO_ENGINE_ERROR); + b[0]->error = ESP_ENCRYPT_ERROR_CRYPTO_ENGINE_ERROR; + esp_set_next_index (1, from, nexts, from[b - bufs], + &n_async_drop, drop_next, next); + goto trace; } } - - if (sa0->integ_op_id) + else { - vnet_crypto_op_t *op; - vec_add2_aligned (ptd->integ_ops, op, 1, CLIB_CACHE_LINE_BYTES); - vnet_crypto_op_init (op, sa0->integ_op_id); - op->src = payload - iv_sz - sizeof (esp_header_t); - op->digest = payload + payload_len - icv_sz; - op->key_index = sa0->integ_key_index; - op->digest_len = icv_sz; - op->len = payload_len - icv_sz + iv_sz + sizeof (esp_header_t); - op->user_data = b - bufs; - if (ipsec_sa_is_set_USE_ESN (sa0)) - { - u32 seq_hi = clib_net_to_host_u32 (sa0->seq_hi); - clib_memcpy_fast (op->digest, &seq_hi, sizeof (seq_hi)); - op->len += sizeof (seq_hi); - } + esp_prepare_sync_op (vm, ptd, crypto_ops, integ_ops, sa0, payload, + payload_len, iv_sz, icv_sz, bufs, b, lb, + hdr_len, esp, nonce++); } vlib_buffer_advance (b[0], 0LL - hdr_len); current_sa_packets += 1; - current_sa_bytes += payload_len; + current_sa_bytes += payload_len_total; trace: if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED)) @@ -538,8 +999,33 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_increment_combined_counter (&ipsec_sa_counters, thread_index, current_sa_index, current_sa_packets, current_sa_bytes); - esp_process_ops (vm, node, ptd->crypto_ops, bufs, nexts); - esp_process_ops (vm, node, ptd->integ_ops, bufs, nexts); + if (!is_async) + { + esp_process_ops (vm, node, ptd->crypto_ops, bufs, nexts, drop_next); + esp_process_chained_ops (vm, node, ptd->chained_crypto_ops, bufs, nexts, + ptd->chunks, drop_next); + + esp_process_ops (vm, node, ptd->integ_ops, bufs, nexts, drop_next); + esp_process_chained_ops (vm, node, ptd->chained_integ_ops, bufs, nexts, + ptd->chunks, drop_next); + } + else + { + if (async_frame && async_frame->n_elts) + { + if (vnet_crypto_async_submit_open_frame (vm, async_frame) < 0) + esp_async_recycle_failed_submit (async_frame, b, from, nexts, + &n_async_drop, drop_next, + ESP_ENCRYPT_ERROR_CRYPTO_ENGINE_ERROR); + } + vlib_node_increment_counter (vm, node->node_index, + ESP_ENCRYPT_ERROR_RX_PKTS, + frame->n_vectors); + if (n_async_drop) + vlib_buffer_enqueue_to_next (vm, node, from, nexts, n_async_drop); + + return frame->n_vectors; + } vlib_node_increment_counter (vm, node->node_index, ESP_ENCRYPT_ERROR_RX_PKTS, frame->n_vectors); @@ -548,11 +1034,98 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } +always_inline uword +esp_encrypt_post_inline (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame) +{ + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs; + u16 nexts[VLIB_FRAME_SIZE], *next = nexts; + u32 *from = vlib_frame_vector_args (frame); + u32 n_left = frame->n_vectors; + + vlib_get_buffers (vm, from, b, n_left); + + if (n_left >= 4) + { + vlib_prefetch_buffer_header (b[0], LOAD); + vlib_prefetch_buffer_header (b[1], LOAD); + vlib_prefetch_buffer_header (b[2], LOAD); + vlib_prefetch_buffer_header (b[3], LOAD); + } + + while (n_left > 8) + { + vlib_prefetch_buffer_header (b[4], LOAD); + vlib_prefetch_buffer_header (b[5], LOAD); + vlib_prefetch_buffer_header (b[6], LOAD); + vlib_prefetch_buffer_header (b[7], LOAD); + + next[0] = (esp_post_data (b[0]))->next_index; + next[1] = (esp_post_data (b[1]))->next_index; + next[2] = (esp_post_data (b[2]))->next_index; + next[3] = (esp_post_data (b[3]))->next_index; + + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE)) + { + if (b[0]->flags & VLIB_BUFFER_IS_TRACED) + { + esp_encrypt_post_trace_t *tr = vlib_add_trace (vm, node, b[0], + sizeof (*tr)); + tr->next_index = next[0]; + } + if (b[1]->flags & VLIB_BUFFER_IS_TRACED) + { + esp_encrypt_post_trace_t *tr = vlib_add_trace (vm, node, b[1], + sizeof (*tr)); + tr->next_index = next[1]; + } + if (b[2]->flags & VLIB_BUFFER_IS_TRACED) + { + esp_encrypt_post_trace_t *tr = vlib_add_trace (vm, node, b[2], + sizeof (*tr)); + tr->next_index = next[2]; + } + if (b[3]->flags & VLIB_BUFFER_IS_TRACED) + { + esp_encrypt_post_trace_t *tr = vlib_add_trace (vm, node, b[3], + sizeof (*tr)); + tr->next_index = next[3]; + } + } + + b += 4; + next += 4; + n_left -= 4; + } + + while (n_left > 0) + { + next[0] = (esp_post_data (b[0]))->next_index; + if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED)) + { + esp_encrypt_post_trace_t *tr = vlib_add_trace (vm, node, b[0], + sizeof (*tr)); + tr->next_index = next[0]; + } + + b += 1; + next += 1; + n_left -= 1; + } + + vlib_node_increment_counter (vm, node->node_index, + ESP_ENCRYPT_ERROR_POST_RX_PKTS, + frame->n_vectors); + vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors); + return frame->n_vectors; +} + VLIB_NODE_FN (esp4_encrypt_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - return esp_encrypt_inline (vm, node, from_frame, 0 /* is_ip6 */ , 0); + return esp_encrypt_inline (vm, node, from_frame, VNET_LINK_IP4, 0, + esp_encrypt_async_next.esp4_post_next); } /* *INDENT-OFF* */ @@ -562,15 +1135,37 @@ VLIB_REGISTER_NODE (esp4_encrypt_node) = { .format_trace = format_esp_encrypt_trace, .type = VLIB_NODE_TYPE_INTERNAL, - .n_errors = ARRAY_LEN(esp_encrypt_error_strings), + .n_errors = ARRAY_LEN (esp_encrypt_error_strings), .error_strings = esp_encrypt_error_strings, .n_next_nodes = ESP_ENCRYPT_N_NEXT, - .next_nodes = { -#define _(s,n) [ESP_ENCRYPT_NEXT_##s] = n, - foreach_esp_encrypt_next -#undef _ - }, + .next_nodes = { [ESP_ENCRYPT_NEXT_DROP4] = "ip4-drop", + [ESP_ENCRYPT_NEXT_DROP6] = "ip6-drop", + [ESP_ENCRYPT_NEXT_DROP_MPLS] = "mpls-drop", + [ESP_ENCRYPT_NEXT_HANDOFF4] = "esp4-encrypt-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF6] = "esp6-encrypt-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF_MPLS] = "error-drop", + [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "interface-output" }, +}; +/* *INDENT-ON* */ + +VLIB_NODE_FN (esp4_encrypt_post_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) +{ + return esp_encrypt_post_inline (vm, node, from_frame); +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (esp4_encrypt_post_node) = { + .name = "esp4-encrypt-post", + .vector_size = sizeof (u32), + .format_trace = format_esp_post_encrypt_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "esp4-encrypt", + + .n_errors = ARRAY_LEN(esp_encrypt_error_strings), + .error_strings = esp_encrypt_error_strings, }; /* *INDENT-ON* */ @@ -578,7 +1173,8 @@ VLIB_NODE_FN (esp6_encrypt_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - return esp_encrypt_inline (vm, node, from_frame, 1 /* is_ip6 */ , 0); + return esp_encrypt_inline (vm, node, from_frame, VNET_LINK_IP6, 0, + esp_encrypt_async_next.esp6_post_next); } /* *INDENT-OFF* */ @@ -587,16 +1183,30 @@ VLIB_REGISTER_NODE (esp6_encrypt_node) = { .vector_size = sizeof (u32), .format_trace = format_esp_encrypt_trace, .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "esp4-encrypt", .n_errors = ARRAY_LEN(esp_encrypt_error_strings), .error_strings = esp_encrypt_error_strings, +}; +/* *INDENT-ON* */ - .n_next_nodes = ESP_ENCRYPT_N_NEXT, - .next_nodes = { -#define _(s,n) [ESP_ENCRYPT_NEXT_##s] = n, - foreach_esp_encrypt_next -#undef _ - }, +VLIB_NODE_FN (esp6_encrypt_post_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) +{ + return esp_encrypt_post_inline (vm, node, from_frame); +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (esp6_encrypt_post_node) = { + .name = "esp6-encrypt-post", + .vector_size = sizeof (u32), + .format_trace = format_esp_post_encrypt_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "esp4-encrypt", + + .n_errors = ARRAY_LEN(esp_encrypt_error_strings), + .error_strings = esp_encrypt_error_strings, }; /* *INDENT-ON* */ @@ -604,7 +1214,8 @@ VLIB_NODE_FN (esp4_encrypt_tun_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - return esp_encrypt_inline (vm, node, from_frame, 0 /* is_ip6 */ , 1); + return esp_encrypt_inline (vm, node, from_frame, VNET_LINK_IP4, 1, + esp_encrypt_async_next.esp4_tun_post_next); } /* *INDENT-OFF* */ @@ -617,24 +1228,35 @@ VLIB_REGISTER_NODE (esp4_encrypt_tun_node) = { .n_errors = ARRAY_LEN(esp_encrypt_error_strings), .error_strings = esp_encrypt_error_strings, - .n_next_nodes = 1, + .n_next_nodes = ESP_ENCRYPT_N_NEXT, .next_nodes = { - [ESP_ENCRYPT_NEXT_DROP] = "ip4-drop", + [ESP_ENCRYPT_NEXT_DROP4] = "ip4-drop", + [ESP_ENCRYPT_NEXT_DROP6] = "ip6-drop", + [ESP_ENCRYPT_NEXT_DROP_MPLS] = "mpls-drop", + [ESP_ENCRYPT_NEXT_HANDOFF4] = "esp4-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF6] = "esp6-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF_MPLS] = "esp-mpls-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "adj-midchain-tx", }, }; -VNET_FEATURE_INIT (esp4_encrypt_tun_feat_node, static) = +VLIB_NODE_FN (esp4_encrypt_tun_post_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { - .arc_name = "ip4-output", - .node_name = "esp4-encrypt-tun", - .runs_before = VNET_FEATURES ("adj-midchain-tx"), -}; + return esp_encrypt_post_inline (vm, node, from_frame); +} -VNET_FEATURE_INIT (esp4_ethernet_encrypt_tun_feat_node, static) = -{ - .arc_name = "ethernet-output", - .node_name = "esp4-encrypt-tun", - .runs_before = VNET_FEATURES ("adj-midchain-tx", "adj-midchain-tx-no-count"), +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (esp4_encrypt_tun_post_node) = { + .name = "esp4-encrypt-tun-post", + .vector_size = sizeof (u32), + .format_trace = format_esp_post_encrypt_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "esp4-encrypt-tun", + + .n_errors = ARRAY_LEN(esp_encrypt_error_strings), + .error_strings = esp_encrypt_error_strings, }; /* *INDENT-ON* */ @@ -642,7 +1264,8 @@ VLIB_NODE_FN (esp6_encrypt_tun_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) { - return esp_encrypt_inline (vm, node, from_frame, 1 /* is_ip6 */ , 1); + return esp_encrypt_inline (vm, node, from_frame, VNET_LINK_IP6, 1, + esp_encrypt_async_next.esp6_tun_post_next); } /* *INDENT-OFF* */ @@ -655,20 +1278,85 @@ VLIB_REGISTER_NODE (esp6_encrypt_tun_node) = { .n_errors = ARRAY_LEN(esp_encrypt_error_strings), .error_strings = esp_encrypt_error_strings, - .n_next_nodes = 1, + .n_next_nodes = ESP_ENCRYPT_N_NEXT, .next_nodes = { - [ESP_ENCRYPT_NEXT_DROP] = "ip6-drop", + [ESP_ENCRYPT_NEXT_DROP4] = "ip4-drop", + [ESP_ENCRYPT_NEXT_DROP6] = "ip6-drop", + [ESP_ENCRYPT_NEXT_DROP_MPLS] = "mpls-drop", + [ESP_ENCRYPT_NEXT_HANDOFF4] = "esp4-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF6] = "esp6-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF_MPLS] = "esp-mpls-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "adj-midchain-tx", }, }; -VNET_FEATURE_INIT (esp6_encrypt_tun_feat_node, static) = +/* *INDENT-ON* */ + +VLIB_NODE_FN (esp6_encrypt_tun_post_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { - .arc_name = "ip6-output", - .node_name = "esp6-encrypt-tun", - .runs_before = VNET_FEATURES ("adj-midchain-tx"), + return esp_encrypt_post_inline (vm, node, from_frame); +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (esp6_encrypt_tun_post_node) = { + .name = "esp6-encrypt-tun-post", + .vector_size = sizeof (u32), + .format_trace = format_esp_post_encrypt_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "esp-mpls-encrypt-tun", + + .n_errors = ARRAY_LEN (esp_encrypt_error_strings), + .error_strings = esp_encrypt_error_strings, }; /* *INDENT-ON* */ +VLIB_NODE_FN (esp_mpls_encrypt_tun_node) +(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *from_frame) +{ + return esp_encrypt_inline (vm, node, from_frame, VNET_LINK_MPLS, 1, + esp_encrypt_async_next.esp_mpls_tun_post_next); +} + +VLIB_REGISTER_NODE (esp_mpls_encrypt_tun_node) = { + .name = "esp-mpls-encrypt-tun", + .vector_size = sizeof (u32), + .format_trace = format_esp_encrypt_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + + .n_errors = ARRAY_LEN(esp_encrypt_error_strings), + .error_strings = esp_encrypt_error_strings, + + .n_next_nodes = ESP_ENCRYPT_N_NEXT, + .next_nodes = { + [ESP_ENCRYPT_NEXT_DROP4] = "ip4-drop", + [ESP_ENCRYPT_NEXT_DROP6] = "ip6-drop", + [ESP_ENCRYPT_NEXT_DROP_MPLS] = "mpls-drop", + [ESP_ENCRYPT_NEXT_HANDOFF4] = "esp4-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF6] = "esp6-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_HANDOFF_MPLS] = "esp-mpls-encrypt-tun-handoff", + [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "adj-midchain-tx", + }, +}; + +VLIB_NODE_FN (esp_mpls_encrypt_tun_post_node) +(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *from_frame) +{ + return esp_encrypt_post_inline (vm, node, from_frame); +} + +VLIB_REGISTER_NODE (esp_mpls_encrypt_tun_post_node) = { + .name = "esp-mpls-encrypt-tun-post", + .vector_size = sizeof (u32), + .format_trace = format_esp_post_encrypt_trace, + .type = VLIB_NODE_TYPE_INTERNAL, + .sibling_of = "esp-mpls-encrypt-tun", + + .n_errors = ARRAY_LEN (esp_encrypt_error_strings), + .error_strings = esp_encrypt_error_strings, +}; + typedef struct { u32 sa_index; @@ -706,7 +1394,6 @@ esp_no_crypto_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs; - u16 nexts[VLIB_FRAME_SIZE], *next = nexts; u32 *from = vlib_frame_vector_args (frame); u32 n_left = frame->n_vectors; @@ -714,14 +1401,11 @@ esp_no_crypto_inline (vlib_main_t * vm, vlib_node_runtime_t * node, while (n_left > 0) { - u32 next0; u32 sa_index0; /* packets are always going to be dropped, but get the sa_index */ - sa_index0 = *(u32 *) vnet_feature_next_with_data (&next0, b[0], - sizeof (sa_index0)); - - next[0] = ESP_NO_CRYPTO_NEXT_DROP; + sa_index0 = ipsec_tun_protect_get_sa_out + (vnet_buffer (b[0])->ip.adj_index[VLIB_TX]); if (PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED)) { @@ -731,14 +1415,15 @@ esp_no_crypto_inline (vlib_main_t * vm, vlib_node_runtime_t * node, } n_left -= 1; - next += 1; b += 1; } vlib_node_increment_counter (vm, node->node_index, ESP_NO_CRYPTO_ERROR_RX_PKTS, frame->n_vectors); - vlib_buffer_enqueue_to_next (vm, node, from, nexts, frame->n_vectors); + vlib_buffer_enqueue_to_single_next (vm, node, from, + ESP_NO_CRYPTO_NEXT_DROP, + frame->n_vectors); return frame->n_vectors; } @@ -764,13 +1449,6 @@ VLIB_REGISTER_NODE (esp4_no_crypto_tun_node) = }, }; -VNET_FEATURE_INIT (esp4_no_crypto_tun_feat_node, static) = -{ - .arc_name = "ip4-output", - .node_name = "esp4-no-crypto", - .runs_before = VNET_FEATURES ("adj-midchain-tx"), -}; - VLIB_NODE_FN (esp6_no_crypto_tun_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * from_frame) @@ -791,13 +1469,6 @@ VLIB_REGISTER_NODE (esp6_no_crypto_tun_node) = [ESP_NO_CRYPTO_NEXT_DROP] = "ip6-drop", }, }; - -VNET_FEATURE_INIT (esp6_no_crypto_tun_feat_node, static) = -{ - .arc_name = "ip6-output", - .node_name = "esp6-no-crypto", - .runs_before = VNET_FEATURES ("adj-midchain-tx"), -}; /* *INDENT-ON* */ /*