qos: migrate old MULTIARCH macros to VLIB_NODE_FN

Change-Id: I4dc77979594de0b6a21644ea0a982085c6386010
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

5 files changed, 735 insertions, 703 deletions

diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index e412b451aa7..12b61c8cf54 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -1350,7 +1350,14 @@ list(APPEND VNET_SOURCES
   qos/qos_api.c
   qos/qos_egress_map.c
   qos/qos_record.c
+  qos/qos_record_node.c
   qos/qos_mark.c
+  qos/qos_mark_node.c
+)
+
+list(APPEND VNET_MULTIARCH_SOURCES
+  qos/qos_record_node.c
+  qos/qos_mark_node.c
 )
 
 list(APPEND VNET_API_FILES qos/qos.api)
diff --git a/src/vnet/qos/qos_mark.c b/src/vnet/qos/qos_mark.c
index 3b69bf5c2c3..dcb0f9d1ab3 100644
--- a/src/vnet/qos/qos_mark.c
+++ b/src/vnet/qos/qos_mark.c
@@ -75,335 +75,6 @@ qos_egress_map_feature_config (u32 sw_if_index, qos_source_t qs, u8 enable)
     }
 }
 
-always_inline qos_egress_map_t *
-qos_egress_map_interface (u32 sw_if_index, qos_source_t output_source)
-{
-  ASSERT (vec_len (qos_mark_configs[output_source]) > sw_if_index);
-
-  return pool_elt_at_index (qem_pool,
-			    qos_mark_configs[output_source][sw_if_index]);
-}
-
-/**
- * per-packet trace data
- */
-typedef struct qos_mark_trace_t_
-{
-  /* per-pkt trace data */
-  qos_bits_t bits;
-  qos_source_t input;
-  u32 used;
-} qos_mark_trace_t;
-
-static inline uword
-qos_mark_inline (vlib_main_t * vm,
-		 vlib_node_runtime_t * node,
-		 vlib_frame_t * frame, qos_source_t output_source, int is_ip6)
-{
-  u32 n_left_from, *from, *to_next, next_index;
-
-  next_index = 0;
-  n_left_from = frame->n_vectors;
-  from = vlib_frame_vector_args (frame);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  qos_source_t input_source0;
-	  ethernet_vlan_header_t *vlan0;
-	  u32 sw_if_index0, next0, bi0;
-	  qos_egress_map_t *qem0;
-	  ip4_header_t *ip4_0;
-	  ip6_header_t *ip6_0;
-	  vlib_buffer_t *b0;
-	  qos_bits_t qos0;
-	  u8 *mpls_bytes_0;
-	  u8 eos0;
-
-	  next0 = 0;
-	  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);
-	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
-	  input_source0 = vnet_buffer2 (b0)->qos.source;
-
-	  qem0 = qos_egress_map_interface (sw_if_index0, output_source);
-	  qos0 = qem0->qem_output[input_source0][vnet_buffer2 (b0)->qos.bits];
-
-	  if (PREDICT_TRUE (b0->flags & VNET_BUFFER_F_QOS_DATA_VALID))
-	    {
-	      /* there is a source of QoS recording for this packet */
-	      if (QOS_SOURCE_IP == output_source)
-		{
-		  if (is_ip6)
-		    {
-		      ip6_0 = (vlib_buffer_get_current (b0) +
-			       vnet_buffer (b0)->ip.save_rewrite_length);
-
-		      ip6_set_traffic_class_network_order (ip6_0, qos0);
-		    }
-		  else
-		    {
-		      ip4_0 = (vlib_buffer_get_current (b0) +
-			       vnet_buffer (b0)->ip.save_rewrite_length);
-		      if (PREDICT_FALSE (qos0 != ip4_0->tos))
-			{
-			  ip4_0->tos = qos0;
-			  ip4_0->checksum = ip4_header_checksum (ip4_0);
-			}
-		    }
-		}
-	      else if (QOS_SOURCE_MPLS == output_source)
-		{
-		  mpls_bytes_0 = (vlib_buffer_get_current (b0) +
-				  vnet_buffer (b0)->mpls.save_rewrite_length);
-
-		  /* apply to all the labels in the stack */
-		  do
-		    {
-		      /* clear out the old COS bts */
-		      mpls_bytes_0[2] &= 0xf1;
-		      /* OR in 3 bits of the mapped value */
-		      mpls_bytes_0[2] |= (qos0 & 0x7) << 1;
-		      eos0 = mpls_bytes_0[2] & 0x1;
-		      mpls_bytes_0 += 4;
-		    }
-		  while (!eos0);
-		}
-	      else if (QOS_SOURCE_VLAN == output_source)
-		{
-		  vlan0 = (vlib_buffer_get_current (b0) +
-			   sizeof (ethernet_header_t));
-
-		  ethernet_vlan_header_set_priority_net_order (vlan0, qos0);
-		}
-	    }
-	  vnet_feature_next (&next0, b0);
-
-	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
-	    {
-	      qos_mark_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->bits = qos0;
-	      t->input = input_source0;
-	      t->used = (b0->flags & VNET_BUFFER_F_QOS_DATA_VALID);
-	    }
-
-	  /* 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);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* packet trace format function */
-static u8 *
-format_qos_mark_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 *);
-  qos_mark_trace_t *t = va_arg (*args, qos_mark_trace_t *);
-
-  s = format (s, "source:%U qos:%d used:%s",
-	      format_qos_source, t->input, t->bits, (t->used ? "yes" : "no"));
-
-  return s;
-}
-
-static inline uword
-ip4_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node,
-	      vlib_frame_t * frame)
-{
-  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_IP, 0));
-}
-
-static inline uword
-ip6_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node,
-	      vlib_frame_t * frame)
-{
-  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_IP, 1));
-}
-
-static inline uword
-mpls_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node,
-	       vlib_frame_t * frame)
-{
-  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_MPLS, 0));
-}
-
-static inline uword
-vlan_mpls_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node,
-		    vlib_frame_t * frame)
-{
-  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_VLAN, 0));
-}
-
-static inline uword
-vlan_ip4_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node,
-		   vlib_frame_t * frame)
-{
-  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_VLAN, 0));
-}
-
-static inline uword
-vlan_ip6_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node,
-		   vlib_frame_t * frame)
-{
-  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_VLAN, 0));
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_qos_mark_node) = {
-  .function = ip4_qos_mark,
-  .name = "ip4-qos-mark",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_mark_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "ip4-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_qos_mark_node, ip4_qos_mark);
-
-VNET_FEATURE_INIT (ip4_qos_mark_node, static) = {
-    .arc_name = "ip4-output",
-    .node_name = "ip4-qos-mark",
-};
-
-VLIB_REGISTER_NODE (ip6_qos_mark_node) = {
-  .function = ip6_qos_mark,
-  .name = "ip6-qos-mark",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_mark_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "ip6-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_qos_mark_node, ip6_qos_mark);
-
-VNET_FEATURE_INIT (ip6_qos_mark_node, static) = {
-    .arc_name = "ip6-output",
-    .node_name = "ip6-qos-mark",
-};
-
-VLIB_REGISTER_NODE (mpls_qos_mark_node) = {
-  .function = mpls_qos_mark,
-  .name = "mpls-qos-mark",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_mark_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "mpls-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_qos_mark_node, mpls_qos_mark);
-
-VNET_FEATURE_INIT (mpls_qos_mark_node, static) = {
-    .arc_name = "mpls-output",
-    .node_name = "mpls-qos-mark",
-};
-
-VLIB_REGISTER_NODE (vlan_ip4_qos_mark_node) = {
-  .function = vlan_ip4_qos_mark,
-  .name = "vlan-ip4-qos-mark",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_mark_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vlan_ip4_qos_mark_node, vlan_ip4_qos_mark);
-
-VNET_FEATURE_INIT (vlan_ip4_qos_mark_node, static) = {
-    .arc_name = "ip4-output",
-    .node_name = "vlan-ip4-qos-mark",
-    .runs_after = VNET_FEATURES ("ip4-qos-mark"),
-};
-
-VLIB_REGISTER_NODE (vlan_ip6_qos_mark_node) = {
-  .function = vlan_ip6_qos_mark,
-  .name = "vlan-ip6-qos-mark",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_mark_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vlan_ip6_qos_mark_node, vlan_ip6_qos_mark);
-
-VNET_FEATURE_INIT (vlan_ip6_qos_mark_node, static) = {
-    .arc_name = "ip6-output",
-    .node_name = "vlan-ip6-qos-mark",
-    .runs_after = VNET_FEATURES ("ip6-qos-mark"),
-};
-
-VLIB_REGISTER_NODE (vlan_mpls_qos_mark_node) = {
-  .function = vlan_mpls_qos_mark,
-  .name = "vlan-mpls-qos-mark",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_mark_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vlan_mpls_qos_mark_node, vlan_mpls_qos_mark);
-
-VNET_FEATURE_INIT (vlan_mpls_qos_mark_node, static) = {
-    .arc_name = "mpls-output",
-    .node_name = "vlan-mpls-qos-mark",
-    .runs_after = VNET_FEATURES ("mpls-qos-mark"),
-};
-/* *INDENT-ON* */
-
 int
 qos_mark_enable (u32 sw_if_index,
 		 qos_source_t output_source, qos_egress_map_id_t mid)
diff --git a/src/vnet/qos/qos_mark_node.c b/src/vnet/qos/qos_mark_node.c
new file mode 100644
index 00000000000..f12e66b4fa0
--- /dev/null
+++ b/src/vnet/qos/qos_mark_node.c
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 2019 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/ip/ip.h>
+#include <vnet/feature/feature.h>
+#include <vnet/qos/qos_egress_map.h>
+#include <vnet/qos/qos_mark.h>
+
+extern index_t *qos_mark_configs[QOS_N_SOURCES];
+
+always_inline qos_egress_map_t *
+qos_egress_map_interface (u32 sw_if_index, qos_source_t output_source)
+{
+  ASSERT (vec_len (qos_mark_configs[output_source]) > sw_if_index);
+
+  return pool_elt_at_index (qem_pool,
+			    qos_mark_configs[output_source][sw_if_index]);
+}
+
+/**
+ * per-packet trace data
+ */
+typedef struct qos_mark_trace_t_
+{
+  /* per-pkt trace data */
+  qos_bits_t bits;
+  qos_source_t input;
+  u32 used;
+} qos_mark_trace_t;
+
+static inline uword
+qos_mark_inline (vlib_main_t * vm,
+		 vlib_node_runtime_t * node,
+		 vlib_frame_t * frame, qos_source_t output_source, int is_ip6)
+{
+  u32 n_left_from, *from, *to_next, next_index;
+
+  next_index = 0;
+  n_left_from = frame->n_vectors;
+  from = vlib_frame_vector_args (frame);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  qos_source_t input_source0;
+	  ethernet_vlan_header_t *vlan0;
+	  u32 sw_if_index0, next0, bi0;
+	  qos_egress_map_t *qem0;
+	  ip4_header_t *ip4_0;
+	  ip6_header_t *ip6_0;
+	  vlib_buffer_t *b0;
+	  qos_bits_t qos0;
+	  u8 *mpls_bytes_0;
+	  u8 eos0;
+
+	  next0 = 0;
+	  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);
+	  sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+	  input_source0 = vnet_buffer2 (b0)->qos.source;
+
+	  qem0 = qos_egress_map_interface (sw_if_index0, output_source);
+	  qos0 = qem0->qem_output[input_source0][vnet_buffer2 (b0)->qos.bits];
+
+	  if (PREDICT_TRUE (b0->flags & VNET_BUFFER_F_QOS_DATA_VALID))
+	    {
+	      /* there is a source of QoS recording for this packet */
+	      if (QOS_SOURCE_IP == output_source)
+		{
+		  if (is_ip6)
+		    {
+		      ip6_0 = (vlib_buffer_get_current (b0) +
+			       vnet_buffer (b0)->ip.save_rewrite_length);
+
+		      ip6_set_traffic_class_network_order (ip6_0, qos0);
+		    }
+		  else
+		    {
+		      ip4_0 = (vlib_buffer_get_current (b0) +
+			       vnet_buffer (b0)->ip.save_rewrite_length);
+		      if (PREDICT_FALSE (qos0 != ip4_0->tos))
+			{
+			  ip4_0->tos = qos0;
+			  ip4_0->checksum = ip4_header_checksum (ip4_0);
+			}
+		    }
+		}
+	      else if (QOS_SOURCE_MPLS == output_source)
+		{
+		  mpls_bytes_0 = (vlib_buffer_get_current (b0) +
+				  vnet_buffer (b0)->mpls.save_rewrite_length);
+
+		  /* apply to all the labels in the stack */
+		  do
+		    {
+		      /* clear out the old COS bts */
+		      mpls_bytes_0[2] &= 0xf1;
+		      /* OR in 3 bits of the mapped value */
+		      mpls_bytes_0[2] |= (qos0 & 0x7) << 1;
+		      eos0 = mpls_bytes_0[2] & 0x1;
+		      mpls_bytes_0 += 4;
+		    }
+		  while (!eos0);
+		}
+	      else if (QOS_SOURCE_VLAN == output_source)
+		{
+		  vlan0 = (vlib_buffer_get_current (b0) +
+			   sizeof (ethernet_header_t));
+
+		  ethernet_vlan_header_set_priority_net_order (vlan0, qos0);
+		}
+	    }
+	  vnet_feature_next (&next0, b0);
+
+	  if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+	    {
+	      qos_mark_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->bits = qos0;
+	      t->input = input_source0;
+	      t->used = (b0->flags & VNET_BUFFER_F_QOS_DATA_VALID);
+	    }
+
+	  /* 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);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+/* packet trace format function */
+static u8 *
+format_qos_mark_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 *);
+  qos_mark_trace_t *t = va_arg (*args, qos_mark_trace_t *);
+
+  s = format (s, "source:%U qos:%d used:%s",
+	      format_qos_source, t->input, t->bits, (t->used ? "yes" : "no"));
+
+  return s;
+}
+
+VLIB_NODE_FN (ip4_qos_mark_node) (vlib_main_t * vm,
+				  vlib_node_runtime_t * node,
+				  vlib_frame_t * frame)
+{
+  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_IP, 0));
+}
+
+VLIB_NODE_FN (ip6_qos_mark_node) (vlib_main_t * vm,
+				  vlib_node_runtime_t * node,
+				  vlib_frame_t * frame)
+{
+  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_IP, 1));
+}
+
+VLIB_NODE_FN (mpls_qos_mark_node) (vlib_main_t * vm,
+				   vlib_node_runtime_t * node,
+				   vlib_frame_t * frame)
+{
+  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_MPLS, 0));
+}
+
+VLIB_NODE_FN (vlan_mpls_qos_mark_node) (vlib_main_t * vm,
+					vlib_node_runtime_t * node,
+					vlib_frame_t * frame)
+{
+  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_VLAN, 0));
+}
+
+VLIB_NODE_FN (vlan_ip4_qos_mark_node) (vlib_main_t * vm,
+				       vlib_node_runtime_t * node,
+				       vlib_frame_t * frame)
+{
+  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_VLAN, 0));
+}
+
+VLIB_NODE_FN (vlan_ip6_qos_mark_node) (vlib_main_t * vm,
+				       vlib_node_runtime_t * node,
+				       vlib_frame_t * frame)
+{
+  return (qos_mark_inline (vm, node, frame, QOS_SOURCE_VLAN, 0));
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_qos_mark_node) = {
+  .name = "ip4-qos-mark",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_mark_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "ip4-drop",
+  },
+};
+
+VNET_FEATURE_INIT (ip4_qos_mark_node, static) = {
+    .arc_name = "ip4-output",
+    .node_name = "ip4-qos-mark",
+};
+
+VLIB_REGISTER_NODE (ip6_qos_mark_node) = {
+  .name = "ip6-qos-mark",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_mark_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "ip6-drop",
+  },
+};
+
+VNET_FEATURE_INIT (ip6_qos_mark_node, static) = {
+    .arc_name = "ip6-output",
+    .node_name = "ip6-qos-mark",
+};
+
+VLIB_REGISTER_NODE (mpls_qos_mark_node) = {
+  .name = "mpls-qos-mark",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_mark_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "mpls-drop",
+  },
+};
+
+VNET_FEATURE_INIT (mpls_qos_mark_node, static) = {
+    .arc_name = "mpls-output",
+    .node_name = "mpls-qos-mark",
+};
+
+VLIB_REGISTER_NODE (vlan_ip4_qos_mark_node) = {
+  .name = "vlan-ip4-qos-mark",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_mark_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VNET_FEATURE_INIT (vlan_ip4_qos_mark_node, static) = {
+    .arc_name = "ip4-output",
+    .node_name = "vlan-ip4-qos-mark",
+    .runs_after = VNET_FEATURES ("ip4-qos-mark"),
+};
+
+VLIB_REGISTER_NODE (vlan_ip6_qos_mark_node) = {
+  .name = "vlan-ip6-qos-mark",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_mark_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VNET_FEATURE_INIT (vlan_ip6_qos_mark_node, static) = {
+    .arc_name = "ip6-output",
+    .node_name = "vlan-ip6-qos-mark",
+    .runs_after = VNET_FEATURES ("ip6-qos-mark"),
+};
+
+VLIB_REGISTER_NODE (vlan_mpls_qos_mark_node) = {
+  .name = "vlan-mpls-qos-mark",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_mark_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VNET_FEATURE_INIT (vlan_mpls_qos_mark_node, static) = {
+    .arc_name = "mpls-output",
+    .node_name = "vlan-mpls-qos-mark",
+    .runs_after = VNET_FEATURES ("mpls-qos-mark"),
+};
+
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/vnet/qos/qos_record.c b/src/vnet/qos/qos_record.c
index ef9e587a8a6..20d0b5bf4f5 100644
--- a/src/vnet/qos/qos_record.c
+++ b/src/vnet/qos/qos_record.c
@@ -24,8 +24,8 @@
 /**
  * Per-interface, per-protocol vector of feature on/off configurations
  */
-static u8 *qos_record_configs[QOS_N_SOURCES];
-static u32 l2_qos_input_next[QOS_N_SOURCES][32];
+u8 *qos_record_configs[QOS_N_SOURCES];
+u32 l2_qos_input_next[QOS_N_SOURCES][32];
 
 static void
 qos_record_feature_config (u32 sw_if_index,
@@ -123,386 +123,16 @@ qos_record_ip_interface_add_del (vnet_main_t * vnm,
 
 VNET_SW_INTERFACE_ADD_DEL_FUNCTION (qos_record_ip_interface_add_del);
 
-/**
- * per-packet trace data
- */
-typedef struct qos_record_trace_t_
-{
-  /* per-pkt trace data */
-  qos_bits_t bits;
-} qos_record_trace_t;
-
-static inline uword
-qos_record_inline (vlib_main_t * vm,
-		   vlib_node_runtime_t * node,
-		   vlib_frame_t * frame,
-		   qos_source_t qos_src, dpo_proto_t dproto, int is_l2)
-{
-  u32 n_left_from, *from, *to_next, next_index;
-
-  next_index = 0;
-  n_left_from = frame->n_vectors;
-  from = vlib_frame_vector_args (frame);
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-	{
-	  ip4_header_t *ip4_0;
-	  ip6_header_t *ip6_0;
-	  vlib_buffer_t *b0;
-	  u32 next0, bi0;
-	  qos_bits_t qos0;
-	  u8 l2_len;
-
-	  next0 = 0;
-	  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);
-
-	  if (is_l2)
-	    {
-	      l2_len = vnet_buffer (b0)->l2.l2_len;
-	      u8 *l3h;
-	      u16 ethertype;
-
-	      vlib_buffer_advance (b0, l2_len);
-
-	      l3h = vlib_buffer_get_current (b0);
-	      ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2));
-
-	      if (ethertype == ETHERNET_TYPE_IP4)
-		dproto = DPO_PROTO_IP4;
-	      else if (ethertype == ETHERNET_TYPE_IP6)
-		dproto = DPO_PROTO_IP6;
-	      else if (ethertype == ETHERNET_TYPE_MPLS)
-		dproto = DPO_PROTO_MPLS;
-	      else
-		goto non_ip;
-	    }
-
-	  if (DPO_PROTO_IP6 == dproto)
-	    {
-	      ip6_0 = vlib_buffer_get_current (b0);
-	      qos0 = ip6_traffic_class_network_order (ip6_0);
-	    }
-	  else if (DPO_PROTO_IP4 == dproto)
-	    {
-	      ip4_0 = vlib_buffer_get_current (b0);
-	      qos0 = ip4_0->tos;
-	    }
-	  else if (DPO_PROTO_ETHERNET == dproto)
-	    {
-	      ethernet_vlan_header_t *vlan0;
-
-	      vlan0 = (vlib_buffer_get_current (b0) -
-		       sizeof (ethernet_vlan_header_t));
-
-	      qos0 = ethernet_vlan_header_get_priority_net_order (vlan0);
-	    }
-	  else if (DPO_PROTO_MPLS)
-	    {
-	      mpls_unicast_header_t *mh;
-
-	      mh = vlib_buffer_get_current (b0);
-	      qos0 = vnet_mpls_uc_get_exp (mh->label_exp_s_ttl);
-	    }
-
-	  vnet_buffer2 (b0)->qos.bits = qos0;
-	  vnet_buffer2 (b0)->qos.source = qos_src;
-	  b0->flags |= VNET_BUFFER_F_QOS_DATA_VALID;
-
-	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
-			     (b0->flags & VLIB_BUFFER_IS_TRACED)))
-	    {
-	      qos_record_trace_t *t =
-		vlib_add_trace (vm, node, b0, sizeof (*t));
-	      t->bits = qos0;
-	    }
-
-	non_ip:
-	  if (is_l2)
-	    {
-	      vlib_buffer_advance (b0, -l2_len);
-	      next0 = vnet_l2_feature_next (b0,
-					    l2_qos_input_next[qos_src],
-					    L2INPUT_FEAT_L2_IP_QOS_RECORD);
-	    }
-	  else
-	    vnet_feature_next (&next0, b0);
-
-	  /* 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);
-	}
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  return frame->n_vectors;
-}
-
-/* packet trace format function */
-static u8 *
-format_qos_record_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 *);
-  qos_record_trace_t *t = va_arg (*args, qos_record_trace_t *);
-
-  s = format (s, "qos:%d", t->bits);
-
-  return s;
-}
-
-static inline uword
-ip4_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node,
-		vlib_frame_t * frame)
-{
-  return (qos_record_inline (vm, node, frame, QOS_SOURCE_IP,
-			     DPO_PROTO_IP4, 0));
-}
-
-static inline uword
-ip6_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node,
-		vlib_frame_t * frame)
-{
-  return (qos_record_inline (vm, node, frame, QOS_SOURCE_IP,
-			     DPO_PROTO_IP6, 0));
-}
-
-static inline uword
-mpls_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node,
-		 vlib_frame_t * frame)
-{
-  return (qos_record_inline (vm, node, frame, QOS_SOURCE_MPLS,
-			     DPO_PROTO_MPLS, 0));
-}
-
-static inline uword
-vlan_ip4_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node,
-		     vlib_frame_t * frame)
-{
-  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN,
-			     DPO_PROTO_ETHERNET, 0));
-}
-
-static inline uword
-vlan_ip6_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node,
-		     vlib_frame_t * frame)
-{
-  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN,
-			     DPO_PROTO_ETHERNET, 0));
-}
-
-static inline uword
-vlan_mpls_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node,
-		      vlib_frame_t * frame)
-{
-  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN,
-			     DPO_PROTO_ETHERNET, 0));
-}
-
-static inline uword
-l2_ip_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node,
-		  vlib_frame_t * frame)
-{
-  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN, 0, 1));
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip4_qos_record_node) = {
-  .function = ip4_qos_record,
-  .name = "ip4-qos-record",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_record_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "ip4-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_qos_record_node, ip4_qos_record);
-
-VNET_FEATURE_INIT (ip4_qos_record_node, static) = {
-    .arc_name = "ip4-unicast",
-    .node_name = "ip4-qos-record",
-};
-VNET_FEATURE_INIT (ip4m_qos_record_node, static) = {
-    .arc_name = "ip4-multicast",
-    .node_name = "ip4-qos-record",
-};
-
-VLIB_REGISTER_NODE (ip6_qos_record_node) = {
-  .function = ip6_qos_record,
-  .name = "ip6-qos-record",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_record_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "ip6-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_qos_record_node, ip6_qos_record);
-
-VNET_FEATURE_INIT (ip6_qos_record_node, static) = {
-    .arc_name = "ip6-unicast",
-    .node_name = "ip6-qos-record",
-};
-VNET_FEATURE_INIT (ip6m_qos_record_node, static) = {
-    .arc_name = "ip6-multicast",
-    .node_name = "ip6-qos-record",
-};
-
-VLIB_REGISTER_NODE (mpls_qos_record_node) = {
-  .function = mpls_qos_record,
-  .name = "mpls-qos-record",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_record_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "mpls-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_qos_record_node, mpls_qos_record);
-
-VNET_FEATURE_INIT (mpls_qos_record_node, static) = {
-    .arc_name = "mpls-input",
-    .node_name = "mpls-qos-record",
-};
-
-VLIB_REGISTER_NODE (vlan_mpls_qos_record_node) = {
-  .function = vlan_mpls_qos_record,
-  .name = "vlan-mpls-qos-record",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_record_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "mpls-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vlan_mpls_qos_record_node, vlan_mpls_qos_record);
-
-VNET_FEATURE_INIT (vlan_mpls_qos_record_node, static) = {
-    .arc_name = "mpls-input",
-    .node_name = "vlan-mpls-qos-record",
-    .runs_before = VNET_FEATURES ("mpls-qos-record"),
-};
-
-VLIB_REGISTER_NODE (vlan_ip4_qos_record_node) = {
-  .function = vlan_ip4_qos_record,
-  .name = "vlan-ip4-qos-record",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_record_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "ip4-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vlan_ip4_qos_record_node, vlan_ip4_qos_record);
-
-VNET_FEATURE_INIT (vlan_ip4_qos_record_node, static) = {
-    .arc_name = "ip4-unicast",
-    .node_name = "vlan-ip4-qos-record",
-    .runs_before = VNET_FEATURES ("ip4-qos-record"),
-};
-VNET_FEATURE_INIT (vlan_ip4m_qos_record_node, static) = {
-    .arc_name = "ip4-multicast",
-    .node_name = "vlan-ip4-qos-record",
-    .runs_before = VNET_FEATURES ("ip4-qos-record"),
-};
-
-VLIB_REGISTER_NODE (vlan_ip6_qos_record_node) = {
-  .function = vlan_ip6_qos_record,
-  .name = "vlan-ip6-qos-record",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_record_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  .next_nodes = {
-    [0] = "ip6-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (vlan_ip6_qos_record_node, vlan_ip6_qos_record);
-
-VNET_FEATURE_INIT (vlan_ip6_qos_record_node, static) = {
-    .arc_name = "ip6-unicast",
-    .node_name = "vlan-ip6-qos-record",
-    .runs_before = VNET_FEATURES ("ip6-qos-record"),
-};
-VNET_FEATURE_INIT (vlan_ip6m_qos_record_node, static) = {
-    .arc_name = "ip6-multicast",
-    .node_name = "vlan-ip6-qos-record",
-    .runs_before = VNET_FEATURES ("ip6-qos-record"),
-};
-
-VLIB_REGISTER_NODE (l2_ip_qos_record_node, static) = {
-  .function = l2_ip_qos_record,
-  .name = "l2-ip-qos-record",
-  .vector_size = sizeof (u32),
-  .format_trace = format_qos_record_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = 0,
-  .n_next_nodes = 1,
-
-  /* Consider adding error "no IP after L2, no recording" */
-  .next_nodes = {
-    [0] = "error-drop",
-  },
-};
-
-VLIB_NODE_FUNCTION_MULTIARCH (l2_ip_qos_record_node, l2_ip_qos_record);
-
-/* *INDENT-ON* */
-
 clib_error_t *
 l2_ip_qos_init (vlib_main_t * vm)
 {
   qos_source_t qs;
+  vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "l2-ip-qos-record");
 
   /* Initialize the feature next-node indexes */
   FOR_EACH_QOS_SOURCE (qs)
     feat_bitmap_init_next_nodes (vm,
-				 l2_ip_qos_record_node.index,
+				 node->index,
 				 L2INPUT_N_FEAT,
 				 l2input_get_feat_names (),
 				 l2_qos_input_next[qs]);
diff --git a/src/vnet/qos/qos_record_node.c b/src/vnet/qos/qos_record_node.c
new file mode 100644
index 00000000000..75e1421dc08
--- /dev/null
+++ b/src/vnet/qos/qos_record_node.c
@@ -0,0 +1,383 @@
+/*
+ * Copyright (c) 2018 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vnet/qos/qos_record.h>
+#include <vnet/ip/ip.h>
+#include <vnet/ip/ip6_to_ip4.h>
+#include <vnet/feature/feature.h>
+#include <vnet/qos/qos_types.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/l2/feat_bitmap.h>
+
+extern u8 *qos_record_configs[QOS_N_SOURCES];
+extern u32 l2_qos_input_next[QOS_N_SOURCES][32];
+
+/**
+ * per-packet trace data
+ */
+typedef struct qos_record_trace_t_
+{
+  /* per-pkt trace data */
+  qos_bits_t bits;
+} qos_record_trace_t;
+
+/* packet trace format function */
+static u8 *
+format_qos_record_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 *);
+  qos_record_trace_t *t = va_arg (*args, qos_record_trace_t *);
+
+  s = format (s, "qos:%d", t->bits);
+
+  return s;
+}
+
+static inline uword
+qos_record_inline (vlib_main_t * vm,
+		   vlib_node_runtime_t * node,
+		   vlib_frame_t * frame,
+		   qos_source_t qos_src, dpo_proto_t dproto, int is_l2)
+{
+  u32 n_left_from, *from, *to_next, next_index;
+
+  next_index = 0;
+  n_left_from = frame->n_vectors;
+  from = vlib_frame_vector_args (frame);
+
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
+
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+	{
+	  ip4_header_t *ip4_0;
+	  ip6_header_t *ip6_0;
+	  vlib_buffer_t *b0;
+	  u32 next0, bi0;
+	  qos_bits_t qos0;
+	  u8 l2_len;
+
+	  next0 = 0;
+	  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);
+
+	  if (is_l2)
+	    {
+	      l2_len = vnet_buffer (b0)->l2.l2_len;
+	      u8 *l3h;
+	      u16 ethertype;
+
+	      vlib_buffer_advance (b0, l2_len);
+
+	      l3h = vlib_buffer_get_current (b0);
+	      ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2));
+
+	      if (ethertype == ETHERNET_TYPE_IP4)
+		dproto = DPO_PROTO_IP4;
+	      else if (ethertype == ETHERNET_TYPE_IP6)
+		dproto = DPO_PROTO_IP6;
+	      else if (ethertype == ETHERNET_TYPE_MPLS)
+		dproto = DPO_PROTO_MPLS;
+	      else
+		goto non_ip;
+	    }
+
+	  if (DPO_PROTO_IP6 == dproto)
+	    {
+	      ip6_0 = vlib_buffer_get_current (b0);
+	      qos0 = ip6_traffic_class_network_order (ip6_0);
+	    }
+	  else if (DPO_PROTO_IP4 == dproto)
+	    {
+	      ip4_0 = vlib_buffer_get_current (b0);
+	      qos0 = ip4_0->tos;
+	    }
+	  else if (DPO_PROTO_ETHERNET == dproto)
+	    {
+	      ethernet_vlan_header_t *vlan0;
+
+	      vlan0 = (vlib_buffer_get_current (b0) -
+		       sizeof (ethernet_vlan_header_t));
+
+	      qos0 = ethernet_vlan_header_get_priority_net_order (vlan0);
+	    }
+	  else if (DPO_PROTO_MPLS)
+	    {
+	      mpls_unicast_header_t *mh;
+
+	      mh = vlib_buffer_get_current (b0);
+	      qos0 = vnet_mpls_uc_get_exp (mh->label_exp_s_ttl);
+	    }
+
+	  vnet_buffer2 (b0)->qos.bits = qos0;
+	  vnet_buffer2 (b0)->qos.source = qos_src;
+	  b0->flags |= VNET_BUFFER_F_QOS_DATA_VALID;
+
+	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
+			     (b0->flags & VLIB_BUFFER_IS_TRACED)))
+	    {
+	      qos_record_trace_t *t =
+		vlib_add_trace (vm, node, b0, sizeof (*t));
+	      t->bits = qos0;
+	    }
+
+	non_ip:
+	  if (is_l2)
+	    {
+	      vlib_buffer_advance (b0, -l2_len);
+	      next0 = vnet_l2_feature_next (b0,
+					    l2_qos_input_next[qos_src],
+					    L2INPUT_FEAT_L2_IP_QOS_RECORD);
+	    }
+	  else
+	    vnet_feature_next (&next0, b0);
+
+	  /* 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);
+	}
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  return frame->n_vectors;
+}
+
+
+VLIB_NODE_FN (ip4_qos_record_node) (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vlib_frame_t * frame)
+{
+  return (qos_record_inline (vm, node, frame, QOS_SOURCE_IP,
+			     DPO_PROTO_IP4, 0));
+}
+
+VLIB_NODE_FN (ip6_qos_record_node) (vlib_main_t * vm,
+				    vlib_node_runtime_t * node,
+				    vlib_frame_t * frame)
+{
+  return (qos_record_inline (vm, node, frame, QOS_SOURCE_IP,
+			     DPO_PROTO_IP6, 0));
+}
+
+VLIB_NODE_FN (mpls_qos_record_node) (vlib_main_t * vm,
+				     vlib_node_runtime_t * node,
+				     vlib_frame_t * frame)
+{
+  return (qos_record_inline (vm, node, frame, QOS_SOURCE_MPLS,
+			     DPO_PROTO_MPLS, 0));
+}
+
+VLIB_NODE_FN (vlan_ip4_qos_record_node) (vlib_main_t * vm,
+					 vlib_node_runtime_t * node,
+					 vlib_frame_t * frame)
+{
+  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN,
+			     DPO_PROTO_ETHERNET, 0));
+}
+
+VLIB_NODE_FN (vlan_ip6_qos_record_node) (vlib_main_t * vm,
+					 vlib_node_runtime_t * node,
+					 vlib_frame_t * frame)
+{
+  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN,
+			     DPO_PROTO_ETHERNET, 0));
+}
+
+VLIB_NODE_FN (vlan_mpls_qos_record_node) (vlib_main_t * vm,
+					  vlib_node_runtime_t * node,
+					  vlib_frame_t * frame)
+{
+  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN,
+			     DPO_PROTO_ETHERNET, 0));
+}
+
+VLIB_NODE_FN (l2_ip_qos_record_node) (vlib_main_t * vm,
+				      vlib_node_runtime_t * node,
+				      vlib_frame_t * frame)
+{
+  return (qos_record_inline (vm, node, frame, QOS_SOURCE_VLAN, 0, 1));
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (ip4_qos_record_node) = {
+  .name = "ip4-qos-record",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_record_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "ip4-drop",
+  },
+};
+
+VNET_FEATURE_INIT (ip4_qos_record_node, static) = {
+    .arc_name = "ip4-unicast",
+    .node_name = "ip4-qos-record",
+};
+VNET_FEATURE_INIT (ip4m_qos_record_node, static) = {
+    .arc_name = "ip4-multicast",
+    .node_name = "ip4-qos-record",
+};
+
+VLIB_REGISTER_NODE (ip6_qos_record_node) = {
+  .name = "ip6-qos-record",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_record_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "ip6-drop",
+  },
+};
+
+VNET_FEATURE_INIT (ip6_qos_record_node, static) = {
+    .arc_name = "ip6-unicast",
+    .node_name = "ip6-qos-record",
+};
+VNET_FEATURE_INIT (ip6m_qos_record_node, static) = {
+    .arc_name = "ip6-multicast",
+    .node_name = "ip6-qos-record",
+};
+
+VLIB_REGISTER_NODE (mpls_qos_record_node) = {
+  .name = "mpls-qos-record",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_record_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "mpls-drop",
+  },
+};
+
+VNET_FEATURE_INIT (mpls_qos_record_node, static) = {
+    .arc_name = "mpls-input",
+    .node_name = "mpls-qos-record",
+};
+
+VLIB_REGISTER_NODE (vlan_mpls_qos_record_node) = {
+  .name = "vlan-mpls-qos-record",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_record_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "mpls-drop",
+  },
+};
+
+VNET_FEATURE_INIT (vlan_mpls_qos_record_node, static) = {
+    .arc_name = "mpls-input",
+    .node_name = "vlan-mpls-qos-record",
+    .runs_before = VNET_FEATURES ("mpls-qos-record"),
+};
+
+VLIB_REGISTER_NODE (vlan_ip4_qos_record_node) = {
+  .name = "vlan-ip4-qos-record",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_record_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "ip4-drop",
+  },
+};
+
+VNET_FEATURE_INIT (vlan_ip4_qos_record_node, static) = {
+    .arc_name = "ip4-unicast",
+    .node_name = "vlan-ip4-qos-record",
+    .runs_before = VNET_FEATURES ("ip4-qos-record"),
+};
+VNET_FEATURE_INIT (vlan_ip4m_qos_record_node, static) = {
+    .arc_name = "ip4-multicast",
+    .node_name = "vlan-ip4-qos-record",
+    .runs_before = VNET_FEATURES ("ip4-qos-record"),
+};
+
+VLIB_REGISTER_NODE (vlan_ip6_qos_record_node) = {
+  .name = "vlan-ip6-qos-record",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_record_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  .next_nodes = {
+    [0] = "ip6-drop",
+  },
+};
+
+VNET_FEATURE_INIT (vlan_ip6_qos_record_node, static) = {
+    .arc_name = "ip6-unicast",
+    .node_name = "vlan-ip6-qos-record",
+    .runs_before = VNET_FEATURES ("ip6-qos-record"),
+};
+VNET_FEATURE_INIT (vlan_ip6m_qos_record_node, static) = {
+    .arc_name = "ip6-multicast",
+    .node_name = "vlan-ip6-qos-record",
+    .runs_before = VNET_FEATURES ("ip6-qos-record"),
+};
+
+VLIB_REGISTER_NODE (l2_ip_qos_record_node) = {
+  .name = "l2-ip-qos-record",
+  .vector_size = sizeof (u32),
+  .format_trace = format_qos_record_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = 0,
+  .n_next_nodes = 1,
+
+  /* Consider adding error "no IP after L2, no recording" */
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */