Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IP-neighbor: add and delete internal API
[vpp.git]
/
src
/
vnet
/
ip
/
ip6_neighbor.c
diff --git
a/src/vnet/ip/ip6_neighbor.c
b/src/vnet/ip/ip6_neighbor.c
old mode 100644
(file)
new mode 100755
(executable)
index
e281d7e
..
8466ba7
--- a/
src/vnet/ip/ip6_neighbor.c
+++ b/
src/vnet/ip/ip6_neighbor.c
@@
-25,6
+25,7
@@
#include <vnet/fib/ip6_fib.h>
#include <vnet/mfib/ip6_mfib.h>
#include <vnet/ip/ip6_ll_table.h>
#include <vnet/fib/ip6_fib.h>
#include <vnet/mfib/ip6_mfib.h>
#include <vnet/ip/ip6_ll_table.h>
+#include <vnet/l2/l2_input.h>
/**
* @file
/**
* @file
@@
-342,7
+343,7
@@
format_ip6_neighbor_ip6_entry (u8 * s, va_list * va)
u8 *flags = 0;
if (!n)
u8 *flags = 0;
if (!n)
- return format (s, "%=12s%=
2
5s%=6s%=20s%=40s", "Time", "Address", "Flags",
+ return format (s, "%=12s%=
4
5s%=6s%=20s%=40s", "Time", "Address", "Flags",
"Link layer", "Interface");
if (n->flags & IP6_NEIGHBOR_FLAG_DYNAMIC)
"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);
flags = format (flags, "N");
si = vnet_get_sw_interface (vnm, n->key.sw_if_index);
- s = format (s, "%=12U%=
2
5U%=6s%=20U%=40U",
+ s = format (s, "%=12U%=
4
5U%=6s%=20U%=40U",
format_vlib_time, vm, n->time_last_updated,
format_ip6_address, &n->key.ip6_address,
flags ? (char *) flags : "",
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,
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);
{
ip6_neighbor_set_unset_rpc_args_t args;
void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length);
@@
-466,6
+468,8
@@
ip6_nbr_probe (ip_adjacency_t * adj)
h = vlib_packet_template_get_packet (vm,
&im->discover_neighbor_packet_template,
&bi);
h = vlib_packet_template_get_packet (vm,
&im->discover_neighbor_packet_template,
&bi);
+ if (!h)
+ return;
hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
@@
-660,6
+664,14
@@
ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
ip6_nbr_probe (adj);
}
break;
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:
{
/*
case IP_LOOKUP_NEXT_MCAST:
{
/*
@@
-761,8
+773,8
@@
force_reuse_neighbor_entry (void)
int
vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
u32 sw_if_index,
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)
{
uword n_bytes_link_layer_address,
int is_static, int is_no_fib_entry)
{
@@
-792,7
+804,13
@@
vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm,
n = pool_elt_at_index (nm->neighbor_pool, p[0]);
/* Refuse to over-write static neighbor entry. */
if (!is_static && (n->flags & IP6_NEIGHBOR_FLAG_STATIC))
n = pool_elt_at_index (nm->neighbor_pool, p[0]);
/* Refuse to over-write static neighbor entry. */
if (!is_static && (n->flags & IP6_NEIGHBOR_FLAG_STATIC))
- return -2;
+ {
+ /* if MAC address match, still check to send event */
+ if (0 == memcmp (n->link_layer_address,
+ link_layer_address, n_bytes_link_layer_address))
+ goto check_customers;
+ return -2;
+ }
make_new_nd_cache_entry = 0;
}
make_new_nd_cache_entry = 0;
}
@@
-878,7
+896,7
@@
check_customers:
pool_put (nm->pending_resolutions, pr);
}
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? */
}
/* Customer(s) requesting ND event for this address? */
@@
-897,7
+915,8
@@
check_customers:
/* Call the user's data callback, return 1 to suppress dup events */
if (fp)
rv =
/* 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
/*
* Signal the resolver process, as long as the user
* says they want to be notified
@@
-914,10
+933,7
@@
check_customers:
int
vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
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;
{
ip6_neighbor_main_t *nm = &ip6_neighbor_main;
ip6_neighbor_key_t k;
@@
-927,7
+943,7
@@
vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm,
if (vlib_get_thread_index ())
{
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;
}
0 /* unset */ , 0, 0);
return 0;
}
@@
-966,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
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
}
static int
@@
-1105,8
+1120,7
@@
set_ip6_neighbor (vlib_main_t * vm,
mac_address, sizeof (mac_address),
is_static, is_no_fib_entry);
else
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;
}
return 0;
}
@@
-3149,10
+3163,9
@@
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;
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;
f64 time_now;
+ u64 seed;
+ u32 thread_index = vm->thread_index;
int bogus_length;
ip6_neighbor_main_t *nm = &ip6_neighbor_main;
int bogus_length;
ip6_neighbor_main_t *nm = &ip6_neighbor_main;
@@
-3160,20
+3173,15
@@
ip6_discover_neighbor_inline (vlib_main_t * vm,
ip6_forward_next_trace (vm, node, frame, VLIB_TX);
time_now = vlib_time_now (vm);
ip6_forward_next_trace (vm, node, frame, VLIB_TX);
time_now = vlib_time_now (vm);
- if (time_now -
time_last_seed_change
> 1e-3)
+ if (time_now -
im->nd_throttle_last_seed_change_time[thread_index]
> 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;
+ (void) random_u64 (&im->nd_throttle_seeds[thread_index]);
+ memset (im->nd_throttle_bitmaps[thread_index], 0,
+ ND_THROTTLE_BITS / BITS (u8));
-
time_last_seed_change
= time_now;
+
im->nd_throttle_last_seed_change_time[thread_index]
= time_now;
}
}
+ seed = im->nd_throttle_seeds[thread_index];
from = vlib_frame_vector_args (frame);
n_left_from = frame->n_vectors;
from = vlib_frame_vector_args (frame);
n_left_from = frame->n_vectors;
@@
-3187,8
+3195,9
@@
ip6_discover_neighbor_inline (vlib_main_t * vm,
{
vlib_buffer_t *p0;
ip6_header_t *ip0;
{
vlib_buffer_t *p0;
ip6_header_t *ip0;
- u32 pi0, adj_index0, a0, b0, c0, m0, sw_if_index0, drop0;
- uword bm0;
+ u32 pi0, adj_index0, w0, sw_if_index0, drop0;
+ u64 r0;
+ uword m0;
ip_adjacency_t *adj0;
vnet_hw_interface_t *hw_if0;
ip6_radv_t *radv_info;
ip_adjacency_t *adj0;
vnet_hw_interface_t *hw_if0;
ip6_radv_t *radv_info;
@@
-3212,33
+3221,21
@@
ip6_discover_neighbor_inline (vlib_main_t * vm,
adj0->sub_type.nbr.next_hop.ip6.as_u64[1];
}
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;
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];
+ /* Compute the ND throttle bitmap hash */
+ r0 = ip0->dst_address.as_u64[0] ^ ip0->dst_address.as_u64[1] ^ seed;
- hash_v3_finalize32 (a0, b0, c0);
+ /* Find the word and bit */
+ r0 &= ND_THROTTLE_BITS - 1;
+ w0 = r0 / BITS (uword);
+ m0 = (uword) 1 << (r0 % BITS (uword));
- c0 &= BITS (hash_bitmap) - 1;
- c0 = c0 / BITS (uword);
- m0 = (uword) 1 << (c0 % BITS (uword));
-
- bm0 = hash_bitmap[c0];
- drop0 = (bm0 & m0) != 0;
-
- /* Mark it as seen. */
- hash_bitmap[c0] = bm0 | m0;
+ /* If the bit is set, drop the ND request */
+ drop0 = (im->nd_throttle_bitmaps[thread_index][w0] & m0) != 0;
+ /* (unconditionally) mark the bit "inuse" */
+ im->nd_throttle_bitmaps[thread_index][w0] |= m0;
from += 1;
n_left_from -= 1;
from += 1;
n_left_from -= 1;
@@
-3285,6
+3282,8
@@
ip6_discover_neighbor_inline (vlib_main_t * vm,
h0 = vlib_packet_template_get_packet
(vm, &im->discover_neighbor_packet_template, &bi0);
h0 = vlib_packet_template_get_packet
(vm, &im->discover_neighbor_packet_template, &bi0);
+ if (!h0)
+ continue;
/*
* Build ethernet header.
/*
* Build ethernet header.
@@
-4186,6
+4185,7
@@
enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index)
sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB ||
sw_if0 = vnet_get_sw_interface (vnm, sw_if_index);
if (sw_if0->type == VNET_SW_INTERFACE_TYPE_SUB ||
+ sw_if0->type == VNET_SW_INTERFACE_TYPE_PIPE ||
sw_if0->type == VNET_SW_INTERFACE_TYPE_P2P)
{
/* make up an interface id */
sw_if0->type == VNET_SW_INTERFACE_TYPE_P2P)
{
/* make up an interface id */
@@
-4228,7
+4228,7
@@
ip6_get_ll_address (u32 sw_if_index, ip6_address_t * addr)
ip6_radv_t *radv_info;
u32 ri;
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];
return 0;
ri = nm->if_radv_pool_index_by_sw_if_index[sw_if_index];
@@
-4925,8
+4925,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 */
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
{
}
else
{
@@
-5037,6
+5036,9
@@
send_ip6_na_w_addr (vlib_main_t * vm,
vlib_packet_template_get_packet (vm,
&i6m->discover_neighbor_packet_template,
&bi);
vlib_packet_template_get_packet (vm,
&i6m->discover_neighbor_packet_template,
&bi);
+ if (!h)
+ return;
+
ip6_set_reserved_multicast_address (&h->ip.dst_address,
IP6_MULTICAST_SCOPE_link_local,
IP6_MULTICAST_GROUP_ID_all_hosts);
ip6_set_reserved_multicast_address (&h->ip.dst_address,
IP6_MULTICAST_SCOPE_link_local,
IP6_MULTICAST_GROUP_ID_all_hosts);
@@
-5045,6
+5047,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->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 =
clib_memcpy (h->link_layer_option.ethernet_address,
hi->hw_address, vec_len (hi->hw_address));
h->neighbor.icmp.checksum =