qos: migrate old MULTIARCH macros to VLIB_NODE_FN

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

1 files changed, 0 insertions, 329 deletions

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)