X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fqos%2Fqos_record.c;h=40e6b0778bb9abd5655a5dffe1675ba0f1ebd4cf;hb=5281a9029;hp=fb235e09735e46575cfb9ece5394bc436cc36266;hpb=7d98a12f29d5b9696df98b8af2f128614a4f0360;p=vpp.git diff --git a/src/vnet/qos/qos_record.c b/src/vnet/qos/qos_record.c index fb235e09735..40e6b0778bb 100644 --- a/src/vnet/qos/qos_record.c +++ b/src/vnet/qos/qos_record.c @@ -18,12 +18,14 @@ #include #include #include +#include +#include /** * Per-interface, per-protocol vector of feature on/off configurations */ -static u8 *qos_record_configs[QOS_N_SOURCES]; -static u32 l2_qos_input_next[QOS_N_SOURCES][32]; +u8 *qos_record_configs[QOS_N_SOURCES]; +u32 l2_qos_input_next[QOS_N_SOURCES][32]; static void qos_record_feature_config (u32 sw_if_index, @@ -44,9 +46,23 @@ qos_record_feature_config (u32 sw_if_index, enable); break; case QOS_SOURCE_MPLS: + vnet_feature_enable_disable ("mpls-input", "mpls-qos-record", + sw_if_index, enable, NULL, 0); + break; case QOS_SOURCE_VLAN: + vnet_feature_enable_disable ("ip6-unicast", "vlan-ip6-qos-record", + sw_if_index, enable, NULL, 0); + vnet_feature_enable_disable ("ip6-multicast", "vlan-ip6-qos-record", + sw_if_index, enable, NULL, 0); + vnet_feature_enable_disable ("ip4-unicast", "vlan-ip4-qos-record", + sw_if_index, enable, NULL, 0); + vnet_feature_enable_disable ("ip4-multicast", "vlan-ip4-qos-record", + sw_if_index, enable, NULL, 0); + vnet_feature_enable_disable ("mpls-input", "vlan-mpls-qos-record", + sw_if_index, enable, NULL, 0); + break; case QOS_SOURCE_EXT: - // not implemented yet + /* not a valid option for recording */ break; } } @@ -84,8 +100,25 @@ qos_record_disable (u32 sw_if_index, qos_source_t input_source) return (0); } +void +qos_record_walk (qos_record_walk_cb_t fn, void *c) +{ + qos_source_t qs; + + FOR_EACH_QOS_SOURCE (qs) + { + u32 sw_if_index; + + vec_foreach_index (sw_if_index, qos_record_configs[qs]) + { + if (0 != qos_record_configs[qs][sw_if_index]) + fn (sw_if_index, qs, c); + } + } +} + /* - * Disable recording feautre for all protocols when the interface + * Disable recording feature for all protocols when the interface * is deleted */ static clib_error_t * @@ -107,226 +140,23 @@ qos_record_ip_interface_add_del (vnet_main_t * vnm, VNET_SW_INTERFACE_ADD_DEL_FUNCTION (qos_record_ip_interface_add_del); -/** - * per-packet trace data - */ -typedef struct qos_record_trace_t_ -{ - /* per-pkt trace data */ - qos_bits_t bits; -} qos_record_trace_t; - -static inline uword -qos_record_inline (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame, int is_ip6, int is_l2) -{ - u32 n_left_from, *from, *to_next, next_index; - - next_index = 0; - n_left_from = frame->n_vectors; - from = vlib_frame_vector_args (frame); - - 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 > 0 && n_left_to_next > 0) - { - ip4_header_t *ip4_0; - ip6_header_t *ip6_0; - vlib_buffer_t *b0; - u32 next0, bi0; - qos_bits_t qos0; - u8 l2_len; - - next0 = 0; - 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); - - if (is_l2) - { - l2_len = vnet_buffer (b0)->l2.l2_len; - u8 *l3h; - u16 ethertype; - - vlib_buffer_advance (b0, l2_len); - - l3h = vlib_buffer_get_current (b0); - ethertype = clib_net_to_host_u16 (*(u16 *) (l3h - 2)); - - if (ethertype == ETHERNET_TYPE_IP4) - is_ip6 = 0; - else if (ethertype == ETHERNET_TYPE_IP6) - is_ip6 = 1; - else - goto non_ip; - } - - if (is_ip6) - { - ip6_0 = vlib_buffer_get_current (b0); - qos0 = ip6_traffic_class_network_order (ip6_0); - } - else - { - ip4_0 = vlib_buffer_get_current (b0); - qos0 = ip4_0->tos; - } - vnet_buffer2 (b0)->qos.bits = qos0; - vnet_buffer2 (b0)->qos.source = QOS_SOURCE_IP; - b0->flags |= VNET_BUFFER_F_QOS_DATA_VALID; - - if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) && - (b0->flags & VLIB_BUFFER_IS_TRACED))) - { - qos_record_trace_t *t = - vlib_add_trace (vm, node, b0, sizeof (*t)); - t->bits = qos0; - } - - non_ip: - if (is_l2) - { - vlib_buffer_advance (b0, -l2_len); - next0 = vnet_l2_feature_next (b0, - l2_qos_input_next[QOS_SOURCE_IP], - L2INPUT_FEAT_L2_IP_QOS_RECORD); - } - else - vnet_feature_next (&next0, b0); - - /* 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; -} - -/* packet trace format function */ -static u8 * -format_qos_record_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 *); - qos_record_trace_t *t = va_arg (*args, qos_record_trace_t *); - - s = format (s, "qos:%d", t->bits); - - return s; -} - -static inline uword -ip4_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - return (qos_record_inline (vm, node, frame, 0, 0)); -} - -static inline uword -ip6_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - return (qos_record_inline (vm, node, frame, 1, 0)); -} - -static inline uword -l2_ip_qos_record (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - return (qos_record_inline (vm, node, frame, 0, 1)); -} - -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (ip4_qos_record_node) = { - .function = ip4_qos_record, - .name = "ip4-qos-record", - .vector_size = sizeof (u32), - .format_trace = format_qos_record_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - - .n_errors = 0, - .n_next_nodes = 1, - - .next_nodes = { - [0] = "ip4-drop", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (ip4_qos_record_node, ip4_qos_record); - -VNET_FEATURE_INIT (ip4_qos_record_node, static) = { - .arc_name = "ip4-unicast", - .node_name = "ip4-qos-record", -}; - -VLIB_REGISTER_NODE (ip6_qos_record_node) = { - .function = ip6_qos_record, - .name = "ip6-qos-record", - .vector_size = sizeof (u32), - .format_trace = format_qos_record_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - - .n_errors = 0, - .n_next_nodes = 1, - - .next_nodes = { - [0] = "ip6-drop", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (ip6_qos_record_node, ip6_qos_record); - -VNET_FEATURE_INIT (ip6_qos_record_node, static) = { - .arc_name = "ip6-unicast", - .node_name = "ip6-qos-record", -}; - -VLIB_REGISTER_NODE (l2_ip_qos_record_node, static) = { - .function = l2_ip_qos_record, - .name = "l2-ip-qos-record", - .vector_size = sizeof (u32), - .format_trace = format_qos_record_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - - .n_errors = 0, - .n_next_nodes = 1, - - /* Consider adding error "no IP after L2, no recording" */ - .next_nodes = { - [0] = "error-drop", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (l2_ip_qos_record_node, l2_ip_qos_record); -/* *INDENT-ON* */ - clib_error_t * -l2_ip_qos_init (vlib_main_t * vm) +qos_record_init (vlib_main_t * vm) { + qos_source_t qs; + vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "l2-ip-qos-record"); + /* Initialize the feature next-node indexes */ - feat_bitmap_init_next_nodes (vm, - l2_ip_qos_record_node.index, - L2INPUT_N_FEAT, - l2input_get_feat_names (), - l2_qos_input_next[QOS_SOURCE_IP]); + FOR_EACH_QOS_SOURCE (qs) + feat_bitmap_init_next_nodes (vm, + node->index, + L2INPUT_N_FEAT, + l2input_get_feat_names (), + l2_qos_input_next[qs]); return 0; } -VLIB_INIT_FUNCTION (l2_ip_qos_init); +VLIB_INIT_FUNCTION (qos_record_init); static clib_error_t * qos_record_cli (vlib_main_t * vm, @@ -371,7 +201,7 @@ qos_record_cli (vlib_main_t * vm, /*? * Enable QoS bit recording on an interface using the packet's input DSCP bits * Which input QoS bits to use are either; IP, MPLS or VLAN. If more than - * one protocol is chosen (which is foolish) the higer layers override the + * one protocol is chosen (which is foolish) the higher layers override the * lower. * * @cliexpar @@ -386,6 +216,87 @@ VLIB_CLI_COMMAND (qos_record_command, static) = { }; /* *INDENT-ON* */ +static void +qos_record_show_one_interface (vlib_main_t * vm, u32 sw_if_index) +{ + u8 n_cfgs[QOS_N_SOURCES] = { }; + qos_source_t qs; + bool set; + + set = false; + + FOR_EACH_QOS_SOURCE (qs) + { + if (vec_len (qos_record_configs[qs]) <= sw_if_index) + continue; + if (0 != (n_cfgs[qs] = qos_record_configs[qs][sw_if_index])) + set = true; + } + + if (set) + { + vlib_cli_output (vm, " %U:", format_vnet_sw_if_index_name, + vnet_get_main (), sw_if_index); + + FOR_EACH_QOS_SOURCE (qs) + { + if (n_cfgs[qs] != 0) + vlib_cli_output (vm, " %U", format_qos_source, qs); + } + } +} + +static clib_error_t * +qos_record_show (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + vnet_main_t *vnm = vnet_get_main (); + qos_source_t qs; + u32 sw_if_index; + + sw_if_index = ~0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%U", unformat_vnet_sw_interface, + vnm, &sw_if_index)) + ; + } + + if (~0 == sw_if_index) + { + u32 ii, n_ints = 0; + + FOR_EACH_QOS_SOURCE (qs) + { + n_ints = clib_max (n_ints, vec_len (qos_record_configs[qs])); + } + + for (ii = 0; ii < n_ints; ii++) + { + qos_record_show_one_interface (vm, ii); + } + } + else + qos_record_show_one_interface (vm, sw_if_index); + + return (NULL); +} + +/*? + * Show Egress Qos Maps + * + * @cliexpar + * @cliexcmd{show qos egress map} + ?*/ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (qos_record_show_command, static) = { + .path = "show qos record", + .short_help = "show qos record [interface]", + .function = qos_record_show, + .is_mp_safe = 1, +}; +/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON