misc: replace CLIB_PREFETCH with clib_prefetch_{load,store}

[vpp.git] / src / vnet / l2 / l2_xcrw.c

diff --git a/src/vnet/l2/l2_xcrw.c b/src/vnet/l2/l2_xcrw.c
index 334e864..c2c325a 100644 (file)
--- a/src/vnet/l2/l2_xcrw.c
+++ b/src/vnet/l2/l2_xcrw.c
@@ -57,9 +57,11 @@ format_l2_xcrw_trace (u8 * s, va_list * args)
   return s;
 }
 
-l2_xcrw_main_t l2_xcrw_main;
+extern l2_xcrw_main_t l2_xcrw_main;
 
-static vlib_node_registration_t l2_xcrw_node;
+#ifndef CLIB_MARCH_VARIANT
+l2_xcrw_main_t l2_xcrw_main;
+#endif /* CLIB_MARCH_VARIANT */
 
 static char *l2_xcrw_error_strings[] = {
 #define _(sym,string) string,
@@ -67,9 +69,8 @@ static char *l2_xcrw_error_strings[] = {
 #undef _
 };
 
-static uword
-l2_xcrw_node_fn (vlib_main_t * vm,
-                vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (l2_xcrw_node) (vlib_main_t * vm,
+                            vlib_node_runtime_t * node, vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   l2_xcrw_next_t next_index;
@@ -106,8 +107,8 @@ l2_xcrw_node_fn (vlib_main_t * vm,
            vlib_prefetch_buffer_header (p2, LOAD);
            vlib_prefetch_buffer_header (p3, LOAD);
 
-           CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-           CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+           clib_prefetch_store (p2->data);
+           clib_prefetch_store (p3->data);
          }
 
          /* speculatively enqueue b0 and b1 to the current next frame */
@@ -238,8 +239,7 @@ l2_xcrw_node_fn (vlib_main_t * vm,
 }
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (l2_xcrw_node, static) = {
-  .function = l2_xcrw_node_fn,
+VLIB_REGISTER_NODE (l2_xcrw_node) = {
   .name = "l2-xcrw",
   .vector_size = sizeof (u32),
   .format_trace = format_l2_xcrw_trace,
@@ -257,8 +257,9 @@ VLIB_REGISTER_NODE (l2_xcrw_node, static) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (l2_xcrw_node, l2_xcrw_node_fn)
-     clib_error_t *l2_xcrw_init (vlib_main_t * vm)
+#ifndef CLIB_MARCH_VARIANT
+clib_error_t *
+l2_xcrw_init (vlib_main_t * vm)
 {
   l2_xcrw_main_t *mp = &l2_xcrw_main;
 
@@ -271,14 +272,6 @@ VLIB_NODE_FUNCTION_MULTIARCH (l2_xcrw_node, l2_xcrw_node_fn)
 
 VLIB_INIT_FUNCTION (l2_xcrw_init);
 
-static uword
-dummy_interface_tx (vlib_main_t * vm,
-                   vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  clib_warning ("you shouldn't be here, leaking buffers...");
-  return frame->n_vectors;
-}
-
 static u8 *
 format_xcrw_name (u8 * s, va_list * args)
 {
@@ -290,7 +283,6 @@ format_xcrw_name (u8 * s, va_list * args)
 VNET_DEVICE_CLASS (xcrw_device_class,static) = {
   .name = "Xcrw",
   .format_device_name = format_xcrw_name,
-  .tx_function = dummy_interface_tx,
 };
 /* *INDENT-ON* */
 
@@ -306,7 +298,7 @@ create_xcrw_interface (vlib_main_t * vm)
   u32 sw_if_index;
 
   /* mac address doesn't really matter */
-  memset (address, 0, sizeof (address));
+  clib_memset (address, 0, sizeof (address));
   address[2] = 0x12;
 
   /* can returns error iff phy != 0 */
@@ -352,7 +344,7 @@ vnet_configure_l2_xcrw (vlib_main_t * vm, vnet_main_t * vnm,
       vec_validate (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
 
       a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
-      memset (a, 0, sizeof (*a));
+      clib_memset (a, 0, sizeof (*a));
 
       a->rewrite_header.sw_if_index = tx_fib_index;
 
@@ -382,7 +374,7 @@ vnet_configure_l2_xcrw (vlib_main_t * vm, vnet_main_t * vnm,
 
       a = vec_elt_at_index (xcm->adj_by_sw_if_index, t->l2_sw_if_index);
       /* Reset adj to drop traffic */
-      memset (a, 0, sizeof (*a));
+      clib_memset (a, 0, sizeof (*a));
 
       set_int_l2_mode (vm, vnm, MODE_L3, t->l2_sw_if_index, 0,
                       L2_BD_PORT_TYPE_NORMAL, 0, 0);
@@ -514,6 +506,8 @@ VLIB_CLI_COMMAND (set_l2_xcrw_command, static) = {
 };
 /* *INDENT-ON* */
 
+#endif /* CLIB_MARCH_VARIANT */
+
 static u8 *
 format_l2xcrw (u8 * s, va_list * args)
 {
@@ -575,10 +569,10 @@ show_l2xcrw_command_fn (vlib_main_t * vm,
   vlib_cli_output (vm, "%U", format_l2xcrw, 0, 0);
 
   /* *INDENT-OFF* */
-  pool_foreach (t, xcm->tunnels,
-  ({
+  pool_foreach (t, xcm->tunnels)
+   {
     vlib_cli_output (vm, "%U", format_l2xcrw, vnm, t);
-  }));
+  }
   /* *INDENT-ON* */
 
   return 0;