nat: cleanup & reorganization
[vpp.git] / src / plugins / nat / out2in_ed.c
index e4f0130..b0e8892 100644 (file)
 
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
-#include <vnet/pg/pg.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/fib/ip4_fib.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vppinfra/error.h>
 #include <nat/nat.h>
-#include <nat/nat_ipfix_logging.h>
+#include <nat/lib/ipfix_logging.h>
 #include <nat/nat_inlines.h>
 #include <nat/nat44/inlines.h>
-#include <nat/nat_syslog.h>
+#include <nat/lib/nat_syslog.h>
 #include <nat/nat_ha.h>
+#include <nat/nat44/ed_inlines.h>
 
 static char *nat_out2in_ed_error_strings[] = {
 #define _(sym,string) string,
@@ -71,6 +71,8 @@ icmp_out2in_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0,
                          vlib_node_runtime_t * node, u32 next0, f64 now,
                          u32 thread_index, snat_session_t ** p_s0)
 {
+  vlib_main_t *vm = vlib_get_main ();
+
   next0 = icmp_out2in (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                       next0, thread_index, p_s0, 0);
   snat_session_t *s0 = *p_s0;
@@ -79,7 +81,7 @@ icmp_out2in_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0,
       /* Accounting */
       nat44_session_update_counters (s0, now,
                                     vlib_buffer_length_in_chain
-                                    (sm->vlib_main, b0), thread_index);
+                                    (vm, b0), thread_index);
       /* Per-user LRU list maintenance */
       nat44_session_update_lru (sm, s0, thread_index);
     }
@@ -94,11 +96,13 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
   nat44_is_idle_session_ctx_t *ctx = arg;
   snat_session_t *s;
   u64 sess_timeout_time;
-  nat_ed_ses_key_t ed_key;
+  u8 proto;
+  u16 r_port, l_port;
+  ip4_address_t *l_addr, *r_addr;
+  u32 fib_index;
   clib_bihash_kv_16_8_t ed_kv;
   int i;
-  snat_address_t *a;
-  snat_session_key_t key;
+  //snat_address_t *a;
   snat_main_per_thread_data_t *tsm = vec_elt_at_index (sm->per_thread_data,
                                                       ctx->thread_index);
 
@@ -106,67 +110,67 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
   sess_timeout_time = s->last_heard + (f64) nat44_session_get_timeout (sm, s);
   if (ctx->now >= sess_timeout_time)
     {
-      ed_key.l_addr = s->in2out.addr;
-      ed_key.r_addr = s->ext_host_addr;
-      ed_key.fib_index = s->in2out.fib_index;
+      l_addr = &s->in2out.addr;
+      r_addr = &s->ext_host_addr;
+      fib_index = s->in2out.fib_index;
       if (snat_is_unk_proto_session (s))
        {
-         ed_key.proto = s->in2out.port;
-         ed_key.r_port = 0;
-         ed_key.l_port = 0;
+         proto = s->in2out.port;
+         r_port = 0;
+         l_port = 0;
        }
       else
        {
-         ed_key.proto = snat_proto_to_ip_proto (s->in2out.protocol);
-         ed_key.l_port = s->in2out.port;
-         ed_key.r_port = s->ext_host_port;
+         proto = nat_proto_to_ip_proto (s->nat_proto);
+         l_port = s->in2out.port;
+         r_port = s->ext_host_port;
        }
       if (is_twice_nat_session (s))
        {
-         ed_key.r_addr = s->ext_host_nat_addr;
-         ed_key.r_port = s->ext_host_nat_port;
+         r_addr = &s->ext_host_nat_addr;
+         r_port = s->ext_host_nat_port;
        }
-      ed_kv.key[0] = ed_key.as_u64[0];
-      ed_kv.key[1] = ed_key.as_u64[1];
+      init_ed_k (&ed_kv, *l_addr, l_port, *r_addr, r_port, fib_index, proto);
       if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &ed_kv, 0))
        nat_elog_warn ("in2out_ed key del failed");
 
       if (snat_is_unk_proto_session (s))
        goto delete;
 
-      snat_ipfix_logging_nat44_ses_delete (ctx->thread_index,
-                                          s->in2out.addr.as_u32,
-                                          s->out2in.addr.as_u32,
-                                          s->in2out.protocol,
-                                          s->in2out.port,
-                                          s->out2in.port,
-                                          s->in2out.fib_index);
+      nat_ipfix_logging_nat44_ses_delete (ctx->thread_index,
+                                         s->in2out.addr.as_u32,
+                                         s->out2in.addr.as_u32,
+                                         s->nat_proto,
+                                         s->in2out.port,
+                                         s->out2in.port,
+                                         s->in2out.fib_index);
 
       nat_syslog_nat44_sdel (s->user_index, s->in2out.fib_index,
                             &s->in2out.addr, s->in2out.port,
                             &s->ext_host_nat_addr, s->ext_host_nat_port,
                             &s->out2in.addr, s->out2in.port,
                             &s->ext_host_addr, s->ext_host_port,
-                            s->in2out.protocol, is_twice_nat_session (s));
+                            s->nat_proto, is_twice_nat_session (s));
 
       nat_ha_sdel (&s->out2in.addr, s->out2in.port, &s->ext_host_addr,
-                  s->ext_host_port, s->out2in.protocol, s->out2in.fib_index,
+                  s->ext_host_port, s->nat_proto, s->out2in.fib_index,
                   ctx->thread_index);
 
       if (is_twice_nat_session (s))
        {
          for (i = 0; i < vec_len (sm->twice_nat_addresses); i++)
            {
-             key.protocol = s->in2out.protocol;
-             key.port = s->ext_host_nat_port;
-             a = sm->twice_nat_addresses + i;
-             if (a->addr.as_u32 == s->ext_host_nat_addr.as_u32)
-               {
-                 snat_free_outside_address_and_port (sm->twice_nat_addresses,
-                                                     ctx->thread_index,
-                                                     &key);
-                 break;
-               }
+             // FIXME TODO this is obviously wrong code ... needs fix!
+             //       key.protocol = s->nat_proto;
+             //       key.port = s->ext_host_nat_port;
+             //       a = sm->twice_nat_addresses + i;
+             //       if (a->addr.as_u32 == s->ext_host_nat_addr.as_u32)
+             //      {
+             //        snat_free_outside_address_and_port (sm->twice_nat_addresses,
+             //                                            ctx->thread_index,
+             //                                            &key);
+             //        break;
+             //      }
            }
        }
 
@@ -174,9 +178,10 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
        goto delete;
 
       snat_free_outside_address_and_port (sm->addresses, ctx->thread_index,
-                                         &s->out2in);
+                                         &s->out2in.addr, s->out2in.port,
+                                         s->nat_proto);
     delete:
-      nat44_delete_session (sm, s, ctx->thread_index);
+      nat_ed_session_delete (sm, s, ctx->thread_index, 1);
       return 1;
     }
 
@@ -184,45 +189,88 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
 }
 #endif
 
+// allocate exact address based on preference
+static_always_inline int
+nat_alloc_addr_and_port_exact (snat_address_t * a,
+                              u32 thread_index,
+                              nat_protocol_t proto,
+                              ip4_address_t * addr,
+                              u16 * port,
+                              u16 port_per_thread, u32 snat_thread_index)
+{
+  u32 portnum;
+
+  switch (proto)
+    {
+#define _(N, j, n, s) \
+    case NAT_PROTOCOL_##N: \
+      if (a->busy_##n##_ports_per_thread[thread_index] < port_per_thread) \
+        { \
+          while (1) \
+            { \
+              portnum = (port_per_thread * \
+                snat_thread_index) + \
+                snat_random_port(0, port_per_thread - 1) + 1024; \
+              if (a->busy_##n##_port_refcounts[portnum]) \
+                continue; \
+             --a->busy_##n##_port_refcounts[portnum]; \
+              a->busy_##n##_ports_per_thread[thread_index]++; \
+              a->busy_##n##_ports++; \
+              *addr = a->addr; \
+              *port = clib_host_to_net_u16(portnum); \
+              return 0; \
+            } \
+        } \
+      break;
+      foreach_nat_protocol
+#undef _
+    default:
+      nat_elog_info ("unknown protocol");
+      return 1;
+    }
+
+  /* Totally out of translations to use... */
+  nat_ipfix_logging_addresses_exhausted (thread_index, 0);
+  return 1;
+}
+
+
 static snat_session_t *
 create_session_for_static_mapping_ed (snat_main_t * sm,
                                      vlib_buffer_t * b,
-                                     snat_session_key_t l_key,
-                                     snat_session_key_t e_key,
+                                     ip4_address_t i2o_addr,
+                                     u16 i2o_port,
+                                     u32 i2o_fib_index,
+                                     ip4_address_t o2i_addr,
+                                     u16 o2i_port,
+                                     u32 o2i_fib_index,
+                                     nat_protocol_t nat_proto,
                                      vlib_node_runtime_t * node,
+                                     u32 rx_fib_index,
                                      u32 thread_index,
                                      twice_nat_type_t twice_nat,
-                                     lb_nat_type_t lb_nat, f64 now)
+                                     lb_nat_type_t lb_nat, f64 now,
+                                     snat_static_mapping_t * mapping)
 {
   snat_session_t *s;
-  snat_user_t *u;
   ip4_header_t *ip;
   udp_header_t *udp;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
   clib_bihash_kv_16_8_t kv;
-  snat_session_key_t eh_key;
   nat44_is_idle_session_ctx_t ctx;
 
-  if (PREDICT_FALSE (nat44_maximum_sessions_exceeded (sm, thread_index)))
+  if (PREDICT_FALSE
+      (nat44_ed_maximum_sessions_exceeded (sm, rx_fib_index, thread_index)))
     {
       b->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_SESSIONS_EXCEEDED];
       nat_elog_notice ("maximum sessions exceeded");
       return 0;
     }
 
-  u = nat_user_get_or_create (sm, &l_key.addr, l_key.fib_index, thread_index);
-  if (!u)
-    {
-      b->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_SESSIONS_EXCEEDED];
-      nat_elog_warn ("create NAT user failed");
-      return 0;
-    }
-
-  s = nat_ed_session_alloc (sm, u, thread_index, now);
+  s = nat_ed_session_alloc (sm, thread_index, now, nat_proto);
   if (!s)
     {
       b->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_USER_SESS_EXCEEDED];
-      nat44_delete_user_with_no_session (sm, u, thread_index);
       nat_elog_warn ("create NAT session failed");
       return 0;
     }
@@ -231,93 +279,131 @@ create_session_for_static_mapping_ed (snat_main_t * sm,
   udp = ip4_next_header (ip);
 
   s->ext_host_addr.as_u32 = ip->src_address.as_u32;
-  s->ext_host_port = e_key.protocol == SNAT_PROTOCOL_ICMP ? 0 : udp->src_port;
+  s->ext_host_port = nat_proto == NAT_PROTOCOL_ICMP ? 0 : udp->src_port;
   s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
   if (lb_nat)
     s->flags |= SNAT_SESSION_FLAG_LOAD_BALANCING;
   if (lb_nat == AFFINITY_LB_NAT)
     s->flags |= SNAT_SESSION_FLAG_AFFINITY;
   s->flags |= SNAT_SESSION_FLAG_ENDPOINT_DEPENDENT;
-  s->out2in = e_key;
-  s->in2out = l_key;
-  s->in2out.protocol = s->out2in.protocol;
-  user_session_increment (sm, u, 1);
+  s->out2in.addr = o2i_addr;
+  s->out2in.port = o2i_port;
+  s->out2in.fib_index = o2i_fib_index;
+  s->in2out.addr = i2o_addr;
+  s->in2out.port = i2o_port;
+  s->in2out.fib_index = i2o_fib_index;
+  s->nat_proto = nat_proto;
 
   /* Add to lookup tables */
-  make_ed_kv (&kv, &e_key.addr, &s->ext_host_addr, ip->protocol,
-             e_key.fib_index, e_key.port, s->ext_host_port);
-  kv.value = s - tsm->sessions;
+  init_ed_kv (&kv, o2i_addr, o2i_port, s->ext_host_addr, s->ext_host_port,
+             o2i_fib_index, ip->protocol, thread_index, s - tsm->sessions);
   ctx.now = now;
   ctx.thread_index = thread_index;
-  if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->out2in_ed, &kv,
+  if (clib_bihash_add_or_overwrite_stale_16_8 (&sm->out2in_ed, &kv,
                                               nat44_o2i_ed_is_idle_session_cb,
                                               &ctx))
     nat_elog_notice ("out2in-ed key add failed");
 
   if (twice_nat == TWICE_NAT || (twice_nat == TWICE_NAT_SELF &&
-                                ip->src_address.as_u32 == l_key.addr.as_u32))
+                                ip->src_address.as_u32 == i2o_addr.as_u32))
     {
-      eh_key.protocol = e_key.protocol;
-      if (snat_alloc_outside_address_and_port (sm->twice_nat_addresses, 0,
-                                              thread_index, &eh_key,
-                                              sm->port_per_thread,
-                                              tsm->snat_thread_index))
+      int rc = 0;
+      snat_address_t *filter = 0;
+
+      // if exact address is specified use this address
+      if (is_exact_address (mapping))
+       {
+         snat_address_t *ap;
+         vec_foreach (ap, sm->twice_nat_addresses)
+         {
+           if (mapping->pool_addr.as_u32 == ap->addr.as_u32)
+             {
+               filter = ap;
+               break;
+             }
+         }
+       }
+
+      if (filter)
+       {
+         rc = nat_alloc_addr_and_port_exact (filter,
+                                             thread_index,
+                                             nat_proto,
+                                             &s->ext_host_nat_addr,
+                                             &s->ext_host_nat_port,
+                                             sm->port_per_thread,
+                                             tsm->snat_thread_index);
+         s->flags |= SNAT_SESSION_FLAG_EXACT_ADDRESS;
+       }
+      else
+       {
+         rc =
+           snat_alloc_outside_address_and_port (sm->twice_nat_addresses, 0,
+                                                thread_index, nat_proto,
+                                                &s->ext_host_nat_addr,
+                                                &s->ext_host_nat_port,
+                                                sm->port_per_thread,
+                                                tsm->snat_thread_index);
+       }
+
+      if (rc)
        {
          b->error = node->errors[NAT_OUT2IN_ED_ERROR_OUT_OF_PORTS];
-         nat44_delete_session (sm, s, thread_index);
-         if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &kv, 0))
+         nat_ed_session_delete (sm, s, thread_index, 1);
+         if (clib_bihash_add_del_16_8 (&sm->out2in_ed, &kv, 0))
            nat_elog_notice ("out2in-ed key del failed");
          return 0;
        }
-      s->ext_host_nat_addr.as_u32 = eh_key.addr.as_u32;
-      s->ext_host_nat_port = eh_key.port;
+
       s->flags |= SNAT_SESSION_FLAG_TWICE_NAT;
-      make_ed_kv (&kv, &l_key.addr, &s->ext_host_nat_addr, ip->protocol,
-                 l_key.fib_index, l_key.port, s->ext_host_nat_port);
+      init_ed_kv (&kv, i2o_addr, i2o_port, s->ext_host_nat_addr,
+                 s->ext_host_nat_port, i2o_fib_index, ip->protocol,
+                 thread_index, s - tsm->sessions);
     }
   else
     {
-      make_ed_kv (&kv, &l_key.addr, &s->ext_host_addr, ip->protocol,
-                 l_key.fib_index, l_key.port, s->ext_host_port);
+      init_ed_kv (&kv, i2o_addr, i2o_port, s->ext_host_addr,
+                 s->ext_host_port, i2o_fib_index, ip->protocol,
+                 thread_index, s - tsm->sessions);
     }
-  kv.value = s - tsm->sessions;
   if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->in2out_ed, &kv,
                                               nat44_i2o_ed_is_idle_session_cb,
                                               &ctx))
     nat_elog_notice ("in2out-ed key add failed");
 
-  snat_ipfix_logging_nat44_ses_create (thread_index,
-                                      s->in2out.addr.as_u32,
-                                      s->out2in.addr.as_u32,
-                                      s->in2out.protocol,
-                                      s->in2out.port,
-                                      s->out2in.port, s->in2out.fib_index);
+  nat_ipfix_logging_nat44_ses_create (thread_index,
+                                     s->in2out.addr.as_u32,
+                                     s->out2in.addr.as_u32,
+                                     s->nat_proto,
+                                     s->in2out.port,
+                                     s->out2in.port, s->in2out.fib_index);
 
   nat_syslog_nat44_sadd (s->user_index, s->in2out.fib_index,
                         &s->in2out.addr, s->in2out.port,
                         &s->ext_host_nat_addr, s->ext_host_nat_port,
                         &s->out2in.addr, s->out2in.port,
                         &s->ext_host_addr, s->ext_host_port,
-                        s->in2out.protocol, is_twice_nat_session (s));
+                        s->nat_proto, is_twice_nat_session (s));
 
   nat_ha_sadd (&s->in2out.addr, s->in2out.port, &s->out2in.addr,
               s->out2in.port, &s->ext_host_addr, s->ext_host_port,
               &s->ext_host_nat_addr, s->ext_host_nat_port,
-              s->in2out.protocol, s->in2out.fib_index, s->flags,
-              thread_index, 0);
+              s->nat_proto, s->in2out.fib_index, s->flags, thread_index, 0);
+
+  per_vrf_sessions_register_session (s, thread_index);
 
   return s;
 }
 
 static int
-next_src_nat (snat_main_t * sm, ip4_header_t * ip, u8 proto, u16 src_port,
+next_src_nat (snat_main_t * sm, ip4_header_t * ip, u16 src_port,
              u16 dst_port, u32 thread_index, u32 rx_fib_index)
 {
   clib_bihash_kv_16_8_t kv, value;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
 
-  make_ed_kv (&kv, &ip->src_address, &ip->dst_address, proto,
-             rx_fib_index, src_port, dst_port);
+  init_ed_k (&kv, ip->src_address, src_port, ip->dst_address, dst_port,
+            rx_fib_index, ip->protocol);
   if (!clib_bihash_search_16_8 (&tsm->in2out_ed, &kv, &value))
     return 1;
 
@@ -328,95 +414,97 @@ static void
 create_bypass_for_fwd (snat_main_t * sm, vlib_buffer_t * b, ip4_header_t * ip,
                       u32 rx_fib_index, u32 thread_index)
 {
-  nat_ed_ses_key_t key;
   clib_bihash_kv_16_8_t kv, value;
   udp_header_t *udp;
-  snat_user_t *u;
   snat_session_t *s = 0;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
-  f64 now = vlib_time_now (sm->vlib_main);
+  vlib_main_t *vm = vlib_get_main ();
+  f64 now = vlib_time_now (vm);
+  u16 l_port, r_port;
 
   if (ip->protocol == IP_PROTOCOL_ICMP)
     {
-      if (get_icmp_o2i_ed_key (b, ip, &key))
+      if (get_icmp_o2i_ed_key
+         (b, ip, rx_fib_index, ~0, ~0, 0, &l_port, &r_port, &kv))
        return;
     }
-  else if (ip->protocol == IP_PROTOCOL_UDP || ip->protocol == IP_PROTOCOL_TCP)
-    {
-      udp = ip4_next_header (ip);
-      key.r_addr = ip->src_address;
-      key.l_addr = ip->dst_address;
-      key.proto = ip->protocol;
-      key.l_port = udp->dst_port;
-      key.r_port = udp->src_port;
-    }
   else
     {
-      key.r_addr = ip->src_address;
-      key.l_addr = ip->dst_address;
-      key.proto = ip->protocol;
-      key.l_port = key.r_port = 0;
+      if (ip->protocol == IP_PROTOCOL_UDP || ip->protocol == IP_PROTOCOL_TCP)
+       {
+         udp = ip4_next_header (ip);
+         l_port = udp->dst_port;
+         r_port = udp->src_port;
+       }
+      else
+       {
+         l_port = 0;
+         r_port = 0;
+       }
+      init_ed_k (&kv, ip->dst_address, l_port, ip->src_address, r_port,
+                rx_fib_index, ip->protocol);
     }
-  key.fib_index = 0;
-  kv.key[0] = key.as_u64[0];
-  kv.key[1] = key.as_u64[1];
 
   if (!clib_bihash_search_16_8 (&tsm->in2out_ed, &kv, &value))
     {
-      s = pool_elt_at_index (tsm->sessions, value.value);
+      ASSERT (thread_index == ed_value_get_thread_index (&value));
+      s =
+       pool_elt_at_index (tsm->sessions,
+                          ed_value_get_session_index (&value));
+    }
+  else if (ip->protocol == IP_PROTOCOL_ICMP &&
+          icmp_type_is_error_message
+          (vnet_buffer (b)->ip.reass.icmp_type_or_tcp_flags))
+    {
+      return;
     }
   else
     {
       u32 proto;
 
-      if (PREDICT_FALSE (nat44_maximum_sessions_exceeded (sm, thread_index)))
+      if (PREDICT_FALSE
+         (nat44_ed_maximum_sessions_exceeded
+          (sm, rx_fib_index, thread_index)))
        return;
 
-      u = nat_user_get_or_create (sm, &ip->dst_address, sm->inside_fib_index,
-                                 thread_index);
-      if (!u)
-       {
-         nat_elog_warn ("create NAT user failed");
-         return;
-       }
-
-      s = nat_ed_session_alloc (sm, u, thread_index, now);
+      s = nat_ed_session_alloc (sm, thread_index, now, ip->protocol);
       if (!s)
        {
-         nat44_delete_user_with_no_session (sm, u, thread_index);
          nat_elog_warn ("create NAT session failed");
          return;
        }
 
-      proto = ip_proto_to_snat_proto (key.proto);
+      proto = ip_proto_to_nat_proto (ip->protocol);
 
-      s->ext_host_addr = key.r_addr;
-      s->ext_host_port = key.r_port;
+      s->ext_host_addr = ip->src_address;
+      s->ext_host_port = r_port;
       s->flags |= SNAT_SESSION_FLAG_FWD_BYPASS;
-      s->out2in.addr = key.l_addr;
-      s->out2in.port = key.l_port;
-      s->out2in.protocol = proto;
-      if (proto == ~0)
+      s->out2in.addr = ip->dst_address;
+      s->out2in.port = l_port;
+      s->nat_proto = proto;
+      if (proto == NAT_PROTOCOL_OTHER)
        {
          s->flags |= SNAT_SESSION_FLAG_UNKNOWN_PROTO;
          s->out2in.port = ip->protocol;
        }
-      s->out2in.fib_index = 0;
-      s->in2out = s->out2in;
-      user_session_increment (sm, u, 0);
+      s->out2in.fib_index = rx_fib_index;
+      s->in2out.addr = s->out2in.addr;
+      s->in2out.port = s->out2in.port;
+      s->in2out.fib_index = s->out2in.fib_index;
 
       kv.value = s - tsm->sessions;
       if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &kv, 1))
        nat_elog_notice ("in2out_ed key add failed");
+
+      per_vrf_sessions_register_session (s, thread_index);
     }
 
   if (ip->protocol == IP_PROTOCOL_TCP)
     {
       tcp_header_t *tcp = ip4_next_header (ip);
-      if (nat44_set_tcp_session_state_o2i
-         (sm, now, s, tcp->flags, tcp->ack_number, tcp->seq_number,
-          thread_index))
-       return;
+      nat44_set_tcp_session_state_o2i (sm, now, s, tcp->flags,
+                                      tcp->ack_number, tcp->seq_number,
+                                      thread_index);
     }
 
   /* Accounting */
@@ -440,69 +528,75 @@ create_bypass_for_fwd_worker (snat_main_t * sm, vlib_buffer_t * b,
 #ifndef CLIB_MARCH_VARIANT
 u32
 icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
-                     u32 thread_index, vlib_buffer_t * b, ip4_header_t * ip,
-                     u8 * p_proto, snat_session_key_t * p_value,
-                     u8 * p_dont_translate, void *d, void *e)
+                     u32 thread_index, vlib_buffer_t * b,
+                     ip4_header_t * ip, ip4_address_t * addr,
+                     u16 * port, u32 * fib_index, nat_protocol_t * proto,
+                     void *d, void *e, u8 * dont_translate)
 {
   u32 next = ~0, sw_if_index, rx_fib_index;
-  nat_ed_ses_key_t key;
   clib_bihash_kv_16_8_t kv, value;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
   snat_session_t *s = 0;
-  u8 dont_translate = 0, is_addr_only, identity_nat;
-  snat_session_key_t e_key, l_key;
+  u8 is_addr_only, identity_nat;
+  u16 l_port, r_port;
+  vlib_main_t *vm = vlib_get_main ();
+  ip4_address_t sm_addr;
+  u16 sm_port;
+  u32 sm_fib_index;
+  *dont_translate = 0;
+  snat_static_mapping_t *m;
 
   sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX];
   rx_fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
 
-  if (get_icmp_o2i_ed_key (b, ip, &key))
+  if (get_icmp_o2i_ed_key
+      (b, ip, rx_fib_index, ~0, ~0, proto, &l_port, &r_port, &kv))
     {
       b->error = node->errors[NAT_OUT2IN_ED_ERROR_UNSUPPORTED_PROTOCOL];
       next = NAT_NEXT_DROP;
       goto out;
     }
-  key.fib_index = rx_fib_index;
-  kv.key[0] = key.as_u64[0];
-  kv.key[1] = key.as_u64[1];
 
-  if (clib_bihash_search_16_8 (&tsm->out2in_ed, &kv, &value))
+  if (clib_bihash_search_16_8 (&sm->out2in_ed, &kv, &value))
     {
-      /* Try to match static mapping */
-      e_key.addr = ip->dst_address;
-      e_key.port = key.l_port;
-      e_key.protocol = ip_proto_to_snat_proto (key.proto);
-      e_key.fib_index = rx_fib_index;
       if (snat_static_mapping_match
-         (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0, &identity_nat))
+         (sm, ip->dst_address, l_port, rx_fib_index,
+          ip_proto_to_nat_proto (ip->protocol), &sm_addr, &sm_port,
+          &sm_fib_index, 1, &is_addr_only, 0, 0, 0, &identity_nat, &m))
        {
+         // static mapping not matched
          if (!sm->forwarding_enabled)
            {
              /* Don't NAT packet aimed at the intfc address */
              if (PREDICT_FALSE (is_interface_addr (sm, node, sw_if_index,
                                                    ip->dst_address.as_u32)))
                {
-                 dont_translate = 1;
-                 goto out;
+                 *dont_translate = 1;
+               }
+             else
+               {
+                 b->error = node->errors[NAT_OUT2IN_ED_ERROR_NO_TRANSLATION];
+                 next = NAT_NEXT_DROP;
                }
-             b->error = node->errors[NAT_OUT2IN_ED_ERROR_NO_TRANSLATION];
-             next = NAT_NEXT_DROP;
-             goto out;
            }
          else
            {
-             dont_translate = 1;
-             if (next_src_nat (sm, ip, key.proto, key.l_port, key.r_port,
+             *dont_translate = 1;
+             if (next_src_nat (sm, ip, l_port, r_port,
                                thread_index, rx_fib_index))
                {
                  next = NAT_NEXT_IN2OUT_ED_FAST_PATH;
-                 goto out;
                }
-             if (sm->num_workers > 1)
-               create_bypass_for_fwd_worker (sm, b, ip, rx_fib_index);
              else
-               create_bypass_for_fwd (sm, b, ip, rx_fib_index, thread_index);
-             goto out;
+               {
+                 if (sm->num_workers > 1)
+                   create_bypass_for_fwd_worker (sm, b, ip, rx_fib_index);
+                 else
+                   create_bypass_for_fwd (sm, b, ip, rx_fib_index,
+                                          thread_index);
+               }
            }
+         goto out;
        }
 
       if (PREDICT_FALSE
@@ -518,21 +612,20 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
 
       if (PREDICT_FALSE (identity_nat))
        {
-         dont_translate = 1;
+         *dont_translate = 1;
          goto out;
        }
 
       /* Create session initiated by host from external network */
-      s = create_session_for_static_mapping_ed (sm, b, l_key, e_key, node,
-                                               thread_index, 0, 0,
-                                               vlib_time_now
-                                               (sm->vlib_main));
-
+      s =
+       create_session_for_static_mapping_ed (sm, b, sm_addr, sm_port,
+                                             sm_fib_index, ip->dst_address,
+                                             l_port, rx_fib_index, *proto,
+                                             node, rx_fib_index,
+                                             thread_index, 0, 0,
+                                             vlib_time_now (vm), m);
       if (!s)
-       {
-         next = NAT_NEXT_DROP;
-         goto out;
-       }
+       next = NAT_NEXT_DROP;
     }
   else
     {
@@ -549,14 +642,18 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
          goto out;
        }
 
-      s = pool_elt_at_index (tsm->sessions, value.value);
+      ASSERT (thread_index == ed_value_get_thread_index (&value));
+      s =
+       pool_elt_at_index (tsm->sessions,
+                          ed_value_get_session_index (&value));
     }
-
-  *p_proto = ip_proto_to_snat_proto (key.proto);
 out:
   if (s)
-    *p_value = s->in2out;
-  *p_dont_translate = dont_translate;
+    {
+      *addr = s->in2out.addr;
+      *port = s->in2out.port;
+      *fib_index = s->in2out.fib_index;
+    }
   if (d)
     *(snat_session_t **) d = s;
   return next;
@@ -579,28 +676,32 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm,
   ip_csum_t sum;
   snat_session_t *s;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
-  snat_user_t *u;
 
   old_addr = ip->dst_address.as_u32;
 
-  make_ed_kv (&s_kv, &ip->dst_address, &ip->src_address, ip->protocol,
-             rx_fib_index, 0, 0);
+  init_ed_k (&s_kv, ip->dst_address, 0, ip->src_address, 0, rx_fib_index,
+            ip->protocol);
 
-  if (!clib_bihash_search_16_8 (&tsm->out2in_ed, &s_kv, &s_value))
+  if (!clib_bihash_search_16_8 (&sm->out2in_ed, &s_kv, &s_value))
     {
-      s = pool_elt_at_index (tsm->sessions, s_value.value);
+      ASSERT (thread_index == ed_value_get_thread_index (&s_value));
+      s =
+       pool_elt_at_index (tsm->sessions,
+                          ed_value_get_session_index (&s_value));
       new_addr = ip->dst_address.as_u32 = s->in2out.addr.as_u32;
     }
   else
     {
-      if (PREDICT_FALSE (nat44_maximum_sessions_exceeded (sm, thread_index)))
+      if (PREDICT_FALSE
+         (nat44_ed_maximum_sessions_exceeded
+          (sm, rx_fib_index, thread_index)))
        {
          b->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_SESSIONS_EXCEEDED];
          nat_elog_notice ("maximum sessions exceeded");
          return 0;
        }
 
-      make_sm_kv (&kv, &ip->dst_address, 0, 0, 0);
+      init_nat_k (&kv, ip->dst_address, 0, 0, 0);
       if (clib_bihash_search_8_8
          (&sm->static_mapping_by_external, &kv, &value))
        {
@@ -612,21 +713,11 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm,
 
       new_addr = ip->dst_address.as_u32 = m->local_addr.as_u32;
 
-      u = nat_user_get_or_create (sm, &m->local_addr, m->fib_index,
-                                 thread_index);
-      if (!u)
-       {
-         b->error = node->errors[NAT_OUT2IN_ED_ERROR_CANNOT_CREATE_USER];
-         nat_elog_warn ("create NAT user failed");
-         return 0;
-       }
-
       /* Create a new session */
-      s = nat_ed_session_alloc (sm, u, thread_index, now);
+      s = nat_ed_session_alloc (sm, thread_index, now, ip->protocol);
       if (!s)
        {
          b->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_USER_SESS_EXCEEDED];
-         nat44_delete_user_with_no_session (sm, u, thread_index);
          nat_elog_warn ("create NAT session failed");
          return 0;
        }
@@ -640,18 +731,18 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm,
       s->in2out.addr.as_u32 = new_addr;
       s->in2out.fib_index = m->fib_index;
       s->in2out.port = s->out2in.port = ip->protocol;
-      user_session_increment (sm, u, 1);
 
       /* Add to lookup tables */
       s_kv.value = s - tsm->sessions;
-      if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &s_kv, 1))
+      if (clib_bihash_add_del_16_8 (&sm->out2in_ed, &s_kv, 1))
        nat_elog_notice ("out2in key add failed");
 
-      make_ed_kv (&s_kv, &ip->dst_address, &ip->src_address, ip->protocol,
-                 m->fib_index, 0, 0);
-      s_kv.value = s - tsm->sessions;
+      init_ed_kv (&s_kv, ip->dst_address, 0, ip->src_address, 0, m->fib_index,
+                 ip->protocol, thread_index, s - tsm->sessions);
       if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &s_kv, 1))
        nat_elog_notice ("in2out key add failed");
+
+      per_vrf_sessions_register_session (s, thread_index);
     }
 
   /* Update IP checksum */
@@ -673,191 +764,194 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm,
 static inline uword
 nat44_ed_out2in_fast_path_node_fn_inline (vlib_main_t * vm,
                                          vlib_node_runtime_t * node,
-                                         vlib_frame_t * frame)
+                                         vlib_frame_t * frame,
+                                         int is_multi_worker)
 {
-  u32 n_left_from, *from, *to_next, pkts_processed = 0, stats_node_index;
-  nat_next_t next_index;
+  u32 n_left_from, *from;
   snat_main_t *sm = &snat_main;
   f64 now = vlib_time_now (vm);
   u32 thread_index = vm->thread_index;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
-  u32 tcp_packets = 0, udp_packets = 0, icmp_packets = 0, other_packets =
-    0, fragments = 0;
-
-  stats_node_index = sm->ed_out2in_node_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
+
+  vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs;
+  u16 nexts[VLIB_FRAME_SIZE], *next = nexts;
+  vlib_get_buffers (vm, from, b, n_left_from);
 
   while (n_left_from > 0)
     {
-      u32 n_left_to_next;
+      vlib_buffer_t *b0;
+      u32 sw_if_index0, rx_fib_index0, proto0, old_addr0, new_addr0;
+      u16 old_port0, new_port0;
+      ip4_header_t *ip0;
+      udp_header_t *udp0;
+      tcp_header_t *tcp0;
+      snat_session_t *s0 = 0;
+      clib_bihash_kv_16_8_t kv0, value0;
+      ip_csum_t sum0;
+
+      b0 = *b;
+      b++;
+
+      /* Prefetch next iteration. */
+      if (PREDICT_TRUE (n_left_from >= 2))
+       {
+         vlib_buffer_t *p2;
 
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+         p2 = *b;
 
-      while (n_left_from > 0 && n_left_to_next > 0)
+         vlib_prefetch_buffer_header (p2, LOAD);
+
+         CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, LOAD);
+       }
+
+      next[0] = vnet_buffer2 (b0)->nat.arc_next;
+
+      vnet_buffer (b0)->snat.flags = 0;
+      ip0 = vlib_buffer_get_current (b0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      rx_fib_index0 =
+       fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index0);
+
+      if (PREDICT_FALSE (ip0->ttl == 1))
        {
-         u32 bi0;
-         vlib_buffer_t *b0;
-         u32 next0, sw_if_index0, rx_fib_index0, proto0, old_addr0,
-           new_addr0;
-         u16 old_port0, new_port0;
-         ip4_header_t *ip0;
-         udp_header_t *udp0;
-         tcp_header_t *tcp0;
-         snat_session_t *s0 = 0;
-         clib_bihash_kv_16_8_t kv0, value0;
-         ip_csum_t sum0;
-
-         /* speculatively enqueue b0 to the current next frame */
-         bi0 = from[0];
-         to_next[0] = bi0;
-         from += 1;
-         to_next += 1;
-         n_left_from -= 1;
-         n_left_to_next -= 1;
-
-         b0 = vlib_get_buffer (vm, bi0);
-         next0 = nat_buffer_opaque (b0)->arc_next;
-
-         vnet_buffer (b0)->snat.flags = 0;
-         ip0 = vlib_buffer_get_current (b0);
-
-         sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-         rx_fib_index0 =
-           fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
-                                                sw_if_index0);
-
-         if (PREDICT_FALSE (ip0->ttl == 1))
-           {
-             vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-             icmp4_error_set_vnet_buffer (b0, ICMP4_time_exceeded,
-                                          ICMP4_time_exceeded_ttl_exceeded_in_transit,
-                                          0);
-             next0 = NAT_NEXT_ICMP_ERROR;
-             goto trace0;
-           }
+         vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+         icmp4_error_set_vnet_buffer (b0, ICMP4_time_exceeded,
+                                      ICMP4_time_exceeded_ttl_exceeded_in_transit,
+                                      0);
+         next[0] = NAT_NEXT_ICMP_ERROR;
+         goto trace0;
+       }
 
-         udp0 = ip4_next_header (ip0);
-         tcp0 = (tcp_header_t *) udp0;
-         proto0 = ip_proto_to_snat_proto (ip0->protocol);
+      udp0 = ip4_next_header (ip0);
+      tcp0 = (tcp_header_t *) udp0;
+      proto0 = ip_proto_to_nat_proto (ip0->protocol);
 
-         if (PREDICT_FALSE (proto0 == ~0))
-           {
-             next0 = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
-             goto trace0;
-           }
+      if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_OTHER))
+       {
+         next[0] = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
+         goto trace0;
+       }
+
+      if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_ICMP))
+       {
+         next[0] = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
+         goto trace0;
+       }
 
-         if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+      init_ed_k (&kv0, ip0->dst_address,
+                vnet_buffer (b0)->ip.reass.l4_dst_port, ip0->src_address,
+                vnet_buffer (b0)->ip.reass.l4_src_port, rx_fib_index0,
+                ip0->protocol);
+
+      /* there is a stashed index in vnet_buffer2 from handoff node,
+       * see if we can use it */
+      if (is_multi_worker
+         &&
+         PREDICT_TRUE (!pool_is_free_index
+                       (tsm->sessions,
+                        vnet_buffer2 (b0)->nat.ed_out2in_nat_session_index)))
+       {
+         s0 = pool_elt_at_index (tsm->sessions,
+                                 vnet_buffer2 (b0)->
+                                 nat.ed_out2in_nat_session_index);
+         if (PREDICT_TRUE
+             (s0->out2in.addr.as_u32 == ip0->dst_address.as_u32
+              && s0->out2in.port == vnet_buffer (b0)->ip.reass.l4_dst_port
+              && s0->nat_proto == ip_proto_to_nat_proto (ip0->protocol)
+              && s0->out2in.fib_index == rx_fib_index0
+              && s0->ext_host_addr.as_u32 == ip0->src_address.as_u32
+              && s0->ext_host_port ==
+              vnet_buffer (b0)->ip.reass.l4_src_port))
            {
-             next0 = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
-             goto trace0;
+             /* yes, this is the droid we're looking for */
+             goto skip_lookup;
            }
+       }
 
-         make_ed_kv (&kv0, &ip0->dst_address, &ip0->src_address,
-                     ip0->protocol, rx_fib_index0,
-                     vnet_buffer (b0)->ip.reass.l4_dst_port,
-                     vnet_buffer (b0)->ip.reass.l4_src_port);
+      // lookup for session
+      if (clib_bihash_search_16_8 (&sm->out2in_ed, &kv0, &value0))
+       {
+         // session does not exist go slow path
+         next[0] = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
+         goto trace0;
+       }
+      ASSERT (thread_index == ed_value_get_thread_index (&value0));
+      s0 =
+       pool_elt_at_index (tsm->sessions,
+                          ed_value_get_session_index (&value0));
 
-         if (clib_bihash_search_16_8 (&tsm->out2in_ed, &kv0, &value0))
-           {
-             next0 = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
-             goto trace0;
-           }
-         s0 = pool_elt_at_index (tsm->sessions, value0.value);
+    skip_lookup:
+
+      if (PREDICT_FALSE (per_vrf_sessions_is_expired (s0, thread_index)))
+       {
+         // session is closed, go slow path
+         nat_free_session_data (sm, s0, thread_index, 0);
+         nat_ed_session_delete (sm, s0, thread_index, 1);
+         next[0] = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
+         goto trace0;
+       }
 
-         if (s0->tcp_close_timestamp)
+      if (s0->tcp_closed_timestamp)
+       {
+         if (now >= s0->tcp_closed_timestamp)
            {
-             if (now >= s0->tcp_close_timestamp)
-               {
-                 // session is closed, go slow path
-                 next0 = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
-               }
-             else
-               {
-                 // session in transitory timeout, drop
-                 b0->error = node->errors[NAT_OUT2IN_ED_ERROR_TCP_CLOSED];
-                 next0 = NAT_NEXT_DROP;
-               }
-             goto trace0;
+             // session is closed, go slow path, freed in slow path
+             next[0] = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
            }
-
-         // drop if session expired
-         u64 sess_timeout_time;
-         sess_timeout_time = s0->last_heard +
-           (f64) nat44_session_get_timeout (sm, s0);
-         if (now >= sess_timeout_time)
+         else
            {
-             // session is closed, go slow path
-             nat_free_session_data (sm, s0, thread_index, 0);
-             nat44_delete_session (sm, s0, thread_index);
-             next0 = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
-             goto trace0;
+             // session in transitory timeout, drop
+             b0->error = node->errors[NAT_OUT2IN_ED_ERROR_TCP_CLOSED];
+             next[0] = NAT_NEXT_DROP;
            }
-         //
+         goto trace0;
+       }
 
-         old_addr0 = ip0->dst_address.as_u32;
-         new_addr0 = ip0->dst_address.as_u32 = s0->in2out.addr.as_u32;
-         vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+      // drop if session expired
+      u64 sess_timeout_time;
+      sess_timeout_time =
+       s0->last_heard + (f64) nat44_session_get_timeout (sm, s0);
+      if (now >= sess_timeout_time)
+       {
+         // session is closed, go slow path
+         nat_free_session_data (sm, s0, thread_index, 0);
+         nat_ed_session_delete (sm, s0, thread_index, 1);
+         next[0] = NAT_NEXT_OUT2IN_ED_SLOW_PATH;
+         goto trace0;
+       }
 
-         sum0 = ip0->checksum;
-         sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                                dst_address);
-         if (PREDICT_FALSE (is_twice_nat_session (s0)))
-           sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
-                                  s0->ext_host_nat_addr.as_u32, ip4_header_t,
-                                  src_address);
-         ip0->checksum = ip_csum_fold (sum0);
+      old_addr0 = ip0->dst_address.as_u32;
+      new_addr0 = ip0->dst_address.as_u32 = s0->in2out.addr.as_u32;
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
 
-         old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
+      sum0 = ip0->checksum;
+      sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                            dst_address);
+      if (PREDICT_FALSE (is_twice_nat_session (s0)))
+       sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
+                              s0->ext_host_nat_addr.as_u32, ip4_header_t,
+                              src_address);
+      ip0->checksum = ip_csum_fold (sum0);
 
-         if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
-           {
-             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
-               {
-                 new_port0 = udp0->dst_port = s0->in2out.port;
-                 sum0 = tcp0->checksum;
-                 sum0 =
-                   ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                                   dst_address);
-                 sum0 =
-                   ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
-                                   length);
-                 if (is_twice_nat_session (s0))
-                   {
-                     sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
-                                            s0->ext_host_nat_addr.as_u32,
-                                            ip4_header_t, dst_address);
-                     sum0 =
-                       ip_csum_update (sum0,
-                                       vnet_buffer (b0)->ip.
-                                       reass.l4_src_port,
-                                       s0->ext_host_nat_port, ip4_header_t,
-                                       length);
-                     tcp0->src_port = s0->ext_host_nat_port;
-                     ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
-                   }
-                 tcp0->checksum = ip_csum_fold (sum0);
-               }
-             tcp_packets++;
-             if (nat44_set_tcp_session_state_o2i
-                 (sm, now, s0,
-                  vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags,
-                  vnet_buffer (b0)->ip.reass.tcp_ack_number,
-                  vnet_buffer (b0)->ip.reass.tcp_seq_number, thread_index))
-               goto trace0;
-           }
-         else if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment
-                  && udp0->checksum)
+      old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
+
+      if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
+       {
+         if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
            {
              new_port0 = udp0->dst_port = s0->in2out.port;
-             sum0 = udp0->checksum;
-             sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                                    dst_address);
-             sum0 = ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
-                                    length);
-             if (PREDICT_FALSE (is_twice_nat_session (s0)))
+             sum0 = tcp0->checksum;
+             sum0 =
+               ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                               dst_address);
+             sum0 =
+               ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
+                               length);
+             if (is_twice_nat_session (s0))
                {
                  sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
                                         s0->ext_host_nat_addr.as_u32,
@@ -867,74 +961,99 @@ nat44_ed_out2in_fast_path_node_fn_inline (vlib_main_t * vm,
                                    vnet_buffer (b0)->ip.reass.l4_src_port,
                                    s0->ext_host_nat_port, ip4_header_t,
                                    length);
-                 udp0->src_port = s0->ext_host_nat_port;
+                 tcp0->src_port = s0->ext_host_nat_port;
                  ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
-             udp0->checksum = ip_csum_fold (sum0);
-             udp_packets++;
+             tcp0->checksum = ip_csum_fold (sum0);
            }
-         else
+         vlib_increment_simple_counter (&sm->counters.fastpath.out2in_ed.tcp,
+                                        thread_index, sw_if_index0, 1);
+         nat44_set_tcp_session_state_o2i (sm, now, s0,
+                                          vnet_buffer (b0)->ip.
+                                          reass.icmp_type_or_tcp_flags,
+                                          vnet_buffer (b0)->ip.
+                                          reass.tcp_ack_number,
+                                          vnet_buffer (b0)->ip.
+                                          reass.tcp_seq_number,
+                                          thread_index);
+       }
+      else if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment
+              && udp0->checksum)
+       {
+         new_port0 = udp0->dst_port = s0->in2out.port;
+         sum0 = udp0->checksum;
+         sum0 =
+           ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                           dst_address);
+         sum0 =
+           ip_csum_update (sum0, old_port0, new_port0, ip4_header_t, length);
+         if (PREDICT_FALSE (is_twice_nat_session (s0)))
            {
-             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+             sum0 =
+               ip_csum_update (sum0, ip0->src_address.as_u32,
+                               s0->ext_host_nat_addr.as_u32, ip4_header_t,
+                               dst_address);
+             sum0 =
+               ip_csum_update (sum0, vnet_buffer (b0)->ip.reass.l4_src_port,
+                               s0->ext_host_nat_port, ip4_header_t, length);
+             udp0->src_port = s0->ext_host_nat_port;
+             ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
+           }
+         udp0->checksum = ip_csum_fold (sum0);
+         vlib_increment_simple_counter (&sm->counters.fastpath.out2in_ed.udp,
+                                        thread_index, sw_if_index0, 1);
+       }
+      else
+       {
+         if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+           {
+             new_port0 = udp0->dst_port = s0->in2out.port;
+             if (PREDICT_FALSE (is_twice_nat_session (s0)))
                {
-                 new_port0 = udp0->dst_port = s0->in2out.port;
-                 if (PREDICT_FALSE (is_twice_nat_session (s0)))
-                   {
-                     udp0->src_port = s0->ext_host_nat_port;
-                     ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
-                   }
+                 udp0->src_port = s0->ext_host_nat_port;
+                 ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
-             udp_packets++;
            }
+         vlib_increment_simple_counter (&sm->counters.fastpath.out2in_ed.udp,
+                                        thread_index, sw_if_index0, 1);
+       }
 
-         /* Accounting */
-         nat44_session_update_counters (s0, now,
-                                        vlib_buffer_length_in_chain (vm, b0),
-                                        thread_index);
-         /* Per-user LRU list maintenance */
-         nat44_session_update_lru (sm, s0, thread_index);
+      /* Accounting */
+      nat44_session_update_counters (s0, now,
+                                    vlib_buffer_length_in_chain (vm, b0),
+                                    thread_index);
+      /* Per-user LRU list maintenance */
+      nat44_session_update_lru (sm, s0, thread_index);
 
-       trace0:
-         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-           {
-             nat44_ed_out2in_trace_t *t =
-               vlib_add_trace (vm, node, b0, sizeof (*t));
-             t->sw_if_index = sw_if_index0;
-             t->next_index = next0;
-             t->is_slow_path = 0;
-
-             if (s0)
-               t->session_index = s0 - tsm->sessions;
-             else
-               t->session_index = ~0;
-           }
+    trace0:
+      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+                        && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+       {
+         nat44_ed_out2in_trace_t *t =
+           vlib_add_trace (vm, node, b0, sizeof (*t));
+         t->sw_if_index = sw_if_index0;
+         t->next_index = next[0];
+         t->is_slow_path = 0;
+
+         if (s0)
+           t->session_index = s0 - tsm->sessions;
+         else
+           t->session_index = ~0;
+       }
 
-         pkts_processed += next0 == nat_buffer_opaque (b0)->arc_next;
-         /* verify speculative enqueue, maybe switch current next frame */
-         vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-                                          to_next, n_left_to_next,
-                                          bi0, next0);
+      if (next[0] == NAT_NEXT_DROP)
+       {
+         vlib_increment_simple_counter (&sm->counters.fastpath.
+                                        out2in_ed.drops, thread_index,
+                                        sw_if_index0, 1);
        }
 
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      n_left_from--;
+      next++;
     }
 
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_OUT2IN_PACKETS,
-                              pkts_processed);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_TCP_PACKETS, tcp_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_UDP_PACKETS, udp_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_ICMP_PACKETS,
-                              icmp_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_OTHER_PACKETS,
-                              other_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_FRAGMENTS, fragments);
+  vlib_buffer_enqueue_to_next (vm, node, from, (u16 *) nexts,
+                              frame->n_vectors);
   return frame->n_vectors;
 }
 
@@ -943,166 +1062,152 @@ nat44_ed_out2in_slow_path_node_fn_inline (vlib_main_t * vm,
                                          vlib_node_runtime_t * node,
                                          vlib_frame_t * frame)
 {
-  u32 n_left_from, *from, *to_next, pkts_processed = 0, stats_node_index;
-  nat_next_t next_index;
+  u32 n_left_from, *from;
   snat_main_t *sm = &snat_main;
   f64 now = vlib_time_now (vm);
   u32 thread_index = vm->thread_index;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
-  u32 tcp_packets = 0, udp_packets = 0, icmp_packets = 0, other_packets =
-    0, fragments = 0;
-
-  stats_node_index = sm->ed_out2in_slowpath_node_index;
+  snat_static_mapping_t *m;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
+
+  vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b = bufs;
+  u16 nexts[VLIB_FRAME_SIZE], *next = nexts;
+  vlib_get_buffers (vm, from, b, n_left_from);
 
   while (n_left_from > 0)
     {
-      u32 n_left_to_next;
+      vlib_buffer_t *b0;
+      u32 sw_if_index0, rx_fib_index0, proto0, old_addr0, new_addr0;
+      u16 old_port0, new_port0;
+      ip4_header_t *ip0;
+      udp_header_t *udp0;
+      tcp_header_t *tcp0;
+      icmp46_header_t *icmp0;
+      snat_session_t *s0 = 0;
+      clib_bihash_kv_16_8_t kv0, value0;
+      ip_csum_t sum0;
+      lb_nat_type_t lb_nat0;
+      twice_nat_type_t twice_nat0;
+      u8 identity_nat0;
+      ip4_address_t sm_addr;
+      u16 sm_port;
+      u32 sm_fib_index;
+
+      b0 = *b;
+      next[0] = vnet_buffer2 (b0)->nat.arc_next;
+
+      vnet_buffer (b0)->snat.flags = 0;
+      ip0 = vlib_buffer_get_current (b0);
+
+      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      rx_fib_index0 =
+       fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index0);
+
+      if (PREDICT_FALSE (ip0->ttl == 1))
+       {
+         vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
+         icmp4_error_set_vnet_buffer (b0, ICMP4_time_exceeded,
+                                      ICMP4_time_exceeded_ttl_exceeded_in_transit,
+                                      0);
+         next[0] = NAT_NEXT_ICMP_ERROR;
+         goto trace0;
+       }
 
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+      udp0 = ip4_next_header (ip0);
+      tcp0 = (tcp_header_t *) udp0;
+      icmp0 = (icmp46_header_t *) udp0;
+      proto0 = ip_proto_to_nat_proto (ip0->protocol);
 
-      while (n_left_from > 0 && n_left_to_next > 0)
+      if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_OTHER))
        {
-         u32 bi0;
-         vlib_buffer_t *b0;
-         u32 next0, sw_if_index0, rx_fib_index0, proto0, old_addr0,
-           new_addr0;
-         u16 old_port0, new_port0;
-         ip4_header_t *ip0;
-         udp_header_t *udp0;
-         tcp_header_t *tcp0;
-         icmp46_header_t *icmp0;
-         snat_session_t *s0 = 0;
-         clib_bihash_kv_16_8_t kv0, value0;
-         ip_csum_t sum0;
-         snat_session_key_t e_key0, l_key0;
-         lb_nat_type_t lb_nat0;
-         twice_nat_type_t twice_nat0;
-         u8 identity_nat0;
-
-         /* speculatively enqueue b0 to the current next frame */
-         bi0 = from[0];
-         to_next[0] = bi0;
-         from += 1;
-         to_next += 1;
-         n_left_from -= 1;
-         n_left_to_next -= 1;
-
-         b0 = vlib_get_buffer (vm, bi0);
-         next0 = nat_buffer_opaque (b0)->arc_next;
-
-         vnet_buffer (b0)->snat.flags = 0;
-         ip0 = vlib_buffer_get_current (b0);
-
-         sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-         rx_fib_index0 =
-           fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
-                                                sw_if_index0);
-
-         if (PREDICT_FALSE (ip0->ttl == 1))
+         s0 =
+           nat44_ed_out2in_unknown_proto (sm, b0, ip0, rx_fib_index0,
+                                          thread_index, now, vm, node);
+         if (!sm->forwarding_enabled)
            {
-             vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-             icmp4_error_set_vnet_buffer (b0, ICMP4_time_exceeded,
-                                          ICMP4_time_exceeded_ttl_exceeded_in_transit,
-                                          0);
-             next0 = NAT_NEXT_ICMP_ERROR;
-             goto trace0;
+             if (!s0)
+               next[0] = NAT_NEXT_DROP;
            }
+         vlib_increment_simple_counter (&sm->counters.slowpath.
+                                        out2in_ed.other, thread_index,
+                                        sw_if_index0, 1);
+         goto trace0;
+       }
 
-         udp0 = ip4_next_header (ip0);
-         tcp0 = (tcp_header_t *) udp0;
-         icmp0 = (icmp46_header_t *) udp0;
-         proto0 = ip_proto_to_snat_proto (ip0->protocol);
+      if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_ICMP))
+       {
+         next[0] = icmp_out2in_ed_slow_path
+           (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
+            next[0], now, thread_index, &s0);
+         vlib_increment_simple_counter (&sm->counters.slowpath.
+                                        out2in_ed.icmp, thread_index,
+                                        sw_if_index0, 1);
+         goto trace0;
+       }
 
-         if (PREDICT_FALSE (proto0 == ~0))
-           {
-             s0 =
-               nat44_ed_out2in_unknown_proto (sm, b0, ip0, rx_fib_index0,
-                                              thread_index, now, vm, node);
-             if (!sm->forwarding_enabled)
-               {
-                 if (!s0)
-                   next0 = NAT_NEXT_DROP;
-               }
-             other_packets++;
-             goto trace0;
-           }
+      init_ed_k (&kv0, ip0->dst_address,
+                vnet_buffer (b0)->ip.reass.l4_dst_port, ip0->src_address,
+                vnet_buffer (b0)->ip.reass.l4_src_port, rx_fib_index0,
+                ip0->protocol);
 
-         if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
+      s0 = NULL;
+      if (!clib_bihash_search_16_8 (&sm->out2in_ed, &kv0, &value0))
+       {
+         ASSERT (thread_index == ed_value_get_thread_index (&value0));
+         s0 =
+           pool_elt_at_index (tsm->sessions,
+                              ed_value_get_session_index (&value0));
+
+         if (s0->tcp_closed_timestamp && now >= s0->tcp_closed_timestamp)
            {
-             next0 = icmp_out2in_ed_slow_path
-               (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
-                next0, now, thread_index, &s0);
-             icmp_packets++;
-             goto trace0;
+             nat_free_session_data (sm, s0, thread_index, 0);
+             nat_ed_session_delete (sm, s0, thread_index, 1);
+             s0 = NULL;
            }
+       }
 
-         make_ed_kv (&kv0, &ip0->dst_address, &ip0->src_address,
-                     ip0->protocol, rx_fib_index0,
-                     vnet_buffer (b0)->ip.reass.l4_dst_port,
-                     vnet_buffer (b0)->ip.reass.l4_src_port);
-
-         s0 = NULL;
-         if (!clib_bihash_search_16_8 (&tsm->out2in_ed, &kv0, &value0))
+      if (!s0)
+       {
+         /* Try to match static mapping by external address and port,
+            destination address and port in packet */
+
+         if (snat_static_mapping_match
+             (sm, ip0->dst_address,
+              vnet_buffer (b0)->ip.reass.l4_dst_port, rx_fib_index0,
+              proto0, &sm_addr, &sm_port, &sm_fib_index, 1, 0,
+              &twice_nat0, &lb_nat0, &ip0->src_address, &identity_nat0, &m))
            {
-             s0 = pool_elt_at_index (tsm->sessions, value0.value);
-
-             if (s0->tcp_close_timestamp && now >= s0->tcp_close_timestamp)
+             /*
+              * Send DHCP packets to the ipv4 stack, or we won't
+              * be able to use dhcp client on the outside interface
+              */
+             if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_UDP
+                                && (vnet_buffer (b0)->ip.reass.l4_dst_port ==
+                                    clib_host_to_net_u16
+                                    (UDP_DST_PORT_dhcp_to_client))))
                {
-                 nat_free_session_data (sm, s0, thread_index, 0);
-                 nat44_delete_session (sm, s0, thread_index);
-                 s0 = NULL;
+                 goto trace0;
                }
-           }
 
-         if (!s0)
-           {
-             /* Try to match static mapping by external address and port,
-                destination address and port in packet */
-             e_key0.addr = ip0->dst_address;
-             e_key0.port = vnet_buffer (b0)->ip.reass.l4_dst_port;
-             e_key0.protocol = proto0;
-             e_key0.fib_index = rx_fib_index0;
-
-             if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
-                                            &twice_nat0, &lb_nat0,
-                                            &ip0->src_address,
-                                            &identity_nat0))
+             if (!sm->forwarding_enabled)
                {
-                 /*
-                  * Send DHCP packets to the ipv4 stack, or we won't
-                  * be able to use dhcp client on the outside interface
-                  */
-                 if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_UDP
-                                    && (vnet_buffer (b0)->ip.
-                                        reass.l4_dst_port ==
-                                        clib_host_to_net_u16
-                                        (UDP_DST_PORT_dhcp_to_client))))
-                   {
-                     goto trace0;
-                   }
-
-                 if (!sm->forwarding_enabled)
+                 b0->error =
+                   node->errors[NAT_OUT2IN_ED_ERROR_NO_TRANSLATION];
+                 next[0] = NAT_NEXT_DROP;
+               }
+             else
+               {
+                 if (next_src_nat
+                     (sm, ip0, vnet_buffer (b0)->ip.reass.l4_src_port,
+                      vnet_buffer (b0)->ip.reass.l4_dst_port,
+                      thread_index, rx_fib_index0))
                    {
-                     b0->error =
-                       node->errors[NAT_OUT2IN_ED_ERROR_NO_TRANSLATION];
-                     next0 = NAT_NEXT_DROP;
+                     next[0] = NAT_NEXT_IN2OUT_ED_FAST_PATH;
                    }
                  else
                    {
-                     if (next_src_nat (sm, ip0, ip0->protocol,
-                                       vnet_buffer (b0)->ip.
-                                       reass.l4_src_port,
-                                       vnet_buffer (b0)->ip.
-                                       reass.l4_dst_port, thread_index,
-                                       rx_fib_index0))
-                       {
-                         next0 = NAT_NEXT_IN2OUT_ED_FAST_PATH;
-                         goto trace0;
-                       }
                      if (sm->num_workers > 1)
                        create_bypass_for_fwd_worker (sm, b0, ip0,
                                                      rx_fib_index0);
@@ -1110,95 +1215,68 @@ nat44_ed_out2in_slow_path_node_fn_inline (vlib_main_t * vm,
                        create_bypass_for_fwd (sm, b0, ip0, rx_fib_index0,
                                               thread_index);
                    }
-                 goto trace0;
                }
+             goto trace0;
+           }
 
-             if (PREDICT_FALSE (identity_nat0))
-               goto trace0;
+         if (PREDICT_FALSE (identity_nat0))
+           goto trace0;
 
-             if ((proto0 == SNAT_PROTOCOL_TCP)
-                 && !tcp_flags_is_init (vnet_buffer (b0)->ip.
-                                        reass.icmp_type_or_tcp_flags))
-               {
-                 b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN];
-                 next0 = NAT_NEXT_DROP;
-                 goto trace0;
-               }
+         if ((proto0 == NAT_PROTOCOL_TCP)
+             && !tcp_flags_is_init (vnet_buffer (b0)->ip.
+                                    reass.icmp_type_or_tcp_flags))
+           {
+             b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN];
+             next[0] = NAT_NEXT_DROP;
+             goto trace0;
+           }
 
-             /* Create session initiated by host from external network */
-             s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
-                                                        e_key0, node,
-                                                        thread_index,
-                                                        twice_nat0,
-                                                        lb_nat0, now);
-             if (!s0)
-               {
-                 next0 = NAT_NEXT_DROP;
-                 goto trace0;
-               }
+         /* Create session initiated by host from external network */
+         s0 = create_session_for_static_mapping_ed (sm, b0,
+                                                    sm_addr, sm_port,
+                                                    sm_fib_index,
+                                                    ip0->dst_address,
+                                                    vnet_buffer (b0)->
+                                                    ip.reass.l4_dst_port,
+                                                    rx_fib_index0, proto0,
+                                                    node, rx_fib_index0,
+                                                    thread_index, twice_nat0,
+                                                    lb_nat0, now, m);
+         if (!s0)
+           {
+             next[0] = NAT_NEXT_DROP;
+             goto trace0;
            }
+       }
 
-         old_addr0 = ip0->dst_address.as_u32;
-         new_addr0 = ip0->dst_address.as_u32 = s0->in2out.addr.as_u32;
-         vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+      old_addr0 = ip0->dst_address.as_u32;
+      new_addr0 = ip0->dst_address.as_u32 = s0->in2out.addr.as_u32;
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
 
-         sum0 = ip0->checksum;
-         sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                                dst_address);
-         if (PREDICT_FALSE (is_twice_nat_session (s0)))
-           sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
-                                  s0->ext_host_nat_addr.as_u32, ip4_header_t,
-                                  src_address);
-         ip0->checksum = ip_csum_fold (sum0);
+      sum0 = ip0->checksum;
+      sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                            dst_address);
+      if (PREDICT_FALSE (is_twice_nat_session (s0)))
+       sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
+                              s0->ext_host_nat_addr.as_u32, ip4_header_t,
+                              src_address);
+      ip0->checksum = ip_csum_fold (sum0);
 
-         old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
+      old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
 
-         if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
-           {
-             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
-               {
-                 new_port0 = udp0->dst_port = s0->in2out.port;
-                 sum0 = tcp0->checksum;
-                 sum0 =
-                   ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                                   dst_address);
-                 sum0 =
-                   ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
-                                   length);
-                 if (is_twice_nat_session (s0))
-                   {
-                     sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
-                                            s0->ext_host_nat_addr.as_u32,
-                                            ip4_header_t, dst_address);
-                     sum0 =
-                       ip_csum_update (sum0,
-                                       vnet_buffer (b0)->ip.
-                                       reass.l4_src_port,
-                                       s0->ext_host_nat_port, ip4_header_t,
-                                       length);
-                     tcp0->src_port = s0->ext_host_nat_port;
-                     ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
-                   }
-                 tcp0->checksum = ip_csum_fold (sum0);
-               }
-             tcp_packets++;
-             if (nat44_set_tcp_session_state_o2i
-                 (sm, now, s0,
-                  vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags,
-                  vnet_buffer (b0)->ip.reass.tcp_ack_number,
-                  vnet_buffer (b0)->ip.reass.tcp_seq_number, thread_index))
-               goto trace0;
-           }
-         else if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment
-                  && udp0->checksum)
+      if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
+       {
+         if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
            {
              new_port0 = udp0->dst_port = s0->in2out.port;
-             sum0 = udp0->checksum;
-             sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                                    dst_address);
-             sum0 = ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
-                                    length);
-             if (PREDICT_FALSE (is_twice_nat_session (s0)))
+             sum0 = tcp0->checksum;
+             sum0 =
+               ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                               dst_address);
+             sum0 =
+               ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
+                               length);
+             if (is_twice_nat_session (s0))
                {
                  sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
                                         s0->ext_host_nat_addr.as_u32,
@@ -1208,74 +1286,100 @@ nat44_ed_out2in_slow_path_node_fn_inline (vlib_main_t * vm,
                                    vnet_buffer (b0)->ip.reass.l4_src_port,
                                    s0->ext_host_nat_port, ip4_header_t,
                                    length);
-                 udp0->src_port = s0->ext_host_nat_port;
+                 tcp0->src_port = s0->ext_host_nat_port;
                  ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
-             udp0->checksum = ip_csum_fold (sum0);
-             udp_packets++;
+             tcp0->checksum = ip_csum_fold (sum0);
            }
-         else
+         vlib_increment_simple_counter (&sm->counters.slowpath.out2in_ed.tcp,
+                                        thread_index, sw_if_index0, 1);
+         nat44_set_tcp_session_state_o2i (sm, now, s0,
+                                          vnet_buffer (b0)->ip.
+                                          reass.icmp_type_or_tcp_flags,
+                                          vnet_buffer (b0)->ip.
+                                          reass.tcp_ack_number,
+                                          vnet_buffer (b0)->ip.
+                                          reass.tcp_seq_number,
+                                          thread_index);
+       }
+      else if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment
+              && udp0->checksum)
+       {
+         new_port0 = udp0->dst_port = s0->in2out.port;
+         sum0 = udp0->checksum;
+         sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                                dst_address);
+         sum0 = ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
+                                length);
+         if (PREDICT_FALSE (is_twice_nat_session (s0)))
+           {
+             sum0 = ip_csum_update (sum0, ip0->src_address.as_u32,
+                                    s0->ext_host_nat_addr.as_u32,
+                                    ip4_header_t, dst_address);
+             sum0 =
+               ip_csum_update (sum0,
+                               vnet_buffer (b0)->ip.reass.l4_src_port,
+                               s0->ext_host_nat_port, ip4_header_t, length);
+             udp0->src_port = s0->ext_host_nat_port;
+             ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
+           }
+         udp0->checksum = ip_csum_fold (sum0);
+         vlib_increment_simple_counter (&sm->counters.slowpath.out2in_ed.udp,
+                                        thread_index, sw_if_index0, 1);
+       }
+      else
+       {
+         if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
            {
-             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+             new_port0 = udp0->dst_port = s0->in2out.port;
+             if (PREDICT_FALSE (is_twice_nat_session (s0)))
                {
-                 new_port0 = udp0->dst_port = s0->in2out.port;
-                 if (PREDICT_FALSE (is_twice_nat_session (s0)))
-                   {
-                     udp0->src_port = s0->ext_host_nat_port;
-                     ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
-                   }
+                 udp0->src_port = s0->ext_host_nat_port;
+                 ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
-             udp_packets++;
            }
+         vlib_increment_simple_counter (&sm->counters.slowpath.out2in_ed.udp,
+                                        thread_index, sw_if_index0, 1);
+       }
 
-         /* Accounting */
-         nat44_session_update_counters (s0, now,
-                                        vlib_buffer_length_in_chain (vm, b0),
-                                        thread_index);
-         /* Per-user LRU list maintenance */
-         nat44_session_update_lru (sm, s0, thread_index);
+      /* Accounting */
+      nat44_session_update_counters (s0, now,
+                                    vlib_buffer_length_in_chain (vm, b0),
+                                    thread_index);
+      /* Per-user LRU list maintenance */
+      nat44_session_update_lru (sm, s0, thread_index);
 
-       trace0:
-         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-           {
-             nat44_ed_out2in_trace_t *t =
-               vlib_add_trace (vm, node, b0, sizeof (*t));
-             t->sw_if_index = sw_if_index0;
-             t->next_index = next0;
-             t->is_slow_path = 1;
-
-             if (s0)
-               t->session_index = s0 - tsm->sessions;
-             else
-               t->session_index = ~0;
-           }
+    trace0:
+      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
+                        && (b0->flags & VLIB_BUFFER_IS_TRACED)))
+       {
+         nat44_ed_out2in_trace_t *t =
+           vlib_add_trace (vm, node, b0, sizeof (*t));
+         t->sw_if_index = sw_if_index0;
+         t->next_index = next[0];
+         t->is_slow_path = 1;
+
+         if (s0)
+           t->session_index = s0 - tsm->sessions;
+         else
+           t->session_index = ~0;
+       }
 
-         pkts_processed += next0 == nat_buffer_opaque (b0)->arc_next;
-         /* verify speculative enqueue, maybe switch current next frame */
-         vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-                                          to_next, n_left_to_next,
-                                          bi0, next0);
+      if (next[0] == NAT_NEXT_DROP)
+       {
+         vlib_increment_simple_counter (&sm->counters.slowpath.
+                                        out2in_ed.drops, thread_index,
+                                        sw_if_index0, 1);
        }
 
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+      n_left_from--;
+      next++;
+      b++;
     }
 
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_OUT2IN_PACKETS,
-                              pkts_processed);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_TCP_PACKETS, tcp_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_UDP_PACKETS, udp_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_ICMP_PACKETS,
-                              icmp_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_OTHER_PACKETS,
-                              other_packets);
-  vlib_node_increment_counter (vm, stats_node_index,
-                              NAT_OUT2IN_ED_ERROR_FRAGMENTS, fragments);
+  vlib_buffer_enqueue_to_next (vm, node, from, (u16 *) nexts,
+                              frame->n_vectors);
+
   return frame->n_vectors;
 }
 
@@ -1283,7 +1387,14 @@ VLIB_NODE_FN (nat44_ed_out2in_node) (vlib_main_t * vm,
                                     vlib_node_runtime_t * node,
                                     vlib_frame_t * frame)
 {
-  return nat44_ed_out2in_fast_path_node_fn_inline (vm, node, frame);
+  if (snat_main.num_workers > 1)
+    {
+      return nat44_ed_out2in_fast_path_node_fn_inline (vm, node, frame, 1);
+    }
+  else
+    {
+      return nat44_ed_out2in_fast_path_node_fn_inline (vm, node, frame, 0);
+    }
 }
 
 /* *INDENT-OFF* */
@@ -1325,7 +1436,8 @@ format_nat_pre_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 *);
   nat_pre_trace_t *t = va_arg (*args, nat_pre_trace_t *);
-  return format (s, "out2in next_index %d", t->next_index);
+  return format (s, "out2in next_index %d arc_next_index %d", t->next_index,
+                t->arc_next_index);
 }
 
 VLIB_NODE_FN (nat_pre_out2in_node) (vlib_main_t * vm,