X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_input.c;h=15c2ebf5609a388fc32686bc3ae307c8e3f3e258;hb=067cd6229a47ea3ba8b59a2a04090e80afb5bd2c;hp=7af2bee187a7dea8c389ba1b944868f5def63fe4;hpb=3ade6b668e0198611934e28c937f69ce6a12db16;p=vpp.git diff --git a/src/vnet/ip/ip4_input.c b/src/vnet/ip/ip4_input.c index 7af2bee187a..15c2ebf5609 100644 --- a/src/vnet/ip/ip4_input.c +++ b/src/vnet/ip/ip4_input.c @@ -47,7 +47,7 @@ typedef struct u8 packet_data[64]; } ip4_input_trace_t; -#ifndef CLIB_MULTIARCH_VARIANT +#ifndef CLIB_MARCH_VARIANT static u8 * format_ip4_input_trace (u8 * s, va_list * va) { @@ -90,7 +90,8 @@ ip4_input_set_next (u32 sw_if_index, vlib_buffer_t * b, int arc_enabled) } static_always_inline void -ip4_input_check_sw_if_index (vlib_simple_counter_main_t * cm, u32 sw_if_index, +ip4_input_check_sw_if_index (vlib_main_t * vm, + vlib_simple_counter_main_t * cm, u32 sw_if_index, u32 * last_sw_if_index, u32 * cnt, int *arc_enabled) { @@ -103,7 +104,7 @@ ip4_input_check_sw_if_index (vlib_simple_counter_main_t * cm, u32 sw_if_index, return; } - thread_index = vlib_get_thread_index (); + thread_index = vm->thread_index; if (*cnt) vlib_increment_simple_counter (cm, thread_index, *last_sw_if_index, *cnt); *cnt = 1; @@ -125,7 +126,7 @@ ip4_input_inline (vlib_main_t * vm, { vnet_main_t *vnm = vnet_get_main (); u32 n_left_from, *from; - u32 thread_index = vlib_get_thread_index (); + u32 thread_index = vm->thread_index; vlib_node_runtime_t *error_node = vlib_node_get_runtime (vm, ip4_input_node.index); vlib_simple_counter_main_t *cm; @@ -206,14 +207,14 @@ ip4_input_inline (vlib_main_t * vm, } else { - ip4_input_check_sw_if_index (cm, sw_if_index[0], &last_sw_if_index, - &cnt, &arc_enabled); - ip4_input_check_sw_if_index (cm, sw_if_index[1], &last_sw_if_index, - &cnt, &arc_enabled); - ip4_input_check_sw_if_index (cm, sw_if_index[2], &last_sw_if_index, - &cnt, &arc_enabled); - ip4_input_check_sw_if_index (cm, sw_if_index[3], &last_sw_if_index, - &cnt, &arc_enabled); + ip4_input_check_sw_if_index (vm, cm, sw_if_index[0], + &last_sw_if_index, &cnt, &arc_enabled); + ip4_input_check_sw_if_index (vm, cm, sw_if_index[1], + &last_sw_if_index, &cnt, &arc_enabled); + ip4_input_check_sw_if_index (vm, cm, sw_if_index[2], + &last_sw_if_index, &cnt, &arc_enabled); + ip4_input_check_sw_if_index (vm, cm, sw_if_index[3], + &last_sw_if_index, &cnt, &arc_enabled); next[0] = ip4_input_set_next (sw_if_index[0], b[0], 1); next[1] = ip4_input_set_next (sw_if_index[1], b[1], 1); @@ -238,7 +239,7 @@ ip4_input_inline (vlib_main_t * vm, u32 next0; vnet_buffer (b[0])->ip.adj_index[VLIB_RX] = ~0; sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_RX]; - ip4_input_check_sw_if_index (cm, sw_if_index[0], &last_sw_if_index, + ip4_input_check_sw_if_index (vm, cm, sw_if_index[0], &last_sw_if_index, &cnt, &arc_enabled); next0 = ip4_input_set_next (sw_if_index[0], b[0], arc_enabled); ip[0] = vlib_buffer_get_current (b[0]); @@ -292,22 +293,20 @@ ip4_input_inline (vlib_main_t * vm, vnet_get_config_data (... &next0 ...); or @c error-drop */ -uword CLIB_CPU_OPTIMIZED -CLIB_MULTIARCH_FN (ip4_input) (vlib_main_t * vm, vlib_node_runtime_t * node, +VLIB_NODE_FN (ip4_input_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return ip4_input_inline (vm, node, frame, /* verify_checksum */ 1); } -uword CLIB_CPU_OPTIMIZED -CLIB_MULTIARCH_FN (ip4_input_no_checksum) (vlib_main_t * vm, +VLIB_NODE_FN (ip4_input_no_checksum_node) (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { return ip4_input_inline (vm, node, frame, /* verify_checksum */ 0); } -#ifndef CLIB_MULTIARCH_VARIANT +#ifndef CLIB_MARCH_VARIANT char *ip4_error_strings[] = { #define _(sym,string) string, foreach_ip4_error @@ -316,7 +315,6 @@ char *ip4_error_strings[] = { /* *INDENT-OFF* */ VLIB_REGISTER_NODE (ip4_input_node) = { - .function = ip4_input, .name = "ip4-input", .vector_size = sizeof (u32), @@ -327,6 +325,7 @@ VLIB_REGISTER_NODE (ip4_input_node) = { .next_nodes = { [IP4_INPUT_NEXT_DROP] = "error-drop", [IP4_INPUT_NEXT_PUNT] = "error-punt", + [IP4_INPUT_NEXT_OPTIONS] = "ip4-options", [IP4_INPUT_NEXT_LOOKUP] = "ip4-lookup", [IP4_INPUT_NEXT_LOOKUP_MULTICAST] = "ip4-mfib-forward-lookup", [IP4_INPUT_NEXT_ICMP_ERROR] = "ip4-icmp-error", @@ -337,8 +336,7 @@ VLIB_REGISTER_NODE (ip4_input_node) = { .format_trace = format_ip4_input_trace, }; -VLIB_REGISTER_NODE (ip4_input_no_checksum_node,static) = { - .function = ip4_input_no_checksum, +VLIB_REGISTER_NODE (ip4_input_no_checksum_node) = { .name = "ip4-input-no-checksum", .vector_size = sizeof (u32), @@ -346,6 +344,7 @@ VLIB_REGISTER_NODE (ip4_input_no_checksum_node,static) = { .next_nodes = { [IP4_INPUT_NEXT_DROP] = "error-drop", [IP4_INPUT_NEXT_PUNT] = "error-punt", + [IP4_INPUT_NEXT_OPTIONS] = "ip4-options", [IP4_INPUT_NEXT_LOOKUP] = "ip4-lookup", [IP4_INPUT_NEXT_LOOKUP_MULTICAST] = "ip4-mfib-forward-lookup", [IP4_INPUT_NEXT_ICMP_ERROR] = "ip4-icmp-error", @@ -357,26 +356,6 @@ VLIB_REGISTER_NODE (ip4_input_no_checksum_node,static) = { }; /* *INDENT-ON* */ -#if __x86_64__ -vlib_node_function_t __clib_weak ip4_input_avx512; -vlib_node_function_t __clib_weak ip4_input_avx2; -vlib_node_function_t __clib_weak ip4_input_no_checksum_avx512; -vlib_node_function_t __clib_weak ip4_input_no_checksum_avx2; -static void __clib_constructor -ip4_input_multiarch_select (void) -{ - if (ip4_input_no_checksum_avx512 && clib_cpu_supports_avx512f ()) - ip4_input_no_checksum_node.function = ip4_input_no_checksum_avx512; - else if (ip4_input_no_checksum_avx2 && clib_cpu_supports_avx2 ()) - ip4_input_no_checksum_node.function = ip4_input_no_checksum_avx2; - - if (ip4_input_avx512 && clib_cpu_supports_avx512f ()) - ip4_input_node.function = ip4_input_avx512; - else if (ip4_input_avx2 && clib_cpu_supports_avx2 ()) - ip4_input_node.function = ip4_input_avx2; -} -#endif - static clib_error_t * ip4_init (vlib_main_t * vm) {