ioam: migrate old MULTIARCH macros to VLIB_NODE_FN

[vpp.git] / src / plugins / ioam / ip6 / ioam_cache_tunnel_select_node.c

diff --git a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
index a56dc04..17016e2 100644 (file)
--- a/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
+++ b/src/plugins/ioam/ip6/ioam_cache_tunnel_select_node.c
@@ -43,7 +43,7 @@
 #include <vnet/pg/pg.h>
 #include <vppinfra/error.h>
 #include <vnet/ip/ip.h>
-#include <vnet/sr/sr.h>
+#include <vnet/srv6/sr.h>
 #include <ioam/ip6/ioam_cache.h>
 #include <vnet/ip/ip6_hop_by_hop.h>
 #include <vnet/ip/ip6_hop_by_hop_packet.h>
@@ -275,8 +275,6 @@ format_ip6_reset_ts_hbh_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t ip6_reset_ts_hbh_node;
-
 #define foreach_ip6_reset_ts_hbh_error \
 _(PROCESSED, "iOAM Syn/Ack Pkts processed") \
 _(SAVED, "iOAM Syn Pkts state saved") \
@@ -309,9 +307,9 @@ typedef enum
 } ip6_ioam_cache_ts_input_next_t;
 
 
-static uword
-ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
-                         vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (ip6_reset_ts_hbh_node) (vlib_main_t * vm,
+                                     vlib_node_runtime_t * node,
+                                     vlib_frame_t * frame)
 {
   ioam_cache_main_t *cm = &ioam_cache_main;
   u32 n_left_from, *from, *to_next;
@@ -396,7 +394,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
                                              clib_net_to_host_u32
                                              (tcp0->seq_number) + 1,
                                              no_of_responses, now,
-                                             vm->cpu_index, &pool_index0))
+                                             vm->thread_index, &pool_index0))
                    {
                      cache_ts_added++;
                    }
@@ -415,16 +413,16 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
 
              hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
              /* $$$ tune, rewrite_length is a multiple of 8 */
-             clib_memcpy (hbh0, rewrite, rewrite_length);
+             clib_memcpy_fast (hbh0, rewrite, rewrite_length);
              e2e =
                (ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
                                             cm->rewrite_pool_index_offset);
-             e2e->pool_id = (u8) vm->cpu_index;
+             e2e->pool_id = (u8) vm->thread_index;
              e2e->pool_index = pool_index0;
              ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
                                           ((u8 *) e2e +
                                            sizeof (ioam_e2e_cache_option_t)),
-                                          b0);
+                                          &cm->sr_localsid_ts);
              /* Patch the protocol chain, insert the h-b-h (type 0) header */
              hbh0->protocol = ip0->protocol;
              ip0->protocol = 0;
@@ -455,7 +453,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
                                              clib_net_to_host_u32
                                              (tcp1->seq_number) + 1,
                                              no_of_responses, now,
-                                             vm->cpu_index, &pool_index1))
+                                             vm->thread_index, &pool_index1))
                    {
                      cache_ts_added++;
                    }
@@ -475,16 +473,16 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
 
              hbh1 = (ip6_hop_by_hop_header_t *) (ip1 + 1);
              /* $$$ tune, rewrite_length is a multiple of 8 */
-             clib_memcpy (hbh1, rewrite, rewrite_length);
+             clib_memcpy_fast (hbh1, rewrite, rewrite_length);
              e2e =
                (ioam_e2e_cache_option_t *) ((u8 *) hbh1 +
                                             cm->rewrite_pool_index_offset);
-             e2e->pool_id = (u8) vm->cpu_index;
+             e2e->pool_id = (u8) vm->thread_index;
              e2e->pool_index = pool_index1;
              ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
                                           ((u8 *) e2e +
                                            sizeof (ioam_e2e_cache_option_t)),
-                                          b1);
+                                          &cm->sr_localsid_ts);
              /* Patch the protocol chain, insert the h-b-h (type 0) header */
              hbh1->protocol = ip1->protocol;
              ip1->protocol = 0;
@@ -562,7 +560,7 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
                                              clib_net_to_host_u32
                                              (tcp0->seq_number) + 1,
                                              no_of_responses, now,
-                                             vm->cpu_index, &pool_index0))
+                                             vm->thread_index, &pool_index0))
                    {
                      cache_ts_added++;
                    }
@@ -581,16 +579,16 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
 
              hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
              /* $$$ tune, rewrite_length is a multiple of 8 */
-             clib_memcpy (hbh0, rewrite, rewrite_length);
+             clib_memcpy_fast (hbh0, rewrite, rewrite_length);
              e2e =
                (ioam_e2e_cache_option_t *) ((u8 *) hbh0 +
                                             cm->rewrite_pool_index_offset);
-             e2e->pool_id = (u8) vm->cpu_index;
+             e2e->pool_id = (u8) vm->thread_index;
              e2e->pool_index = pool_index0;
              ioam_e2e_id_rewrite_handler ((ioam_e2e_id_option_t *)
                                           ((u8 *) e2e +
                                            sizeof (ioam_e2e_cache_option_t)),
-                                          b0);
+                                          &cm->sr_localsid_ts);
              /* Patch the protocol chain, insert the h-b-h (type 0) header */
              hbh0->protocol = ip0->protocol;
              ip0->protocol = 0;
@@ -617,9 +615,9 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, ip6_reset_ts_hbh_node.index,
+  vlib_node_increment_counter (vm, cm->ip6_reset_ts_hbh_node_index,
                               IP6_RESET_TS_HBH_ERROR_PROCESSED, processed);
-  vlib_node_increment_counter (vm, ip6_reset_ts_hbh_node.index,
+  vlib_node_increment_counter (vm, cm->ip6_reset_ts_hbh_node_index,
                               IP6_RESET_TS_HBH_ERROR_SAVED, cache_ts_added);
 
   return frame->n_vectors;
@@ -628,7 +626,6 @@ ip6_reset_ts_hbh_node_fn (vlib_main_t * vm,
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip6_reset_ts_hbh_node) =
 {
-  .function = ip6_reset_ts_hbh_node_fn,
   .name = "ip6-add-syn-hop-by-hop",
   .vector_size = sizeof (u32),
   .format_trace = format_ip6_reset_ts_hbh_trace,
@@ -645,10 +642,11 @@ VLIB_REGISTER_NODE (ip6_reset_ts_hbh_node) =
   },
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_reset_ts_hbh_node, ip6_reset_ts_hbh_node_fn)
 /* *INDENT-ON* */
 
+#ifndef CLIB_MARCH_VARIANT
 vlib_node_registration_t ioam_cache_ts_timer_tick_node;
+#endif /* CLIB_MARCH_VARIANT */
 
 typedef struct
 {
@@ -686,6 +684,7 @@ static char *ioam_cache_ts_timer_tick_error_strings[] = {
 #undef _
 };
 
+#ifndef CLIB_MARCH_VARIANT
 void
 ioam_cache_ts_timer_node_enable (vlib_main_t * vm, u8 enable)
 {
@@ -701,7 +700,7 @@ expired_cache_ts_timer_callback (u32 * expired_timers)
   ioam_cache_main_t *cm = &ioam_cache_main;
   int i;
   u32 pool_index;
-  u32 thread_index = os_get_cpu_number ();
+  u32 thread_index = vlib_get_thread_index ();
   u32 count = 0;
 
   for (i = 0; i < vec_len (expired_timers); i++)
@@ -717,6 +716,7 @@ expired_cache_ts_timer_callback (u32 * expired_timers)
                               ioam_cache_ts_timer_tick_node.index,
                               IOAM_CACHE_TS_TIMER_TICK_ERROR_TIMER, count);
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 static uword
 ioam_cache_ts_timer_tick_node_fn (vlib_main_t * vm,
@@ -724,7 +724,7 @@ ioam_cache_ts_timer_tick_node_fn (vlib_main_t * vm,
                                  vlib_frame_t * f)
 {
   ioam_cache_main_t *cm = &ioam_cache_main;
-  u32 my_thread_index = os_get_cpu_number ();
+  u32 my_thread_index = vlib_get_thread_index ();
   struct timespec ts, tsrem;
 
   tw_timer_expire_timers_16t_2w_512sl (&cm->timer_wheels[my_thread_index],