ipsec: Support async mode per-SA
[vpp.git] / src / vnet / ipsec / esp_encrypt.c
index 9b32d3f..214cf67 100644 (file)
 #include <vnet/vnet.h>
 #include <vnet/api_errno.h>
 #include <vnet/ip/ip.h>
-#include <vnet/udp/udp.h>
 
 #include <vnet/crypto/crypto.h>
 
 #include <vnet/ipsec/ipsec.h>
 #include <vnet/ipsec/ipsec_tun.h>
 #include <vnet/ipsec/esp.h>
+#include <vnet/tunnel/tunnel_dp.h>
 
-#define foreach_esp_encrypt_next                   \
-_(DROP, "error-drop")                              \
-_(HANDOFF, "handoff")                              \
-_(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
@@ -39,11 +43,14 @@ typedef enum
     ESP_ENCRYPT_N_NEXT,
 } esp_encrypt_next_t;
 
-#define foreach_esp_encrypt_error                               \
- _(RX_PKTS, "ESP pkts received")                                \
- _(SEQ_CYCLED, "sequence number cycled (packet dropped)")       \
- _(CRYPTO_ENGINE_ERROR, "crypto engine error (packet dropped)") \
- _(NO_BUFFERS, "no buffers (packet dropped)")                   \
+#define foreach_esp_encrypt_error                                             \
+  _ (RX_PKTS, "ESP pkts received")                                            \
+  _ (POST_RX_PKTS, "ESP-post pkts received")                                  \
+  _ (HANDOFF, "Hand-off")                                                     \
+  _ (SEQ_CYCLED, "sequence number cycled (packet dropped)")                   \
+  _ (CRYPTO_ENGINE_ERROR, "crypto engine error (packet dropped)")             \
+  _ (CRYPTO_QUEUE_FULL, "crypto queue full (packet dropped)")                 \
+  _ (NO_BUFFERS, "no buffers (packet dropped)")
 
 typedef enum
 {
@@ -70,6 +77,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)
@@ -88,20 +100,30 @@ 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_main_t * vm, vlib_buffer_t ** last,
-                       u8 block_size, u8 icv_sz,
-                       u16 * next, vlib_node_runtime_t * node,
+esp_add_footer_and_icv (vlib_main_t *vm, vlib_buffer_t **last, u8 esp_align,
+                       u8 icv_sz, 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 = total_len + sizeof (esp_footer_t);
-  u16 new_length = round_pow2 (min_length, block_size);
+  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 (last[0]) +
                                      last[0]->current_length + pad_bytes);
@@ -216,7 +238,8 @@ esp_get_ip6_hdr_len (ip6_header_t * ip6, ip6_ext_header_t ** ext_hdr)
 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 * nexts, vnet_crypto_op_chunk_t * chunks,
+                        u16 drop_next)
 {
   u32 n_fail, n_ops = vec_len (ops);
   vnet_crypto_op_t *op = ops;
@@ -234,7 +257,7 @@ esp_process_chained_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++;
@@ -243,7 +266,8 @@ esp_process_chained_ops (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 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;
@@ -261,49 +285,329 @@ 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++;
     }
 }
 
-typedef struct
+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)
 {
-  u32 salt;
-  u64 iv;
-} __clib_packed esp_gcm_nonce_t;
+  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;
 
-STATIC_ASSERT_SIZEOF (esp_gcm_nonce_t, 12);
+      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, u32 bi,
+                    vlib_buffer_t **b, vlib_buffer_t *lb, u32 hdr_len,
+                    esp_header_t *esp)
+{
+  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 = bi;
+
+      if (ipsec_sa_is_set_IS_CTR (sa0))
+       {
+         ASSERT (sizeof (u64) == iv_sz);
+         /* construct nonce in a scratch space in front of the IP header */
+         esp_ctr_nonce_t *nonce =
+           (esp_ctr_nonce_t *) (payload - sizeof (u64) - hdr_len -
+                                sizeof (*nonce));
+         u64 *pkt_iv = (u64 *) (payload - sizeof (u64));
+
+         if (ipsec_sa_is_set_IS_AEAD (sa0))
+           {
+             /* constuct aad in a scratch space in front of the nonce */
+             op->aad = (u8 *) nonce - sizeof (esp_aead_t);
+             op->aad_len = esp_aad_fill (op->aad, esp, sa0);
+             op->tag = payload + op->len;
+             op->tag_len = 16;
+           }
+         else
+           {
+             nonce->ctr = clib_host_to_net_u32 (1);
+           }
+
+         nonce->salt = sa0->salt;
+         nonce->iv = *pkt_iv = clib_host_to_net_u64 (sa0->ctr_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 = bi;
+
+      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 void
+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;
+
+  key_index = sa->linked_key_index;
+
+  if (ipsec_sa_is_set_IS_CTR (sa))
+    {
+      ASSERT (sizeof (u64) == iv_sz);
+      /* construct nonce in a scratch space in front of the IP header */
+      esp_ctr_nonce_t *nonce = (esp_ctr_nonce_t *) (payload - sizeof (u64) -
+                                                   hdr_len - sizeof (*nonce));
+      u64 *pkt_iv = (u64 *) (payload - sizeof (u64));
+
+      if (ipsec_sa_is_set_IS_AEAD (sa))
+       {
+         /* constuct aad in a scratch space in front of the nonce */
+         aad = (u8 *) nonce - sizeof (esp_aead_t);
+         esp_aad_fill (aad, esp, sa);
+         key_index = sa->crypto_key_index;
+       }
+      else
+       {
+         nonce->ctr = clib_host_to_net_u32 (1);
+       }
+
+      nonce->salt = sa->salt;
+      nonce->iv = *pkt_iv = clib_host_to_net_u64 (sa->ctr_iv_counter++);
+      iv = (u8 *) nonce;
+    }
+  else
+    {
+      iv = payload - iv_sz;
+      flag |= VNET_CRYPTO_OP_FLAG_INIT_IV;
+    }
+
+  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);
+    }
+
+  if (sa->integ_op_id)
+    {
+      integ_start_offset = crypto_start_offset - iv_sz - sizeof (esp_header_t);
+      integ_total_len += iv_sz + sizeof (esp_header_t);
+
+      if (b != lb)
+       {
+         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))
+       {
+         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);
+       }
+    }
+
+  /* this always succeeds because we know the frame is not full */
+  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_node)
 {
   ipsec_main_t *im = &ipsec_main;
   ipsec_per_thread_data_t *ptd = vec_elt_at_index (im->ptd, vm->thread_index);
   u32 *from = vlib_frame_vector_args (frame);
   u32 n_left = frame->n_vectors;
   vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs;
-  u16 nexts[VLIB_FRAME_SIZE], *next = nexts;
-  esp_gcm_nonce_t nonces[VLIB_FRAME_SIZE], *nonce = nonces;
   u32 thread_index = vm->thread_index;
   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;
-  vnet_crypto_op_chunk_t *ch;
   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_frames[VNET_CRYPTO_ASYNC_OP_N_IDS];
+  int is_async = im->async_mode;
+  vnet_crypto_async_op_id_t 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));
+  vlib_buffer_t *sync_bufs[VLIB_FRAME_SIZE];
+  u16 sync_nexts[VLIB_FRAME_SIZE], *sync_next = sync_nexts, n_sync = 0;
+  u16 async_nexts[VLIB_FRAME_SIZE], *async_next = async_nexts, n_async = 0;
+  u16 noop_nexts[VLIB_FRAME_SIZE], *noop_next = noop_nexts, n_noop = 0;
+  u32 sync_bi[VLIB_FRAME_SIZE];
+  u32 noop_bi[VLIB_FRAME_SIZE];
+  esp_encrypt_error_t err;
 
   vlib_get_buffers (vm, from, b, n_left);
+
   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->async_frames);
   vec_reset_length (ptd->chunks);
+  clib_memset (async_frames, 0, sizeof (async_frames));
 
   while (n_left > 0)
     {
@@ -312,7 +616,9 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       esp_header_t *esp;
       u8 *payload, *next_hdr_ptr;
       u16 payload_len, payload_len_total, n_bufs;
-      u32 hdr_len, config_index;
+      u32 hdr_len;
+
+      err = ESP_ENCRYPT_ERROR_RX_PKTS;
 
       if (n_left > 2)
        {
@@ -322,13 +628,14 @@ 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 */
-         config_index = b[0]->current_config_index;
-         vnet_feature_next_u16 (&next[0], b[0]);
          vnet_buffer (b[0])->ipsec.sad_index =
            sa_index0 = ipsec_tun_protect_get_sa_out
            (vnet_buffer (b[0])->ip.adj_index[VLIB_TX]);
@@ -345,30 +652,50 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                                             current_sa_bytes);
          current_sa_packets = current_sa_bytes = 0;
 
-         sa0 = pool_elt_at_index (im->sad, sa_index0);
+         sa0 = ipsec_sa_get (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;
+         is_async = im->async_mode | ipsec_sa_is_set_IS_ASYNC (sa0);
        }
 
-      if (PREDICT_FALSE (~0 == sa0->encrypt_thread_index))
+      if (is_async)
+       {
+         async_op = sa0->crypto_async_enc_op_id;
+
+         /* get a frame for this op if we don't yet have one or it's full
+          */
+         if (NULL == async_frames[async_op] ||
+             vnet_crypto_async_frame_is_full (async_frames[async_op]))
+           {
+             async_frames[async_op] =
+               vnet_crypto_async_get_frame (vm, async_op);
+             /* Save the frame to the list we'll submit at the end */
+             vec_add1 (ptd->async_frames, async_frames[async_op]);
+           }
+       }
+
+      if (PREDICT_FALSE (~0 == sa0->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,
+         clib_atomic_cmp_and_swap (&sa0->thread_index, ~0,
                                    ipsec_sa_assign_thread (thread_index));
        }
 
-      if (PREDICT_TRUE (thread_index != sa0->encrypt_thread_index))
+      if (PREDICT_FALSE (thread_index != sa0->thread_index))
        {
-         next[0] = ESP_ENCRYPT_NEXT_HANDOFF;
-         if (is_tun)
-           {
-             b[0]->current_config_index = config_index;
-           }
+         vnet_buffer (b[0])->ipsec.thread_index = sa0->thread_index;
+         err = ESP_ENCRYPT_ERROR_HANDOFF;
+         esp_set_next_index (b[0], node, err, n_noop, noop_nexts,
+                             handoff_next);
          goto trace;
        }
 
@@ -376,30 +703,22 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       n_bufs = vlib_buffer_chain_linearize (vm, b[0]);
       if (n_bufs == 0)
        {
-         b[0]->error = node->errors[ESP_ENCRYPT_ERROR_NO_BUFFERS];
-         next[0] = ESP_ENCRYPT_NEXT_DROP;
+         err = ESP_ENCRYPT_ERROR_NO_BUFFERS;
+         esp_set_next_index (b[0], node, err, n_noop, noop_nexts, drop_next);
          goto trace;
        }
 
       if (n_bufs > 1)
        {
-         crypto_ops = &ptd->chained_crypto_ops;
-         integ_ops = &ptd->chained_integ_ops;
-
          /* find last buffer in the chain */
          while (lb->flags & VLIB_BUFFER_NEXT_PRESENT)
            lb = vlib_get_buffer (vm, lb->next_buffer);
        }
-      else
-       {
-         crypto_ops = &ptd->crypto_ops;
-         integ_ops = &ptd->integ_ops;
-       }
 
       if (PREDICT_FALSE (esp_seq_advance (sa0)))
        {
-         b[0]->error = node->errors[ESP_ENCRYPT_ERROR_SEQ_CYCLED];
-         next[0] = ESP_ENCRYPT_NEXT_DROP;
+         err = ESP_ENCRYPT_ERROR_SEQ_CYCLED;
+         esp_set_next_index (b[0], node, err, n_noop, noop_nexts, drop_next);
          goto trace;
        }
 
@@ -409,15 +728,14 @@ 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 (vm, &lb, block_sz, icv_sz,
-                                                next, node,
-                                                buffer_data_size,
-                                                vlib_buffer_length_in_chain
-                                                (vm, b[0]));
+         next_hdr_ptr = esp_add_footer_and_icv (
+           vm, &lb, esp_align, icv_sz, 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];
-             next[0] = ESP_ENCRYPT_NEXT_DROP;
+             err = ESP_ENCRYPT_ERROR_NO_BUFFERS;
+             esp_set_next_index (b[0], node, err, n_noop, noop_nexts,
+                                 drop_next);
              goto trace;
            }
          b[0]->flags &= ~VLIB_BUFFER_TOTAL_LENGTH_VALID;
@@ -443,11 +761,34 @@ 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);
+             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, b[0],
+                                         (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, b[0],
+                   (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);
+             b[0]->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
            }
          else
            {
@@ -455,9 +796,32 @@ 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);
+             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);
            }
@@ -465,30 +829,38 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          dpo = &sa0->dpo;
          if (!is_tun)
            {
-             next[0] = dpo->dpoi_next_node;
+             sync_next[0] = dpo->dpoi_next_node;
              vnet_buffer (b[0])->ip.adj_index[VLIB_TX] = dpo->dpoi_index;
            }
+         else
+           sync_next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
+         b[0]->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
        }
       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, &ext_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 (vm, &lb, block_sz, icv_sz,
-                                                next, node,
-                                                buffer_data_size,
-                                                vlib_buffer_length_in_chain
-                                                (vm, b[0]));
+         next_hdr_ptr = esp_add_footer_and_icv (
+           vm, &lb, esp_align, icv_sz, node, buffer_data_size,
+           vlib_buffer_length_in_chain (vm, b[0]));
          if (!next_hdr_ptr)
-           goto trace;
+           {
+             err = ESP_ENCRYPT_ERROR_NO_BUFFERS;
+             esp_set_next_index (b[0], node, err, n_noop, noop_nexts,
+                                 drop_next);
+             goto trace;
+           }
 
          b[0]->flags &= ~VLIB_BUFFER_TOTAL_LENGTH_VALID;
          payload_len = b[0]->current_length;
@@ -522,7 +894,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          else
            l2_len = 0;
 
-         if (is_ip6)
+         if (VNET_LINK_IP6 == lt)
            {
              ip6_header_t *ip6 = (ip6_header_t *) (old_ip_hdr);
              if (PREDICT_TRUE (NULL == ext_hdr))
@@ -539,7 +911,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                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 *) (old_ip_hdr);
@@ -548,7 +920,7 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
              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);
@@ -556,138 +928,38 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
          clib_memcpy_le64 (ip_hdr, old_ip_hdr, ip_len);
 
-         if (!is_tun)
-           next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
-       }
-
-      esp->spi = spi;
-      esp->seq = clib_net_to_host_u32 (sa0->seq);
-
-      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))
+         if (udp)
            {
-             /*
-              * 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++;
-           }
-         else
-           {
-             op->iv = payload - iv_sz;
-             op->flags = VNET_CRYPTO_OP_FLAG_INIT_IV;
+             esp_fill_udp_hdr (sa0, udp, udp_len);
            }
 
-         if (lb != b[0])
-           {
-             /* is chained */
-             vlib_buffer_t *cb = b[0];
-             op->flags |= VNET_CRYPTO_OP_FLAG_CHAINED_BUFFERS;
-             op->chunk_index = vec_len (ptd->chunks);
-             op->tag = vlib_buffer_get_tail (lb) - icv_sz;
-             vec_add2 (ptd->chunks, ch, 1);
-             ch->len = payload_len;
-             ch->src = ch->dst = payload;
-             cb = vlib_get_buffer (vm, cb->next_buffer);
-             op->n_chunks = 1;
-
-             while (1)
-               {
-                 vec_add2 (ptd->chunks, ch, 1);
-                 op->n_chunks += 1;
-                 if (lb == cb)
-                   ch->len = cb->current_length - icv_sz;
-                 else
-                   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);
-               }
-           }
+         sync_next[0] = ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT;
        }
 
-      if (sa0->integ_op_id)
+      if (lb != b[0])
        {
-         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;
-             vlib_buffer_t *cb = b[0];
-             op->chunk_index = vec_len (ptd->chunks);
-             op->digest = vlib_buffer_get_tail (lb) - icv_sz;
-             vec_add2 (ptd->chunks, ch, 1);
-             ch->len = payload_len + iv_sz + sizeof (esp_header_t);
-             ch->src = payload - iv_sz - sizeof (esp_header_t);
-             cb = vlib_get_buffer (vm, cb->next_buffer);
-             op->n_chunks = 1;
-
-             while (1)
-               {
-                 vec_add2 (ptd->chunks, ch, 1);
-                 op->n_chunks += 1;
-                 if (lb == cb)
-                   {
-                     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 (op->digest, &seq_hi,
-                                           sizeof (seq_hi));
-                         ch->len += sizeof (seq_hi);
-                       }
-                   }
-                 else
-                   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);
-               }
-           }
-         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);
-           }
+         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 (is_async)
+       esp_prepare_async_frame (vm, ptd, async_frames[async_op], sa0, b[0],
+                                esp, payload, payload_len, iv_sz, icv_sz,
+                                from[b - bufs], sync_next[0], hdr_len,
+                                async_next_node, lb);
+      else
+       esp_prepare_sync_op (vm, ptd, crypto_ops, integ_ops, sa0, payload,
+                            payload_len, iv_sz, icv_sz, n_sync, b, lb,
+                            hdr_len, esp);
+
       vlib_buffer_advance (b[0], 0LL - hdr_len);
 
       current_sa_packets += 1;
@@ -706,27 +978,155 @@ esp_encrypt_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          tr->crypto_alg = sa0->crypto_alg;
          tr->integ_alg = sa0->integ_alg;
        }
+
       /* next */
+      if (ESP_ENCRYPT_ERROR_RX_PKTS != err)
+       {
+         noop_bi[n_noop] = from[b - bufs];
+         n_noop++;
+         noop_next++;
+       }
+      else if (!is_async)
+       {
+         sync_bi[n_sync] = from[b - bufs];
+         sync_bufs[n_sync] = b[0];
+         n_sync++;
+         sync_next++;
+       }
+      else
+       {
+         n_async++;
+         async_next++;
+       }
       n_left -= 1;
-      next += 1;
       b += 1;
     }
 
   vlib_increment_combined_counter (&ipsec_sa_counters, thread_index,
                                   current_sa_index, current_sa_packets,
                                   current_sa_bytes);
+  if (n_sync)
+    {
+      esp_process_ops (vm, node, ptd->crypto_ops, sync_bufs, sync_nexts,
+                      drop_next);
+      esp_process_chained_ops (vm, node, ptd->chained_crypto_ops, sync_bufs,
+                              sync_nexts, ptd->chunks, drop_next);
 
-  esp_process_ops (vm, node, ptd->crypto_ops, bufs, nexts);
-  esp_process_chained_ops (vm, node, ptd->chained_crypto_ops, bufs, nexts,
-                          ptd->chunks);
+      esp_process_ops (vm, node, ptd->integ_ops, sync_bufs, sync_nexts,
+                      drop_next);
+      esp_process_chained_ops (vm, node, ptd->chained_integ_ops, sync_bufs,
+                              sync_nexts, ptd->chunks, drop_next);
 
-  esp_process_ops (vm, node, ptd->integ_ops, bufs, nexts);
-  esp_process_chained_ops (vm, node, ptd->chained_integ_ops, bufs, nexts,
-                          ptd->chunks);
+      vlib_buffer_enqueue_to_next (vm, node, sync_bi, sync_nexts, n_sync);
+    }
+  if (n_async)
+    {
+      /* submit all of the open frames */
+      vnet_crypto_async_frame_t **async_frame;
 
-  vlib_node_increment_counter (vm, node->node_index,
-                              ESP_ENCRYPT_ERROR_RX_PKTS, frame->n_vectors);
+      vec_foreach (async_frame, ptd->async_frames)
+       {
+         if (vnet_crypto_async_submit_open_frame (vm, *async_frame) < 0)
+           {
+             n_noop += esp_async_recycle_failed_submit (
+               vm, *async_frame, node, ESP_ENCRYPT_ERROR_CRYPTO_ENGINE_ERROR,
+               n_sync, noop_bi, noop_nexts, drop_next);
+             vnet_crypto_async_reset_frame (*async_frame);
+             vnet_crypto_async_free_frame (vm, *async_frame);
+           }
+       }
+    }
+  if (n_noop)
+    vlib_buffer_enqueue_to_next (vm, node, noop_bi, noop_nexts, n_noop);
+
+  vlib_node_increment_counter (vm, node->node_index, ESP_ENCRYPT_ERROR_RX_PKTS,
+                              frame->n_vectors);
+
+  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;
 }
@@ -735,7 +1135,8 @@ 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* */
@@ -745,15 +1146,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 = {
-    [ESP_ENCRYPT_NEXT_DROP] = "ip4-drop",
-    [ESP_ENCRYPT_NEXT_HANDOFF] = "esp4-encrypt-handoff",
-    [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "interface-output",
-  },
+  .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* */
 
@@ -761,7 +1184,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* */
@@ -770,16 +1194,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 = {
-    [ESP_ENCRYPT_NEXT_DROP] = "ip6-drop",
-    [ESP_ENCRYPT_NEXT_HANDOFF] = "esp6-encrypt-handoff",
-    [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "interface-output",
-  },
+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* */
 
@@ -787,7 +1225,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* */
@@ -802,31 +1241,33 @@ VLIB_REGISTER_NODE (esp4_encrypt_tun_node) = {
 
   .n_next_nodes = ESP_ENCRYPT_N_NEXT,
   .next_nodes = {
-    [ESP_ENCRYPT_NEXT_DROP] = "ip4-drop",
-    [ESP_ENCRYPT_NEXT_HANDOFF] = "esp4-encrypt-tun-handoff",
-    [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "error-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 (esp6o4_encrypt_tun_feat_node, static) =
-{
-  .arc_name = "ip6-output",
-  .node_name = "esp4-encrypt-tun",
-  .runs_before = VNET_FEATURES ("adj-midchain-tx"),
-};
+/* *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",
 
-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"),
+  .n_errors = ARRAY_LEN(esp_encrypt_error_strings),
+  .error_strings = esp_encrypt_error_strings,
 };
 /* *INDENT-ON* */
 
@@ -834,7 +1275,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* */
@@ -849,27 +1291,82 @@ VLIB_REGISTER_NODE (esp6_encrypt_tun_node) = {
 
   .n_next_nodes = ESP_ENCRYPT_N_NEXT,
   .next_nodes = {
-    [ESP_ENCRYPT_NEXT_DROP] = "ip6-drop",
-    [ESP_ENCRYPT_NEXT_HANDOFF] = "esp6-encrypt-tun-handoff",
-    [ESP_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "error-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* */
 
-VNET_FEATURE_INIT (esp4o6_encrypt_tun_feat_node, static) =
+VLIB_NODE_FN (esp_mpls_encrypt_tun_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *from_frame)
 {
-  .arc_name = "ip4-output",
-  .node_name = "esp6-encrypt-tun",
-  .runs_before = VNET_FEATURES ("adj-midchain-tx"),
+  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",
+  },
 };
 
-/* *INDENT-ON* */
+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
 {
@@ -908,7 +1405,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;
 
@@ -916,14 +1412,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))
        {
@@ -933,14 +1426,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;
 }
@@ -966,13 +1460,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)
@@ -993,14 +1480,32 @@ VLIB_REGISTER_NODE (esp6_no_crypto_tun_node) =
     [ESP_NO_CRYPTO_NEXT_DROP] = "ip6-drop",
   },
 };
+/* *INDENT-ON* */
+
+#ifndef CLIB_MARCH_VARIANT
 
-VNET_FEATURE_INIT (esp6_no_crypto_tun_feat_node, static) =
+static clib_error_t *
+esp_encrypt_init (vlib_main_t *vm)
 {
-  .arc_name = "ip6-output",
-  .node_name = "esp6-no-crypto",
-  .runs_before = VNET_FEATURES ("adj-midchain-tx"),
-};
-/* *INDENT-ON* */
+  ipsec_main_t *im = &ipsec_main;
+
+  im->esp4_enc_fq_index =
+    vlib_frame_queue_main_init (esp4_encrypt_node.index, 0);
+  im->esp6_enc_fq_index =
+    vlib_frame_queue_main_init (esp6_encrypt_node.index, 0);
+  im->esp4_enc_tun_fq_index =
+    vlib_frame_queue_main_init (esp4_encrypt_tun_node.index, 0);
+  im->esp6_enc_tun_fq_index =
+    vlib_frame_queue_main_init (esp6_encrypt_tun_node.index, 0);
+  im->esp_mpls_enc_tun_fq_index =
+    vlib_frame_queue_main_init (esp_mpls_encrypt_tun_node.index, 0);
+
+  return 0;
+}
+
+VLIB_INIT_FUNCTION (esp_encrypt_init);
+
+#endif
 
 /*
  * fd.io coding-style-patch-verification: ON