ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow providers to override glean behaviour

Browse Source 
and update glean address on local interface MAC change

Change-Id: I530826d60c7e9db2b0fa2d45754139d82c5ea807
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
This commit is contained in:
Neale Ranns
2018-02-16 02:44:05 -08:00
parent 25d417f286
commit c819fc612f
12 changed files with 186 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/vnet/adj/adj_glean.c
View File

@@ -68,26 +68,55 @@ adj_glean_add_or_lock (fib_protocol_t proto,
adj->sub_type.glean.receive_addr = *nh_addr;
}
adj->rewrite_header.sw_if_index = sw_if_index;
adj->rewrite_header.data_bytes = 0;
adj_lock(adj_get_index(adj));
vnet_rewrite_for_sw_interface(vnet_get_main(),
adj_fib_proto_2_nd(proto),
sw_if_index,
adj_get_glean_node(proto)->index,
VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
&adj->rewrite_header,
sizeof (adj->rewrite_data));
vnet_update_adjacency_for_sw_interface(vnet_get_main(),
sw_if_index,
adj_get_index(adj));
}
else
{
adj = adj_get(adj_gleans[proto][sw_if_index]);
adj_lock(adj_get_index(adj));
}
adj_lock(adj_get_index(adj));
return (adj_get_index(adj));
}
/**
* adj_glean_update_rewrite
*/
void
adj_glean_update_rewrite (adj_index_t adj_index)
{
ip_adjacency_t *adj;
ASSERT(ADJ_INDEX_INVALID != adj_index);
adj = adj_get(adj_index);
vnet_rewrite_for_sw_interface(vnet_get_main(),
adj_fib_proto_2_nd(adj->ia_nh_proto),
adj->rewrite_header.sw_if_index,
adj_get_glean_node(adj->ia_nh_proto)->index,
VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST,
&adj->rewrite_header,
sizeof (adj->rewrite_data));
}
adj_index_t
adj_glean_get (fib_protocol_t proto,
u32 sw_if_index)
{
if (sw_if_index < vec_len(adj_gleans[proto]))
{
return (adj_gleans[proto][sw_if_index]);
}
return (ADJ_INDEX_INVALID);
}
void
adj_glean_remove (fib_protocol_t proto,
u32 sw_if_index)
@@ -227,12 +256,17 @@ format_adj_glean (u8* s, va_list *ap)
vnet_main_t * vnm = vnet_get_main();
ip_adjacency_t * adj = adj_get(index);
return (format(s, "%U-glean: %U",
format_fib_protocol, adj->ia_nh_proto,
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm,
adj->rewrite_header.sw_if_index)));
s = format(s, "%U-glean: %U",
format_fib_protocol, adj->ia_nh_proto,
format_vnet_sw_interface_name,
vnm,
vnet_get_sw_interface(vnm,
adj->rewrite_header.sw_if_index));
s = format (s, " %U",
format_vnet_rewrite,
&adj->rewrite_header, sizeof (adj->rewrite_data), 0);
return (s);
}

19
src/vnet/adj/adj_glean.h
View File

@@ -47,6 +47,25 @@ extern adj_index_t adj_glean_add_or_lock(fib_protocol_t proto,
u32 sw_if_index,
const ip46_address_t *nh_addr);
/**
* @brief Get an existing glean
*
* @return INVALID if it does not exist
*/
extern adj_index_t adj_glean_get(fib_protocol_t proto,
u32 sw_if_index);
/**
* adj_glean_update_rewrite
*
* Called by an adjacency provider (an interface type) to configure
* a glean adj (i.e. and adjacency linked to a connected prefix) to
* its default behaviour.
* Other interface types (i.e. 6RD tunnels) can can choose not to use
* glean behaviour on an adjacency liked to a connected prefix.
*/
extern void adj_glean_update_rewrite(adj_index_t adj_index);
/**
* @brief Format/display a glean adjacency.
*/

15
src/vnet/adj/adj_internal.h
View File

@@ -78,6 +78,21 @@ adj_fib_proto_2_nd (fib_protocol_t fp)
return (0);
}
static inline ip46_type_t
adj_proto_to_46 (fib_protocol_t proto)
{
switch (proto)
{
case FIB_PROTOCOL_IP4:
return (IP46_TYPE_IP4);
case FIB_PROTOCOL_IP6:
return (IP46_TYPE_IP6);
default:
return (IP46_TYPE_IP4);
}
return (IP46_TYPE_IP4);
}
/**
* @brief
* Get a pointer to an adjacency object from its index

9
src/vnet/adj/adj_midchain.c
View File

@@ -519,7 +519,9 @@ adj_nbr_midchain_update_rewrite (adj_index_t adj_index,
* one time only update. since we don't support chainging the tunnel
* src,dst, this is all we need.
*/
ASSERT(adj->lookup_next_index == IP_LOOKUP_NEXT_ARP);
ASSERT((adj->lookup_next_index == IP_LOOKUP_NEXT_ARP) ||
(adj->lookup_next_index == IP_LOOKUP_NEXT_GLEAN));
/*
* tunnels can always provide a rewrite.
*/
@@ -590,8 +592,9 @@ format_adj_midchain (u8* s, va_list *ap)
ip_adjacency_t * adj = adj_get(index);
s = format (s, "%U", format_vnet_link, adj->ia_link);
s = format (s, " via %U ",
format_ip46_address, &adj->sub_type.nbr.next_hop);
s = format (s, " via %U",
format_ip46_address, &adj->sub_type.nbr.next_hop,
adj_proto_to_46(adj->ia_nh_proto));
s = format (s, " %U",
format_vnet_rewrite,
&adj->rewrite_header, sizeof (adj->rewrite_data), indent);

15
src/vnet/adj/adj_nbr.c
View File

@@ -968,21 +968,6 @@ VLIB_CLI_COMMAND (ip4_show_fib_command, static) = {
.function = adj_nbr_show,
};
static ip46_type_t
adj_proto_to_46 (fib_protocol_t proto)
{
switch (proto)
{
case FIB_PROTOCOL_IP4:
return (IP46_TYPE_IP4);
case FIB_PROTOCOL_IP6:
return (IP46_TYPE_IP6);
default:
return (IP46_TYPE_IP4);
}
return (IP46_TYPE_IP4);
}
u8*
format_adj_nbr_incomplete (u8* s, va_list *ap)
{

10
src/vnet/ethernet/arp.c
View File

@@ -455,8 +455,10 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
switch (adj->lookup_next_index)
{
case IP_LOOKUP_NEXT_ARP:
case IP_LOOKUP_NEXT_GLEAN:
adj_glean_update_rewrite (ai);
break;
case IP_LOOKUP_NEXT_ARP:
if (NULL != e)
{
adj_nbr_walk_nh4 (sw_if_index,
@@ -2480,6 +2482,7 @@ ethernet_arp_change_mac (u32 sw_if_index)
{
ethernet_arp_main_t *am = &ethernet_arp_main;
ethernet_arp_ip4_entry_t *e;
adj_index_t ai;
/* *INDENT-OFF* */
pool_foreach (e, am->ip4_entry_pool,
@@ -2487,6 +2490,11 @@ ethernet_arp_change_mac (u32 sw_if_index)
change_arp_mac (sw_if_index, e);
}));
/* *INDENT-ON* */
ai = adj_glean_get (FIB_PROTOCOL_IP4, sw_if_index);
if (ADJ_INDEX_INVALID != ai)
adj_glean_update_rewrite (ai);
}
void

4
src/vnet/interface.c
View File

@@ -1453,8 +1453,10 @@ default_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
switch (adj->lookup_next_index)
{
case IP_LOOKUP_NEXT_ARP:
case IP_LOOKUP_NEXT_GLEAN:
adj_glean_update_rewrite (ai);
break;
case IP_LOOKUP_NEXT_ARP:
/*
* default rewirte in neighbour adj
*/

10
src/vnet/ip/ip6_neighbor.c
View File

@@ -566,8 +566,10 @@ ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
switch (adj->lookup_next_index)
{
case IP_LOOKUP_NEXT_ARP:
case IP_LOOKUP_NEXT_GLEAN:
adj_glean_update_rewrite (ai);
break;
case IP_LOOKUP_NEXT_ARP:
if (NULL != nbr)
{
adj_nbr_walk_nh6 (sw_if_index, &nbr->key.ip6_address,
@@ -4256,6 +4258,7 @@ ethernet_ndp_change_mac (u32 sw_if_index)
{
ip6_neighbor_main_t *nm = &ip6_neighbor_main;
ip6_neighbor_t *n;
adj_index_t ai;
/* *INDENT-OFF* */
pool_foreach (n, nm->neighbor_pool,
@@ -4268,6 +4271,11 @@ ethernet_ndp_change_mac (u32 sw_if_index)
}
}));
/* *INDENT-ON* */
ai = adj_glean_get (FIB_PROTOCOL_IP6, sw_if_index);
if (ADJ_INDEX_INVALID != ai)
adj_glean_update_rewrite (ai);
}
void

41
src/vnet/ip/lookup.c
View File

@@ -254,47 +254,6 @@ format_ip_flow_hash_config (u8 * s, va_list * args)
return s;
}
u8 *
format_ip_lookup_next (u8 * s, va_list * args)
{
/* int promotion of ip_lookup_next_t */
ip_lookup_next_t n = va_arg (*args, int);
char *t = 0;
switch (n)
{
default:
s = format (s, "unknown %d", n);
return s;
case IP_LOOKUP_NEXT_DROP:
t = "drop";
break;
case IP_LOOKUP_NEXT_PUNT:
t = "punt";
break;
case IP_LOOKUP_NEXT_ARP:
t = "arp";
break;
case IP_LOOKUP_NEXT_MIDCHAIN:
t = "midchain";
break;
case IP_LOOKUP_NEXT_GLEAN:
t = "glean";
break;
case IP_LOOKUP_NEXT_MCAST:
t = "mcast";
break;
case IP_LOOKUP_NEXT_REWRITE:
break;
}
if (t)
vec_add (s, t, strlen (t));
return s;
}
u8 *
format_ip_adjacency_packet_data (u8 * s, va_list * args)
{

2
test/test_bier.py
View File

@@ -195,7 +195,7 @@ class TestBier(VppTestCase):
self.bier_midpoint(BIERLength.BIER_LEN_128, 16, 128)
def test_bier_midpoint_64(self):
"""BIER midpoint BSL:256"""
"""BIER midpoint BSL:64"""
self.bier_midpoint(BIERLength.BIER_LEN_64, 8, 64)
def test_bier_head(self):

70
test/test_neighbor.py
View File

@@ -1144,6 +1144,76 @@ class ARPTestCase(VppTestCase):
self.pg2.unconfig_ip4()
self.pg2.set_table_ip4(0)
def test_arp_incomplete(self):
""" ARP Incomplete"""
self.pg1.generate_remote_hosts(3)
p0 = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
IP(src=self.pg0.remote_ip4,
dst=self.pg1.remote_hosts[1].ip4) /
UDP(sport=1234, dport=1234) /
Raw())
p1 = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
IP(src=self.pg0.remote_ip4,
dst=self.pg1.remote_hosts[2].ip4) /
UDP(sport=1234, dport=1234) /
Raw())
#
# a packet to an unresolved destination generates an ARP request
#
rx = self.send_and_expect(self.pg0, [p0], self.pg1)
self.verify_arp_req(rx[0],
self.pg1.local_mac,
self.pg1.local_ip4,
self.pg1._remote_hosts[1].ip4)
#
# add a neighbour for remote host 1
#
static_arp = VppNeighbor(self,
self.pg1.sw_if_index,
self.pg1.remote_hosts[1].mac,
self.pg1.remote_hosts[1].ip4,
is_static=1)
static_arp.add_vpp_config()
#
# change the interface's MAC
#
mac = [chr(0x00), chr(0x00), chr(0x00),
chr(0x33), chr(0x33), chr(0x33)]
mac_string = ''.join(mac)
self.vapi.sw_interface_set_mac_address(self.pg1.sw_if_index,
mac_string)
#
# now ARP requests come from the new source mac
#
rx = self.send_and_expect(self.pg0, [p1], self.pg1)
self.verify_arp_req(rx[0],
"00:00:00:33:33:33",
self.pg1.local_ip4,
self.pg1._remote_hosts[2].ip4)
#
# packets to the resolved host also have the new source mac
#
rx = self.send_and_expect(self.pg0, [p0], self.pg1)
self.verify_ip(rx[0],
"00:00:00:33:33:33",
self.pg1.remote_hosts[1].mac,
self.pg0.remote_ip4,
self.pg1.remote_hosts[1].ip4)
#
# set the mac address on the inteface that does not have a
# configured subnet and thus no glean
#
self.vapi.sw_interface_set_mac_address(self.pg2.sw_if_index,
mac_string)
if __name__ == '__main__':
unittest.main(testRunner=VppTestRunner)

5
test/vpp_papi_provider.py
View File

@@ -639,6 +639,11 @@ class VppPapiProvider(object):
{'sw_if_index': sw_if_index,
'mtu': mtu})
def sw_interface_set_mac_address(self, sw_if_index, mac):
return self.api(self.papi.sw_interface_set_mac_address,
{'sw_if_index': sw_if_index,
'mac_address': mac})
def create_subif(self, sw_if_index, sub_id, outer_vlan, inner_vlan,
no_tags=0, one_tag=0, two_tags=0, dot1ad=0, exact_match=0,
default_sub=0, outer_vlan_id_any=0, inner_vlan_id_any=0):