summaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
authorJohn Lo <loj@cisco.com>2017-09-23 08:59:58 -0400
committerDave Barach <openvpp@barachs.net>2017-09-25 16:07:37 +0000
commit7e9743aef924093c9c25bdf445637434c190d31a (patch)
tree74367e3929a946465d9644ede6a21bd32ee197e5 /src/vnet
parent905c14af2b1464840cea201daed005cb30513683 (diff)
Fix sending GARP/NA on Bonded Interface Active/Backup Link Up/Down
For bonded interface in Active/Backup mode (mode 1), we need to send a GARP/NA packet, if IP address is present, on slave link state change to up or down to help with route convergence. The callback from DPDK happens in a separate thread so we need to make sure RPC call is used to signal the send_garp_na process in the main thread. Also need to fix DPDK polling so the slave links are not polled. Change-Id: If5fd8ea2d28c54dd28726ac403ad366386ce9651 Signed-off-by: John Lo <loj@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/ethernet/arp.c38
-rw-r--r--src/vnet/ethernet/arp_packet.h9
2 files changed, 2 insertions, 45 deletions
diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c
index e974d2551e5..120a276cc0f 100644
--- a/src/vnet/ethernet/arp.c
+++ b/src/vnet/ethernet/arp.c
@@ -2482,7 +2482,7 @@ ethernet_arp_change_mac (u32 sw_if_index)
/* *INDENT-ON* */
}
-void static
+void
send_ip4_garp (vlib_main_t * vm, vnet_hw_interface_t * hi)
{
ip4_main_t *i4m = &ip4_main;
@@ -2526,42 +2526,6 @@ send_ip4_garp (vlib_main_t * vm, vnet_hw_interface_t * hi)
}
}
-static vlib_node_registration_t send_garp_na_proc_node;
-
-static uword
-send_garp_na_process (vlib_main_t * vm,
- vlib_node_runtime_t * rt, vlib_frame_t * f)
-{
- vnet_main_t *vnm = vnet_get_main ();
- uword event_type, *event_data = 0;
-
- send_garp_na_process_node_index = send_garp_na_proc_node.index;
-
- while (1)
- {
- vlib_process_wait_for_event (vm);
- event_type = vlib_process_get_events (vm, &event_data);
- if ((event_type == SEND_GARP_NA) && (vec_len (event_data) >= 1))
- {
- u32 hw_if_index = event_data[0];
- vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index);
- send_ip4_garp (vm, hi);
- send_ip6_na (vm, hi);
- }
- vec_reset_length (event_data);
- }
- return 0;
-}
-
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (send_garp_na_proc_node, static) = {
- .function = send_garp_na_process,
- .type = VLIB_NODE_TYPE_PROCESS,
- .name = "send-garp-na-process",
-};
-/* *INDENT-ON* */
-
/*
* fd.io coding-style-patch-verification: ON
*
diff --git a/src/vnet/ethernet/arp_packet.h b/src/vnet/ethernet/arp_packet.h
index d740b844e12..661f33f93af 100644
--- a/src/vnet/ethernet/arp_packet.h
+++ b/src/vnet/ethernet/arp_packet.h
@@ -167,14 +167,7 @@ typedef struct
ethernet_arp_ip4_entry_t *ip4_neighbor_entries (u32 sw_if_index);
u8 *format_ethernet_arp_ip4_entry (u8 * s, va_list * va);
-/* Node index for send_garp_na_process */
-extern u32 send_garp_na_process_node_index;
-
-/* Even type for send_garp_na_process */
-enum
-{
- SEND_GARP_NA = 1,
-} dpdk_send_garp_na_process_event_t;
+void send_ip4_garp (vlib_main_t * vm, vnet_hw_interface_t * hi);
#endif /* included_ethernet_arp_packet_h */