X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Flookup.c;h=533d010a738659bb9e720d58345f6fd832a274f2;hb=57b5860f013953ce161d05302e05370db9cd6ee2;hp=6c5611d395550b68c1589c9c1660ec5fd27fac51;hpb=32e1c010b0c34fd0984f7fc45fae648a182025c5;p=vpp.git diff --git a/src/vnet/ip/lookup.c b/src/vnet/ip/lookup.c old mode 100644 new mode 100755 index 6c5611d3955..533d010a738 --- a/src/vnet/ip/lookup.c +++ b/src/vnet/ip/lookup.c @@ -49,6 +49,7 @@ #include #include #include +#include /** * @file @@ -72,7 +73,10 @@ ip_interface_address_add_del (ip_lookup_main_t * lm, a = p ? pool_elt_at_index (lm->if_address_pool, p[0]) : 0; /* Verify given length. */ - if ((a && (address_length != a->address_length)) || (address_length == 0)) + if ((a && (address_length != a->address_length)) || + (address_length == 0) || + (lm->is_ip6 && address_length > 128) || + (!lm->is_ip6 && address_length > 32)) { vnm->api_errno = VNET_API_ERROR_ADDRESS_LENGTH_MISMATCH; return clib_error_create @@ -169,19 +173,24 @@ ip_interface_address_add_del (ip_lookup_main_t * lm, return /* no error */ 0; } -void -ip_lookup_init (ip_lookup_main_t * lm, u32 is_ip6) +static clib_error_t * +ip_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) { - /* ensure that adjacency is cacheline aligned and sized */ - STATIC_ASSERT (STRUCT_OFFSET_OF (ip_adjacency_t, cacheline0) == 0, - "Cache line marker must be 1st element in struct"); - STATIC_ASSERT (STRUCT_OFFSET_OF (ip_adjacency_t, cacheline1) == - CLIB_CACHE_LINE_BYTES, - "Data in cache line 0 is bigger than cache line size"); + vec_validate_init_empty (ip4_main. + lookup_main.if_address_pool_index_by_sw_if_index, + sw_if_index, ~0); + vec_validate_init_empty (ip6_main. + lookup_main.if_address_pool_index_by_sw_if_index, + sw_if_index, ~0); + + return (NULL); +} - /* Preallocate three "special" adjacencies */ - lm->adjacency_heap = adj_pool; +VNET_SW_INTERFACE_ADD_DEL_FUNCTION (ip_sw_interface_add_del); +void +ip_lookup_init (ip_lookup_main_t * lm, u32 is_ip6) +{ if (!lm->fib_result_n_bytes) lm->fib_result_n_bytes = sizeof (uword); @@ -235,7 +244,8 @@ format_ip_flow_hash_config (u8 * s, va_list * args) u8 * format_ip_lookup_next (u8 * s, va_list * args) { - ip_lookup_next_t n = va_arg (*args, ip_lookup_next_t); + /* int promotion of ip_lookup_next_t */ + ip_lookup_next_t n = va_arg (*args, int); char *t = 0; switch (n) @@ -275,7 +285,6 @@ format_ip_lookup_next (u8 * s, va_list * args) u8 * format_ip_adjacency_packet_data (u8 * s, va_list * args) { - vnet_main_t *vnm = va_arg (*args, vnet_main_t *); u32 adj_index = va_arg (*args, u32); u8 *packet_data = va_arg (*args, u8 *); u32 n_packet_data_bytes = va_arg (*args, u32); @@ -284,10 +293,9 @@ format_ip_adjacency_packet_data (u8 * s, va_list * args) switch (adj->lookup_next_index) { case IP_LOOKUP_NEXT_REWRITE: - s = format (s, "%U", - format_vnet_rewrite_header, - vnm->vlib_main, &adj->rewrite_header, packet_data, - n_packet_data_bytes); + case IP_LOOKUP_NEXT_MCAST: + s = + format (s, "%U", format_hex_bytes, packet_data, n_packet_data_bytes); break; default: @@ -342,32 +350,6 @@ const ip46_address_t zero_addr = { 0, 0}, }; -u32 -fib_table_id_find_fib_index (fib_protocol_t proto, u32 table_id) -{ - ip4_main_t *im4 = &ip4_main; - ip6_main_t *im6 = &ip6_main; - uword *p; - - switch (proto) - { - case FIB_PROTOCOL_IP4: - p = hash_get (im4->fib_index_by_table_id, table_id); - break; - case FIB_PROTOCOL_IP6: - p = hash_get (im6->fib_index_by_table_id, table_id); - break; - default: - p = NULL; - break; - } - if (NULL != p) - { - return (p[0]); - } - return (~0); -} - clib_error_t * vnet_ip_route_cmd (vlib_main_t * vm, unformat_input_t * main_input, vlib_cli_command_t * cmd) @@ -378,6 +360,7 @@ vnet_ip_route_cmd (vlib_main_t * vm, fib_prefix_t *prefixs = NULL, pfx; mpls_label_t out_label, via_label; clib_error_t *error = NULL; + u32 weight, preference; u32 table_id, is_del; vnet_main_t *vnm; u32 fib_index; @@ -439,6 +422,7 @@ vnet_ip_route_cmd (vlib_main_t * vm, unformat_mpls_unicast_label, &rpath.frp_local_label)) { rpath.frp_weight = 1; + rpath.frp_eos = MPLS_NON_EOS; rpath.frp_proto = FIB_PROTOCOL_MPLS; rpath.frp_sw_if_index = ~0; vec_add1 (rpaths, rpath); @@ -458,26 +442,6 @@ vnet_ip_route_cmd (vlib_main_t * vm, pfx.fp_proto = FIB_PROTOCOL_IP6; vec_add1 (prefixs, pfx); } - else if (unformat (line_input, "via %U %U weight %u", - unformat_ip4_address, - &rpath.frp_addr.ip4, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index, &rpath.frp_weight)) - { - rpath.frp_proto = FIB_PROTOCOL_IP4; - vec_add1 (rpaths, rpath); - } - - else if (unformat (line_input, "via %U %U weight %u", - unformat_ip6_address, - &rpath.frp_addr.ip6, - unformat_vnet_sw_interface, vnm, - &rpath.frp_sw_if_index, &rpath.frp_weight)) - { - rpath.frp_proto = FIB_PROTOCOL_IP6; - vec_add1 (rpaths, rpath); - } - else if (unformat (line_input, "via %U %U", unformat_ip4_address, &rpath.frp_addr.ip4, @@ -499,6 +463,16 @@ vnet_ip_route_cmd (vlib_main_t * vm, rpath.frp_proto = FIB_PROTOCOL_IP6; vec_add1 (rpaths, rpath); } + else if (unformat (line_input, "weight %u", &weight)) + { + ASSERT (vec_len (rpaths)); + rpaths[vec_len (rpaths) - 1].frp_weight = weight; + } + else if (unformat (line_input, "preference %u", &preference)) + { + ASSERT (vec_len (rpaths)); + rpaths[vec_len (rpaths) - 1].frp_preference = preference; + } else if (unformat (line_input, "via %U next-hop-table %d", unformat_ip4_address, &rpath.frp_addr.ip4, &rpath.frp_fib_index)) @@ -568,8 +542,6 @@ vnet_ip_route_cmd (vlib_main_t * vm, } } - unformat_free (line_input); - if (vec_len (prefixs) == 0) { error = @@ -592,7 +564,7 @@ vnet_ip_route_cmd (vlib_main_t * vm, } else { - fib_index = fib_table_id_find_fib_index (prefixs[0].fp_proto, table_id); + fib_index = fib_table_find (prefixs[0].fp_proto, table_id); if (~0 == fib_index) { @@ -641,8 +613,8 @@ vnet_ip_route_cmd (vlib_main_t * vm, /* * the CLI parsing stored table Ids, swap to FIB indicies */ - fi = fib_table_id_find_fib_index (prefixs[i].fp_proto, - rpaths[i].frp_fib_index); + fi = fib_table_find (prefixs[i].fp_proto, + rpaths[i].frp_fib_index); if (~0 == fi) { @@ -704,6 +676,7 @@ done: vec_free (dpos); vec_free (prefixs); vec_free (rpaths); + unformat_free (line_input); return error; } @@ -784,7 +757,10 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, u32 fib_index; mfib_itf_flags_t iflags = 0; mfib_entry_flags_t eflags = 0; + u32 gcount, scount, ss, gg, incr; + f64 timet[2]; + gcount = scount = 1; vnm = vnet_get_main (); is_del = 0; table_id = 0; @@ -804,6 +780,10 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, is_del = 1; else if (unformat (line_input, "add")) is_del = 0; + else if (unformat (line_input, "scount %d", &scount)) + ; + else if (unformat (line_input, "gcount %d", &gcount)) + ; else if (unformat (line_input, "%U %U", unformat_ip4_address, &pfx.fp_src_addr.ip4, @@ -824,12 +804,14 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, unformat_ip4_address, &pfx.fp_grp_addr.ip4, &pfx.fp_len)) { + memset (&pfx.fp_src_addr.ip4, 0, sizeof (pfx.fp_src_addr.ip4)); pfx.fp_proto = FIB_PROTOCOL_IP4; } else if (unformat (line_input, "%U/%d", unformat_ip6_address, &pfx.fp_grp_addr.ip6, &pfx.fp_len)) { + memset (&pfx.fp_src_addr.ip6, 0, sizeof (pfx.fp_src_addr.ip6)); pfx.fp_proto = FIB_PROTOCOL_IP6; } else if (unformat (line_input, "%U", @@ -851,7 +833,12 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, &rpath.frp_sw_if_index)) { rpath.frp_weight = 1; - rpath.frp_proto = FIB_PROTOCOL_IP4; + } + else if (unformat (line_input, "via local")) + { + rpath.frp_sw_if_index = ~0; + rpath.frp_weight = 1; + rpath.frp_flags |= FIB_ROUTE_PATH_LOCAL; } else if (unformat (line_input, "%U", unformat_mfib_itf_flags, &iflags)) ; @@ -865,8 +852,6 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, } } - unformat_free (line_input); - if (~0 == table_id) { /* @@ -885,25 +870,86 @@ vnet_ip_mroute_cmd (vlib_main_t * vm, } } - if (is_del && 0 == rpath.frp_weight) + timet[0] = vlib_time_now (vm); + + if (FIB_PROTOCOL_IP4 == pfx.fp_proto) { - mfib_table_entry_delete (fib_index, &pfx, MFIB_SOURCE_CLI); + incr = 1 << (32 - (pfx.fp_len % 32)); } - else if (eflags) + else { - mfib_table_entry_update (fib_index, &pfx, MFIB_SOURCE_CLI, eflags); + incr = 1 << (128 - (pfx.fp_len % 128)); } - else + + for (ss = 0; ss < scount; ss++) { - if (is_del) - mfib_table_entry_path_remove (fib_index, - &pfx, MFIB_SOURCE_CLI, &rpath); + for (gg = 0; gg < gcount; gg++) + { + if (is_del && 0 == rpath.frp_weight) + { + /* no path provided => route delete */ + mfib_table_entry_delete (fib_index, &pfx, MFIB_SOURCE_CLI); + } + else if (eflags) + { + mfib_table_entry_update (fib_index, &pfx, MFIB_SOURCE_CLI, + MFIB_RPF_ID_NONE, eflags); + } + else + { + if (is_del) + mfib_table_entry_path_remove (fib_index, + &pfx, MFIB_SOURCE_CLI, &rpath); + else + mfib_table_entry_path_update (fib_index, + &pfx, MFIB_SOURCE_CLI, &rpath, + iflags); + } + + if (FIB_PROTOCOL_IP4 == pfx.fp_proto) + { + pfx.fp_grp_addr.ip4.as_u32 = + clib_host_to_net_u32 (incr + + clib_net_to_host_u32 (pfx. + fp_grp_addr.ip4. + as_u32)); + } + else + { + int bucket = (incr < 64 ? 0 : 1); + pfx.fp_grp_addr.ip6.as_u64[bucket] = + clib_host_to_net_u64 (incr + + clib_net_to_host_u64 (pfx. + fp_grp_addr.ip6.as_u64 + [bucket])); + + } + } + if (FIB_PROTOCOL_IP4 == pfx.fp_proto) + { + pfx.fp_src_addr.ip4.as_u32 = + clib_host_to_net_u32 (1 + + clib_net_to_host_u32 (pfx.fp_src_addr. + ip4.as_u32)); + } else - mfib_table_entry_path_update (fib_index, - &pfx, MFIB_SOURCE_CLI, &rpath, iflags); + { + pfx.fp_src_addr.ip6.as_u64[1] = + clib_host_to_net_u64 (1 + + clib_net_to_host_u64 (pfx.fp_src_addr. + ip6.as_u64[1])); + } } + timet[1] = vlib_time_now (vm); + + if (scount > 1 || gcount > 1) + vlib_cli_output (vm, "%.6e routes/sec", + (scount * gcount) / (timet[1] - timet[0])); + done: + unformat_free (line_input); + return error; } @@ -1083,24 +1129,37 @@ probe_neighbor_address (vlib_main_t * vm, is_ip4 = 0; } else - return clib_error_return (0, "unknown input '%U'", - format_unformat_error, line_input); + { + error = clib_error_return (0, "unknown input '%U'", + format_unformat_error, line_input); + goto done; + } } - unformat_free (line_input); - if (sw_if_index == ~0) - return clib_error_return (0, "Interface required, not set."); + { + error = clib_error_return (0, "Interface required, not set."); + goto done; + } if (address_set == 0) - return clib_error_return (0, "ip address required, not set."); + { + error = clib_error_return (0, "ip address required, not set."); + goto done; + } if (address_set > 1) - return clib_error_return (0, "Multiple ip addresses not supported."); + { + error = clib_error_return (0, "Multiple ip addresses not supported."); + goto done; + } if (is_ip4) error = ip4_probe_neighbor_wait (vm, &a4, sw_if_index, retry_count); else error = ip6_probe_neighbor_wait (vm, &a6, sw_if_index, retry_count); +done: + unformat_free (line_input); + return error; }