ip: reassembly cleanup
[vpp.git] / src / vnet / ip / reass / ip4_full_reass.c
index d492e5e..d2069c0 100644 (file)
@@ -184,6 +184,7 @@ typedef struct
   /** Worker handoff */
   u32 fq_index;
   u32 fq_feature_index;
+  u32 fq_custom_index;
 
   // reference count for enabling/disabling feature - per interface
   u32 *feature_use_refcount_per_intf;
@@ -203,6 +204,13 @@ typedef enum
   IP4_FULL_REASS_N_NEXT,
 } ip4_full_reass_next_t;
 
+typedef enum
+{
+  NORMAL,
+  FEATURE,
+  CUSTOM
+} ip4_full_reass_node_type_t;
+
 typedef enum
 {
   RANGE_NEW,
@@ -241,6 +249,7 @@ typedef struct
 
 extern vlib_node_registration_t ip4_full_reass_node;
 extern vlib_node_registration_t ip4_full_reass_node_feature;
+extern vlib_node_registration_t ip4_full_reass_node_custom;
 
 static void
 ip4_full_reass_trace_details (vlib_main_t * vm, u32 bi,
@@ -326,13 +335,19 @@ format_ip4_full_reass_trace (u8 * s, va_list * args)
 
 static void
 ip4_full_reass_add_trace (vlib_main_t * vm, vlib_node_runtime_t * node,
-                         ip4_full_reass_main_t * rm,
                          ip4_full_reass_t * reass, u32 bi,
                          ip4_full_reass_trace_operation_e action,
                          u32 size_diff, u32 thread_id_to)
 {
   vlib_buffer_t *b = vlib_get_buffer (vm, bi);
   vnet_buffer_opaque_t *vnb = vnet_buffer (b);
+  if (pool_is_free_index
+      (vm->trace_main.trace_buffer_pool, vlib_buffer_get_trace_index (b)))
+    {
+      // this buffer's trace is gone
+      b->flags &= ~VLIB_BUFFER_IS_TRACED;
+      return;
+    }
   bool is_after_handoff = false;
   if (vlib_buffer_get_trace_thread (b) != vm->thread_index)
     {
@@ -397,8 +412,8 @@ ip4_full_reass_free (ip4_full_reass_main_t * rm,
 }
 
 always_inline void
-ip4_full_reass_drop_all (vlib_main_t * vm, vlib_node_runtime_t * node,
-                        ip4_full_reass_main_t * rm, ip4_full_reass_t * reass)
+ip4_full_reass_drop_all (vlib_main_t *vm, vlib_node_runtime_t *node,
+                        ip4_full_reass_t *reass)
 {
   u32 range_bi = reass->first_bi;
   vlib_buffer_t *range_b;
@@ -455,6 +470,7 @@ ip4_full_reass_drop_all (vlib_main_t * vm, vlib_node_runtime_t * node,
     {
       vlib_buffer_free (vm, to_free, vec_len (to_free));
     }
+  vec_free (to_free);
 }
 
 always_inline void
@@ -480,22 +496,21 @@ again:
 
   reass = NULL;
   now = vlib_time_now (vm);
-  if (!clib_bihash_search_16_8
-      (&rm->hash, (clib_bihash_kv_16_8_t *) kv, (clib_bihash_kv_16_8_t *) kv))
+  if (!clib_bihash_search_16_8 (&rm->hash, &kv->kv, &kv->kv))
     {
+      if (vm->thread_index != kv->v.memory_owner_thread_index)
+       {
+         *do_handoff = 1;
+         return NULL;
+       }
       reass =
        pool_elt_at_index (rm->per_thread_data
                           [kv->v.memory_owner_thread_index].pool,
                           kv->v.reass_index);
-      if (vm->thread_index != reass->memory_owner_thread_index)
-       {
-         *do_handoff = 1;
-         return reass;
-       }
 
       if (now > reass->last_heard + rm->timeout)
        {
-         ip4_full_reass_drop_all (vm, node, rm, reass);
+         ip4_full_reass_drop_all (vm, node, reass);
          ip4_full_reass_free (rm, rt, reass);
          reass = NULL;
        }
@@ -523,14 +538,13 @@ again:
       ++rt->reass_n;
     }
 
-  reass->key.as_u64[0] = ((clib_bihash_kv_16_8_t *) kv)->key[0];
-  reass->key.as_u64[1] = ((clib_bihash_kv_16_8_t *) kv)->key[1];
+  reass->key.as_u64[0] = kv->kv.key[0];
+  reass->key.as_u64[1] = kv->kv.key[1];
   kv->v.reass_index = (reass - rt->pool);
   kv->v.memory_owner_thread_index = vm->thread_index;
   reass->last_heard = now;
 
-  int rv =
-    clib_bihash_add_del_16_8 (&rm->hash, (clib_bihash_kv_16_8_t *) kv, 2);
+  int rv = clib_bihash_add_del_16_8 (&rm->hash, &kv->kv, 2);
   if (rv)
     {
       ip4_full_reass_free_ctx (rt, reass);
@@ -548,7 +562,7 @@ ip4_full_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
                         ip4_full_reass_main_t * rm,
                         ip4_full_reass_per_thread_t * rt,
                         ip4_full_reass_t * reass, u32 * bi0,
-                        u32 * next0, u32 * error0, bool is_custom_app)
+                        u32 * next0, u32 * error0, bool is_custom)
 {
   vlib_buffer_t *first_b = vlib_get_buffer (vm, reass->first_bi);
   vlib_buffer_t *last_b = NULL;
@@ -702,8 +716,8 @@ ip4_full_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
   first_b->flags &= ~VLIB_BUFFER_EXT_HDR_VALID;
   if (PREDICT_FALSE (first_b->flags & VLIB_BUFFER_IS_TRACED))
     {
-      ip4_full_reass_add_trace (vm, node, rm, reass, reass->first_bi,
-                               FINALIZE, 0, ~0);
+      ip4_full_reass_add_trace (vm, node, reass, reass->first_bi, FINALIZE, 0,
+                               ~0);
 #if 0
       // following code does a hexdump of packet fragments to stdout ...
       do
@@ -732,7 +746,7 @@ ip4_full_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
 #endif
     }
   *bi0 = reass->first_bi;
-  if (!is_custom_app)
+  if (!is_custom)
     {
       *next0 = IP4_FULL_REASS_NEXT_INPUT;
     }
@@ -749,8 +763,6 @@ ip4_full_reass_finalize (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 always_inline ip4_full_reass_rc_t
 ip4_full_reass_insert_range_in_chain (vlib_main_t * vm,
-                                     ip4_full_reass_main_t * rm,
-                                     ip4_full_reass_per_thread_t * rt,
                                      ip4_full_reass_t * reass,
                                      u32 prev_range_bi, u32 new_next_bi)
 {
@@ -784,7 +796,6 @@ ip4_full_reass_insert_range_in_chain (vlib_main_t * vm,
 always_inline ip4_full_reass_rc_t
 ip4_full_reass_remove_range_from_chain (vlib_main_t * vm,
                                        vlib_node_runtime_t * node,
-                                       ip4_full_reass_main_t * rm,
                                        ip4_full_reass_t * reass,
                                        u32 prev_range_bi, u32 discard_bi)
 {
@@ -816,8 +827,8 @@ ip4_full_reass_remove_range_from_chain (vlib_main_t * vm,
       u32 to_be_freed_bi = discard_bi;
       if (PREDICT_FALSE (discard_b->flags & VLIB_BUFFER_IS_TRACED))
        {
-         ip4_full_reass_add_trace (vm, node, rm, reass, discard_bi,
-                                   RANGE_DISCARD, 0, ~0);
+         ip4_full_reass_add_trace (vm, node, reass, discard_bi, RANGE_DISCARD,
+                                   0, ~0);
        }
       if (discard_b->flags & VLIB_BUFFER_NEXT_PRESENT)
        {
@@ -842,12 +853,11 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
                       ip4_full_reass_main_t * rm,
                       ip4_full_reass_per_thread_t * rt,
                       ip4_full_reass_t * reass, u32 * bi0, u32 * next0,
-                      u32 * error0, bool is_custom_app,
-                      u32 * handoff_thread_idx)
+                      u32 * error0, bool is_custom, u32 * handoff_thread_idx)
 {
   vlib_buffer_t *fb = vlib_get_buffer (vm, *bi0);
   vnet_buffer_opaque_t *fvnb = vnet_buffer (fb);
-  if (is_custom_app)
+  if (is_custom)
     {
       // store (error_)next_index before it's overwritten
       reass->next_index = fvnb->ip.reass.next_index;
@@ -876,16 +886,14 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
     {
       // starting a new reassembly
       rc =
-       ip4_full_reass_insert_range_in_chain (vm, rm, rt, reass,
-                                             prev_range_bi, *bi0);
+       ip4_full_reass_insert_range_in_chain (vm, reass, prev_range_bi, *bi0);
       if (IP4_REASS_RC_OK != rc)
        {
          return rc;
        }
       if (PREDICT_FALSE (fb->flags & VLIB_BUFFER_IS_TRACED))
        {
-         ip4_full_reass_add_trace (vm, node, rm, reass, *bi0, RANGE_NEW, 0,
-                                   ~0);
+         ip4_full_reass_add_trace (vm, node, reass, *bi0, RANGE_NEW, 0, ~0);
        }
       *bi0 = ~0;
       reass->min_fragment_length = clib_net_to_host_u16 (fip->length);
@@ -908,9 +916,8 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
              ~0 == candidate_range_bi)
            {
              // special case - this fragment falls beyond all known ranges
-             rc =
-               ip4_full_reass_insert_range_in_chain (vm, rm, rt, reass,
-                                                     prev_range_bi, *bi0);
+             rc = ip4_full_reass_insert_range_in_chain (vm, reass,
+                                                        prev_range_bi, *bi0);
              if (IP4_REASS_RC_OK != rc)
                {
                  return rc;
@@ -923,9 +930,8 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
       if (fragment_last < candidate_vnb->ip.reass.range_first)
        {
          // this fragment ends before candidate range without any overlap
-         rc =
-           ip4_full_reass_insert_range_in_chain (vm, rm, rt, reass,
-                                                 prev_range_bi, *bi0);
+         rc = ip4_full_reass_insert_range_in_chain (vm, reass, prev_range_bi,
+                                                    *bi0);
          if (IP4_REASS_RC_OK != rc)
            {
              return rc;
@@ -940,7 +946,7 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
              // this fragment is a (sub)part of existing range, ignore it
              if (PREDICT_FALSE (fb->flags & VLIB_BUFFER_IS_TRACED))
                {
-                 ip4_full_reass_add_trace (vm, node, rm, reass, *bi0,
+                 ip4_full_reass_add_trace (vm, node, reass, *bi0,
                                            RANGE_OVERLAP, 0, ~0);
                }
              break;
@@ -960,14 +966,12 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
                  reass->data_len -= overlap;
                  if (PREDICT_FALSE (fb->flags & VLIB_BUFFER_IS_TRACED))
                    {
-                     ip4_full_reass_add_trace (vm, node, rm, reass,
+                     ip4_full_reass_add_trace (vm, node, reass,
                                                candidate_range_bi,
                                                RANGE_SHRINK, 0, ~0);
                    }
-                 rc =
-                   ip4_full_reass_insert_range_in_chain (vm, rm, rt, reass,
-                                                         prev_range_bi,
-                                                         *bi0);
+                 rc = ip4_full_reass_insert_range_in_chain (
+                   vm, reass, prev_range_bi, *bi0);
                  if (IP4_REASS_RC_OK != rc)
                    {
                      return rc;
@@ -996,11 +1000,8 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
                  else
                    {
                      // special case - last range discarded
-                     rc =
-                       ip4_full_reass_insert_range_in_chain (vm, rm, rt,
-                                                             reass,
-                                                             candidate_range_bi,
-                                                             *bi0);
+                     rc = ip4_full_reass_insert_range_in_chain (
+                       vm, reass, candidate_range_bi, *bi0);
                      if (IP4_REASS_RC_OK != rc)
                        {
                          return rc;
@@ -1021,10 +1022,8 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
            {
              u32 next_range_bi = candidate_vnb->ip.reass.next_range_bi;
              // discard candidate range, probe next range
-             rc =
-               ip4_full_reass_remove_range_from_chain (vm, node, rm, reass,
-                                                       prev_range_bi,
-                                                       candidate_range_bi);
+             rc = ip4_full_reass_remove_range_from_chain (
+               vm, node, reass, prev_range_bi, candidate_range_bi);
              if (IP4_REASS_RC_OK != rc)
                {
                  return rc;
@@ -1037,10 +1036,8 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
              else
                {
                  // special case - last range discarded
-                 rc =
-                   ip4_full_reass_insert_range_in_chain (vm, rm, rt, reass,
-                                                         prev_range_bi,
-                                                         *bi0);
+                 rc = ip4_full_reass_insert_range_in_chain (
+                   vm, reass, prev_range_bi, *bi0);
                  if (IP4_REASS_RC_OK != rc)
                    {
                      return rc;
@@ -1056,8 +1053,7 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
     {
       if (PREDICT_FALSE (fb->flags & VLIB_BUFFER_IS_TRACED))
        {
-         ip4_full_reass_add_trace (vm, node, rm, reass, *bi0, RANGE_NEW, 0,
-                                   ~0);
+         ip4_full_reass_add_trace (vm, node, reass, *bi0, RANGE_NEW, 0, ~0);
        }
     }
   if (~0 != reass->last_packet_octet &&
@@ -1068,7 +1064,7 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
        reass->memory_owner_thread_index != reass->sendout_thread_index;
       rc =
        ip4_full_reass_finalize (vm, node, rm, rt, reass, bi0, next0, error0,
-                                is_custom_app);
+                                is_custom);
       if (IP4_REASS_RC_OK == rc && handoff)
        {
          rc = IP4_REASS_RC_HANDOFF;
@@ -1095,8 +1091,7 @@ ip4_full_reass_update (vlib_main_t * vm, vlib_node_runtime_t * node,
 
 always_inline uword
 ip4_full_reass_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
-                      vlib_frame_t * frame, bool is_feature,
-                      bool is_custom_app)
+                      vlib_frame_t * frame, ip4_full_reass_node_type_t type)
 {
   u32 *from = vlib_frame_vector_args (frame);
   u32 n_left_from, n_left_to_next, *to_next, next_index;
@@ -1124,7 +1119,7 @@ ip4_full_reass_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          if (!ip4_get_fragment_more (ip0) && !ip4_get_fragment_offset (ip0))
            {
              // this is a whole packet - no fragmentation
-             if (!is_custom_app)
+             if (CUSTOM != type)
                {
                  next0 = IP4_FULL_REASS_NEXT_INPUT;
                }
@@ -1179,7 +1174,7 @@ ip4_full_reass_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
              u32 handoff_thread_idx;
              switch (ip4_full_reass_update
                      (vm, node, rm, rt, reass, &bi0, &next0,
-                      &error0, is_custom_app, &handoff_thread_idx))
+                      &error0, CUSTOM == type, &handoff_thread_idx))
                {
                case IP4_REASS_RC_OK:
                  /* nothing to do here */
@@ -1194,14 +1189,14 @@ ip4_full_reass_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                  vlib_node_increment_counter (vm, node->node_index,
                                               IP4_ERROR_REASS_FRAGMENT_CHAIN_TOO_LONG,
                                               1);
-                 ip4_full_reass_drop_all (vm, node, rm, reass);
+                 ip4_full_reass_drop_all (vm, node, reass);
                  ip4_full_reass_free (rm, rt, reass);
                  goto next_packet;
                  break;
                case IP4_REASS_RC_NO_BUF:
                  vlib_node_increment_counter (vm, node->node_index,
                                               IP4_ERROR_REASS_NO_BUF, 1);
-                 ip4_full_reass_drop_all (vm, node, rm, reass);
+                 ip4_full_reass_drop_all (vm, node, reass);
                  ip4_full_reass_free (rm, rt, reass);
                  goto next_packet;
                  break;
@@ -1210,7 +1205,7 @@ ip4_full_reass_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                  vlib_node_increment_counter (vm, node->node_index,
                                               IP4_ERROR_REASS_INTERNAL_ERROR,
                                               1);
-                 ip4_full_reass_drop_all (vm, node, rm, reass);
+                 ip4_full_reass_drop_all (vm, node, reass);
                  ip4_full_reass_free (rm, rt, reass);
                  goto next_packet;
                  break;
@@ -1233,19 +1228,21 @@ ip4_full_reass_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
              /* bi0 might have been updated by reass_finalize, reload */
              b0 = vlib_get_buffer (vm, bi0);
-             b0->error = node->errors[error0];
+             if (IP4_ERROR_NONE != error0)
+               {
+                 b0->error = node->errors[error0];
+               }
 
              if (next0 == IP4_FULL_REASS_NEXT_HANDOFF)
                {
                  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
                    {
-                     ip4_full_reass_add_trace (vm, node, rm, NULL, bi0,
-                                               HANDOFF, 0,
-                                               vnet_buffer (b0)->ip.
-                                               reass.owner_thread_index);
+                     ip4_full_reass_add_trace (
+                       vm, node, NULL, bi0, HANDOFF, 0,
+                       vnet_buffer (b0)->ip.reass.owner_thread_index);
                    }
                }
-             else if (is_feature && IP4_ERROR_NONE == error0)
+             else if (FEATURE == type && IP4_ERROR_NONE == error0)
                {
                  vnet_feature_next (&next0, b0);
                }
@@ -1277,11 +1274,9 @@ VLIB_NODE_FN (ip4_full_reass_node) (vlib_main_t * vm,
                                    vlib_node_runtime_t * node,
                                    vlib_frame_t * frame)
 {
-  return ip4_full_reass_inline (vm, node, frame, false /* is_feature */ ,
-                               false /* is_custom_app */ );
+  return ip4_full_reass_inline (vm, node, frame, NORMAL);
 }
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip4_full_reass_node) = {
     .name = "ip4-full-reassembly",
     .vector_size = sizeof (u32),
@@ -1297,17 +1292,14 @@ VLIB_REGISTER_NODE (ip4_full_reass_node) = {
 
         },
 };
-/* *INDENT-ON* */
 
 VLIB_NODE_FN (ip4_full_reass_node_feature) (vlib_main_t * vm,
                                            vlib_node_runtime_t * node,
                                            vlib_frame_t * frame)
 {
-  return ip4_full_reass_inline (vm, node, frame, true /* is_feature */ ,
-                               false /* is_custom_app */ );
+  return ip4_full_reass_inline (vm, node, frame, FEATURE);
 }
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip4_full_reass_node_feature) = {
     .name = "ip4-full-reassembly-feature",
     .vector_size = sizeof (u32),
@@ -1322,9 +1314,7 @@ VLIB_REGISTER_NODE (ip4_full_reass_node_feature) = {
                 [IP4_FULL_REASS_NEXT_HANDOFF] = "ip4-full-reass-feature-hoff",
         },
 };
-/* *INDENT-ON* */
 
-/* *INDENT-OFF* */
 VNET_FEATURE_INIT (ip4_full_reass_feature, static) = {
     .arc_name = "ip4-unicast",
     .node_name = "ip4-full-reassembly-feature",
@@ -1332,9 +1322,46 @@ VNET_FEATURE_INIT (ip4_full_reass_feature, static) = {
                                   "ipsec4-input-feature"),
     .runs_after = 0,
 };
-/* *INDENT-ON* */
+
+VLIB_NODE_FN (ip4_full_reass_node_custom) (vlib_main_t * vm,
+                                          vlib_node_runtime_t * node,
+                                          vlib_frame_t * frame)
+{
+  return ip4_full_reass_inline (vm, node, frame, CUSTOM);
+}
+
+VLIB_REGISTER_NODE (ip4_full_reass_node_custom) = {
+    .name = "ip4-full-reassembly-custom",
+    .vector_size = sizeof (u32),
+    .format_trace = format_ip4_full_reass_trace,
+    .n_errors = ARRAY_LEN (ip4_full_reass_error_strings),
+    .error_strings = ip4_full_reass_error_strings,
+    .n_next_nodes = IP4_FULL_REASS_N_NEXT,
+    .next_nodes =
+        {
+                [IP4_FULL_REASS_NEXT_INPUT] = "ip4-input",
+                [IP4_FULL_REASS_NEXT_DROP] = "ip4-drop",
+                [IP4_FULL_REASS_NEXT_HANDOFF] = "ip4-full-reass-custom-hoff",
+        },
+};
+
+VNET_FEATURE_INIT (ip4_full_reass_custom, static) = {
+    .arc_name = "ip4-unicast",
+    .node_name = "ip4-full-reassembly-feature",
+    .runs_before = VNET_FEATURES ("ip4-lookup",
+                                  "ipsec4-input-feature"),
+    .runs_after = 0,
+};
+
 
 #ifndef CLIB_MARCH_VARIANT
+uword
+ip4_full_reass_custom_register_next_node (uword node_index)
+{
+  return vlib_node_add_next (vlib_get_main (),
+                            ip4_full_reass_node_custom.index, node_index);
+}
+
 always_inline u32
 ip4_full_reass_get_nbuckets ()
 {
@@ -1475,6 +1502,8 @@ ip4_full_reass_init_function (vlib_main_t * vm)
   rm->fq_index = vlib_frame_queue_main_init (ip4_full_reass_node.index, 0);
   rm->fq_feature_index =
     vlib_frame_queue_main_init (ip4_full_reass_node_feature.index, 0);
+  rm->fq_custom_index =
+    vlib_frame_queue_main_init (ip4_full_reass_node_custom.index, 0);
 
   rm->feature_use_refcount_per_intf = NULL;
   return error;
@@ -1484,8 +1513,8 @@ VLIB_INIT_FUNCTION (ip4_full_reass_init_function);
 #endif /* CLIB_MARCH_VARIANT */
 
 static uword
-ip4_full_reass_walk_expired (vlib_main_t * vm,
-                            vlib_node_runtime_t * node, vlib_frame_t * f)
+ip4_full_reass_walk_expired (vlib_main_t *vm, vlib_node_runtime_t *node,
+                            CLIB_UNUSED (vlib_frame_t *f))
 {
   ip4_full_reass_main_t *rm = &ip4_full_reass_main;
   uword event_type, *event_data = 0;
@@ -1500,10 +1529,11 @@ ip4_full_reass_walk_expired (vlib_main_t * vm,
 
       switch (event_type)
        {
-       case ~0:                /* no events => timeout */
-         /* nothing to do here */
-         break;
+       case ~0:
+         /* no events => timeout */
+         /* fallthrough */
        case IP4_EVENT_CONFIG_CHANGED:
+         /* nothing to do here */
          break;
        default:
          clib_warning ("BUG: event type 0x%wx", event_type);
@@ -1524,24 +1554,20 @@ ip4_full_reass_walk_expired (vlib_main_t * vm,
          clib_spinlock_lock (&rt->lock);
 
          vec_reset_length (pool_indexes_to_free);
-          /* *INDENT-OFF* */
-          pool_foreach_index (index, rt->pool, ({
+          pool_foreach_index (index, rt->pool)  {
                                 reass = pool_elt_at_index (rt->pool, index);
                                 if (now > reass->last_heard + rm->timeout)
                                   {
                                     vec_add1 (pool_indexes_to_free, index);
                                   }
-                              }));
-          /* *INDENT-ON* */
+                              }
          int *i;
-          /* *INDENT-OFF* */
           vec_foreach (i, pool_indexes_to_free)
           {
             ip4_full_reass_t *reass = pool_elt_at_index (rt->pool, i[0]);
-            ip4_full_reass_drop_all (vm, node, rm, reass);
-            ip4_full_reass_free (rm, rt, reass);
-          }
-          /* *INDENT-ON* */
+           ip4_full_reass_drop_all (vm, node, reass);
+           ip4_full_reass_free (rm, rt, reass);
+         }
 
          clib_spinlock_unlock (&rt->lock);
        }
@@ -1556,7 +1582,6 @@ ip4_full_reass_walk_expired (vlib_main_t * vm,
   return 0;
 }
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip4_full_reass_expire_node) = {
     .function = ip4_full_reass_walk_expired,
     .type = VLIB_NODE_TYPE_PROCESS,
@@ -1566,7 +1591,6 @@ VLIB_REGISTER_NODE (ip4_full_reass_expire_node) = {
     .error_strings = ip4_full_reass_error_strings,
 
 };
-/* *INDENT-ON* */
 
 static u8 *
 format_ip4_full_reass_key (u8 * s, va_list * args)
@@ -1644,31 +1668,37 @@ show_ip4_reass (vlib_main_t * vm,
       clib_spinlock_lock (&rt->lock);
       if (details)
        {
-          /* *INDENT-OFF* */
-          pool_foreach (reass, rt->pool, {
+          pool_foreach (reass, rt->pool) {
             vlib_cli_output (vm, "%U", format_ip4_reass, vm, reass);
-          });
-          /* *INDENT-ON* */
+          }
        }
       sum_reass_n += rt->reass_n;
       clib_spinlock_unlock (&rt->lock);
     }
   vlib_cli_output (vm, "---------------------");
-  vlib_cli_output (vm, "Current IP4 reassemblies count: %lu\n",
+  vlib_cli_output (vm, "Current full IP4 reassemblies count: %lu\n",
                   (long unsigned) sum_reass_n);
   vlib_cli_output (vm,
-                  "Maximum configured concurrent IP4 reassemblies per worker-thread: %lu\n",
+                  "Maximum configured concurrent full IP4 reassemblies per worker-thread: %lu\n",
                   (long unsigned) rm->max_reass_n);
+  vlib_cli_output (vm,
+                  "Maximum configured amount of fragments "
+                  "per full IP4 reassembly: %lu\n",
+                  (long unsigned) rm->max_reass_len);
+  vlib_cli_output (vm,
+                  "Maximum configured full IP4 reassembly timeout: %lums\n",
+                  (long unsigned) rm->timeout_ms);
+  vlib_cli_output (vm,
+                  "Maximum configured full IP4 reassembly expire walk interval: %lums\n",
+                  (long unsigned) rm->expire_walk_interval_ms);
   return 0;
 }
 
-/* *INDENT-OFF* */
 VLIB_CLI_COMMAND (show_ip4_full_reass_cmd, static) = {
     .path = "show ip4-full-reassembly",
     .short_help = "show ip4-full-reassembly [details]",
     .function = show_ip4_reass,
 };
-/* *INDENT-ON* */
 
 #ifndef CLIB_MARCH_VARIANT
 vnet_api_error_t
@@ -1722,7 +1752,8 @@ format_ip4_full_reass_handoff_trace (u8 * s, va_list * args)
 always_inline uword
 ip4_full_reass_handoff_node_inline (vlib_main_t * vm,
                                    vlib_node_runtime_t * node,
-                                   vlib_frame_t * frame, bool is_feature)
+                                   vlib_frame_t * frame,
+                                   ip4_full_reass_node_type_t type)
 {
   ip4_full_reass_main_t *rm = &ip4_full_reass_main;
 
@@ -1738,7 +1769,21 @@ ip4_full_reass_handoff_node_inline (vlib_main_t * vm,
   b = bufs;
   ti = thread_indices;
 
-  fq_index = (is_feature) ? rm->fq_feature_index : rm->fq_index;
+  switch (type)
+    {
+    case NORMAL:
+      fq_index = rm->fq_index;
+      break;
+    case FEATURE:
+      fq_index = rm->fq_feature_index;
+      break;
+    case CUSTOM:
+      fq_index = rm->fq_custom_index;
+      break;
+    default:
+      clib_warning ("Unexpected `type' (%d)!", type);
+      ASSERT (0);
+    }
 
   while (n_left_from > 0)
     {
@@ -1757,9 +1802,8 @@ ip4_full_reass_handoff_node_inline (vlib_main_t * vm,
       ti += 1;
       b += 1;
     }
-  n_enq =
-    vlib_buffer_enqueue_to_thread (vm, fq_index, from, thread_indices,
-                                  frame->n_vectors, 1);
+  n_enq = vlib_buffer_enqueue_to_thread (vm, node, fq_index, from,
+                                        thread_indices, frame->n_vectors, 1);
 
   if (n_enq < frame->n_vectors)
     vlib_node_increment_counter (vm, node->node_index,
@@ -1772,12 +1816,10 @@ VLIB_NODE_FN (ip4_full_reass_handoff_node) (vlib_main_t * vm,
                                            vlib_node_runtime_t * node,
                                            vlib_frame_t * frame)
 {
-  return ip4_full_reass_handoff_node_inline (vm, node, frame,
-                                            false /* is_feature */ );
+  return ip4_full_reass_handoff_node_inline (vm, node, frame, NORMAL);
 }
 
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip4_full_reass_handoff_node) = {
   .name = "ip4-full-reassembly-handoff",
   .vector_size = sizeof (u32),
@@ -1791,22 +1833,17 @@ VLIB_REGISTER_NODE (ip4_full_reass_handoff_node) = {
     [0] = "error-drop",
   },
 };
-/* *INDENT-ON* */
 
 
-/* *INDENT-OFF* */
 VLIB_NODE_FN (ip4_full_reass_feature_handoff_node) (vlib_main_t * vm,
                                                    vlib_node_runtime_t *
                                                    node,
                                                    vlib_frame_t * frame)
 {
-  return ip4_full_reass_handoff_node_inline (vm, node, frame,
-                                            true /* is_feature */ );
+  return ip4_full_reass_handoff_node_inline (vm, node, frame, FEATURE);
 }
-/* *INDENT-ON* */
 
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip4_full_reass_feature_handoff_node) = {
   .name = "ip4-full-reass-feature-hoff",
   .vector_size = sizeof (u32),
@@ -1820,7 +1857,29 @@ VLIB_REGISTER_NODE (ip4_full_reass_feature_handoff_node) = {
     [0] = "error-drop",
   },
 };
-/* *INDENT-ON* */
+
+VLIB_NODE_FN (ip4_full_reass_custom_handoff_node) (vlib_main_t * vm,
+                                                   vlib_node_runtime_t *
+                                                   node,
+                                                   vlib_frame_t * frame)
+{
+  return ip4_full_reass_handoff_node_inline (vm, node, frame, CUSTOM);
+}
+
+
+VLIB_REGISTER_NODE (ip4_full_reass_custom_handoff_node) = {
+  .name = "ip4-full-reass-custom-hoff",
+  .vector_size = sizeof (u32),
+  .n_errors = ARRAY_LEN(ip4_full_reass_handoff_error_strings),
+  .error_strings = ip4_full_reass_handoff_error_strings,
+  .format_trace = format_ip4_full_reass_handoff_trace,
+
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
 
 #ifndef CLIB_MARCH_VARIANT
 int