fib: Don't use [midchain] adjacencies to change an interface's feature arc
[vpp.git] / src / vnet / interface.c
index 1cf63c7..ce02499 100644 (file)
 
 #include <vnet/vnet.h>
 #include <vnet/plugin/plugin.h>
-#include <vnet/fib/ip6_fib.h>
 #include <vnet/adj/adj.h>
 #include <vnet/adj/adj_mcast.h>
+#include <vnet/ip/ip.h>
+#include <vnet/interface/rx_queue_funcs.h>
+#include <vnet/interface/tx_queue_funcs.h>
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_LOG_CLASS (if_default_log, static) = {
+  .class_name = "interface",
+};
+/* *INDENT-ON* */
+
+#define log_debug(fmt,...) vlib_log_debug(if_default_log.class, fmt, __VA_ARGS__)
+#define log_err(fmt,...) vlib_log_err(if_default_log.class, fmt, __VA_ARGS__)
 
 typedef enum vnet_interface_helper_flags_t_
 {
@@ -131,22 +142,22 @@ serialize_vnet_interface_state (serialize_main_t * m, va_list * va)
   /* Serialize hardware interface classes since they may have changed.
      Must do this before sending up/down flags. */
   /* *INDENT-OFF* */
-  pool_foreach (hif, im->hw_interfaces, ({
+  pool_foreach (hif, im->hw_interfaces)  {
     vnet_hw_interface_class_t * hw_class = vnet_get_hw_interface_class (vnm, hif->hw_class_index);
     serialize_cstring (m, hw_class->name);
-  }));
+  }
   /* *INDENT-ON* */
 
   /* Send sw/hw interface state when non-zero. */
   /* *INDENT-OFF* */
-  pool_foreach (sif, im->sw_interfaces, ({
+  pool_foreach (sif, im->sw_interfaces)  {
     if (sif->flags != 0)
       {
        vec_add2 (sts, st, 1);
        st->sw_hw_if_index = sif->sw_if_index;
        st->flags = sif->flags;
       }
-  }));
+  }
   /* *INDENT-ON* */
 
   vec_serialize (m, sts, serialize_vec_vnet_sw_hw_interface_state);
@@ -155,14 +166,14 @@ serialize_vnet_interface_state (serialize_main_t * m, va_list * va)
     _vec_len (sts) = 0;
 
   /* *INDENT-OFF* */
-  pool_foreach (hif, im->hw_interfaces, ({
+  pool_foreach (hif, im->hw_interfaces)  {
     if (hif->flags != 0)
       {
        vec_add2 (sts, st, 1);
        st->sw_hw_if_index = hif->hw_if_index;
        st->flags = vnet_hw_interface_flags_to_sw(hif->flags);
       }
-  }));
+  }
   /* *INDENT-ON* */
 
   vec_serialize (m, sts, serialize_vec_vnet_sw_hw_interface_state);
@@ -196,7 +207,7 @@ unserialize_vnet_interface_state (serialize_main_t * m, va_list * va)
     clib_error_t *error;
 
     /* *INDENT-OFF* */
-    pool_foreach (hif, im->hw_interfaces, ({
+    pool_foreach (hif, im->hw_interfaces)  {
       unserialize_cstring (m, &class_name);
       p = hash_get_mem (im->hw_interface_class_by_name, class_name);
       if (p)
@@ -210,7 +221,7 @@ unserialize_vnet_interface_state (serialize_main_t * m, va_list * va)
       if (error)
        clib_error_report (error);
       vec_free (class_name);
-    }));
+    }
     /* *INDENT-ON* */
   }
 
@@ -338,6 +349,8 @@ vnet_hw_interface_set_flags_helper (vnet_main_t * vnm, u32 hw_if_index,
   hi->flags |= flags;
 
 done:
+  if (error)
+    log_err ("hw_set_flags_helper: %U", format_clib_error, error);
   return error;
 }
 
@@ -449,9 +462,6 @@ vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
              goto done;
            }
 
-         /* save the si admin up flag */
-         old_flags = si->flags;
-
          /* update si admin up flag in advance if we are going admin down */
          if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
            si->flags &= ~VNET_SW_INTERFACE_FLAG_ADMIN_UP;
@@ -483,6 +493,7 @@ vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
                                                hi->flags &
                                                ~VNET_HW_INTERFACE_FLAG_LINK_UP,
                                                helper_flags);
+         vnet_hw_if_update_runtime_data (vnm, si->hw_if_index);
        }
     }
 
@@ -490,6 +501,8 @@ vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
   si->flags |= flags;
 
 done:
+  if (error)
+    log_err ("sw_set_flags_helper: %U", format_clib_error, error);
   return error;
 }
 
@@ -497,6 +510,7 @@ clib_error_t *
 vnet_hw_interface_set_flags (vnet_main_t * vnm, u32 hw_if_index,
                             vnet_hw_interface_flags_t flags)
 {
+  log_debug ("hw_set_flags: hw_if_index %u flags 0x%x", hw_if_index, flags);
   return vnet_hw_interface_set_flags_helper
     (vnm, hw_if_index, flags,
      VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE);
@@ -506,6 +520,7 @@ clib_error_t *
 vnet_sw_interface_set_flags (vnet_main_t * vnm, u32 sw_if_index,
                             vnet_sw_interface_flags_t flags)
 {
+  log_debug ("sw_set_flags: sw_if_index %u flags 0x%x", sw_if_index, flags);
   return vnet_sw_interface_set_flags_helper
     (vnm, sw_if_index, flags,
      VNET_INTERFACE_SET_FLAGS_HELPER_WANT_REDISTRIBUTE);
@@ -515,6 +530,7 @@ void
 vnet_sw_interface_admin_up (vnet_main_t * vnm, u32 sw_if_index)
 {
   u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
+  log_debug ("sw_admin_up: sw_if_index %u", sw_if_index);
 
   if (!(flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP))
     {
@@ -527,6 +543,7 @@ void
 vnet_sw_interface_admin_down (vnet_main_t * vnm, u32 sw_if_index)
 {
   u32 flags = vnet_sw_interface_get_flags (vnm, sw_if_index);
+  log_debug ("sw_admin_down: sw_if_index %u", sw_if_index);
 
   if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP)
     {
@@ -535,6 +552,21 @@ vnet_sw_interface_admin_down (vnet_main_t * vnm, u32 sw_if_index)
     }
 }
 
+static void
+vnet_if_update_lookup_tables (vnet_main_t *vnm, u32 sw_if_index)
+{
+  vnet_interface_main_t *im = &vnm->interface_main;
+  vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
+
+  vec_validate_init_empty (im->hw_if_index_by_sw_if_index, sw_if_index, ~0);
+  vec_validate_init_empty (im->if_out_arc_end_next_index_by_sw_if_index,
+                          sw_if_index, ~0);
+
+  im->hw_if_index_by_sw_if_index[sw_if_index] = hi->hw_if_index;
+  im->if_out_arc_end_next_index_by_sw_if_index[sw_if_index] =
+    hi->if_out_arc_end_node_next_index;
+}
+
 static u32
 vnet_create_sw_interface_no_callbacks (vnet_main_t * vnm,
                                       vnet_sw_interface_t * template)
@@ -576,6 +608,7 @@ vnet_create_sw_interface_no_callbacks (vnet_main_t * vnm,
     vnet_interface_counter_unlock (im);
   }
 
+  vnet_if_update_lookup_tables (vnm, sw_if_index);
   return sw_if_index;
 }
 
@@ -583,6 +616,7 @@ clib_error_t *
 vnet_create_sw_interface (vnet_main_t * vnm, vnet_sw_interface_t * template,
                          u32 * sw_if_index)
 {
+  vnet_interface_main_t *im = &vnm->interface_main;
   clib_error_t *error;
   vnet_hw_interface_t *hi;
   vnet_device_class_t *dev_class;
@@ -592,8 +626,9 @@ vnet_create_sw_interface (vnet_main_t * vnm, vnet_sw_interface_t * template,
       && (template->sub.eth.flags.inner_vlan_id_any == 1
          || template->sub.eth.flags.outer_vlan_id_any == 1))
     {
-      error = clib_error_return (0,
-                                "inner-dot1q any exact-match is unsupported");
+      char *str = "inner-dot1q any exact-match is unsupported";
+      error = clib_error_return (0, str);
+      log_err ("create_sw_interface: %s", str);
       return error;
     }
 
@@ -618,11 +653,19 @@ vnet_create_sw_interface (vnet_main_t * vnm, vnet_sw_interface_t * template,
   if (error)
     {
       /* undo the work done by vnet_create_sw_interface_no_callbacks() */
-      vnet_interface_main_t *im = &vnm->interface_main;
+      log_err ("create_sw_interface: set flags failed\n  %U",
+              format_clib_error, error);
       vnet_sw_interface_t *sw =
        pool_elt_at_index (im->sw_interfaces, *sw_if_index);
       pool_put (im->sw_interfaces, sw);
     }
+  else
+    {
+      vnet_sw_interface_t *sw =
+       pool_elt_at_index (im->sw_interfaces, *sw_if_index);
+      log_debug ("create_sw_interface: interface %U (sw_if_index %u) created",
+                format_vnet_sw_interface_name, vnm, sw, *sw_if_index);
+    }
 
   return error;
 }
@@ -634,6 +677,9 @@ vnet_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index)
   vnet_sw_interface_t *sw =
     pool_elt_at_index (im->sw_interfaces, sw_if_index);
 
+  log_debug ("delete_sw_interface: sw_if_index %u, name '%U'",
+            sw_if_index, format_vnet_sw_if_index_name, vnm, sw_if_index);
+
   /* Check if the interface has config and is removed from L2 BD or XConnect */
   vnet_clear_sw_interface_tag (vnm, sw_if_index);
 
@@ -661,6 +707,9 @@ vnet_sw_interface_set_mtu (vnet_main_t * vnm, u32 sw_if_index, u32 mtu)
   if (si->mtu[VNET_MTU_L3] != mtu)
     {
       si->mtu[VNET_MTU_L3] = mtu;
+      log_debug ("set_mtu: interface %U, new mtu %u",
+                format_vnet_sw_if_index_name, vnm, sw_if_index, mtu);
+
       call_sw_interface_mtu_change_callbacks (vnm, sw_if_index);
     }
 }
@@ -683,7 +732,13 @@ vnet_sw_interface_set_protocol_mtu (vnet_main_t * vnm, u32 sw_if_index,
     }
   /* Notify interested parties */
   if (changed)
-    call_sw_interface_mtu_change_callbacks (vnm, sw_if_index);
+    {
+      log_debug ("set_protocol_mtu: interface %U l3 %u ip4 %u ip6 %u mpls %u",
+                format_vnet_sw_if_index_name, vnm, sw_if_index,
+                mtu[VNET_MTU_L3], mtu[VNET_MTU_IP4], mtu[VNET_MTU_IP6],
+                mtu[VNET_MTU_MPLS]);
+      call_sw_interface_mtu_change_callbacks (vnm, sw_if_index);
+    }
 }
 
 void
@@ -733,13 +788,11 @@ setup_tx_node (vlib_main_t * vm,
 {
   vlib_node_t *n = vlib_get_node (vm, node_index);
 
-  n->function = dev_class->tx_function;
   n->format_trace = dev_class->format_tx_trace;
 
-  /// XXX: Update this to use counter structure
-  vlib_register_errors (vm, node_index,
-                       dev_class->tx_function_n_errors,
-                       dev_class->tx_function_error_strings, 0);
+  vlib_register_errors (vm, node_index, dev_class->tx_function_n_errors,
+                       dev_class->tx_function_error_strings,
+                       dev_class->tx_function_error_counters);
 }
 
 static void
@@ -751,6 +804,36 @@ setup_output_node (vlib_main_t * vm,
   n->unformat_buffer = hw_class->unformat_header;
 }
 
+void
+vnet_reset_interface_l3_output_node (vlib_main_t *vm, u32 sw_if_index)
+{
+  vnet_set_interface_l3_output_node (vm, sw_if_index,
+                                    (u8 *) "interface-output");
+}
+
+void
+vnet_set_interface_l3_output_node (vlib_main_t *vm, u32 sw_if_index,
+                                  u8 *output_node)
+{
+  vlib_node_t *l3_node;
+
+  l3_node = vlib_get_node_by_name (vm, output_node);
+
+  static char *arcs[] = {
+    "ip4-output",
+    "ip6-output",
+    "mpls-output",
+    "ethernet-output",
+  };
+  u8 a;
+
+  for (a = 0; a < ARRAY_LEN (arcs); a++)
+    {
+      u8 arc = vnet_get_feature_arc_index (arcs[a]);
+      vnet_feature_modify_end_node (arc, sw_if_index, l3_node->index);
+    }
+}
+
 /* Register an interface instance. */
 u32
 vnet_register_interface (vnet_main_t * vnm,
@@ -769,6 +852,8 @@ vnet_register_interface (vnet_main_t * vnm,
   vnet_config_main_t *cm;
   u32 hw_index, i;
   char *tx_node_name = NULL, *output_node_name = NULL;
+  vlib_node_t *if_out_node =
+    vlib_get_node (vm, vnet_interface_output_node.index);
 
   pool_get (im->hw_interfaces, hw);
   clib_memset (hw, 0, sizeof (*hw));
@@ -812,7 +897,7 @@ vnet_register_interface (vnet_main_t * vnm,
   hw->min_packet_bytes = 0;
   vnet_sw_interface_set_mtu (vnm, hw->sw_if_index, 0);
 
-  if (dev_class->tx_function == 0)
+  if (dev_class->tx_function == 0 && dev_class->tx_fn_registrations == 0)
     goto no_output_nodes;      /* No output/tx nodes to create */
 
   tx_node_name = (char *) format (0, "%v-tx", hw->name);
@@ -833,49 +918,57 @@ vnet_register_interface (vnet_main_t * vnm,
       vlib_node_rename (vm, hw->tx_node_index, "%v", tx_node_name);
       vlib_node_rename (vm, hw->output_node_index, "%v", output_node_name);
 
-      /* *INDENT-OFF* */
-      foreach_vlib_main ({
-        vnet_interface_output_runtime_t *rt;
-
-       rt = vlib_node_get_runtime_data (this_vlib_main, hw->output_node_index);
-       ASSERT (rt->is_deleted == 1);
-       rt->is_deleted = 0;
-       rt->hw_if_index = hw_index;
-       rt->sw_if_index = hw->sw_if_index;
-       rt->dev_instance = hw->dev_instance;
+      foreach_vlib_main ()
+       {
+         vnet_interface_output_runtime_t *rt;
 
-       rt = vlib_node_get_runtime_data (this_vlib_main, hw->tx_node_index);
-       rt->hw_if_index = hw_index;
-       rt->sw_if_index = hw->sw_if_index;
-       rt->dev_instance = hw->dev_instance;
-      });
-      /* *INDENT-ON* */
+         rt =
+           vlib_node_get_runtime_data (this_vlib_main, hw->output_node_index);
+         ASSERT (rt->is_deleted == 1);
+         rt->is_deleted = 0;
+         rt->hw_if_index = hw_index;
+         rt->sw_if_index = hw->sw_if_index;
+         rt->dev_instance = hw->dev_instance;
+
+         rt = vlib_node_get_runtime_data (this_vlib_main, hw->tx_node_index);
+         rt->hw_if_index = hw_index;
+         rt->sw_if_index = hw->sw_if_index;
+         rt->dev_instance = hw->dev_instance;
+       }
 
       /* The new class may differ from the old one.
        * Functions have to be updated. */
       node = vlib_get_node (vm, hw->output_node_index);
-      node->function = vnet_interface_output_node;
       node->format_trace = format_vnet_interface_output_trace;
-      /* *INDENT-OFF* */
-      foreach_vlib_main ({
-        nrt = vlib_node_get_runtime (this_vlib_main, hw->output_node_index);
-        nrt->function = node->function;
-       vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
-                                       VLIB_NODE_RUNTIME_PERF_RESET);
-      });
-      /* *INDENT-ON* */
+      node->node_fn_registrations = if_out_node->node_fn_registrations;
+      node->function = if_out_node->function;
+
+      foreach_vlib_main ()
+       {
+         nrt = vlib_node_get_runtime (this_vlib_main, hw->output_node_index);
+         nrt->function = node->function;
+         vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
+                                         VLIB_NODE_RUNTIME_PERF_RESET);
+       }
 
       node = vlib_get_node (vm, hw->tx_node_index);
-      node->function = dev_class->tx_function;
+      if (dev_class->tx_fn_registrations)
+       {
+         node->node_fn_registrations = dev_class->tx_fn_registrations;
+         node->function = vlib_node_get_preferred_node_fn_variant (
+           vm, dev_class->tx_fn_registrations);
+       }
+      else
+       node->function = dev_class->tx_function;
       node->format_trace = dev_class->format_tx_trace;
-      /* *INDENT-OFF* */
-      foreach_vlib_main ({
-        nrt = vlib_node_get_runtime (this_vlib_main, hw->tx_node_index);
-        nrt->function = node->function;
-       vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
-                                       VLIB_NODE_RUNTIME_PERF_RESET);
-      });
-      /* *INDENT-ON* */
+
+      foreach_vlib_main ()
+       {
+         nrt = vlib_node_get_runtime (this_vlib_main, hw->tx_node_index);
+         nrt->function = node->function;
+         vlib_node_runtime_perf_counter (this_vlib_main, nrt, 0, 0, 0,
+                                         VLIB_NODE_RUNTIME_PERF_RESET);
+       }
 
       _vec_len (im->deleted_hw_interface_nodes) -= 1;
     }
@@ -893,12 +986,18 @@ vnet_register_interface (vnet_main_t * vnm,
       r.type = VLIB_NODE_TYPE_INTERNAL;
       r.runtime_data = &rt;
       r.runtime_data_bytes = sizeof (rt);
-      r.scalar_size = 0;
+      r.scalar_size = sizeof (vnet_hw_if_tx_frame_t);
       r.vector_size = sizeof (u32);
 
       r.flags = VLIB_NODE_FLAG_IS_OUTPUT;
       r.name = tx_node_name;
-      r.function = dev_class->tx_function;
+      if (dev_class->tx_fn_registrations)
+       {
+         r.function = 0;
+         r.node_fn_registrations = dev_class->tx_fn_registrations;
+       }
+      else
+       r.function = dev_class->tx_function;
 
       hw->tx_node_index = vlib_register_node (vm, &r);
 
@@ -908,14 +1007,19 @@ vnet_register_interface (vnet_main_t * vnm,
 
       r.flags = 0;
       r.name = output_node_name;
-      r.function = vnet_interface_output_node;
       r.format_trace = format_vnet_interface_output_trace;
+      if (if_out_node->node_fn_registrations)
+       {
+         r.function = 0;
+         r.node_fn_registrations = if_out_node->node_fn_registrations;
+       }
+      else
+       r.function = if_out_node->function;
 
       {
        static char *e[] = {
          "interface is down",
          "interface is deleted",
-         "no buffers to segment GSO",
        };
 
        r.n_errors = ARRAY_LEN (e);
@@ -929,7 +1033,6 @@ vnet_register_interface (vnet_main_t * vnm,
       vlib_node_add_next_with_slot (vm, hw->output_node_index,
                                    hw->tx_node_index,
                                    VNET_INTERFACE_OUTPUT_NEXT_TX);
-
       /* add interface to the list of "output-interface" feature arc start nodes
          and clone nexts from 1st interface if it exists */
       fcm = vnet_feature_get_config_main (im->output_feature_arc_index);
@@ -953,6 +1056,9 @@ vnet_register_interface (vnet_main_t * vnm,
        }
     }
 
+  hw->if_out_arc_end_node_next_index = vlib_node_add_next (
+    vm, vnet_interface_output_arc_end_node.index, hw->tx_node_index);
+  vnet_if_update_lookup_tables (vnm, hw->sw_if_index);
   setup_output_node (vm, hw->output_node_index, hw_class);
   setup_tx_node (vm, hw->tx_node_index, dev_class);
 
@@ -983,6 +1089,11 @@ vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
   /* Call delete callbacks. */
   call_hw_interface_add_del_callbacks (vnm, hw_if_index, /* is_create */ 0);
 
+  /* delete rx & tx queues */
+  vnet_hw_if_unregister_all_rx_queues (vnm, hw_if_index);
+  vnet_hw_if_unregister_all_tx_queues (vnm, hw_if_index);
+  vnet_hw_if_update_runtime_data (vnm, hw_if_index);
+
   /* Delete any sub-interfaces. */
   {
     u32 id, sw_if_index;
@@ -1007,17 +1118,15 @@ vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
       /* Put output/tx nodes into recycle pool */
       vnet_hw_interface_nodes_t *dn;
 
-      /* *INDENT-OFF* */
-      foreach_vlib_main
-       ({
+      foreach_vlib_main ()
+       {
          vnet_interface_output_runtime_t *rt =
            vlib_node_get_runtime_data (this_vlib_main, hw->output_node_index);
 
          /* Mark node runtime as deleted so output node (if called)
           * will drop packets. */
          rt->is_deleted = 1;
-       });
-      /* *INDENT-ON* */
+       }
 
       vlib_node_rename (vm, hw->output_node_index,
                        "interface-%d-output-deleted", hw_if_index);
@@ -1027,13 +1136,10 @@ vnet_delete_hw_interface (vnet_main_t * vnm, u32 hw_if_index)
       dn->tx_node_index = hw->tx_node_index;
       dn->output_node_index = hw->output_node_index;
     }
-
   hash_unset_mem (im->hw_interface_by_name, hw->name);
   vec_free (hw->name);
   vec_free (hw->hw_address);
-  vec_free (hw->input_node_thread_index_by_queue);
-  vec_free (hw->dq_runtime_index_by_queue);
-
+  vec_free (hw->output_node_thread_runtimes);
   pool_put (im->hw_interfaces, hw);
 }
 
@@ -1070,11 +1176,11 @@ vnet_hw_interface_walk (vnet_main_t * vnm,
   im = &vnm->interface_main;
 
   /* *INDENT-OFF* */
-  pool_foreach (hi, im->hw_interfaces,
-  ({
+  pool_foreach (hi, im->hw_interfaces)
+   {
     if (WALK_STOP == fn(vnm, hi->hw_if_index, ctx))
       break;
-  }));
+  }
   /* *INDENT-ON* */
 }
 
@@ -1088,11 +1194,11 @@ vnet_sw_interface_walk (vnet_main_t * vnm,
   im = &vnm->interface_main;
 
   /* *INDENT-OFF* */
-  pool_foreach (si, im->sw_interfaces,
+  pool_foreach (si, im->sw_interfaces)
   {
     if (WALK_STOP == fn (vnm, si, ctx))
       break;
-  });
+  }
   /* *INDENT-ON* */
 }
 
@@ -1253,6 +1359,29 @@ vnet_sw_interface_is_nbma (vnet_main_t * vnm, u32 sw_if_index)
   return (hc->flags & VNET_HW_INTERFACE_CLASS_FLAG_NBMA);
 }
 
+clib_error_t *
+vnet_sw_interface_supports_addressing (vnet_main_t *vnm, u32 sw_if_index)
+{
+  if (sw_if_index == 0)
+    {
+      return clib_error_create (
+       "local0 interface doesn't support IP addressing");
+    }
+
+  if (vnet_sw_interface_is_sub (vnm, sw_if_index))
+    {
+      vnet_sw_interface_t *si;
+      si = vnet_get_sw_interface_or_null (vnm, sw_if_index);
+      if (si && si->type == VNET_SW_INTERFACE_TYPE_SUB &&
+         si->sub.eth.flags.exact_match == 0)
+       {
+         return clib_error_create (
+           "sub-interface without exact-match doesn't support IP addressing");
+       }
+    }
+  return NULL;
+}
+
 clib_error_t *
 vnet_interface_init (vlib_main_t * vm)
 {
@@ -1309,25 +1438,13 @@ vnet_interface_init (vlib_main_t * vm)
        c->index = vec_len (im->device_classes);
        hash_set_mem (im->device_class_by_name, c->name, c->index);
 
+       /* to avoid confusion, please remove ".tx_function" statement
+         from VNET_DEVICE_CLASS() if using function candidates */
+       ASSERT (c->tx_fn_registrations == 0 || c->tx_function == 0);
+
        if (c->tx_fn_registrations)
-         {
-           vlib_node_fn_registration_t *fnr = c->tx_fn_registrations;
-           int priority = -1;
-
-           /* to avoid confusion, please remove ".tx_function" statement
-              from VNET_DEVICE_CLASS() if using function candidates */
-           ASSERT (c->tx_function == 0);
-
-           while (fnr)
-             {
-               if (fnr->priority > priority)
-                 {
-                   priority = fnr->priority;
-                   c->tx_function = fnr->function;
-                 }
-               fnr = fnr->next_registration;
-             }
-         }
+         c->tx_function = vlib_node_get_preferred_node_fn_variant (
+           vm, c->tx_fn_registrations);
 
        vec_add1 (im->device_classes, c[0]);
        c = c->next_class_registration;
@@ -1337,6 +1454,10 @@ vnet_interface_init (vlib_main_t * vm)
   im->hw_interface_class_by_name = hash_create_string ( /* size */ 0,
                                                       sizeof (uword));
 
+  im->rxq_index_by_hw_if_index_and_queue_id =
+    hash_create_mem (0, sizeof (u64), sizeof (u32));
+  im->txq_index_by_hw_if_index_and_queue_id =
+    hash_create_mem (0, sizeof (u64), sizeof (u32));
   im->sw_if_index_by_sup_and_sub = hash_create_mem (0, sizeof (u64),
                                                    sizeof (uword));
   {
@@ -1368,11 +1489,6 @@ vnet_interface_init (vlib_main_t * vm)
 
   vnm->interface_tag_by_sw_if_index = hash_create (0, sizeof (uword));
 
-#if VLIB_BUFFER_TRACE_TRAJECTORY > 0
-  if ((error = vlib_call_init_function (vm, trajectory_trace_init)))
-    return error;
-#endif
-
   return 0;
 }
 
@@ -1483,6 +1599,8 @@ vnet_hw_interface_add_del_mac_address (vnet_main_t * vnm,
                                        mac_address, is_add);
 
 done:
+  if (error)
+    log_err ("hw_add_del_mac_address: %U", format_clib_error, error);
   return error;
 }
 
@@ -1540,20 +1658,48 @@ vnet_hw_interface_change_mac_address (vnet_main_t * vnm, u32 hw_if_index,
     (vnm, hw_if_index, mac_address);
 }
 
+static int
+vnet_sw_interface_check_table_same (u32 unnumbered_sw_if_index,
+                                   u32 ip_sw_if_index)
+{
+  if (ip4_main.fib_index_by_sw_if_index[unnumbered_sw_if_index] !=
+      ip4_main.fib_index_by_sw_if_index[ip_sw_if_index])
+    return VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+
+  if (ip4_main.mfib_index_by_sw_if_index[unnumbered_sw_if_index] !=
+      ip4_main.mfib_index_by_sw_if_index[ip_sw_if_index])
+    return VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+
+  if (ip6_main.fib_index_by_sw_if_index[unnumbered_sw_if_index] !=
+      ip6_main.fib_index_by_sw_if_index[ip_sw_if_index])
+    return VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+
+  if (ip6_main.mfib_index_by_sw_if_index[unnumbered_sw_if_index] !=
+      ip6_main.mfib_index_by_sw_if_index[ip_sw_if_index])
+    return VNET_API_ERROR_UNEXPECTED_INTF_STATE;
+
+  return 0;
+}
+
 /* update the unnumbered state of an interface*/
-void
+int
 vnet_sw_interface_update_unnumbered (u32 unnumbered_sw_if_index,
                                     u32 ip_sw_if_index, u8 enable)
 {
   vnet_main_t *vnm = vnet_get_main ();
   vnet_sw_interface_t *si;
   u32 was_unnum;
+  int rv = 0;
 
   si = vnet_get_sw_interface (vnm, unnumbered_sw_if_index);
   was_unnum = (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED);
 
   if (enable)
     {
+      rv = vnet_sw_interface_check_table_same (unnumbered_sw_if_index,
+                                              ip_sw_if_index);
+      if (rv != 0)
+       return rv;
       si->flags |= VNET_SW_INTERFACE_FLAG_UNNUMBERED;
       si->unnumbered_sw_if_index = ip_sw_if_index;
 
@@ -1569,13 +1715,20 @@ vnet_sw_interface_update_unnumbered (u32 unnumbered_sw_if_index,
     }
   else
     {
-      si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
-      si->unnumbered_sw_if_index = (u32) ~ 0;
+      /*
+       * Unless the interface is actually unnumbered, don't
+       * smash e.g. if_address_pool_index_by_sw_if_index
+       */
+      if (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+       {
+         si->flags &= ~(VNET_SW_INTERFACE_FLAG_UNNUMBERED);
+         si->unnumbered_sw_if_index = (u32) ~0;
 
-      ip4_main.lookup_main.if_address_pool_index_by_sw_if_index
-       [unnumbered_sw_if_index] = ~0;
-      ip6_main.lookup_main.if_address_pool_index_by_sw_if_index
-       [unnumbered_sw_if_index] = ~0;
+         ip4_main.lookup_main
+           .if_address_pool_index_by_sw_if_index[unnumbered_sw_if_index] = ~0;
+         ip6_main.lookup_main
+           .if_address_pool_index_by_sw_if_index[unnumbered_sw_if_index] = ~0;
+       }
     }
 
   if (was_unnum != (si->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED))
@@ -1583,6 +1736,8 @@ vnet_sw_interface_update_unnumbered (u32 unnumbered_sw_if_index,
       ip4_sw_interface_enable_disable (unnumbered_sw_if_index, enable);
       ip6_sw_interface_enable_disable (unnumbered_sw_if_index, enable);
     }
+
+  return 0;
 }
 
 vnet_l3_packet_type_t
@@ -1713,6 +1868,8 @@ vnet_hw_interface_set_rss_queues (vnet_main_t * vnm,
     }
 
 done:
+  if (error)
+    log_err ("hw_set_rss_queues: %U", format_clib_error, error);
   return error;
 }