X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fqos%2Fqos_mark.c;h=44bb34bd010063a7b0ad4ee8bdc17354bc3ef314;hb=a357a938019c8df2b061cc5bd14cd8a64fac694f;hp=38c66cba40c08d20b3c1a915804c5023ae8a6f9f;hpb=7d98a12f29d5b9696df98b8af2f128614a4f0360;p=vpp.git diff --git a/src/vnet/qos/qos_mark.c b/src/vnet/qos/qos_mark.c index 38c66cba40c..44bb34bd010 100644 --- a/src/vnet/qos/qos_mark.c +++ b/src/vnet/qos/qos_mark.c @@ -36,7 +36,15 @@ qos_mark_ip_enable_disable (u32 sw_if_index, u8 enable) void qos_mark_vlan_enable_disable (u32 sw_if_index, u8 enable) { - vnet_feature_enable_disable ("interface-output", "vlan-qos-mark", + /* + * one cannot run a feature on a sub-interface, so we need + * to enable a feature on all the L3 output paths + */ + vnet_feature_enable_disable ("ip6-output", "vlan-ip6-qos-mark", + sw_if_index, enable, NULL, 0); + vnet_feature_enable_disable ("ip4-output", "vlan-ip4-qos-mark", + sw_if_index, enable, NULL, 0); + vnet_feature_enable_disable ("mpls-output", "vlan-mpls-qos-mark", sw_if_index, enable, NULL, 0); } @@ -67,273 +75,6 @@ qos_egress_map_feature_config (u32 sw_if_index, qos_source_t qs, u8 enable) } } -always_inline qos_egress_map_t * -qos_egress_map_interface (u32 sw_if_index, qos_source_t output_source) -{ - ASSERT (vec_len (qos_mark_configs[output_source]) > sw_if_index); - - return pool_elt_at_index (qem_pool, - qos_mark_configs[output_source][sw_if_index]); -} - -/** - * per-packet trace data - */ -typedef struct qos_mark_trace_t_ -{ - /* per-pkt trace data */ - qos_bits_t bits; - qos_source_t input; - u32 used; -} qos_mark_trace_t; - -static inline uword -qos_mark_inline (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_frame_t * frame, qos_source_t output_source, int is_ip6) -{ - 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) - { - qos_source_t input_source0; - ethernet_vlan_header_t *vlan0; - u32 sw_if_index0, next0, bi0; - qos_egress_map_t *qem0; - ip4_header_t *ip4_0; - ip6_header_t *ip6_0; - vlib_buffer_t *b0; - qos_bits_t qos0; - u8 *mpls_bytes_0; - u8 eos0; - - 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); - sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX]; - input_source0 = vnet_buffer2 (b0)->qos.source; - - qem0 = qos_egress_map_interface (sw_if_index0, output_source); - qos0 = qem0->qem_output[input_source0][vnet_buffer2 (b0)->qos.bits]; - - if (PREDICT_TRUE (b0->flags & VNET_BUFFER_F_QOS_DATA_VALID)) - { - /* there is a source of QoS recording for this packet */ - if (QOS_SOURCE_IP == output_source) - { - if (is_ip6) - { - ip6_0 = (vlib_buffer_get_current (b0) + - vnet_buffer (b0)->ip.save_rewrite_length); - - ip6_set_traffic_class_network_order (ip6_0, qos0); - } - else - { - ip4_0 = (vlib_buffer_get_current (b0) + - vnet_buffer (b0)->ip.save_rewrite_length); - if (PREDICT_FALSE (qos0 != ip4_0->tos)) - { - ip4_0->tos = qos0; - ip4_0->checksum = ip4_header_checksum (ip4_0); - } - } - } - else if (QOS_SOURCE_MPLS == output_source) - { - mpls_bytes_0 = (vlib_buffer_get_current (b0) + - vnet_buffer (b0)->mpls.save_rewrite_length); - - /* apply to all the labels in the stack */ - do - { - /* clear out the old COS bts */ - mpls_bytes_0[2] &= 0xf1; - /* OR in 3 bits of the mapped value */ - mpls_bytes_0[2] |= (qos0 & 0x7) << 1; - eos0 = mpls_bytes_0[2] & 0x1; - mpls_bytes_0 += 4; - } - while (!eos0); - } - else if (QOS_SOURCE_VLAN == output_source) - { - vlan0 = (vlib_buffer_get_current (b0) + - sizeof (ethernet_header_t)); - - ethernet_vlan_header_set_priority_net_order (vlan0, qos0); - } - } - vnet_feature_next (&next0, b0); - - if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED)) - { - qos_mark_trace_t *t = - vlib_add_trace (vm, node, b0, sizeof (*t)); - t->bits = qos0; - t->input = input_source0; - t->used = (b0->flags & VNET_BUFFER_F_QOS_DATA_VALID); - } - - /* 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_mark_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_mark_trace_t *t = va_arg (*args, qos_mark_trace_t *); - - s = format (s, "source:%U qos:%d used:%s", - format_qos_source, t->input, t->bits, (t->used ? "yes" : "no")); - - return s; -} - -static inline uword -ip4_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - return (qos_mark_inline (vm, node, frame, QOS_SOURCE_IP, 0)); -} - -static inline uword -ip6_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - return (qos_mark_inline (vm, node, frame, QOS_SOURCE_IP, 1)); -} - -static inline uword -mpls_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - return (qos_mark_inline (vm, node, frame, QOS_SOURCE_MPLS, 0)); -} - -static inline uword -vlan_qos_mark (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - return (qos_mark_inline (vm, node, frame, QOS_SOURCE_VLAN, 0)); -} - -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (ip4_qos_mark_node) = { - .function = ip4_qos_mark, - .name = "ip4-qos-mark", - .vector_size = sizeof (u32), - .format_trace = format_qos_mark_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - - .n_errors = 0, - .n_next_nodes = 1, - - .next_nodes = { - [0] = "ip4-drop", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (ip4_qos_mark_node, ip4_qos_mark); - -VNET_FEATURE_INIT (ip4_qos_mark_node, static) = { - .arc_name = "ip4-output", - .node_name = "ip4-qos-mark", -}; - -VLIB_REGISTER_NODE (ip6_qos_mark_node) = { - .function = ip6_qos_mark, - .name = "ip6-qos-mark", - .vector_size = sizeof (u32), - .format_trace = format_qos_mark_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - - .n_errors = 0, - .n_next_nodes = 1, - - .next_nodes = { - [0] = "ip6-drop", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (ip6_qos_mark_node, ip6_qos_mark); - -VNET_FEATURE_INIT (ip6_qos_mark_node, static) = { - .arc_name = "ip6-output", - .node_name = "ip6-qos-mark", -}; - -VLIB_REGISTER_NODE (mpls_qos_mark_node) = { - .function = mpls_qos_mark, - .name = "mpls-qos-mark", - .vector_size = sizeof (u32), - .format_trace = format_qos_mark_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - - .n_errors = 0, - .n_next_nodes = 1, - - .next_nodes = { - [0] = "mpls-drop", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (mpls_qos_mark_node, mpls_qos_mark); - -VNET_FEATURE_INIT (mpls_qos_mark_node, static) = { - .arc_name = "mpls-output", - .node_name = "mpls-qos-mark", -}; -VLIB_REGISTER_NODE (vlan_qos_mark_node) = { - .function = vlan_qos_mark, - .name = "vlan-qos-mark", - .vector_size = sizeof (u32), - .format_trace = format_qos_mark_trace, - .type = VLIB_NODE_TYPE_INTERNAL, - - .n_errors = 0, - .n_next_nodes = 1, - - .next_nodes = { - [0] = "error-drop", - }, -}; - -VLIB_NODE_FUNCTION_MULTIARCH (vlan_qos_mark_node, vlan_qos_mark); - -VNET_FEATURE_INIT (vlan_qos_mark_node, static) = { - .arc_name = "interface-output", - .node_name = "vlan-qos-mark", -}; -/* *INDENT-ON* */ - int qos_mark_enable (u32 sw_if_index, qos_source_t output_source, qos_egress_map_id_t mid) @@ -376,6 +117,24 @@ qos_mark_disable (u32 sw_if_index, qos_source_t output_source) return (0); } +void +qos_mark_walk (qos_mark_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_mark_configs[qs]) + { + if (INDEX_INVALID != qos_mark_configs[qs][sw_if_index]) + fn (sw_if_index, + qos_egress_map_get_id (qos_mark_configs[qs][sw_if_index]), qs, c); + } + } +} + static clib_error_t * qos_mark_cli (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) @@ -437,6 +196,90 @@ VLIB_CLI_COMMAND (qos_egress_map_interface_command, static) = { }; /* *INDENT-ON* */ +static void +qos_mark_show_one_interface (vlib_main_t * vm, u32 sw_if_index) +{ + index_t qemis[QOS_N_SOURCES]; + qos_source_t qs; + bool set; + + set = false; + clib_memset_u32 (qemis, INDEX_INVALID, QOS_N_SOURCES); + + FOR_EACH_QOS_SOURCE (qs) + { + if (vec_len (qos_mark_configs[qs]) <= sw_if_index) + continue; + if (INDEX_INVALID != (qemis[qs] = qos_mark_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 (qemis[qs] != INDEX_INVALID) + vlib_cli_output (vm, " %U: map:%d", format_qos_source, qs, + qemis[qs]); + } + } +} + +static clib_error_t * +qos_mark_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_mark_configs[qs])); + } + + for (ii = 0; ii < n_ints; ii++) + { + qos_mark_show_one_interface (vm, ii); + } + } + else + qos_mark_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_mark_show_command, static) = { + .path = "show qos mark", + .short_help = "show qos mark [interface]", + .function = qos_mark_show, + .is_mp_safe = 1, +}; +/* *INDENT-ON* */ + /* * fd.io coding-style-patch-verification: ON *