From e9dbd2b7819efdb2a3d2f92334c2e25849068e00 Mon Sep 17 00:00:00 2001 From: Neale Date: Fri, 1 Jul 2016 13:00:09 +0100 Subject: VPP-142 Recursive route sending traffic to wrong interface Indirect routes should always result in an indriect adjacency even when the route's next-hop is covered by a connceted, since the covering route may change and no tracking is in place. Some de-duplication of code for installing indirect routes via the CLI and API. Change-Id: I7a440ffba43ae3990b68cb407244c06bd0827534 Signed-off-by: Neale --- vnet/vnet/ip/ip4.h | 7 +++ vnet/vnet/ip/ip4_forward.c | 138 +++++++++++++++++++++++++----------------- vnet/vnet/ip/ip6.h | 8 +++ vnet/vnet/ip/ip6_forward.c | 147 +++++++++++++++++++++++++++------------------ 4 files changed, 188 insertions(+), 112 deletions(-) (limited to 'vnet') diff --git a/vnet/vnet/ip/ip4.h b/vnet/vnet/ip/ip4.h index 7ed5bf5e..5ea4ebf5 100644 --- a/vnet/vnet/ip/ip4.h +++ b/vnet/vnet/ip/ip4.h @@ -355,6 +355,13 @@ void ip4_add_del_route_next_hop (ip4_main_t * im, u32 next_hop_weight, u32 adj_index, u32 explicit_fib_index); +u32 +ip4_route_get_next_hop_adj (ip4_main_t * im, + u32 fib_index, + ip4_address_t *next_hop, + u32 next_hop_sw_if_index, + u32 explicit_fib_index); + void * ip4_get_route (ip4_main_t * im, u32 fib_index_or_table_id, diff --git a/vnet/vnet/ip/ip4_forward.c b/vnet/vnet/ip/ip4_forward.c index 35c42d82..97e472b6 100644 --- a/vnet/vnet/ip/ip4_forward.c +++ b/vnet/vnet/ip/ip4_forward.c @@ -274,6 +274,85 @@ void ip4_add_del_route (ip4_main_t * im, ip4_add_del_route_args_t * a) ip_del_adjacency (lm, old_adj_index); } + +u32 +ip4_route_get_next_hop_adj (ip4_main_t * im, + u32 fib_index, + ip4_address_t *next_hop, + u32 next_hop_sw_if_index, + u32 explicit_fib_index) +{ + ip_lookup_main_t * lm = &im->lookup_main; + vnet_main_t * vnm = vnet_get_main(); + uword * nh_hash, * nh_result; + int is_interface_next_hop; + u32 nh_adj_index; + ip4_fib_t * fib; + + fib = vec_elt_at_index (im->fibs, fib_index); + + is_interface_next_hop = next_hop->data_u32 == 0; + if (is_interface_next_hop) + { + nh_result = hash_get (im->interface_route_adj_index_by_sw_if_index, next_hop_sw_if_index); + if (nh_result) + nh_adj_index = *nh_result; + else + { + ip_adjacency_t * adj; + adj = ip_add_adjacency (lm, /* template */ 0, /* block size */ 1, + &nh_adj_index); + ip4_adjacency_set_interface_route (vnm, adj, next_hop_sw_if_index, /* if_address_index */ ~0); + ip_call_add_del_adjacency_callbacks (lm, nh_adj_index, /* is_del */ 0); + hash_set (im->interface_route_adj_index_by_sw_if_index, next_hop_sw_if_index, nh_adj_index); + } + } + else if (next_hop_sw_if_index == ~0) + { + /* next-hop is recursive. we always need a indirect adj + * for recursive paths. Any LPM we perform now will give + * us a valid adj, but without tracking the next-hop we + * have no way to keep it valid. + */ + ip_adjacency_t add_adj; + memset (&add_adj, 0, sizeof(add_adj)); + add_adj.n_adj = 1; + add_adj.lookup_next_index = IP_LOOKUP_NEXT_INDIRECT; + add_adj.indirect.next_hop.ip4.as_u32 = next_hop->as_u32; + add_adj.explicit_fib_index = explicit_fib_index; + ip_add_adjacency (lm, &add_adj, 1, &nh_adj_index); + } + else + { + nh_hash = fib->adj_index_by_dst_address[32]; + nh_result = hash_get (nh_hash, next_hop->data_u32); + + /* Next hop must be known. */ + if (! nh_result) + { + ip_adjacency_t * adj; + + /* no /32 exists, get the longest prefix match */ + nh_adj_index = ip4_fib_lookup_with_table (im, fib_index, + next_hop, 0); + adj = ip_get_adjacency (lm, nh_adj_index); + /* if ARP interface adjacency is present, we need to + install ARP adjaceny for specific next hop */ + if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP && + adj->arp.next_hop.ip4.as_u32 == 0) + { + nh_adj_index = vnet_arp_glean_add(fib_index, next_hop); + } + } + else + { + nh_adj_index = *nh_result; + } + } + + return (nh_adj_index); +} + void ip4_add_del_route_next_hop (ip4_main_t * im, u32 flags, @@ -291,11 +370,9 @@ ip4_add_del_route_next_hop (ip4_main_t * im, u32 dst_address_u32, old_mp_adj_index, new_mp_adj_index; u32 dst_adj_index, nh_adj_index; uword * dst_hash, * dst_result; - uword * nh_hash, * nh_result; ip_adjacency_t * dst_adj; ip_multipath_adjacency_t * old_mp, * new_mp; int is_del = (flags & IP4_ROUTE_FLAG_DEL) != 0; - int is_interface_next_hop; clib_error_t * error = 0; if (explicit_fib_index == (u32)~0) @@ -304,61 +381,14 @@ ip4_add_del_route_next_hop (ip4_main_t * im, fib_index = explicit_fib_index; fib = vec_elt_at_index (im->fibs, fib_index); - + /* Lookup next hop to be added or deleted. */ - is_interface_next_hop = next_hop->data_u32 == 0; if (adj_index == (u32)~0) { - if (is_interface_next_hop) - { - nh_result = hash_get (im->interface_route_adj_index_by_sw_if_index, next_hop_sw_if_index); - if (nh_result) - nh_adj_index = *nh_result; - else - { - ip_adjacency_t * adj; - adj = ip_add_adjacency (lm, /* template */ 0, /* block size */ 1, - &nh_adj_index); - ip4_adjacency_set_interface_route (vnm, adj, next_hop_sw_if_index, /* if_address_index */ ~0); - ip_call_add_del_adjacency_callbacks (lm, nh_adj_index, /* is_del */ 0); - hash_set (im->interface_route_adj_index_by_sw_if_index, next_hop_sw_if_index, nh_adj_index); - } - } - else - { - nh_hash = fib->adj_index_by_dst_address[32]; - nh_result = hash_get (nh_hash, next_hop->data_u32); - - /* Next hop must be known. */ - if (! nh_result) - { - ip_adjacency_t * adj; - - nh_adj_index = ip4_fib_lookup_with_table (im, fib_index, - next_hop, 0); - adj = ip_get_adjacency (lm, nh_adj_index); - /* if ARP interface adjacencty is present, we need to - install ARP adjaceny for specific next hop */ - if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP && - adj->arp.next_hop.ip4.as_u32 == 0) - { - nh_adj_index = vnet_arp_glean_add(fib_index, next_hop); - } - else - { - /* Next hop is not known, so create indirect adj */ - ip_adjacency_t add_adj; - memset (&add_adj, 0, sizeof(add_adj)); - add_adj.n_adj = 1; - add_adj.lookup_next_index = IP_LOOKUP_NEXT_INDIRECT; - add_adj.indirect.next_hop.ip4.as_u32 = next_hop->as_u32; - add_adj.explicit_fib_index = explicit_fib_index; - ip_add_adjacency (lm, &add_adj, 1, &nh_adj_index); - } - } - else - nh_adj_index = *nh_result; - } + nh_adj_index = ip4_route_get_next_hop_adj(im, fib_index, + next_hop, + next_hop_sw_if_index, + explicit_fib_index); } else { diff --git a/vnet/vnet/ip/ip6.h b/vnet/vnet/ip/ip6.h index edeecdee..22d1a4fe 100644 --- a/vnet/vnet/ip/ip6.h +++ b/vnet/vnet/ip/ip6.h @@ -389,6 +389,14 @@ void ip6_add_del_route_next_hop (ip6_main_t * im, u32 next_hop_sw_if_index, u32 next_hop_weight, u32 adj_index, u32 explicit_fib_index); + +u32 +ip6_route_get_next_hop_adj (ip6_main_t * im, + u32 fib_index, + ip6_address_t *next_hop, + u32 next_hop_sw_if_index, + u32 explicit_fib_index); + u32 ip6_get_route (ip6_main_t * im, u32 fib_index_or_table_id, diff --git a/vnet/vnet/ip/ip6_forward.c b/vnet/vnet/ip/ip6_forward.c index ced5f562..c581a9bc 100644 --- a/vnet/vnet/ip/ip6_forward.c +++ b/vnet/vnet/ip/ip6_forward.c @@ -297,6 +297,91 @@ void ip6_add_del_route (ip6_main_t * im, ip6_add_del_route_args_t * a) } } +u32 +ip6_route_get_next_hop_adj (ip6_main_t * im, + u32 fib_index, + ip6_address_t *next_hop, + u32 next_hop_sw_if_index, + u32 explicit_fib_index) +{ + ip_lookup_main_t * lm = &im->lookup_main; + vnet_main_t * vnm = vnet_get_main(); + int is_interface_next_hop; + uword * nh_result; + u32 nh_adj_index; + ip6_fib_t * fib; + + fib = vec_elt_at_index (im->fibs, fib_index); + + is_interface_next_hop = ip6_address_is_zero (next_hop); + + if (is_interface_next_hop) + { + nh_result = hash_get (im->interface_route_adj_index_by_sw_if_index, + next_hop_sw_if_index); + if (nh_result) + nh_adj_index = *nh_result; + else + { + ip_adjacency_t * adj; + adj = ip_add_adjacency (lm, /* template */ 0, /* block size */ 1, + &nh_adj_index); + ip6_adjacency_set_interface_route (vnm, adj, + next_hop_sw_if_index, ~0); + ip_call_add_del_adjacency_callbacks + (lm, next_hop_sw_if_index, /* is_del */ 0); + hash_set (im->interface_route_adj_index_by_sw_if_index, + next_hop_sw_if_index, nh_adj_index); + } + } + else if (next_hop_sw_if_index == ~0) + { + /* next-hop is recursive. we always need a indirect adj + * for recursive paths. Any LPM we perform now will give + * us a valid adj, but without tracking the next-hop we + * have no way to keep it valid. + */ + ip_adjacency_t add_adj; + memset (&add_adj, 0, sizeof(add_adj)); + add_adj.n_adj = 1; + add_adj.lookup_next_index = IP_LOOKUP_NEXT_INDIRECT; + add_adj.indirect.next_hop.ip6.as_u64[0] = next_hop->as_u64[0]; + add_adj.indirect.next_hop.ip6.as_u64[1] = next_hop->as_u64[1]; + add_adj.explicit_fib_index = explicit_fib_index; + ip_add_adjacency (lm, &add_adj, 1, &nh_adj_index); + } + else + { + BVT(clib_bihash_kv) kv, value; + + /* Look for the interface /128 route */ + kv.key[0] = next_hop->as_u64[0]; + kv.key[1] = next_hop->as_u64[1]; + kv.key[2] = ((u64)((fib - im->fibs))<<32) | 128; + + if (BV(clib_bihash_search)(&im->ip6_lookup_table, &kv, &value) < 0) + { + ip_adjacency_t * adj; + nh_adj_index = ip6_fib_lookup_with_table (im, fib_index, next_hop); + adj = ip_get_adjacency (lm, nh_adj_index); + /* if ND interface adjacencty is present, we need to + install ND adjaceny for specific next hop */ + if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP && + adj->arp.next_hop.ip6.as_u64[0] == 0 && + adj->arp.next_hop.ip6.as_u64[1] == 0) + { + nh_adj_index = vnet_ip6_neighbor_glean_add(fib_index, next_hop); + } + } + else + { + nh_adj_index = value.value; + } + } + + return (nh_adj_index); +} + void ip6_add_del_route_next_hop (ip6_main_t * im, u32 flags, @@ -318,9 +403,7 @@ ip6_add_del_route_next_hop (ip6_main_t * im, ip_adjacency_t * dst_adj; ip_multipath_adjacency_t * old_mp, * new_mp; int is_del = (flags & IP6_ROUTE_FLAG_DEL) != 0; - int is_interface_next_hop; clib_error_t * error = 0; - uword * nh_result; BVT(clib_bihash_kv) kv, value; vlib_smp_unsafe_warning(); @@ -333,64 +416,12 @@ ip6_add_del_route_next_hop (ip6_main_t * im, fib = vec_elt_at_index (im->fibs, fib_index); /* Lookup next hop to be added or deleted. */ - is_interface_next_hop = ip6_address_is_zero (next_hop); if (adj_index == (u32)~0) { - if (is_interface_next_hop) - { - nh_result = hash_get (im->interface_route_adj_index_by_sw_if_index, - next_hop_sw_if_index); - if (nh_result) - nh_adj_index = *nh_result; - else - { - ip_adjacency_t * adj; - adj = ip_add_adjacency (lm, /* template */ 0, /* block size */ 1, - &nh_adj_index); - ip6_adjacency_set_interface_route (vnm, adj, - next_hop_sw_if_index, ~0); - ip_call_add_del_adjacency_callbacks - (lm, nh_adj_index, /* is_del */ 0); - hash_set (im->interface_route_adj_index_by_sw_if_index, - next_hop_sw_if_index, nh_adj_index); - } - } - else - { - /* Look for the interface /128 route */ - kv.key[0] = next_hop->as_u64[0]; - kv.key[1] = next_hop->as_u64[1]; - kv.key[2] = ((u64)((fib - im->fibs))<<32) | 128; - - if (BV(clib_bihash_search)(&im->ip6_lookup_table, &kv, &value) < 0) - { - ip_adjacency_t * adj; - nh_adj_index = ip6_fib_lookup_with_table (im, fib_index, next_hop); - adj = ip_get_adjacency (lm, nh_adj_index); - /* if ND interface adjacencty is present, we need to - install ND adjaceny for specific next hop */ - if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP && - adj->arp.next_hop.ip6.as_u64[0] == 0 && - adj->arp.next_hop.ip6.as_u64[1] == 0) - { - nh_adj_index = vnet_ip6_neighbor_glean_add(fib_index, next_hop); - } - else - { - ip_adjacency_t add_adj; - memset (&add_adj, 0, sizeof(add_adj)); - add_adj.n_adj = 1; - add_adj.lookup_next_index = IP_LOOKUP_NEXT_INDIRECT; - add_adj.indirect.next_hop.ip6.as_u64[0] = next_hop->as_u64[0]; - add_adj.indirect.next_hop.ip6.as_u64[1] = next_hop->as_u64[1]; - add_adj.explicit_fib_index = explicit_fib_index; - ip_add_adjacency (lm, &add_adj, 1, &nh_adj_index); - } - } - else - nh_adj_index = value.value; - - } + nh_adj_index = ip6_route_get_next_hop_adj(im, fib_index, + next_hop, + next_hop_sw_if_index, + explicit_fib_index); } else { -- cgit 1.2.3-korg