X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6_neighbor.c;h=177bcc14a7d73dc6e5cb43ab36b5d0af6f825f51;hb=4d5b917;hp=a6227fc413addeae0761825cfa7d398175224e40;hpb=0e6f4d6af4191340a5f542c9eeb0f34dda32e745;p=vpp.git diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c old mode 100644 new mode 100755 index a6227fc413a..177bcc14a7d --- a/src/vnet/ip/ip6_neighbor.c +++ b/src/vnet/ip/ip6_neighbor.c @@ -25,6 +25,7 @@ #include #include #include +#include /** * @file @@ -342,7 +343,7 @@ format_ip6_neighbor_ip6_entry (u8 * s, va_list * va) u8 *flags = 0; if (!n) - return format (s, "%=12s%=25s%=6s%=20s%=40s", "Time", "Address", "Flags", + return format (s, "%=12s%=45s%=6s%=20s%=40s", "Time", "Address", "Flags", "Link layer", "Interface"); if (n->flags & IP6_NEIGHBOR_FLAG_DYNAMIC) @@ -355,7 +356,7 @@ format_ip6_neighbor_ip6_entry (u8 * s, va_list * va) flags = format (flags, "N"); si = vnet_get_sw_interface (vnm, n->key.sw_if_index); - s = format (s, "%=12U%=25U%=6s%=20U%=40U", + s = format (s, "%=12U%=45U%=6s%=20U%=40U", format_vlib_time, vm, n->time_last_updated, format_ip6_address, &n->key.ip6_address, flags ? (char *) flags : "", @@ -413,8 +414,9 @@ static void ip6_neighbor_set_unset_rpc_callback static void set_unset_ip6_neighbor_rpc (vlib_main_t * vm, u32 sw_if_index, - ip6_address_t * a, u8 * link_layer_address, int is_add, int is_static, - int is_no_fib_entry) + const ip6_address_t * a, + const u8 * link_layer_address, + int is_add, int is_static, int is_no_fib_entry) { ip6_neighbor_set_unset_rpc_args_t args; void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length); @@ -662,6 +664,14 @@ ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) ip6_nbr_probe (adj); } break; + case IP_LOOKUP_NEXT_BCAST: + adj_nbr_update_rewrite (ai, + ADJ_NBR_REWRITE_FLAG_COMPLETE, + ethernet_build_rewrite (vnm, + sw_if_index, + VNET_LINK_IP6, + VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST)); + break; case IP_LOOKUP_NEXT_MCAST: { /* @@ -763,8 +773,8 @@ force_reuse_neighbor_entry (void) int vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm, u32 sw_if_index, - ip6_address_t * a, - u8 * link_layer_address, + const ip6_address_t * a, + const u8 * link_layer_address, uword n_bytes_link_layer_address, int is_static, int is_no_fib_entry) { @@ -886,7 +896,7 @@ check_customers: pool_put (nm->pending_resolutions, pr); } - mhash_unset (&nm->pending_resolutions_by_address, a, 0); + mhash_unset (&nm->pending_resolutions_by_address, (void *) a, 0); } /* Customer(s) requesting ND event for this address? */ @@ -905,7 +915,8 @@ check_customers: /* Call the user's data callback, return 1 to suppress dup events */ if (fp) rv = - (*fp) (mc->data, link_layer_address, sw_if_index, &ip6a_zero); + (*fp) (mc->data, (u8 *) link_layer_address, sw_if_index, + &ip6a_zero); /* * Signal the resolver process, as long as the user * says they want to be notified @@ -922,10 +933,7 @@ check_customers: int vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm, - u32 sw_if_index, - ip6_address_t * a, - u8 * link_layer_address, - uword n_bytes_link_layer_address) + u32 sw_if_index, const ip6_address_t * a) { ip6_neighbor_main_t *nm = &ip6_neighbor_main; ip6_neighbor_key_t k; @@ -935,7 +943,7 @@ vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm, if (vlib_get_thread_index ()) { - set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, link_layer_address, + set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, NULL, 0 /* unset */ , 0, 0); return 0; } @@ -974,8 +982,7 @@ static void ip6_neighbor_set_unset_rpc_callback a->link_layer_address, 6, a->is_static, a->is_no_fib_entry); else - vnet_unset_ip6_ethernet_neighbor (vm, a->sw_if_index, &a->addr, - a->link_layer_address, 6); + vnet_unset_ip6_ethernet_neighbor (vm, a->sw_if_index, &a->addr); } static int @@ -1113,8 +1120,7 @@ set_ip6_neighbor (vlib_main_t * vm, mac_address, sizeof (mac_address), is_static, is_no_fib_entry); else - vnet_unset_ip6_ethernet_neighbor (vm, sw_if_index, &addr, - mac_address, sizeof (mac_address)); + vnet_unset_ip6_ethernet_neighbor (vm, sw_if_index, &addr); return 0; } @@ -2647,7 +2653,7 @@ ip6_neighbor_sw_interface_add_del (vnet_main_t * vnm, nm->if_radv_pool_index_by_sw_if_index[sw_if_index] = ri; /* initialize default values (most of which are zero) */ - memset (a, 0, sizeof (a[0])); + clib_memset (a, 0, sizeof (a[0])); a->sw_if_index = sw_if_index; a->max_radv_interval = DEF_MAX_RADV_INTERVAL; @@ -2774,7 +2780,7 @@ ip6_neighbor_send_mldpv2_report (u32 sw_if_index) ip0 = (ip6_header_t *) & rp0->ip; rh0 = (icmp6_multicast_listener_report_header_t *) & rp0->report_hdr; - memset (rp0, 0x0, sizeof (icmp6_multicast_listener_report_packet_t)); + clib_memset (rp0, 0x0, sizeof (icmp6_multicast_listener_report_packet_t)); ip0->ip_version_traffic_class_and_flow_label = clib_host_to_net_u32 (0x6 << 28); @@ -2962,7 +2968,7 @@ ip6_neighbor_process_timer_event (vlib_main_t * vm, h0 = vlib_buffer_get_current (b0); - memset (h0, 0, sizeof (icmp6_router_solicitation_header_t)); + clib_memset (h0, 0, sizeof (icmp6_router_solicitation_header_t)); h0->ip.ip_version_traffic_class_and_flow_label = clib_host_to_net_u32 (0x6 << 28); h0->ip.payload_length = clib_host_to_net_u16 (sizeof (icmp6_router_solicitation_header_t) @@ -3157,31 +3163,15 @@ ip6_discover_neighbor_inline (vlib_main_t * vm, ip_lookup_main_t *lm = &im->lookup_main; u32 *from, *to_next_drop; uword n_left_from, n_left_to_next_drop; - static f64 time_last_seed_change = -1e100; - static u32 hash_seeds[3]; - static uword hash_bitmap[256 / BITS (uword)]; - f64 time_now; + u64 seed; + u32 thread_index = vm->thread_index; int bogus_length; ip6_neighbor_main_t *nm = &ip6_neighbor_main; if (node->flags & VLIB_NODE_FLAG_TRACE) ip6_forward_next_trace (vm, node, frame, VLIB_TX); - time_now = vlib_time_now (vm); - if (time_now - time_last_seed_change > 1e-3) - { - uword i; - u32 *r = clib_random_buffer_get_data (&vm->random_buffer, - sizeof (hash_seeds)); - for (i = 0; i < ARRAY_LEN (hash_seeds); i++) - hash_seeds[i] = r[i]; - - /* Mark all hash keys as been not-seen before. */ - for (i = 0; i < ARRAY_LEN (hash_bitmap); i++) - hash_bitmap[i] = 0; - - time_last_seed_change = time_now; - } + seed = throttle_seed (&im->nd_throttle, thread_index, vlib_time_now (vm)); from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; @@ -3193,14 +3183,12 @@ ip6_discover_neighbor_inline (vlib_main_t * vm, while (n_left_from > 0 && n_left_to_next_drop > 0) { - vlib_buffer_t *p0; - ip6_header_t *ip0; - u32 pi0, adj_index0, a0, b0, c0, m0, sw_if_index0, drop0; - uword bm0; - ip_adjacency_t *adj0; + u32 pi0, adj_index0, sw_if_index0, drop0, r0, next0; vnet_hw_interface_t *hw_if0; ip6_radv_t *radv_info; - u32 next0; + ip_adjacency_t *adj0; + vlib_buffer_t *p0; + ip6_header_t *ip0; pi0 = from[0]; @@ -3220,33 +3208,13 @@ ip6_discover_neighbor_inline (vlib_main_t * vm, adj0->sub_type.nbr.next_hop.ip6.as_u64[1]; } - a0 = hash_seeds[0]; - b0 = hash_seeds[1]; - c0 = hash_seeds[2]; - sw_if_index0 = adj0->rewrite_header.sw_if_index; vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0; - a0 ^= sw_if_index0; - b0 ^= ip0->dst_address.as_u32[0]; - c0 ^= ip0->dst_address.as_u32[1]; - - hash_v3_mix32 (a0, b0, c0); - - b0 ^= ip0->dst_address.as_u32[2]; - c0 ^= ip0->dst_address.as_u32[3]; - - hash_v3_finalize32 (a0, b0, c0); - - c0 &= BITS (hash_bitmap) - 1; - c0 = c0 / BITS (uword); - m0 = (uword) 1 << (c0 % BITS (uword)); - - bm0 = hash_bitmap[c0]; - drop0 = (bm0 & m0) != 0; + /* combine the address and interface for a hash */ + r0 = ip6_address_hash_to_u64 (&ip0->dst_address) ^ sw_if_index0; - /* Mark it as seen. */ - hash_bitmap[c0] = bm0 | m0; + drop0 = throttle_check (&im->nd_throttle, thread_index, r0, seed); from += 1; n_left_from -= 1; @@ -3582,7 +3550,7 @@ ip6_neighbor_ra_prefix (vlib_main_t * vm, u32 sw_if_index, mhash_set (&radv_info->address_to_prefix_index, prefix_addr, pi, /* old_value */ 0); - memset (prefix, 0x0, sizeof (ip6_radv_prefix_t)); + clib_memset (prefix, 0x0, sizeof (ip6_radv_prefix_t)); prefix->prefix_len = prefix_len; clib_memcpy (&prefix->prefix, prefix_addr, sizeof (ip6_address_t)); @@ -4239,7 +4207,7 @@ ip6_get_ll_address (u32 sw_if_index, ip6_address_t * addr) ip6_radv_t *radv_info; u32 ri; - if (vec_len (nm->if_radv_pool_index_by_sw_if_index) < sw_if_index) + if (vec_len (nm->if_radv_pool_index_by_sw_if_index) <= sw_if_index) return 0; ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index]; @@ -4688,7 +4656,7 @@ ip6_neighbor_init (vlib_main_t * vm) /* add call backs */ ip6_add_del_interface_address_callback_t cb; - memset (&cb, 0x0, sizeof (ip6_add_del_interface_address_callback_t)); + clib_memset (&cb, 0x0, sizeof (ip6_add_del_interface_address_callback_t)); /* when an interface address changes... */ cb.function = ip6_neighbor_add_del_interface_address; @@ -4936,8 +4904,7 @@ ip6_neighbor_proxy_add_del (u32 sw_if_index, ip6_address_t * addr, u8 is_del) sw_if_index, ~0, 1, FIB_ROUTE_PATH_FLAG_NONE); /* flush the ND cache of this address if it's there */ - vnet_unset_ip6_ethernet_neighbor (vlib_get_main (), - sw_if_index, addr, NULL, 0); + vnet_unset_ip6_ethernet_neighbor (vlib_get_main (), sw_if_index, addr); } else { @@ -5059,6 +5026,8 @@ send_ip6_na_w_addr (vlib_main_t * vm, h->neighbor.target_address = ip6_addr[0]; h->neighbor.advertisement_flags = clib_host_to_net_u32 (ICMP6_NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE); + h->link_layer_option.header.type = + ICMP6_NEIGHBOR_DISCOVERY_OPTION_target_link_layer_address; clib_memcpy (h->link_layer_option.ethernet_address, hi->hw_address, vec_len (hi->hw_address)); h->neighbor.icmp.checksum =