X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip4_punt_drop.c;h=aee84b4df52d359e44da64f8bb18f3d2d46f0267;hb=6bcc6a45573f387fa6c1682069da7ee9036cabe2;hp=72f36f33560d1f524357e8a3fb2b136c03315a31;hpb=d91c1dbdb31f80db7d967f2f57c43d0a81d65297;p=vpp.git diff --git a/src/vnet/ip/ip4_punt_drop.c b/src/vnet/ip/ip4_punt_drop.c index 72f36f33560..aee84b4df52 100644 --- a/src/vnet/ip/ip4_punt_drop.c +++ b/src/vnet/ip/ip4_punt_drop.c @@ -28,10 +28,13 @@ VNET_FEATURE_ARC_INIT (ip4_punt) = VNET_FEATURE_ARC_INIT (ip4_drop) = { .arc_name = "ip4-drop", - .start_nodes = VNET_FEATURES ("ip4-drop"), + .start_nodes = VNET_FEATURES ("ip4-drop", "ip4-not-enabled"), }; /* *INDENT-ON* */ +extern ip_punt_policer_t ip4_punt_policer_cfg; + +#ifndef CLIB_MARCH_VARIANT u8 * format_ip_punt_policer_trace (u8 * s, va_list * args) { @@ -46,6 +49,7 @@ format_ip_punt_policer_trace (u8 * s, va_list * args) ip_punt_policer_t ip4_punt_policer_cfg = { .policer_index = ~0, }; +#endif /* CLIB_MARCH_VARIANT */ static char *ip4_punt_policer_error_strings[] = { #define _(sym,string) string, @@ -53,9 +57,9 @@ static char *ip4_punt_policer_error_strings[] = { #undef _ }; -static uword -ip4_punt_policer (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (ip4_punt_policer_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return (ip_punt_policer (vm, node, frame, vnet_feat_arc_ip4_punt.feature_arc_index, @@ -63,8 +67,7 @@ ip4_punt_policer (vlib_main_t * vm, } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (ip4_punt_policer_node, static) = { - .function = ip4_punt_policer, +VLIB_REGISTER_NODE (ip4_punt_policer_node) = { .name = "ip4-punt-policer", .vector_size = sizeof (u32), .n_next_nodes = IP_PUNT_POLICER_N_NEXT, @@ -77,48 +80,13 @@ VLIB_REGISTER_NODE (ip4_punt_policer_node, static) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (ip4_punt_policer_node, - ip4_punt_policer); - -VNET_FEATURE_INIT (ip4_punt_policer_node, static) = { +VNET_FEATURE_INIT (ip4_punt_policer_node) = { .arc_name = "ip4-punt", .node_name = "ip4-punt-policer", .runs_before = VNET_FEATURES("ip4-punt-redirect"), }; /* *INDENT-ON* */ -u8 * -format_ip_punt_redirect_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 *); - ip_punt_redirect_trace_t *t = va_arg (*args, ip_punt_redirect_trace_t *); - vnet_main_t *vnm = vnet_get_main (); - vnet_sw_interface_t *si; - - si = vnet_get_sw_interface_safe (vnm, t->redirect.tx_sw_if_index); - - if (NULL != si) - s = format (s, "via %U on %U using adj:%d", - format_ip46_address, &t->redirect.nh, IP46_TYPE_ANY, - format_vnet_sw_interface_name, vnm, si, - t->redirect.adj_index); - else - s = format (s, "via %U on %d using adj:%d", - format_ip46_address, &t->redirect.nh, IP46_TYPE_ANY, - t->redirect.tx_sw_if_index, t->redirect.adj_index); - - return s; -} - -/* *INDENT-OFF* */ -ip_punt_redirect_t ip4_punt_redirect_cfg = { - .any_rx_sw_if_index = { - .tx_sw_if_index = ~0, - }, -}; -/* *INDENT-ON* */ - #define foreach_ip4_punt_redirect_error \ _(DROP, "ip4 punt redirect drop") @@ -137,18 +105,17 @@ static char *ip4_punt_redirect_error_strings[] = { #undef _ }; -static uword -ip4_punt_redirect (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (ip4_punt_redirect_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) { return (ip_punt_redirect (vm, node, frame, vnet_feat_arc_ip4_punt.feature_arc_index, - &ip4_punt_redirect_cfg)); + FIB_PROTOCOL_IP4)); } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (ip4_punt_redirect_node, static) = { - .function = ip4_punt_redirect, +VLIB_REGISTER_NODE (ip4_punt_redirect_node) = { .name = "ip4-punt-redirect", .vector_size = sizeof (u32), .n_next_nodes = IP_PUNT_REDIRECT_N_NEXT, @@ -164,9 +131,6 @@ VLIB_REGISTER_NODE (ip4_punt_redirect_node, static) = { }, }; -VLIB_NODE_FUNCTION_MULTIARCH (ip4_punt_redirect_node, - ip4_punt_redirect); - VNET_FEATURE_INIT (ip4_punt_redirect_node, static) = { .arc_name = "ip4-punt", .node_name = "ip4-punt-redirect", @@ -174,8 +138,8 @@ VNET_FEATURE_INIT (ip4_punt_redirect_node, static) = { }; /* *INDENT-ON* */ -static uword -ip4_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) +VLIB_NODE_FN (ip4_drop_node) (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame) { if (node->flags & VLIB_NODE_FLAG_TRACE) ip4_forward_next_trace (vm, node, frame, VLIB_TX); @@ -185,6 +149,17 @@ ip4_drop (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) } +VLIB_NODE_FN (ip4_not_enabled_node) (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame) +{ + if (node->flags & VLIB_NODE_FLAG_TRACE) + ip4_forward_next_trace (vm, node, frame, VLIB_TX); + + return ip_drop_or_punt (vm, node, frame, + vnet_feat_arc_ip4_drop.feature_arc_index); +} + static uword ip4_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { @@ -196,9 +171,8 @@ ip4_punt (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (ip4_drop_node, static) = +VLIB_REGISTER_NODE (ip4_drop_node) = { - .function = ip4_drop, .name = "ip4-drop", .vector_size = sizeof (u32), .format_trace = format_ip4_forward_next_trace, @@ -208,9 +182,15 @@ VLIB_REGISTER_NODE (ip4_drop_node, static) = }, }; -VLIB_NODE_FUNCTION_MULTIARCH (ip4_drop_node, ip4_drop); +VLIB_REGISTER_NODE (ip4_not_enabled_node) = +{ + .name = "ip4-not-enabled", + .vector_size = sizeof (u32), + .format_trace = format_ip4_forward_next_trace, + .sibling_of = "ip4-drop", +}; -VLIB_REGISTER_NODE (ip4_punt_node, static) = +VLIB_REGISTER_NODE (ip4_punt_node) = { .function = ip4_punt, .name = "ip4-punt", @@ -235,6 +215,7 @@ VNET_FEATURE_INIT (ip4_drop_end_of_arc, static) = { }; /* *INDENT-ON */ +#ifndef CLIB_MARCH_VARIANT void ip4_punt_policer_add_del (u8 is_add, u32 policer_index) { @@ -243,6 +224,7 @@ ip4_punt_policer_add_del (u8 is_add, u32 policer_index) vnet_feature_enable_disable ("ip4-punt", "ip4-punt-policer", 0, is_add, 0, 0); } +#endif /* CLIB_MARCH_VARIANT */ static clib_error_t * ip4_punt_police_cmd (vlib_main_t * vm, @@ -304,68 +286,35 @@ VLIB_CLI_COMMAND (ip4_punt_policer_command, static) = }; /* *INDENT-ON* */ -/* - * an uninitalised rx-redirect strcut used to pad the vector - */ -ip_punt_redirect_rx_t uninit_rx_redirect = { - .tx_sw_if_index = ~0, -}; +#ifndef CLIB_MARCH_VARIANT void -ip_punt_redirect_add (ip_punt_redirect_t * cfg, - u32 rx_sw_if_index, - ip_punt_redirect_rx_t * redirect, - fib_protocol_t fproto, vnet_link_t linkt) +ip4_punt_redirect_add (u32 rx_sw_if_index, + u32 tx_sw_if_index, ip46_address_t * nh) { - ip_punt_redirect_rx_t *new; - - if (~0 == rx_sw_if_index) - { - cfg->any_rx_sw_if_index = *redirect; - new = &cfg->any_rx_sw_if_index; - } - else - { - vec_validate_init_empty (cfg->redirect_by_rx_sw_if_index, - rx_sw_if_index, uninit_rx_redirect); - cfg->redirect_by_rx_sw_if_index[rx_sw_if_index] = *redirect; - new = &cfg->redirect_by_rx_sw_if_index[rx_sw_if_index]; - } - - new->adj_index = adj_nbr_add_or_lock (fproto, linkt, - &redirect->nh, - redirect->tx_sw_if_index); -} + /* *INDENT-OFF* */ + fib_route_path_t *rpaths = NULL, rpath = { + .frp_proto = DPO_PROTO_IP4, + .frp_addr = *nh, + .frp_sw_if_index = tx_sw_if_index, + .frp_weight = 1, + .frp_fib_index = ~0, + }; + /* *INDENT-ON* */ -void -ip_punt_redirect_del (ip_punt_redirect_t * cfg, u32 rx_sw_if_index) -{ - ip_punt_redirect_rx_t *old; + vec_add1 (rpaths, rpath); - if (~0 == rx_sw_if_index) - { - old = &cfg->any_rx_sw_if_index; - } - else - { - old = &cfg->redirect_by_rx_sw_if_index[rx_sw_if_index]; - } + ip4_punt_redirect_add_paths (rx_sw_if_index, rpaths); - adj_unlock (old->adj_index); - *old = uninit_rx_redirect; + vec_free (rpaths); } void -ip4_punt_redirect_add (u32 rx_sw_if_index, - u32 tx_sw_if_index, ip46_address_t * nh) +ip4_punt_redirect_add_paths (u32 rx_sw_if_index, fib_route_path_t * rpaths) { - ip_punt_redirect_rx_t rx = { - .tx_sw_if_index = tx_sw_if_index, - .nh = *nh, - }; - - ip_punt_redirect_add (&ip4_punt_redirect_cfg, - rx_sw_if_index, &rx, FIB_PROTOCOL_IP4, VNET_LINK_IP4); + ip_punt_redirect_add (FIB_PROTOCOL_IP4, + rx_sw_if_index, + FIB_FORW_CHAIN_TYPE_UNICAST_IP4, rpaths); vnet_feature_enable_disable ("ip4-punt", "ip4-punt-redirect", 0, 1, 0, 0); } @@ -375,8 +324,9 @@ ip4_punt_redirect_del (u32 rx_sw_if_index) { vnet_feature_enable_disable ("ip4-punt", "ip4-punt-redirect", 0, 0, 0, 0); - ip_punt_redirect_del (&ip4_punt_redirect_cfg, rx_sw_if_index); + ip_punt_redirect_del (FIB_PROTOCOL_IP4, rx_sw_if_index); } +#endif /* CLIB_MARCH_VARIANT */ static clib_error_t * ip4_punt_redirect_cmd (vlib_main_t * vm, @@ -384,10 +334,10 @@ ip4_punt_redirect_cmd (vlib_main_t * vm, vlib_cli_command_t * cmd) { unformat_input_t _line_input, *line_input = &_line_input; + fib_route_path_t *rpaths = NULL, rpath; + dpo_proto_t payload_proto; clib_error_t *error = 0; - u32 rx_sw_if_index; - u32 tx_sw_if_index; - ip46_address_t nh; + u32 rx_sw_if_index = ~0; vnet_main_t *vnm; u8 is_add; @@ -408,14 +358,9 @@ ip4_punt_redirect_cmd (vlib_main_t * vm, else if (unformat (line_input, "rx %U", unformat_vnet_sw_interface, vnm, &rx_sw_if_index)) ; - else if (unformat (line_input, "via %U %U", - unformat_ip4_address, - &nh.ip4, - unformat_vnet_sw_interface, vnm, &tx_sw_if_index)) - ; else if (unformat (line_input, "via %U", - unformat_vnet_sw_interface, vnm, &tx_sw_if_index)) - memset (&nh, 0, sizeof (nh)); + unformat_fib_route_path, &rpath, &payload_proto)) + vec_add1 (rpaths, rpath); else { error = unformat_parse_error (line_input); @@ -423,10 +368,21 @@ ip4_punt_redirect_cmd (vlib_main_t * vm, } } + if (~0 == rx_sw_if_index) + { + error = unformat_parse_error (line_input); + goto done; + } + if (is_add) - ip4_punt_redirect_add (rx_sw_if_index, tx_sw_if_index, &nh); + { + if (vec_len (rpaths)) + ip4_punt_redirect_add_paths (rx_sw_if_index, rpaths); + } else - ip4_punt_redirect_del (rx_sw_if_index); + { + ip4_punt_redirect_del (rx_sw_if_index); + } done: unformat_free (line_input); @@ -447,46 +403,12 @@ VLIB_CLI_COMMAND (ip4_punt_redirect_command, static) = }; /* *INDENT-ON* */ -u8 * -format_ip_punt_redirect (u8 * s, va_list * args) -{ - ip_punt_redirect_t *cfg = va_arg (*args, ip_punt_redirect_t *); - ip_punt_redirect_rx_t *rx; - u32 rx_sw_if_index; - vnet_main_t *vnm = vnet_get_main (); - - vec_foreach_index (rx_sw_if_index, cfg->redirect_by_rx_sw_if_index) - { - rx = &cfg->redirect_by_rx_sw_if_index[rx_sw_if_index]; - if (~0 != rx->tx_sw_if_index) - { - s = format (s, " rx %U redirect via %U %U\n", - format_vnet_sw_interface_name, vnm, - vnet_get_sw_interface (vnm, rx_sw_if_index), - format_ip46_address, &rx->nh, IP46_TYPE_ANY, - format_vnet_sw_interface_name, vnm, - vnet_get_sw_interface (vnm, rx->tx_sw_if_index)); - } - } - if (~0 != cfg->any_rx_sw_if_index.tx_sw_if_index) - { - s = format (s, " rx all redirect via %U %U\n", - format_ip46_address, &cfg->any_rx_sw_if_index.nh, - IP46_TYPE_ANY, format_vnet_sw_interface_name, vnm, - vnet_get_sw_interface (vnm, - cfg-> - any_rx_sw_if_index.tx_sw_if_index)); - } - - return (s); -} - static clib_error_t * ip4_punt_redirect_show_cmd (vlib_main_t * vm, unformat_input_t * main_input, vlib_cli_command_t * cmd) { - vlib_cli_output (vm, "%U", format_ip_punt_redirect, &ip4_punt_redirect_cfg); + vlib_cli_output (vm, "%U", format_ip_punt_redirect, FIB_PROTOCOL_IP4); return (NULL); } @@ -501,7 +423,7 @@ VLIB_CLI_COMMAND (show_ip4_punt_redirect_command, static) = { .path = "show ip punt redirect", .function = ip4_punt_redirect_show_cmd, - .short_help = "show ip punt redirect [add|del] rx [|all] via [] ", + .short_help = "show ip punt redirect", .is_mp_safe = 1, }; /* *INDENT-ON* */