X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fhandoff.c;h=5d4ef6f5c1bea636e9b2f22a370973590d932c00;hb=9432340362a0eb8fe5ed39cdac0a907f0f50a461;hp=81cb9f55fba56db87c9d179c6e43bff727a25dce;hpb=213b5aae860c2a9d5de8d4d070d0d2091af699f5;p=vpp.git diff --git a/src/vnet/handoff.c b/src/vnet/handoff.c index 81cb9f55fba..5d4ef6f5c1b 100644 --- a/src/vnet/handoff.c +++ b/src/vnet/handoff.c @@ -15,13 +15,13 @@ */ #include -#include +#include #include -#include #include typedef struct { + vnet_hash_fn_t hash_fn; uword *workers_bitmap; u32 *workers; } per_inteface_handoff_data_t; @@ -36,16 +36,15 @@ typedef struct /* Worker handoff index */ u32 frame_queue_index; +} handoff_main_t; - /* convenience variables */ - vlib_main_t *vlib_main; - vnet_main_t *vnet_main; +extern handoff_main_t handoff_main; - u64 (*hash_fn) (ethernet_header_t *); -} handoff_main_t; +#ifndef CLIB_MARCH_VARIANT handoff_main_t handoff_main; -vlib_node_registration_t handoff_dispatch_node; + +#endif /* CLIB_MARCH_VARIANT */ typedef struct { @@ -54,6 +53,23 @@ typedef struct u32 buffer_index; } worker_handoff_trace_t; +#define foreach_worker_handoff_error \ + _(CONGESTION_DROP, "congestion drop") + +typedef enum +{ +#define _(sym,str) WORKER_HANDOFF_ERROR_##sym, + foreach_worker_handoff_error +#undef _ + WORKER_HANDOFF_N_ERROR, +} worker_handoff_error_t; + +static char *worker_handoff_error_strings[] = { +#define _(sym,string) string, + foreach_worker_handoff_error +#undef _ +}; + /* packet trace format function */ static u8 * format_worker_handoff_trace (u8 * s, va_list * args) @@ -62,168 +78,101 @@ format_worker_handoff_trace (u8 * s, va_list * args) CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); worker_handoff_trace_t *t = va_arg (*args, worker_handoff_trace_t *); - s = - format (s, "worker-handoff: sw_if_index %d, next_worker %d, buffer 0x%x", - t->sw_if_index, t->next_worker_index, t->buffer_index); + s = format (s, "worker-handoff: sw_if_index %d, next_worker %d, buffer 0x%x", + t->sw_if_index, t->next_worker_index, t->buffer_index); return s; } -vlib_node_registration_t handoff_node; - -static uword -worker_handoff_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +static void +worker_handoff_trace_frame (vlib_main_t *vm, vlib_node_runtime_t *node, + vlib_buffer_t **bufs, u16 *threads, u32 n_vectors) { - handoff_main_t *hm = &handoff_main; - vlib_thread_main_t *tm = vlib_get_thread_main (); - u32 n_left_from, *from; - static __thread vlib_frame_queue_elt_t **handoff_queue_elt_by_worker_index; - static __thread vlib_frame_queue_t **congested_handoff_queue_by_worker_index - = 0; - vlib_frame_queue_elt_t *hf = 0; - int i; - u32 n_left_to_next_worker = 0, *to_next_worker = 0; - u32 next_worker_index = 0; - u32 current_worker_index = ~0; - - if (PREDICT_FALSE (handoff_queue_elt_by_worker_index == 0)) - { - vec_validate (handoff_queue_elt_by_worker_index, tm->n_vlib_mains - 1); + worker_handoff_trace_t *t; + vlib_buffer_t **b; + u16 *ti; + + b = bufs; + ti = threads; - vec_validate_init_empty (congested_handoff_queue_by_worker_index, - hm->first_worker_index + hm->num_workers - 1, - (vlib_frame_queue_t *) (~0)); + while (n_vectors) + { + t = vlib_add_trace (vm, node, b[0], sizeof (*t)); + t->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_RX]; + t->next_worker_index = ti[0]; + t->buffer_index = vlib_get_buffer_index (vm, b[0]); + + b += 1; + ti += 1; + n_vectors -= 1; } +} + +VLIB_NODE_FN (worker_handoff_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) +{ + handoff_main_t *hm = &handoff_main; + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; + u32 n_enq, n_left_from, *from; + u16 thread_indices[VLIB_FRAME_SIZE], *ti; from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; + vlib_get_buffers (vm, from, bufs, n_left_from); + + b = bufs; + ti = thread_indices; while (n_left_from > 0) { - u32 bi0; - vlib_buffer_t *b0; - u32 sw_if_index0; - u32 hash; - u64 hash_key; per_inteface_handoff_data_t *ihd0; - u32 index0; + u32 sw_if_index0, hash, index0; + void *data; - bi0 = from[0]; - from += 1; - n_left_from -= 1; - - b0 = vlib_get_buffer (vm, bi0); - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - ASSERT (hm->if_data); + sw_if_index0 = vnet_buffer (b[0])->sw_if_index[VLIB_RX]; ihd0 = vec_elt_at_index (hm->if_data, sw_if_index0); - next_worker_index = hm->first_worker_index; - - /* - * Force unknown traffic onto worker 0, - * and into ethernet-input. $$$$ add more hashes. - */ - /* Compute ingress LB hash */ - hash_key = hm->hash_fn ((ethernet_header_t *) b0->data); - hash = (u32) clib_xxhash (hash_key); + data = vlib_buffer_get_current (b[0]); + ihd0->hash_fn (&data, &hash, 1); /* if input node did not specify next index, then packet - should go to eternet-input */ - if (PREDICT_FALSE ((b0->flags & VNET_BUFFER_F_HANDOFF_NEXT_VALID) == 0)) - vnet_buffer (b0)->handoff.next_index = - HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT; - else if (vnet_buffer (b0)->handoff.next_index == - HANDOFF_DISPATCH_NEXT_IP4_INPUT - || vnet_buffer (b0)->handoff.next_index == - HANDOFF_DISPATCH_NEXT_IP6_INPUT - || vnet_buffer (b0)->handoff.next_index == - HANDOFF_DISPATCH_NEXT_MPLS_INPUT) - vlib_buffer_advance (b0, (sizeof (ethernet_header_t))); + should go to ethernet-input */ if (PREDICT_TRUE (is_pow2 (vec_len (ihd0->workers)))) index0 = hash & (vec_len (ihd0->workers) - 1); else index0 = hash % vec_len (ihd0->workers); - next_worker_index += ihd0->workers[index0]; - - if (next_worker_index != current_worker_index) - { - if (hf) - hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker; - - hf = vlib_get_worker_handoff_queue_elt (hm->frame_queue_index, - next_worker_index, - handoff_queue_elt_by_worker_index); - - n_left_to_next_worker = VLIB_FRAME_SIZE - hf->n_vectors; - to_next_worker = &hf->buffer_index[hf->n_vectors]; - current_worker_index = next_worker_index; - } - - /* enqueue to correct worker thread */ - to_next_worker[0] = bi0; - to_next_worker++; - n_left_to_next_worker--; - - if (n_left_to_next_worker == 0) - { - hf->n_vectors = VLIB_FRAME_SIZE; - vlib_put_frame_queue_elt (hf); - current_worker_index = ~0; - handoff_queue_elt_by_worker_index[next_worker_index] = 0; - hf = 0; - } - - if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) - && (b0->flags & VLIB_BUFFER_IS_TRACED))) - { - worker_handoff_trace_t *t = - vlib_add_trace (vm, node, b0, sizeof (*t)); - t->sw_if_index = sw_if_index0; - t->next_worker_index = next_worker_index - hm->first_worker_index; - t->buffer_index = bi0; - } + ti[0] = hm->first_worker_index + ihd0->workers[index0]; + /* next */ + n_left_from -= 1; + ti += 1; + b += 1; } - if (hf) - hf->n_vectors = VLIB_FRAME_SIZE - n_left_to_next_worker; + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE)) + worker_handoff_trace_frame (vm, node, bufs, thread_indices, + frame->n_vectors); - /* Ship frames to the worker nodes */ - for (i = 0; i < vec_len (handoff_queue_elt_by_worker_index); i++) - { - if (handoff_queue_elt_by_worker_index[i]) - { - hf = handoff_queue_elt_by_worker_index[i]; - /* - * It works better to let the handoff node - * rate-adapt, always ship the handoff queue element. - */ - if (1 || hf->n_vectors == hf->last_n_vectors) - { - vlib_put_frame_queue_elt (hf); - handoff_queue_elt_by_worker_index[i] = 0; - } - else - hf->last_n_vectors = hf->n_vectors; - } - congested_handoff_queue_by_worker_index[i] = - (vlib_frame_queue_t *) (~0); - } - hf = 0; - current_worker_index = ~0; + n_enq = vlib_buffer_enqueue_to_thread (vm, node, hm->frame_queue_index, from, + thread_indices, frame->n_vectors, 1); + + if (n_enq < frame->n_vectors) + vlib_node_increment_counter (vm, node->node_index, + WORKER_HANDOFF_ERROR_CONGESTION_DROP, + frame->n_vectors - n_enq); return frame->n_vectors; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (worker_handoff_node) = { - .function = worker_handoff_node_fn, .name = "worker-handoff", .vector_size = sizeof (u32), .format_trace = format_worker_handoff_trace, .type = VLIB_NODE_TYPE_INTERNAL, + .n_errors = ARRAY_LEN(worker_handoff_error_strings), + .error_strings = worker_handoff_error_strings, .n_next_nodes = 1, .next_nodes = { @@ -231,12 +180,12 @@ VLIB_REGISTER_NODE (worker_handoff_node) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (worker_handoff_node, worker_handoff_node_fn) -/* *INDENT-ON* */ +#ifndef CLIB_MARCH_VARIANT int -interface_handoff_enable_disable (vlib_main_t * vm, u32 sw_if_index, - uword * bitmap, int enable_disable) +interface_handoff_enable_disable (vlib_main_t *vm, u32 sw_if_index, + uword *bitmap, u8 is_sym, int is_l4, + int enable_disable) { handoff_main_t *hm = &handoff_main; vnet_sw_interface_t *sw; @@ -255,8 +204,10 @@ interface_handoff_enable_disable (vlib_main_t * vm, u32 sw_if_index, return VNET_API_ERROR_INVALID_WORKER; if (hm->frame_queue_index == ~0) - hm->frame_queue_index = - vlib_frame_queue_main_init (handoff_dispatch_node.index, 0); + { + vlib_node_t *n = vlib_get_node_by_name (vm, (u8 *) "ethernet-input"); + hm->frame_queue_index = vlib_frame_queue_main_init (n->index, 0); + } vec_validate (hm->if_data, sw_if_index); d = vec_elt_at_index (hm->if_data, sw_if_index); @@ -267,12 +218,28 @@ interface_handoff_enable_disable (vlib_main_t * vm, u32 sw_if_index, if (enable_disable) { d->workers_bitmap = bitmap; - /* *INDENT-OFF* */ - clib_bitmap_foreach (i, bitmap, - ({ + clib_bitmap_foreach (i, bitmap) + { vec_add1(d->workers, i); - })); - /* *INDENT-ON* */ + } + + if (is_sym) + { + if (is_l4) + return VNET_API_ERROR_UNIMPLEMENTED; + + d->hash_fn = vnet_hash_function_from_name ( + "handoff-eth-sym", VNET_HASH_FN_TYPE_ETHERNET); + } + else + { + if (is_l4) + d->hash_fn = + vnet_hash_default_function (VNET_HASH_FN_TYPE_ETHERNET); + else + d->hash_fn = vnet_hash_function_from_name ( + "handoff-eth", VNET_HASH_FN_TYPE_ETHERNET); + } } vnet_feature_enable_disable ("device-input", "worker-handoff", @@ -285,12 +252,9 @@ set_interface_handoff_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - handoff_main_t *hm = &handoff_main; - u32 sw_if_index = ~0; + u32 sw_if_index = ~0, is_sym = 0, is_l4 = 0; int enable_disable = 1; uword *bitmap = 0; - u32 sym = ~0; - int rv = 0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -303,9 +267,11 @@ set_interface_handoff_command_fn (vlib_main_t * vm, vnet_get_main (), &sw_if_index)) ; else if (unformat (input, "symmetrical")) - sym = 1; + is_sym = 1; else if (unformat (input, "asymmetrical")) - sym = 0; + is_sym = 0; + else if (unformat (input, "l4")) + is_l4 = 1; else break; } @@ -316,9 +282,8 @@ set_interface_handoff_command_fn (vlib_main_t * vm, if (bitmap == 0) return clib_error_return (0, "Please specify list of workers..."); - rv = - interface_handoff_enable_disable (vm, sw_if_index, bitmap, - enable_disable); + rv = interface_handoff_enable_disable (vm, sw_if_index, bitmap, is_sym, + is_l4, enable_disable); switch (rv) { @@ -342,213 +307,18 @@ set_interface_handoff_command_fn (vlib_main_t * vm, return clib_error_return (0, "unknown return value %d", rv); } - if (sym == 1) - hm->hash_fn = eth_get_sym_key; - else if (sym == 0) - hm->hash_fn = eth_get_key; - return 0; } /* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_interface_handoff_command, static) = { .path = "set interface handoff", - .short_help = - "set interface handoff workers [symmetrical|asymmetrical]", + .short_help = "set interface handoff workers " + " [symmetrical|asymmetrical]", .function = set_interface_handoff_command_fn, }; /* *INDENT-ON* */ -typedef struct -{ - u32 buffer_index; - u32 next_index; - u32 sw_if_index; -} handoff_dispatch_trace_t; - -/* packet trace format function */ -static u8 * -format_handoff_dispatch_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 *); - handoff_dispatch_trace_t *t = va_arg (*args, handoff_dispatch_trace_t *); - - s = format (s, "handoff-dispatch: sw_if_index %d next_index %d buffer 0x%x", - t->sw_if_index, t->next_index, t->buffer_index); - return s; -} - -#define foreach_handoff_dispatch_error \ -_(EXAMPLE, "example packets") - -typedef enum -{ -#define _(sym,str) HANDOFF_DISPATCH_ERROR_##sym, - foreach_handoff_dispatch_error -#undef _ - HANDOFF_DISPATCH_N_ERROR, -} handoff_dispatch_error_t; - -static char *handoff_dispatch_error_strings[] = { -#define _(sym,string) string, - foreach_handoff_dispatch_error -#undef _ -}; - -static uword -handoff_dispatch_node_fn (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) -{ - u32 n_left_from, *from, *to_next; - handoff_dispatch_next_t next_index; - - from = vlib_frame_vector_args (frame); - n_left_from = frame->n_vectors; - next_index = node->cached_next_index; - - while (n_left_from > 0) - { - u32 n_left_to_next; - - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); - - while (n_left_from >= 4 && n_left_to_next >= 2) - { - u32 bi0, bi1; - vlib_buffer_t *b0, *b1; - u32 next0, next1; - u32 sw_if_index0, sw_if_index1; - - /* Prefetch next iteration. */ - { - vlib_buffer_t *p2, *p3; - - p2 = vlib_get_buffer (vm, from[2]); - p3 = vlib_get_buffer (vm, from[3]); - - vlib_prefetch_buffer_header (p2, LOAD); - vlib_prefetch_buffer_header (p3, LOAD); - } - - /* speculatively enqueue b0 and b1 to the current next frame */ - to_next[0] = bi0 = from[0]; - to_next[1] = bi1 = from[1]; - from += 2; - to_next += 2; - n_left_from -= 2; - n_left_to_next -= 2; - - b0 = vlib_get_buffer (vm, bi0); - b1 = vlib_get_buffer (vm, bi1); - - next0 = vnet_buffer (b0)->handoff.next_index; - next1 = vnet_buffer (b1)->handoff.next_index; - - if (PREDICT_FALSE (vm->trace_main.trace_active_hint)) - { - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) - { - vlib_trace_buffer (vm, node, next0, b0, /* follow_chain */ - 0); - handoff_dispatch_trace_t *t = - vlib_add_trace (vm, node, b0, sizeof (*t)); - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - t->sw_if_index = sw_if_index0; - t->next_index = next0; - t->buffer_index = bi0; - } - if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED)) - { - vlib_trace_buffer (vm, node, next1, b1, /* follow_chain */ - 0); - handoff_dispatch_trace_t *t = - vlib_add_trace (vm, node, b1, sizeof (*t)); - sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX]; - t->sw_if_index = sw_if_index1; - t->next_index = next1; - t->buffer_index = bi1; - } - } - - /* verify speculative enqueues, maybe switch current next frame */ - vlib_validate_buffer_enqueue_x2 (vm, node, next_index, - to_next, n_left_to_next, - bi0, bi1, next0, next1); - } - - while (n_left_from > 0 && n_left_to_next > 0) - { - u32 bi0; - vlib_buffer_t *b0; - u32 next0; - u32 sw_if_index0; - - /* speculatively enqueue b0 to the current next frame */ - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; - - b0 = vlib_get_buffer (vm, bi0); - - next0 = vnet_buffer (b0)->handoff.next_index; - - if (PREDICT_FALSE (vm->trace_main.trace_active_hint)) - { - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) - { - vlib_trace_buffer (vm, node, next0, b0, /* follow_chain */ - 0); - handoff_dispatch_trace_t *t = - vlib_add_trace (vm, node, b0, sizeof (*t)); - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX]; - t->sw_if_index = sw_if_index0; - t->next_index = next0; - t->buffer_index = bi0; - } - } - - /* verify speculative enqueue, maybe switch current next frame */ - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, - to_next, n_left_to_next, - bi0, next0); - } - - vlib_put_next_frame (vm, node, next_index, n_left_to_next); - } - - return frame->n_vectors; -} - -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (handoff_dispatch_node) = { - .function = handoff_dispatch_node_fn, - .name = "handoff-dispatch", - .vector_size = sizeof (u32), - .format_trace = format_handoff_dispatch_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - .flags = VLIB_NODE_FLAG_IS_HANDOFF, - - .n_errors = ARRAY_LEN(handoff_dispatch_error_strings), - .error_strings = handoff_dispatch_error_strings, - - .n_next_nodes = HANDOFF_DISPATCH_N_NEXT, - - .next_nodes = { - [HANDOFF_DISPATCH_NEXT_DROP] = "error-drop", - [HANDOFF_DISPATCH_NEXT_ETHERNET_INPUT] = "ethernet-input", - [HANDOFF_DISPATCH_NEXT_IP4_INPUT] = "ip4-input-no-checksum", - [HANDOFF_DISPATCH_NEXT_IP6_INPUT] = "ip6-input", - [HANDOFF_DISPATCH_NEXT_MPLS_INPUT] = "mpls-input", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (handoff_dispatch_node, handoff_dispatch_node_fn) -/* *INDENT-ON* */ - clib_error_t * handoff_init (vlib_main_t * vm) { @@ -573,11 +343,6 @@ handoff_init (vlib_main_t * vm) } } - hm->hash_fn = eth_get_key; - - hm->vlib_main = vm; - hm->vnet_main = &vnet_main; - hm->frame_queue_index = ~0; return 0; @@ -585,6 +350,7 @@ handoff_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (handoff_init); +#endif /* CLIB_MARCH_VARIANT */ /* * fd.io coding-style-patch-verification: ON *