From 55333d76c6501e78ed234a81301e844edc1863b2 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Tue, 5 Mar 2019 00:36:04 -0800 Subject: geneve: migrate old MULTIARCH macros to VLIB_NODE_FN Change-Id: Ie7b201b2742e0051b249acc011f609905bc178c8 Signed-off-by: Filip Tehlar --- src/vnet/CMakeLists.txt | 5 +++++ src/vnet/geneve/decap.c | 46 ++++++++++++++++++++-------------------------- src/vnet/geneve/encap.c | 37 ++++++------------------------------- src/vnet/geneve/geneve.c | 12 ++++++++++++ src/vnet/geneve/geneve.h | 6 ++++++ 5 files changed, 49 insertions(+), 57 deletions(-) diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index 77cba7b7e3b..949749228b9 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -288,6 +288,11 @@ list(APPEND VNET_SOURCES geneve/geneve_api.c ) +list(APPEND VNET_MULTIARCH_SOURCES + geneve/encap.c + geneve/decap.c +) + list(APPEND VNET_HEADERS geneve/geneve.h geneve/geneve_packet.h diff --git a/src/vnet/geneve/decap.c b/src/vnet/geneve/decap.c index ceb04447817..e5f5132a539 100644 --- a/src/vnet/geneve/decap.c +++ b/src/vnet/geneve/decap.c @@ -17,9 +17,6 @@ #include #include -vlib_node_registration_t geneve4_input_node; -vlib_node_registration_t geneve6_input_node; - typedef struct { u32 next_index; @@ -797,16 +794,16 @@ geneve_input (vlib_main_t * vm, 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); } @@ -820,7 +817,6 @@ static char *geneve_error_strings[] = { /* *INDENT-OFF* */ VLIB_REGISTER_NODE (geneve4_input_node) = { - .function = geneve4_input, .name = "geneve4-input", /* Takes a vector of packets. */ .vector_size = sizeof (u32), @@ -838,10 +834,7 @@ VLIB_REGISTER_NODE (geneve4_input_node) = { // $$$$ .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), @@ -857,8 +850,6 @@ VLIB_REGISTER_NODE (geneve6_input_node) = { .format_trace = format_geneve_rx_trace, // $$$$ .unformat_buffer = unformat_geneve_header, }; - -VLIB_NODE_FUNCTION_MULTIARCH (geneve6_input_node, geneve6_input) /* *INDENT-ON* */ typedef enum @@ -1264,9 +1255,9 @@ ip_geneve_bypass_inline (vlib_main_t * vm, 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); } @@ -1274,7 +1265,7 @@ ip4_geneve_bypass (vlib_main_t * vm, /* *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", @@ -1282,7 +1273,7 @@ VLIB_REGISTER_NODE (ip4_geneve_bypass_node) = ,.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) { @@ -1291,10 +1282,11 @@ VLIB_NODE_FUNCTION_MULTIARCH (ip4_geneve_bypass_node, ip4_geneve_bypass) 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); } @@ -1302,7 +1294,7 @@ ip6_geneve_bypass (vlib_main_t * vm, /* *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", @@ -1311,14 +1303,16 @@ VLIB_REGISTER_NODE (ip6_geneve_bypass_node) = 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 diff --git a/src/vnet/geneve/encap.c b/src/vnet/geneve/encap.c index 73e182d8588..3d98f9e2ba6 100644 --- a/src/vnet/geneve/encap.c +++ b/src/vnet/geneve/encap.c @@ -43,25 +43,6 @@ typedef enum GENEVE_ENCAP_N_NEXT, } geneve_encap_next_t; -typedef struct -{ - u32 tunnel_index; - u32 vni; -} geneve_encap_trace_t; - -u8 * -format_geneve_encap_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 *); - geneve_encap_trace_t *t = va_arg (*args, geneve_encap_trace_t *); - - s = format (s, "GENEVE encap to geneve_tunnel%d vni %d", - t->tunnel_index, t->vni); - return s; -} - - #define foreach_fixed_header4_offset \ _(0) _(1) _(2) _(3) @@ -543,23 +524,22 @@ geneve_encap_inline (vlib_main_t * vm, return from_frame->n_vectors; } -static uword -geneve4_encap (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * from_frame) +VLIB_NODE_FN (geneve4_encap_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return geneve_encap_inline (vm, node, from_frame, /* is_ip4 */ 1); } -static uword -geneve6_encap (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * from_frame) +VLIB_NODE_FN (geneve6_encap_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * from_frame) { return geneve_encap_inline (vm, node, from_frame, /* is_ip4 */ 0); } /* *INDENT-OFF* */ VLIB_REGISTER_NODE (geneve4_encap_node) = { - .function = geneve4_encap, .name = "geneve4-encap", .vector_size = sizeof (u32), .format_trace = format_geneve_encap_trace, @@ -572,10 +552,7 @@ VLIB_REGISTER_NODE (geneve4_encap_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (geneve4_encap_node, geneve4_encap) - VLIB_REGISTER_NODE (geneve6_encap_node) = { - .function = geneve6_encap, .name = "geneve6-encap", .vector_size = sizeof (u32), .format_trace = format_geneve_encap_trace, @@ -587,8 +564,6 @@ VLIB_REGISTER_NODE (geneve6_encap_node) = { [GENEVE_ENCAP_NEXT_DROP] = "error-drop", }, }; - -VLIB_NODE_FUNCTION_MULTIARCH (geneve6_encap_node, geneve6_encap) /* *INDENT-ON* */ /* diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c index c53a67a1abd..fe35c6c2429 100644 --- a/src/vnet/geneve/geneve.c +++ b/src/vnet/geneve/geneve.c @@ -37,6 +37,18 @@ geneve_main_t geneve_main; +u8 * +format_geneve_encap_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 *); + geneve_encap_trace_t *t = va_arg (*args, geneve_encap_trace_t *); + + s = format (s, "GENEVE encap to geneve_tunnel%d vni %d", + t->tunnel_index, t->vni); + return s; +} + static u8 * format_decap_next (u8 * s, va_list * args) { diff --git a/src/vnet/geneve/geneve.h b/src/vnet/geneve/geneve.h index 8f028df517f..3bb9083fbd5 100644 --- a/src/vnet/geneve/geneve.h +++ b/src/vnet/geneve/geneve.h @@ -73,6 +73,12 @@ typedef CLIB_PACKED (struct u32 vni; /* shifted left 8 bits */ }) geneve6_tunnel_key_t; +typedef struct +{ + u32 tunnel_index; + u32 vni; +} geneve_encap_trace_t; + typedef struct { /* Required for pool_get_aligned */ -- cgit 1.2.3-korg