#include <vnet/pg/pg.h>
#include <vnet/geneve/geneve.h>
-vlib_node_registration_t geneve4_input_node;
-vlib_node_registration_t geneve6_input_node;
-
typedef struct
{
u32 next_index;
tunnel_index0 = last_tunnel_index;
t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
- /* Validate GENEVE tunnel encap-fib index agaist packet */
+ /* Validate GENEVE tunnel encap-fib index against packet */
if (PREDICT_FALSE (validate_geneve_fib (b0, t0, is_ip4) == 0))
{
error0 = GENEVE_ERROR_NO_SUCH_TUNNEL;
next0 = GENEVE_INPUT_NEXT_DROP;
goto trace0;
}
- clib_memcpy (&last_key6, &key6_0, sizeof (key6_0));
+ clib_memcpy_fast (&last_key6, &key6_0, sizeof (key6_0));
tunnel_index0 = last_tunnel_index = p0[0];
}
else
tunnel_index0 = last_tunnel_index;
t0 = pool_elt_at_index (vxm->tunnels, tunnel_index0);
- /* Validate GENEVE tunnel encap-fib index agaist packet */
+ /* Validate GENEVE tunnel encap-fib index against packet */
if (PREDICT_FALSE (validate_geneve_fib (b0, t0, is_ip4) == 0))
{
error0 = GENEVE_ERROR_NO_SUCH_TUNNEL;
tunnel_index1 = last_tunnel_index;
t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
- /* Validate GENEVE tunnel encap-fib index agaist packet */
+ /* Validate GENEVE tunnel encap-fib index against packet */
if (PREDICT_FALSE (validate_geneve_fib (b1, t1, is_ip4) == 0))
{
error1 = GENEVE_ERROR_NO_SUCH_TUNNEL;
goto trace1;
}
- clib_memcpy (&last_key6, &key6_1, sizeof (key6_1));
+ clib_memcpy_fast (&last_key6, &key6_1, sizeof (key6_1));
tunnel_index1 = last_tunnel_index = p1[0];
}
else
tunnel_index1 = last_tunnel_index;
t1 = pool_elt_at_index (vxm->tunnels, tunnel_index1);
- /* Validate GENEVE tunnel encap-fib index agaist packet */
+ /* Validate GENEVE tunnel encap-fib index against packet */
if (PREDICT_FALSE (validate_geneve_fib (b1, t1, is_ip4) == 0))
{
error1 = GENEVE_ERROR_NO_SUCH_TUNNEL;
next0 = GENEVE_INPUT_NEXT_DROP;
goto trace00;
}
- clib_memcpy (&last_key6, &key6_0, sizeof (key6_0));
+ clib_memcpy_fast (&last_key6, &key6_0, sizeof (key6_0));
tunnel_index0 = last_tunnel_index = p0[0];
}
else
return from_frame->n_vectors;
}
-static uword
-geneve4_input (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (geneve4_input_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
{
return geneve_input (vm, node, from_frame, /* is_ip4 */ 1);
}
-static uword
-geneve6_input (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (geneve6_input_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
{
return geneve_input (vm, node, from_frame, /* is_ip4 */ 0);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (geneve4_input_node) = {
- .function = geneve4_input,
.name = "geneve4-input",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
// $$$$ .unformat_buffer = unformat_geneve_header,
};
-VLIB_NODE_FUNCTION_MULTIARCH (geneve4_input_node, geneve4_input)
-
VLIB_REGISTER_NODE (geneve6_input_node) = {
- .function = geneve6_input,
.name = "geneve6-input",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.format_trace = format_geneve_rx_trace,
// $$$$ .unformat_buffer = unformat_geneve_header,
};
-
-VLIB_NODE_FUNCTION_MULTIARCH (geneve6_input_node, geneve6_input)
/* *INDENT-ON* */
typedef enum
return frame->n_vectors;
}
-static uword
-ip4_geneve_bypass (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (ip4_geneve_bypass_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
return ip_geneve_bypass_inline (vm, node, frame, /* is_ip4 */ 1);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ip4_geneve_bypass_node) =
{
- .function = ip4_geneve_bypass,.name = "ip4-geneve-bypass",.vector_size =
+ .name = "ip4-geneve-bypass",.vector_size =
sizeof (u32),.n_next_nodes = IP_GENEVE_BYPASS_N_NEXT,.next_nodes =
{
[IP_GENEVE_BYPASS_NEXT_DROP] = "error-drop",
,.format_buffer = format_ip4_header,.format_trace =
format_ip4_forward_next_trace,};
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_geneve_bypass_node, ip4_geneve_bypass)
+#ifndef CLIB_MARCH_VARIANT
/* Dummy init function to get us linked in. */
clib_error_t *ip4_geneve_bypass_init (vlib_main_t * vm)
{
VLIB_INIT_FUNCTION (ip4_geneve_bypass_init);
/* *INDENT-ON* */
+#endif /* CLIB_MARCH_VARIANT */
-static uword
-ip6_geneve_bypass (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (ip6_geneve_bypass_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
return ip_geneve_bypass_inline (vm, node, frame, /* is_ip4 */ 0);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (ip6_geneve_bypass_node) =
{
- .function = ip6_geneve_bypass,.name = "ip6-geneve-bypass",.vector_size =
+ .name = "ip6-geneve-bypass",.vector_size =
sizeof (u32),.n_next_nodes = IP_GENEVE_BYPASS_N_NEXT,.next_nodes =
{
[IP_GENEVE_BYPASS_NEXT_DROP] = "error-drop",
format_ip6_forward_next_trace,};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_geneve_bypass_node, ip6_geneve_bypass)
+#ifndef CLIB_MARCH_VARIANT
/* Dummy init function to get us linked in. */
- clib_error_t *ip6_geneve_bypass_init (vlib_main_t * vm)
+clib_error_t *
+ip6_geneve_bypass_init (vlib_main_t * vm)
{
return 0;
}
VLIB_INIT_FUNCTION (ip6_geneve_bypass_init);
+#endif /* CLIB_MARCH_VARIANT */
/*
* fd.io coding-style-patch-verification: ON