X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fethernet%2Farp.c;h=6b1069ecb6dc6a91ea04c775b82b7071de6c4f94;hb=9db6ada77;hp=a17f7dae02b0f14924690a46b16c27d5c89a3b94;hpb=084606befb45507e9241b5555f86196fe08530f6;p=vpp.git diff --git a/src/vnet/ethernet/arp.c b/src/vnet/ethernet/arp.c index a17f7dae02b..6b1069ecb6d 100644 --- a/src/vnet/ethernet/arp.c +++ b/src/vnet/ethernet/arp.c @@ -16,6 +16,7 @@ */ #include +#include #include #include #include @@ -26,6 +27,9 @@ #include #include #include +#include + +#include /** * @file @@ -36,8 +40,6 @@ */ -void vl_api_rpc_call_main_thread (void *fp, u8 * data, u32 data_length); - /** * @brief Per-interface ARP configuration and state */ @@ -48,6 +50,14 @@ typedef struct ethernet_arp_interface_t_ * Since this hash table is per-interface, the key is only the IPv4 address. */ uword *arp_entries; + /** + * Is ARP enabled on this interface + */ + u32 enabled; + /** + * Is Proxy ARP enabled on this interface + */ + u32 proxy_enabled; } ethernet_arp_interface_t; typedef struct @@ -64,7 +74,7 @@ typedef struct uword type_opaque; uword data; /* Used for arp event notification only */ - void *data_callback; + arp_change_event_cb_t data_callback; u32 pid; } pending_resolution_t; @@ -95,6 +105,9 @@ typedef struct uword wc_ip4_arp_publisher_node; uword wc_ip4_arp_publisher_et; + + /* ARP feature arc index */ + u8 feature_arc_index; } ethernet_arp_main_t; static ethernet_arp_main_t ethernet_arp_main; @@ -102,10 +115,10 @@ static ethernet_arp_main_t ethernet_arp_main; typedef struct { u32 sw_if_index; - ethernet_arp_ip4_over_ethernet_address_t a; - int is_static; - int is_no_fib_entry; - int flags; + ip4_address_t ip4; + mac_address_t mac; + ip_neighbor_flags_t nbr_flags; + u32 flags; #define ETHERNET_ARP_ARGS_REMOVE (1<<0) #define ETHERNET_ARP_ARGS_FLUSH (1<<1) #define ETHERNET_ARP_ARGS_POPULATE (1<<2) @@ -225,9 +238,9 @@ format_ethernet_arp_header (u8 * s, va_list * va) { s = format (s, "\n%U%U/%U -> %U/%U", format_white_space, indent, - format_ethernet_address, a->ip4_over_ethernet[0].ethernet, + format_mac_address_t, &a->ip4_over_ethernet[0].mac, format_ip4_address, &a->ip4_over_ethernet[0].ip4, - format_ethernet_address, a->ip4_over_ethernet[1].ethernet, + format_mac_address_t, &a->ip4_over_ethernet[1].mac, format_ip4_address, &a->ip4_over_ethernet[1].ip4); } else @@ -251,7 +264,6 @@ format_ethernet_arp_ip4_entry (u8 * s, va_list * va) vnet_main_t *vnm = va_arg (*va, vnet_main_t *); ethernet_arp_ip4_entry_t *e = va_arg (*va, ethernet_arp_ip4_entry_t *); vnet_sw_interface_t *si; - u8 *flags = 0; if (!e) return format (s, "%=12s%=16s%=6s%=20s%=24s", "Time", "IP4", @@ -259,24 +271,12 @@ format_ethernet_arp_ip4_entry (u8 * s, va_list * va) si = vnet_get_sw_interface (vnm, e->sw_if_index); - if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC) - flags = format (flags, "S"); - - if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC) - flags = format (flags, "D"); - - if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_NO_FIB_ENTRY) - flags = format (flags, "N"); - - s = format (s, "%=12U%=16U%=6s%=20U%U", - format_vlib_time, vnm->vlib_main, e->time_last_updated, - format_ip4_address, &e->ip4_address, - flags ? (char *) flags : "", - format_ethernet_address, e->ethernet_address, - format_vnet_sw_interface_name, vnm, si); - - vec_free (flags); - return s; + return format (s, "%=12U%=16U%=6U%=20U%U", + format_vlib_time, vnm->vlib_main, e->time_last_updated, + format_ip4_address, &e->ip4_address, + format_ip_neighbor_flags, e->flags, + format_mac_address_t, &e->mac, + format_vnet_sw_interface_name, vnm, si); } typedef struct @@ -357,8 +357,7 @@ arp_nbr_probe (ip_adjacency_t * adj) hi = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index); - clib_memcpy (h->ip4_over_ethernet[0].ethernet, - hi->hw_address, sizeof (h->ip4_over_ethernet[0].ethernet)); + mac_address_from_bytes (&h->ip4_over_ethernet[0].mac, hi->hw_address); h->ip4_over_ethernet[0].ip4 = src[0]; h->ip4_over_ethernet[1].ip4 = adj->sub_type.nbr.next_hop.ip4; @@ -387,7 +386,7 @@ arp_mk_complete (adj_index_t ai, ethernet_arp_ip4_entry_t * e) (ai, ADJ_NBR_REWRITE_FLAG_COMPLETE, ethernet_build_rewrite (vnet_get_main (), e->sw_if_index, - adj_get_link_type (ai), e->ethernet_address)); + adj_get_link_type (ai), &e->mac)); } static void @@ -441,6 +440,81 @@ arp_mk_incomplete_walk (adj_index_t ai, void *ctx) return (ADJ_WALK_RC_CONTINUE); } +static int +arp_is_enabled (ethernet_arp_main_t * am, u32 sw_if_index) +{ + if (vec_len (am->ethernet_arp_by_sw_if_index) <= sw_if_index) + return 0; + + return (am->ethernet_arp_by_sw_if_index[sw_if_index].enabled); +} + +static void +arp_enable (ethernet_arp_main_t * am, u32 sw_if_index) +{ + if (arp_is_enabled (am, sw_if_index)) + return; + + vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index); + + am->ethernet_arp_by_sw_if_index[sw_if_index].enabled = 1; + + vnet_feature_enable_disable ("arp", "arp-reply", sw_if_index, 1, NULL, 0); + vnet_feature_enable_disable ("arp", "arp-disabled", sw_if_index, 0, NULL, + 0); +} + +static int +vnet_arp_flush_ip4_over_ethernet_internal (vnet_main_t * vnm, + vnet_arp_set_ip4_over_ethernet_rpc_args_t + * args); + +static void +arp_disable (ethernet_arp_main_t * am, u32 sw_if_index) +{ + ethernet_arp_interface_t *eai; + ethernet_arp_ip4_entry_t *e; + u32 i, *to_delete = 0; + hash_pair_t *pair; + + if (!arp_is_enabled (am, sw_if_index)) + return; + + vnet_feature_enable_disable ("arp", "arp-disabled", sw_if_index, 1, NULL, + 0); + vnet_feature_enable_disable ("arp", "arp-reply", sw_if_index, 0, NULL, 0); + + eai = &am->ethernet_arp_by_sw_if_index[sw_if_index]; + + + /* *INDENT-OFF* */ + hash_foreach_pair (pair, eai->arp_entries, + ({ + e = pool_elt_at_index(am->ip4_entry_pool, + pair->value[0]); + vec_add1 (to_delete, e - am->ip4_entry_pool); + })); + /* *INDENT-ON* */ + + for (i = 0; i < vec_len (to_delete); i++) + { + e = pool_elt_at_index (am->ip4_entry_pool, to_delete[i]); + + vnet_arp_set_ip4_over_ethernet_rpc_args_t delme = { + .ip4.as_u32 = e->ip4_address.as_u32, + .sw_if_index = e->sw_if_index, + .flags = ETHERNET_ARP_ARGS_FLUSH, + }; + mac_address_copy (&delme.mac, &e->mac); + + vnet_arp_flush_ip4_over_ethernet_internal (vnet_get_main (), &delme); + } + + vec_free (to_delete); + + eai->enabled = 0; +} + void arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) { @@ -451,7 +525,7 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) adj = adj_get (ai); - vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index); + arp_enable (am, sw_if_index); arp_int = &am->ethernet_arp_by_sw_if_index[sw_if_index]; e = arp_entry_find (arp_int, &adj->sub_type.nbr.next_hop.ip4); @@ -492,6 +566,15 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) arp_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_IP4, + VNET_REWRITE_FOR_SW_INTERFACE_ADDRESS_BROADCAST)); + break; case IP_LOOKUP_NEXT_MCAST: { /* @@ -510,7 +593,7 @@ arp_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai) * Complete the remaining fields of the adj's rewrite to direct the * complete of the rewrite at switch time by copying in the IP * dst address's bytes. - * Ofset is 2 bytes into the MAC desintation address. + * Offset is 2 bytes into the MAC destination address. */ adj_mcast_update_rewrite (ai, rewrite, offset); @@ -547,7 +630,7 @@ arp_adj_fib_add (ethernet_arp_ip4_entry_t * e, u32 fib_index) fib_table_lock (fib_index, FIB_PROTOCOL_IP4, FIB_SOURCE_ADJ); } -void +static void arp_adj_fib_remove (ethernet_arp_ip4_entry_t * e, u32 fib_index) { if (FIB_NODE_INDEX_INVALID != e->fib_entry_index) @@ -590,7 +673,7 @@ force_reuse_arp_entry (void) am->arp_delete_rotor = index; index = pool_next_index (am->ip4_entry_pool, index); } - while (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC); + while (e->flags & IP_NEIGHBOR_FLAG_STATIC); /* Remove ARP entry from its interface and update fib */ hash_unset @@ -599,7 +682,7 @@ force_reuse_arp_entry (void) arp_adj_fib_remove (e, ip4_fib_table_get_index_for_sw_if_index (e->sw_if_index)); adj_nbr_walk_nh4 (e->sw_if_index, - &e->ip4_address, arp_mk_incomplete_walk, NULL); + &e->ip4_address, arp_mk_incomplete_walk, e); return e; } @@ -610,30 +693,33 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm, { ethernet_arp_ip4_entry_t *e = 0; ethernet_arp_main_t *am = ðernet_arp_main; - ethernet_arp_ip4_over_ethernet_address_t *a = &args->a; vlib_main_t *vm = vlib_get_main (); int make_new_arp_cache_entry = 1; uword *p; pending_resolution_t *pr, *mc; ethernet_arp_interface_t *arp_int; - int is_static = args->is_static; u32 sw_if_index = args->sw_if_index; - int is_no_fib_entry = args->is_no_fib_entry; - vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index); + arp_enable (am, sw_if_index); arp_int = &am->ethernet_arp_by_sw_if_index[sw_if_index]; if (NULL != arp_int->arp_entries) { - p = hash_get (arp_int->arp_entries, a->ip4.as_u32); + p = hash_get (arp_int->arp_entries, args->ip4.as_u32); if (p) { e = pool_elt_at_index (am->ip4_entry_pool, p[0]); /* Refuse to over-write static arp. */ - if (!is_static && (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC)) - return -2; + if (!(args->nbr_flags & IP_NEIGHBOR_FLAG_STATIC) && + (e->flags & IP_NEIGHBOR_FLAG_STATIC)) + { + /* if MAC address match, still check to send event */ + if (mac_address_equal (&e->mac, &args->mac)) + goto check_customers; + return -2; + } make_new_arp_cache_entry = 0; } } @@ -653,15 +739,15 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm, if (NULL == arp_int->arp_entries) arp_int->arp_entries = hash_create (0, sizeof (u32)); - hash_set (arp_int->arp_entries, a->ip4.as_u32, e - am->ip4_entry_pool); + hash_set (arp_int->arp_entries, args->ip4.as_u32, + e - am->ip4_entry_pool); e->sw_if_index = sw_if_index; - e->ip4_address = a->ip4; + e->ip4_address = args->ip4; e->fib_entry_index = FIB_NODE_INDEX_INVALID; - clib_memcpy (e->ethernet_address, - a->ethernet, sizeof (e->ethernet_address)); + mac_address_copy (&e->mac, &args->mac); - if (!is_no_fib_entry) + if (!(args->nbr_flags & IP_NEIGHBOR_FLAG_NO_FIB_ENTRY)) { arp_adj_fib_add (e, ip4_fib_table_get_index_for_sw_if_index @@ -669,7 +755,7 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm, } else { - e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_NO_FIB_ENTRY; + e->flags |= IP_NEIGHBOR_FLAG_NO_FIB_ENTRY; } } else @@ -678,35 +764,34 @@ vnet_arp_set_ip4_over_ethernet_internal (vnet_main_t * vnm, * prevent a DoS attack from the data-plane that * spams us with no-op updates to the MAC address */ - if (0 == memcmp (e->ethernet_address, - a->ethernet, sizeof (e->ethernet_address))) + if (mac_address_equal (&e->mac, &args->mac)) { e->time_last_updated = vlib_time_now (vm); goto check_customers; } - /* Update time stamp and ethernet address. */ - clib_memcpy (e->ethernet_address, a->ethernet, - sizeof (e->ethernet_address)); + /* Update ethernet address. */ + mac_address_copy (&e->mac, &args->mac); } + /* Update time stamp and flags. */ e->time_last_updated = vlib_time_now (vm); - if (is_static) + if (args->nbr_flags & IP_NEIGHBOR_FLAG_STATIC) { - e->flags &= ~ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC; - e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC; + e->flags &= ~IP_NEIGHBOR_FLAG_DYNAMIC; + e->flags |= IP_NEIGHBOR_FLAG_STATIC; } else { - e->flags &= ~ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC; - e->flags |= ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC; + e->flags &= ~IP_NEIGHBOR_FLAG_STATIC; + e->flags |= IP_NEIGHBOR_FLAG_DYNAMIC; } adj_nbr_walk_nh4 (sw_if_index, &e->ip4_address, arp_mk_complete_walk, e); check_customers: /* Customer(s) waiting for this address to be resolved? */ - p = hash_get (am->pending_resolutions_by_address, a->ip4.as_u32); + p = hash_get (am->pending_resolutions_by_address, args->ip4.as_u32); if (p) { u32 next_index; @@ -721,11 +806,11 @@ check_customers: pool_put (am->pending_resolutions, pr); } - hash_unset (am->pending_resolutions_by_address, a->ip4.as_u32); + hash_unset (am->pending_resolutions_by_address, args->ip4.as_u32); } /* Customer(s) requesting ARP event for this address? */ - p = hash_get (am->mac_changes_by_address, a->ip4.as_u32); + p = hash_get (am->mac_changes_by_address, args->ip4.as_u32); if (p) { u32 next_index; @@ -733,14 +818,12 @@ check_customers: while (next_index != (u32) ~ 0) { - int (*fp) (u32, u8 *, u32, u32); int rv = 1; mc = pool_elt_at_index (am->mac_changes, next_index); - fp = mc->data_callback; /* Call the user's data callback, return 1 to suppress dup events */ - if (fp) - rv = (*fp) (mc->data, a->ethernet, sw_if_index, 0); + if (mc->data_callback) + rv = (mc->data_callback) (mc->data, &args->mac, sw_if_index, 0); /* * Signal the resolver process, as long as the user @@ -789,7 +872,7 @@ vnet_register_ip4_arp_resolution_event (vnet_main_t * vnm, int vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm, - void *data_callback, + arp_change_event_cb_t data_callback, u32 pid, void *address_arg, uword node_index, @@ -818,11 +901,17 @@ vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm, return VNET_API_ERROR_ENTRY_ALREADY_EXISTS; pool_get (am->mac_changes, mc); + /* *INDENT-OFF* */ *mc = (pending_resolution_t) { - .next_index = ~0,.node_index = node_index,.type_opaque = - type_opaque,.data = data,.data_callback = data_callback,.pid = - pid,}; + .next_index = ~0, + .node_index = node_index, + .type_opaque = type_opaque, + .data = data, + .data_callback = data_callback, + .pid = pid, + }; + /* *INDENT-ON* */ /* Insert new resolution at the end of the list */ u32 new_idx = mc - am->mac_changes; @@ -837,9 +926,9 @@ vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm, return VNET_API_ERROR_NO_SUCH_ENTRY; /* Clients may need to clean up pool entries, too */ - void (*fp) (u32, u8 *) = data_callback; - if (fp) - (*fp) (mc->data, 0 /* no new mac addrs */ ); + if (data_callback) + /* no new mac addrs */ + (data_callback) (mc->data, NULL, ~0, NULL); /* Remove the entry from the list and delete the entry */ *p = mc->next_index; @@ -855,10 +944,10 @@ vnet_add_del_ip4_arp_change_event (vnet_main_t * vnm, /* Either we drop the packet or we send a reply to the sender. */ typedef enum { - ARP_INPUT_NEXT_DROP, - ARP_INPUT_NEXT_REPLY_TX, - ARP_INPUT_N_NEXT, -} arp_input_next_t; + ARP_REPLY_NEXT_DROP, + ARP_REPLY_NEXT_REPLY_TX, + ARP_REPLY_N_NEXT, +} arp_reply_next_t; #define foreach_ethernet_arp_error \ _ (replies_sent, "ARP replies sent") \ @@ -876,6 +965,7 @@ typedef enum _ (gratuitous_arp, "ARP probe or announcement dropped") \ _ (interface_no_table, "Interface is not mapped to an IP table") \ _ (interface_not_ip_enabled, "Interface is not IP enabled") \ + _ (unnumbered_mismatch, "RX interface is unnumbered to different subnet") \ typedef enum { @@ -883,7 +973,7 @@ typedef enum foreach_ethernet_arp_error #undef _ ETHERNET_ARP_N_ERROR, -} ethernet_arp_input_error_t; +} ethernet_arp_reply_error_t; static int arp_unnumbered (vlib_buffer_t * p0, @@ -912,20 +1002,25 @@ arp_unnumbered (vlib_buffer_t * p0, static u32 arp_learn (vnet_main_t * vnm, - ethernet_arp_main_t * am, u32 sw_if_index, void *addr) + ethernet_arp_main_t * am, u32 sw_if_index, + const ethernet_arp_ip4_over_ethernet_address_t * addr) { - vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index, addr, 0, 0); + vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index, addr, 0); return (ETHERNET_ARP_ERROR_l3_src_address_learned); } +typedef enum arp_input_next_t_ +{ + ARP_INPUT_NEXT_DROP, + ARP_INPUT_NEXT_DISABLED, + ARP_INPUT_N_NEXT, +} arp_input_next_t; + static uword arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) { + u32 n_left_from, next_index, *from, *to_next, n_left_to_next; ethernet_arp_main_t *am = ðernet_arp_main; - vnet_main_t *vnm = vnet_get_main (); - ip4_main_t *im4 = &ip4_main; - u32 n_left_from, next_index, *from, *to_next; - u32 n_replies_sent = 0, n_proxy_arp_replies_sent = 0; from = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; @@ -938,42 +1033,26 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) while (n_left_from > 0) { - u32 n_left_to_next; - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); while (n_left_from > 0 && n_left_to_next > 0) { + const ethernet_arp_header_t *arp0; + arp_input_next_t next0; vlib_buffer_t *p0; - vnet_hw_interface_t *hw_if0; - ethernet_arp_header_t *arp0; - ethernet_header_t *eth_rx, *eth_tx; - ip4_address_t *if_addr0, proxy_src; - u32 pi0, error0, next0, sw_if_index0, conn_sw_if_index0, fib_index0; - u8 is_request0, dst_is_local0, is_unnum0, is_vrrp_reply0; - ethernet_proxy_arp_t *pa; - fib_node_index_t dst_fei, src_fei; - fib_prefix_t pfx0; - fib_entry_flag_t src_flags, dst_flags; - u8 *rewrite0, rewrite0_len; + u32 pi0, error0; - pi0 = from[0]; - to_next[0] = pi0; + pi0 = to_next[0] = from[0]; from += 1; to_next += 1; n_left_from -= 1; n_left_to_next -= 1; - pa = 0; p0 = vlib_get_buffer (vm, pi0); arp0 = vlib_buffer_get_current (p0); - /* Fill in ethernet header. */ - eth_rx = ethernet_buffer_get_header (p0); - - is_request0 = arp0->opcode - == clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request); error0 = ETHERNET_ARP_ERROR_replies_sent; + next0 = ARP_INPUT_NEXT_DROP; error0 = (arp0->l2_type != @@ -987,33 +1066,239 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) (0 == arp0->ip4_over_ethernet[0].ip4.as_u32 ? ETHERNET_ARP_ERROR_l3_dst_address_unset : error0); - sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX]; + if (ETHERNET_ARP_ERROR_replies_sent == error0) + { + next0 = ARP_INPUT_NEXT_DISABLED; + vnet_feature_arc_start (am->feature_arc_index, + vnet_buffer (p0)->sw_if_index[VLIB_RX], + &next0, p0); + } + else + p0->error = node->errors[error0]; - /* not playing the ARP game if the interface is not IPv4 enabled */ - error0 = - (im4->ip_enabled_by_sw_if_index[sw_if_index0] == 0 ? - ETHERNET_ARP_ERROR_interface_not_ip_enabled : error0); + vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, + n_left_to_next, pi0, next0); + } - if (error0) - goto drop2; + vlib_put_next_frame (vm, node, next_index, n_left_to_next); + } + + return frame->n_vectors; +} + +typedef enum arp_disabled_next_t_ +{ + ARP_DISABLED_NEXT_DROP, + ARP_DISABLED_N_NEXT, +} arp_disabled_next_t; + +#define foreach_arp_disabled_error \ + _ (DISABLED, "ARP Disabled on this interface") \ + +typedef enum +{ +#define _(sym,string) ARP_DISABLED_ERROR_##sym, + foreach_arp_disabled_error +#undef _ + ARP_DISABLED_N_ERROR, +} arp_disabled_error_t; + +static char *arp_disabled_error_strings[] = { +#define _(sym,string) string, + foreach_arp_disabled_error +#undef _ +}; + +static uword +arp_disabled (vlib_main_t * vm, + vlib_node_runtime_t * node, vlib_frame_t * frame) +{ + u32 n_left_from, next_index, *from, *to_next, n_left_to_next; + + from = vlib_frame_vector_args (frame); + n_left_from = frame->n_vectors; + next_index = node->cached_next_index; + + if (node->flags & VLIB_NODE_FLAG_TRACE) + vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors, + /* stride */ 1, + sizeof (ethernet_arp_input_trace_t)); + + while (n_left_from > 0) + { + vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); + + while (n_left_from > 0 && n_left_to_next > 0) + { + arp_disabled_next_t next0 = ARP_DISABLED_NEXT_DROP; + vlib_buffer_t *p0; + u32 pi0, error0; + + next0 = ARP_DISABLED_NEXT_DROP; + error0 = ARP_DISABLED_ERROR_DISABLED; + + pi0 = to_next[0] = from[0]; + from += 1; + to_next += 1; + n_left_from -= 1; + n_left_to_next -= 1; + + p0 = vlib_get_buffer (vm, pi0); + p0->error = node->errors[error0]; + + vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, + n_left_to_next, pi0, next0); + } + + vlib_put_next_frame (vm, node, next_index, n_left_to_next); + } + + return frame->n_vectors; +} + +static_always_inline u32 +arp_mk_reply (vnet_main_t * vnm, + vlib_buffer_t * p0, + u32 sw_if_index0, + const ip4_address_t * if_addr0, + ethernet_arp_header_t * arp0, ethernet_header_t * eth_rx) +{ + vnet_hw_interface_t *hw_if0; + u8 *rewrite0, rewrite0_len; + ethernet_header_t *eth_tx; + u32 next0; + + /* Send a reply. + An adjacency to the sender is not always present, + so we use the interface to build us a rewrite string + which will contain all the necessary tags. */ + rewrite0 = ethernet_build_rewrite (vnm, sw_if_index0, + VNET_LINK_ARP, eth_rx->src_address); + rewrite0_len = vec_len (rewrite0); + + /* Figure out how much to rewind current data from adjacency. */ + vlib_buffer_advance (p0, -rewrite0_len); + eth_tx = vlib_buffer_get_current (p0); + + vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0; + hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0); + + /* Send reply back through input interface */ + vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0; + next0 = ARP_REPLY_NEXT_REPLY_TX; + + arp0->opcode = clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply); + + arp0->ip4_over_ethernet[1] = arp0->ip4_over_ethernet[0]; + + mac_address_from_bytes (&arp0->ip4_over_ethernet[0].mac, + hw_if0->hw_address); + clib_mem_unaligned (&arp0->ip4_over_ethernet[0].ip4.data_u32, u32) = + if_addr0->data_u32; + + /* Hardware must be ethernet-like. */ + ASSERT (vec_len (hw_if0->hw_address) == 6); + + /* the rx nd tx ethernet headers wil overlap in the case + * when we received a tagged VLAN=0 packet, but we are sending + * back untagged */ + clib_memcpy_fast (eth_tx, rewrite0, vec_len (rewrite0)); + vec_free (rewrite0); + + return (next0); +} + +enum arp_dst_fib_type +{ + ARP_DST_FIB_NONE, + ARP_DST_FIB_ADJ, + ARP_DST_FIB_CONN +}; + +/* + * we're looking for FIB sources that indicate the destination + * is attached. There may be interposed DPO prior to the one + * we are looking for + */ +static enum arp_dst_fib_type +arp_dst_fib_check (const fib_node_index_t fei, fib_entry_flag_t * flags) +{ + const fib_entry_t *entry = fib_entry_get (fei); + const fib_entry_src_t *entry_src; + fib_source_t src; + /* *INDENT-OFF* */ + FOR_EACH_SRC_ADDED(entry, entry_src, src, + ({ + *flags = fib_entry_get_flags_for_source (fei, src); + if (fib_entry_is_sourced (fei, FIB_SOURCE_ADJ)) + return ARP_DST_FIB_ADJ; + else if (FIB_ENTRY_FLAG_CONNECTED & *flags) + return ARP_DST_FIB_CONN; + })) + /* *INDENT-ON* */ + + return ARP_DST_FIB_NONE; +} + +static uword +arp_reply (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) +{ + ethernet_arp_main_t *am = ðernet_arp_main; + vnet_main_t *vnm = vnet_get_main (); + u32 n_left_from, next_index, *from, *to_next; + u32 n_replies_sent = 0; + + from = vlib_frame_vector_args (frame); + n_left_from = frame->n_vectors; + next_index = node->cached_next_index; + + if (node->flags & VLIB_NODE_FLAG_TRACE) + vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors, + /* stride */ 1, + sizeof (ethernet_arp_input_trace_t)); + + while (n_left_from > 0) + { + u32 n_left_to_next; + + vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); + + while (n_left_from > 0 && n_left_to_next > 0) + { + vlib_buffer_t *p0; + ethernet_arp_header_t *arp0; + ethernet_header_t *eth_rx; + const ip4_address_t *if_addr0; + u32 pi0, error0, next0, sw_if_index0, conn_sw_if_index0, fib_index0; + u8 dst_is_local0, is_vrrp_reply0; + fib_node_index_t dst_fei, src_fei; + const fib_prefix_t *pfx0; + fib_entry_flag_t src_flags, dst_flags; + + pi0 = from[0]; + to_next[0] = pi0; + from += 1; + to_next += 1; + n_left_from -= 1; + n_left_to_next -= 1; + + p0 = vlib_get_buffer (vm, pi0); + arp0 = vlib_buffer_get_current (p0); + /* Fill in ethernet header. */ + eth_rx = ethernet_buffer_get_header (p0); + + next0 = ARP_REPLY_NEXT_DROP; + error0 = ETHERNET_ARP_ERROR_replies_sent; + sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX]; /* Check that IP address is local and matches incoming interface. */ fib_index0 = ip4_fib_table_get_index_for_sw_if_index (sw_if_index0); if (~0 == fib_index0) { error0 = ETHERNET_ARP_ERROR_interface_no_table; - goto drop2; + goto drop; } - dst_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0), - &arp0->ip4_over_ethernet[1].ip4, - 32); - dst_flags = fib_entry_get_flags (dst_fei); - - conn_sw_if_index0 = fib_entry_get_resolving_interface (dst_fei); - - /* Honor unnumbered interface, if any */ - is_unnum0 = sw_if_index0 != conn_sw_if_index0; { /* @@ -1025,9 +1310,9 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) * to reach us, they only affect how we reach the sender. */ fib_entry_t *src_fib_entry; + const fib_prefix_t *pfx; fib_entry_src_t *src; fib_source_t source; - fib_prefix_t pfx; int attached; int mask; @@ -1067,7 +1352,7 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) * So don't drop immediately here, instead go see if this * is a proxy ARP case. */ - goto drop1; + goto next_feature; } /* A Source must also be local to subnet of matching * interface address. */ @@ -1090,8 +1375,8 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) /* * shorter mask lookup for the next iteration. */ - fib_entry_get_prefix (src_fei, &pfx); - mask = pfx.fp_len - 1; + pfx = fib_entry_get_prefix (src_fei); + mask = pfx->fp_len - 1; /* * continue until we hit the default route or we find @@ -1112,12 +1397,16 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) * (i.e. a /32) */ error0 = ETHERNET_ARP_ERROR_l3_src_address_not_local; - goto drop2; + goto drop; } } - if (fib_entry_is_sourced (dst_fei, FIB_SOURCE_ADJ)) + dst_fei = ip4_fib_table_lookup (ip4_fib_get (fib_index0), + &arp0->ip4_over_ethernet[1].ip4, + 32); + switch (arp_dst_fib_check (dst_fei, &dst_flags)) { + case ARP_DST_FIB_ADJ: /* * We matched an adj-fib on ths source subnet (a /32 previously * added as a result of ARP). If this request is a gratuitous @@ -1130,45 +1419,37 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) arp0->ip4_over_ethernet[1].ip4.as_u32) error0 = arp_learn (vnm, am, sw_if_index0, &arp0->ip4_over_ethernet[0]); - goto drop2; - } - else if (!(FIB_ENTRY_FLAG_CONNECTED & dst_flags)) - { + goto drop; + case ARP_DST_FIB_CONN: + /* destination is connected, continue to process */ + break; + case ARP_DST_FIB_NONE: + /* destination is not connected, stop here */ error0 = ETHERNET_ARP_ERROR_l3_dst_address_not_local; - goto drop1; - } - - if (sw_if_index0 != fib_entry_get_resolving_interface (src_fei)) - { - /* - * The interface the ARP was received on is not the interface - * on which the covering prefix is configured. Maybe this is a - * case for unnumbered. - */ - is_unnum0 = 1; + goto next_feature; } dst_is_local0 = (FIB_ENTRY_FLAG_LOCAL & dst_flags); - fib_entry_get_prefix (dst_fei, &pfx0); - if_addr0 = &pfx0.fp_addr.ip4; + pfx0 = fib_entry_get_prefix (dst_fei); + if_addr0 = &pfx0->fp_addr.ip4; is_vrrp_reply0 = ((arp0->opcode == clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply)) && (!memcmp - (arp0->ip4_over_ethernet[0].ethernet, vrrp_prefix, + (arp0->ip4_over_ethernet[0].mac.bytes, vrrp_prefix, sizeof (vrrp_prefix)))); /* Trash ARP packets whose ARP-level source addresses do not match their L2-frame-level source addresses, unless it's a reply from a VRRP virtual router */ - if (memcmp - (eth_rx->src_address, arp0->ip4_over_ethernet[0].ethernet, - sizeof (eth_rx->src_address)) && !is_vrrp_reply0) + if (!ethernet_mac_address_equal + (eth_rx->src_address, + arp0->ip4_over_ethernet[0].mac.bytes) && !is_vrrp_reply0) { error0 = ETHERNET_ARP_ERROR_l2_address_mismatch; - goto drop2; + goto drop; } /* Learn or update sender's mapping only for replies to addresses @@ -1185,62 +1466,40 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) * we drop */ error0 = ETHERNET_ARP_ERROR_l3_dst_address_not_local; - goto drop1; + goto next_feature; } else if (arp0->opcode == clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request) && (dst_is_local0 == 0)) { - goto drop1; + goto next_feature; } - send_reply: - /* Send a reply. - An adjacency to the sender is not always present, - so we use the interface to build us a rewrite string - which will contain all the necessary tags. */ - rewrite0 = ethernet_build_rewrite (vnm, sw_if_index0, - VNET_LINK_ARP, - eth_rx->src_address); - rewrite0_len = vec_len (rewrite0); - - /* Figure out how much to rewind current data from adjacency. */ - vlib_buffer_advance (p0, -rewrite0_len); - eth_tx = vlib_buffer_get_current (p0); - - vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0; - hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index0); - - /* Send reply back through input interface */ - vnet_buffer (p0)->sw_if_index[VLIB_TX] = sw_if_index0; - next0 = ARP_INPUT_NEXT_REPLY_TX; - - arp0->opcode = clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply); - - arp0->ip4_over_ethernet[1] = arp0->ip4_over_ethernet[0]; - - clib_memcpy (arp0->ip4_over_ethernet[0].ethernet, - hw_if0->hw_address, 6); - clib_mem_unaligned (&arp0->ip4_over_ethernet[0].ip4.data_u32, u32) = - if_addr0->data_u32; - - /* Hardware must be ethernet-like. */ - ASSERT (vec_len (hw_if0->hw_address) == 6); - - /* the rx nd tx ethernet headers wil overlap in the case - * when we received a tagged VLAN=0 packet, but we are sending - * back untagged */ - clib_memcpy (eth_tx, rewrite0, vec_len (rewrite0)); - vec_free (rewrite0); - - if (NULL == pa) + /* Honor unnumbered interface, if any */ + conn_sw_if_index0 = fib_entry_get_resolving_interface (dst_fei); + if (sw_if_index0 != conn_sw_if_index0 || + sw_if_index0 != fib_entry_get_resolving_interface (src_fei)) { - if (is_unnum0) + /* + * The interface the ARP is sent to or was received on is not the + * interface on which the covering prefix is configured. + * Maybe this is a case for unnumbered. + */ + if (!arp_unnumbered (p0, sw_if_index0, conn_sw_if_index0)) { - if (!arp_unnumbered (p0, sw_if_index0, conn_sw_if_index0)) - goto drop2; + error0 = ETHERNET_ARP_ERROR_unnumbered_mismatch; + goto drop; } } + if (arp0->ip4_over_ethernet[0].ip4.as_u32 == + arp0->ip4_over_ethernet[1].ip4.as_u32) + { + error0 = ETHERNET_ARP_ERROR_gratuitous_arp; + goto drop; + } + + next0 = arp_mk_reply (vnm, p0, sw_if_index0, + if_addr0, arp0, eth_rx); /* We are going to reply to this request, so, in the absence of errors, learn the sender */ @@ -1248,34 +1507,92 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) error0 = arp_learn (vnm, am, sw_if_index0, &arp0->ip4_over_ethernet[1]); + n_replies_sent += 1; + goto enqueue; + + next_feature: + vnet_feature_next (&next0, p0); + goto enqueue; + + drop: + p0->error = node->errors[error0]; + + enqueue: vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, pi0, next0); + } - n_replies_sent += 1; - continue; + vlib_put_next_frame (vm, node, next_index, n_left_to_next); + } - drop1: - if (arp0->ip4_over_ethernet[0].ip4.as_u32 == - arp0->ip4_over_ethernet[1].ip4.as_u32) + vlib_error_count (vm, node->node_index, + ETHERNET_ARP_ERROR_replies_sent, n_replies_sent); + + return frame->n_vectors; +} + +static uword +arp_proxy (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) +{ + ethernet_arp_main_t *am = ðernet_arp_main; + vnet_main_t *vnm = vnet_get_main (); + u32 n_left_from, next_index, *from, *to_next; + u32 n_arp_replies_sent = 0; + + from = vlib_frame_vector_args (frame); + n_left_from = frame->n_vectors; + next_index = node->cached_next_index; + + if (node->flags & VLIB_NODE_FLAG_TRACE) + vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors, + /* stride */ 1, + sizeof (ethernet_arp_input_trace_t)); + + while (n_left_from > 0) + { + u32 n_left_to_next; + + vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); + + while (n_left_from > 0 && n_left_to_next > 0) + { + vlib_buffer_t *p0; + ethernet_arp_header_t *arp0; + ethernet_header_t *eth_rx; + ip4_address_t proxy_src; + u32 pi0, error0, next0, sw_if_index0, fib_index0; + u8 is_request0; + ethernet_proxy_arp_t *pa; + + pi0 = from[0]; + to_next[0] = pi0; + from += 1; + to_next += 1; + n_left_from -= 1; + n_left_to_next -= 1; + + p0 = vlib_get_buffer (vm, pi0); + arp0 = vlib_buffer_get_current (p0); + /* Fill in ethernet header. */ + eth_rx = ethernet_buffer_get_header (p0); + + is_request0 = arp0->opcode + == clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request); + + error0 = ETHERNET_ARP_ERROR_replies_sent; + sw_if_index0 = vnet_buffer (p0)->sw_if_index[VLIB_RX]; + next0 = ARP_REPLY_NEXT_DROP; + + fib_index0 = ip4_fib_table_get_index_for_sw_if_index (sw_if_index0); + if (~0 == fib_index0) { - error0 = ETHERNET_ARP_ERROR_gratuitous_arp; - goto drop2; + error0 = ETHERNET_ARP_ERROR_interface_no_table; } - /* See if proxy arp is configured for the address */ - if (is_request0) + + if (0 == error0 && is_request0) { - vnet_sw_interface_t *si; u32 this_addr = clib_net_to_host_u32 (arp0->ip4_over_ethernet[1].ip4.as_u32); - u32 fib_index0; - - si = vnet_get_sw_interface (vnm, sw_if_index0); - - if (!(si->flags & VNET_SW_INTERFACE_FLAG_PROXY_ARP)) - goto drop2; - - fib_index0 = vec_elt (im4->fib_index_by_sw_if_index, - sw_if_index0); vec_foreach (pa, am->proxy_arps) { @@ -1292,18 +1609,18 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) /* * change the interface address to the proxied */ - if_addr0 = &proxy_src; - is_unnum0 = 0; - n_proxy_arp_replies_sent++; - goto send_reply; + n_arp_replies_sent++; + + next0 = + arp_mk_reply (vnm, p0, sw_if_index0, &proxy_src, arp0, + eth_rx); } } } - - drop2: - - next0 = ARP_INPUT_NEXT_DROP; - p0->error = node->errors[error0]; + else + { + p0->error = node->errors[error0]; + } vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, n_left_to_next, pi0, next0); @@ -1313,37 +1630,120 @@ arp_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame) } vlib_error_count (vm, node->node_index, - ETHERNET_ARP_ERROR_replies_sent, - n_replies_sent - n_proxy_arp_replies_sent); + ETHERNET_ARP_ERROR_replies_sent, n_arp_replies_sent); - vlib_error_count (vm, node->node_index, - ETHERNET_ARP_ERROR_proxy_arp_replies_sent, - n_proxy_arp_replies_sent); return frame->n_vectors; } -static char *ethernet_arp_error_strings[] = { -#define _(sym,string) string, - foreach_ethernet_arp_error -#undef _ +static char *ethernet_arp_error_strings[] = { +#define _(sym,string) string, + foreach_ethernet_arp_error +#undef _ +}; + +/* *INDENT-OFF* */ + +VLIB_REGISTER_NODE (arp_input_node, static) = +{ + .function = arp_input, + .name = "arp-input", + .vector_size = sizeof (u32), + .n_errors = ETHERNET_ARP_N_ERROR, + .error_strings = ethernet_arp_error_strings, + .n_next_nodes = ARP_INPUT_N_NEXT, + .next_nodes = { + [ARP_INPUT_NEXT_DROP] = "error-drop", + [ARP_INPUT_NEXT_DISABLED] = "arp-disabled", + }, + .format_buffer = format_ethernet_arp_header, + .format_trace = format_ethernet_arp_input_trace, +}; + +VLIB_REGISTER_NODE (arp_disabled_node, static) = +{ + .function = arp_disabled, + .name = "arp-disabled", + .vector_size = sizeof (u32), + .n_errors = ARP_DISABLED_N_ERROR, + .error_strings = arp_disabled_error_strings, + .n_next_nodes = ARP_DISABLED_N_NEXT, + .next_nodes = { + [ARP_INPUT_NEXT_DROP] = "error-drop", + }, + .format_buffer = format_ethernet_arp_header, + .format_trace = format_ethernet_arp_input_trace, +}; + +VLIB_REGISTER_NODE (arp_reply_node, static) = +{ + .function = arp_reply, + .name = "arp-reply", + .vector_size = sizeof (u32), + .n_errors = ETHERNET_ARP_N_ERROR, + .error_strings = ethernet_arp_error_strings, + .n_next_nodes = ARP_REPLY_N_NEXT, + .next_nodes = { + [ARP_REPLY_NEXT_DROP] = "error-drop", + [ARP_REPLY_NEXT_REPLY_TX] = "interface-output", + }, + .format_buffer = format_ethernet_arp_header, + .format_trace = format_ethernet_arp_input_trace, }; -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (arp_input_node, static) = +VLIB_REGISTER_NODE (arp_proxy_node, static) = { - .function = arp_input, - .name = "arp-input", + .function = arp_proxy, + .name = "arp-proxy", .vector_size = sizeof (u32), .n_errors = ETHERNET_ARP_N_ERROR, .error_strings = ethernet_arp_error_strings, - .n_next_nodes = ARP_INPUT_N_NEXT, + .n_next_nodes = ARP_REPLY_N_NEXT, .next_nodes = { - [ARP_INPUT_NEXT_DROP] = "error-drop", - [ARP_INPUT_NEXT_REPLY_TX] = "interface-output", + [ARP_REPLY_NEXT_DROP] = "error-drop", + [ARP_REPLY_NEXT_REPLY_TX] = "interface-output", }, .format_buffer = format_ethernet_arp_header, .format_trace = format_ethernet_arp_input_trace, }; + +/* Built-in ARP rx feature path definition */ +VNET_FEATURE_ARC_INIT (arp_feat, static) = +{ + .arc_name = "arp", + .start_nodes = VNET_FEATURES ("arp-input"), + .last_in_arc = "error-drop", + .arc_index_ptr = ðernet_arp_main.feature_arc_index, +}; + +VNET_FEATURE_INIT (arp_reply_feat_node, static) = +{ + .arc_name = "arp", + .node_name = "arp-reply", + .runs_before = VNET_FEATURES ("arp-disabled"), +}; + +VNET_FEATURE_INIT (arp_proxy_feat_node, static) = +{ + .arc_name = "arp", + .node_name = "arp-proxy", + .runs_after = VNET_FEATURES ("arp-reply"), + .runs_before = VNET_FEATURES ("arp-disabled"), +}; + +VNET_FEATURE_INIT (arp_disabled_feat_node, static) = +{ + .arc_name = "arp", + .node_name = "arp-disabled", + .runs_before = VNET_FEATURES ("error-drop"), +}; + +VNET_FEATURE_INIT (arp_drop_feat_node, static) = +{ + .arc_name = "arp", + .node_name = "error-drop", + .runs_before = 0, /* last feature */ +}; + /* *INDENT-ON* */ static int @@ -1457,7 +1857,7 @@ typedef struct pg_edit_t opcode; struct { - pg_edit_t ethernet; + pg_edit_t mac; pg_edit_t ip4; } ip4_over_ethernet[2]; } pg_ethernet_arp_header_t; @@ -1472,9 +1872,9 @@ pg_ethernet_arp_header_init (pg_ethernet_arp_header_t * p) _(n_l2_address_bytes); _(n_l3_address_bytes); _(opcode); - _(ip4_over_ethernet[0].ethernet); + _(ip4_over_ethernet[0].mac); _(ip4_over_ethernet[0].ip4); - _(ip4_over_ethernet[1].ethernet); + _(ip4_over_ethernet[1].mac); _(ip4_over_ethernet[1].ip4); #undef _ } @@ -1500,11 +1900,11 @@ unformat_pg_arp_header (unformat_input_t * input, va_list * args) unformat_pg_edit, unformat_ethernet_arp_opcode_net_byte_order, &p->opcode, unformat_pg_edit, - unformat_ethernet_address, &p->ip4_over_ethernet[0].ethernet, + unformat_mac_address_t, &p->ip4_over_ethernet[0].mac, unformat_pg_edit, unformat_ip4_address, &p->ip4_over_ethernet[0].ip4, unformat_pg_edit, - unformat_ethernet_address, &p->ip4_over_ethernet[1].ethernet, + unformat_mac_address_t, &p->ip4_over_ethernet[1].mac, unformat_pg_edit, unformat_ip4_address, &p->ip4_over_ethernet[1].ip4)) { @@ -1529,59 +1929,17 @@ ip4_set_arp_limit (u32 arp_limit) */ int vnet_arp_unset_ip4_over_ethernet (vnet_main_t * vnm, - u32 sw_if_index, void *a_arg) -{ - ethernet_arp_ip4_over_ethernet_address_t *a = a_arg; - vnet_arp_set_ip4_over_ethernet_rpc_args_t args; - - args.sw_if_index = sw_if_index; - args.flags = ETHERNET_ARP_ARGS_REMOVE; - clib_memcpy (&args.a, a, sizeof (*a)); - - vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback, - (u8 *) & args, sizeof (args)); - return 0; -} - -/** - * @brief Internally generated event to flush the ARP cache on an - * interface state change event. - * A flush will remove dynamic ARP entries, and for statics remove the MAC - * address from the corresponding adjacencies. - */ -static int -vnet_arp_flush_ip4_over_ethernet (vnet_main_t * vnm, - u32 sw_if_index, void *a_arg) -{ - ethernet_arp_ip4_over_ethernet_address_t *a = a_arg; - vnet_arp_set_ip4_over_ethernet_rpc_args_t args; - - args.sw_if_index = sw_if_index; - args.flags = ETHERNET_ARP_ARGS_FLUSH; - clib_memcpy (&args.a, a, sizeof (*a)); - - vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback, - (u8 *) & args, sizeof (args)); - return 0; -} - -/** - * @brief Internally generated event to populate the ARP cache on an - * interface state change event. - * For static entries this will re-source the adjacencies. - * - * @param sw_if_index The interface on which the ARP entires are acted - */ -static int -vnet_arp_populate_ip4_over_ethernet (vnet_main_t * vnm, - u32 sw_if_index, void *a_arg) + u32 sw_if_index, + const + ethernet_arp_ip4_over_ethernet_address_t * + a) { - ethernet_arp_ip4_over_ethernet_address_t *a = a_arg; - vnet_arp_set_ip4_over_ethernet_rpc_args_t args; - - args.sw_if_index = sw_if_index; - args.flags = ETHERNET_ARP_ARGS_POPULATE; - clib_memcpy (&args.a, a, sizeof (*a)); + vnet_arp_set_ip4_over_ethernet_rpc_args_t args = { + .sw_if_index = sw_if_index, + .flags = ETHERNET_ARP_ARGS_REMOVE, + .ip4 = a->ip4, + .mac = a->mac, + }; vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback, (u8 *) & args, sizeof (args)); @@ -1590,16 +1948,17 @@ vnet_arp_populate_ip4_over_ethernet (vnet_main_t * vnm, /** * @brief publish wildcard arp event - * @param sw_if_index The interface on which the ARP entires are acted + * @param sw_if_index The interface on which the ARP entries are acted */ static int -vnet_arp_wc_publish (u32 sw_if_index, void *a_arg) +vnet_arp_wc_publish (u32 sw_if_index, + const ethernet_arp_ip4_over_ethernet_address_t * a) { - ethernet_arp_ip4_over_ethernet_address_t *a = a_arg; vnet_arp_set_ip4_over_ethernet_rpc_args_t args = { .flags = ETHERNET_ARP_ARGS_WC_PUB, .sw_if_index = sw_if_index, - .a = *a + .ip4 = a->ip4, + .mac = a->mac, }; vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback, @@ -1621,9 +1980,9 @@ vnet_arp_wc_publish_internal (vnet_main_t * vnm, return; wc_arp_report_t *r = vlib_process_signal_event_data (vm, ni, et, 1, sizeof *r); - r->ip4 = args->a.ip4.as_u32; + r->ip.as_u32 = args->ip4.as_u32; r->sw_if_index = args->sw_if_index; - memcpy (r->mac, args->a.ethernet, sizeof r->mac); + mac_address_copy (&r->mac, &args->mac); } void @@ -1634,6 +1993,66 @@ wc_arp_set_publisher_node (uword node_index, uword event_type) am->wc_ip4_arp_publisher_et = event_type; } +static void +arp_entry_free (ethernet_arp_interface_t * eai, ethernet_arp_ip4_entry_t * e); + +static int +vnet_arp_flush_ip4_over_ethernet_internal (vnet_main_t * vnm, + vnet_arp_set_ip4_over_ethernet_rpc_args_t + * args) +{ + ethernet_arp_main_t *am = ðernet_arp_main; + ethernet_arp_ip4_entry_t *e; + ethernet_arp_interface_t *eai; + + if (vec_len (am->ethernet_arp_by_sw_if_index) <= args->sw_if_index) + return 0; + + eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index]; + + e = arp_entry_find (eai, &args->ip4); + + if (NULL != e) + { + adj_nbr_walk_nh4 (e->sw_if_index, + &e->ip4_address, arp_mk_incomplete_walk, e); + + /* + * The difference between flush and unset, is that an unset + * means delete for static and dynamic entries. A flush + * means delete only for dynamic. Flushing is what the DP + * does in response to interface events. unset is only done + * by the control plane. + */ + if (e->flags & IP_NEIGHBOR_FLAG_STATIC) + { + e->flags &= ~IP_NEIGHBOR_FLAG_DYNAMIC; + } + else if (e->flags & IP_NEIGHBOR_FLAG_DYNAMIC) + { + arp_entry_free (eai, e); + } + } + return (0); +} + +/* + * arp_add_del_interface_address + * + * callback when an interface address is added or deleted + */ +static void +arp_enable_disable_interface (ip4_main_t * im, + uword opaque, u32 sw_if_index, u32 is_enable) +{ + ethernet_arp_main_t *am = ðernet_arp_main; + + if (is_enable) + arp_enable (am, sw_if_index); + else + arp_disable (am, sw_if_index); +} + /* * arp_add_del_interface_address * @@ -1680,14 +2099,17 @@ arp_add_del_interface_address (ip4_main_t * im, for (i = 0; i < vec_len (to_delete); i++) { - ethernet_arp_ip4_over_ethernet_address_t delme; e = pool_elt_at_index (am->ip4_entry_pool, to_delete[i]); - clib_memcpy (&delme.ethernet, e->ethernet_address, 6); - delme.ip4.as_u32 = e->ip4_address.as_u32; + vnet_arp_set_ip4_over_ethernet_rpc_args_t delme = { + .ip4.as_u32 = e->ip4_address.as_u32, + .sw_if_index = e->sw_if_index, + .flags = ETHERNET_ARP_ARGS_FLUSH, + }; + mac_address_copy (&delme.mac, &e->mac); - vnet_arp_flush_ip4_over_ethernet (vnet_get_main (), - e->sw_if_index, &delme); + vnet_arp_flush_ip4_over_ethernet_internal (vnet_get_main (), + &delme); } vec_free (to_delete); @@ -1734,12 +2156,8 @@ ethernet_arp_init (vlib_main_t * vm) { ethernet_arp_main_t *am = ðernet_arp_main; ip4_main_t *im = &ip4_main; - clib_error_t *error; pg_node_t *pn; - if ((error = vlib_call_init_function (vm, ethernet_init))) - return error; - ethernet_register_input_type (vm, ETHERNET_TYPE_ARP, arp_input_node.index); pn = pg_get_node (arp_input_node.index); @@ -1775,6 +2193,11 @@ ethernet_arp_init (vlib_main_t * vm) cb.function_opaque = 0; vec_add1 (im->add_del_interface_address_callbacks, cb); + ip4_enable_disable_interface_callback_t cbe; + cbe.function = arp_enable_disable_interface; + cbe.function_opaque = 0; + vec_add1 (im->enable_disable_interface_callbacks, cbe); + ip4_table_bind_callback_t cbt; cbt.function = arp_table_bind; cbt.function_opaque = 0; @@ -1782,8 +2205,12 @@ ethernet_arp_init (vlib_main_t * vm) return 0; } - -VLIB_INIT_FUNCTION (ethernet_arp_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (ethernet_arp_init) = +{ + .runs_after = VLIB_INITS("ethernet_init"), +}; +/* *INDENT-ON* */ static void arp_entry_free (ethernet_arp_interface_t * eai, ethernet_arp_ip4_entry_t * e) @@ -1810,57 +2237,18 @@ vnet_arp_unset_ip4_over_ethernet_internal (vnet_main_t * vnm, eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index]; - e = arp_entry_find (eai, &args->a.ip4); + e = arp_entry_find (eai, &args->ip4); if (NULL != e) { adj_nbr_walk_nh4 (e->sw_if_index, - &e->ip4_address, arp_mk_incomplete_walk, NULL); + &e->ip4_address, arp_mk_incomplete_walk, e); arp_entry_free (eai, e); } return 0; } -static int -vnet_arp_flush_ip4_over_ethernet_internal (vnet_main_t * vnm, - vnet_arp_set_ip4_over_ethernet_rpc_args_t - * args) -{ - ethernet_arp_main_t *am = ðernet_arp_main; - ethernet_arp_ip4_entry_t *e; - ethernet_arp_interface_t *eai; - - if (vec_len (am->ethernet_arp_by_sw_if_index) <= args->sw_if_index) - return 0; - - eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index]; - - e = arp_entry_find (eai, &args->a.ip4); - - if (NULL != e) - { - adj_nbr_walk_nh4 (e->sw_if_index, - &e->ip4_address, arp_mk_incomplete_walk, e); - - /* - * The difference between flush and unset, is that an unset - * means delete for static and dynamic entries. A flush - * means delete only for dynamic. Flushing is what the DP - * does in response to interface events. unset is only done - * by the control plane. - */ - if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_STATIC) - { - e->flags &= ~ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC; - } - else if (e->flags & ETHERNET_ARP_IP4_ENTRY_FLAG_DYNAMIC) - { - arp_entry_free (eai, e); - } - } - return (0); -} static int vnet_arp_populate_ip4_over_ethernet_internal (vnet_main_t * vnm, @@ -1871,10 +2259,10 @@ vnet_arp_populate_ip4_over_ethernet_internal (vnet_main_t * vnm, ethernet_arp_ip4_entry_t *e; ethernet_arp_interface_t *eai; - vec_validate (am->ethernet_arp_by_sw_if_index, args->sw_if_index); + arp_enable (am, args->sw_if_index); eai = &am->ethernet_arp_by_sw_if_index[args->sw_if_index]; - e = arp_entry_find (eai, &args->a.ip4); + e = arp_entry_find (eai, &args->ip4); if (NULL != e) { @@ -1912,36 +2300,39 @@ ethernet_arp_sw_interface_up_down (vnet_main_t * vnm, { ethernet_arp_main_t *am = ðernet_arp_main; ethernet_arp_ip4_entry_t *e; - u32 i, *to_delete = 0; + u32 i, *to_update = 0; /* *INDENT-OFF* */ pool_foreach (e, am->ip4_entry_pool, ({ if (e->sw_if_index == sw_if_index) - vec_add1 (to_delete, + vec_add1 (to_update, e - am->ip4_entry_pool); })); /* *INDENT-ON* */ - for (i = 0; i < vec_len (to_delete); i++) + for (i = 0; i < vec_len (to_update); i++) { - ethernet_arp_ip4_over_ethernet_address_t delme; - e = pool_elt_at_index (am->ip4_entry_pool, to_delete[i]); + e = pool_elt_at_index (am->ip4_entry_pool, to_update[i]); - clib_memcpy (&delme.ethernet, e->ethernet_address, 6); - delme.ip4.as_u32 = e->ip4_address.as_u32; + vnet_arp_set_ip4_over_ethernet_rpc_args_t update_me = { + .ip4.as_u32 = e->ip4_address.as_u32, + .sw_if_index = e->sw_if_index, + }; + mac_address_copy (&update_me.mac, &e->mac); if (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) { - vnet_arp_populate_ip4_over_ethernet (vnm, e->sw_if_index, &delme); + update_me.flags = ETHERNET_ARP_ARGS_POPULATE; + vnet_arp_populate_ip4_over_ethernet_internal (vnm, &update_me); } else { - vnet_arp_flush_ip4_over_ethernet (vnm, e->sw_if_index, &delme); + update_me.flags = ETHERNET_ARP_ARGS_FLUSH; + vnet_arp_flush_ip4_over_ethernet_internal (vnm, &update_me); } - } - vec_free (to_delete); + vec_free (to_update); return 0; } @@ -1964,26 +2355,26 @@ increment_ip4_and_mac_address (ethernet_arp_ip4_over_ethernet_address_t * a) for (i = 5; i >= 0; i--) { - old = a->ethernet[i]; - a->ethernet[i] += 1; - if (old < a->ethernet[i]) + old = a->mac.bytes[i]; + a->mac.bytes[i] += 1; + if (old < a->mac.bytes[i]) break; } } int vnet_arp_set_ip4_over_ethernet (vnet_main_t * vnm, - u32 sw_if_index, void *a_arg, - int is_static, int is_no_fib_entry) + u32 sw_if_index, + const ethernet_arp_ip4_over_ethernet_address_t + * a, ip_neighbor_flags_t flags) { - ethernet_arp_ip4_over_ethernet_address_t *a = a_arg; - vnet_arp_set_ip4_over_ethernet_rpc_args_t args; - - args.sw_if_index = sw_if_index; - args.is_static = is_static; - args.is_no_fib_entry = is_no_fib_entry; - args.flags = 0; - clib_memcpy (&args.a, a, sizeof (*a)); + vnet_arp_set_ip4_over_ethernet_rpc_args_t args = { + .sw_if_index = sw_if_index, + .nbr_flags = flags, + .flags = 0, + .ip4.as_u32 = a->ip4.as_u32, + .mac = a->mac, + }; vl_api_rpc_call_main_thread (set_ip4_over_ethernet_rpc_callback, (u8 *) & args, sizeof (args)); @@ -2003,6 +2394,38 @@ proxy_arp_walk (proxy_arp_walk_t cb, void *data) } } +int +vnet_proxy_arp_enable_disable (vnet_main_t * vnm, u32 sw_if_index, u8 enable) +{ + ethernet_arp_main_t *am = ðernet_arp_main; + ethernet_arp_interface_t *eai; + + vec_validate (am->ethernet_arp_by_sw_if_index, sw_if_index); + + eai = &am->ethernet_arp_by_sw_if_index[sw_if_index]; + + if (enable) + { + if (!eai->proxy_enabled) + { + vnet_feature_enable_disable ("arp", "arp-proxy", + sw_if_index, 1, NULL, 0); + } + eai->proxy_enabled = 1; + } + else + { + if (eai->proxy_enabled) + { + vnet_feature_enable_disable ("arp", "arp-proxy", + sw_if_index, 0, NULL, 0); + } + eai->proxy_enabled = 0; + } + + return (0); +} + int vnet_proxy_arp_add_del (ip4_address_t * lo_addr, ip4_address_t * hi_addr, u32 fib_index, int is_del) @@ -2040,39 +2463,17 @@ vnet_proxy_arp_add_del (ip4_address_t * lo_addr, return 0; } -/* - * Remove any proxy arp entries asdociated with the - * specificed fib. - */ -int -vnet_proxy_arp_fib_reset (u32 fib_id) +void +proxy_arp_intfc_walk (proxy_arp_intf_walk_t cb, void *data) { ethernet_arp_main_t *am = ðernet_arp_main; - ethernet_proxy_arp_t *pa; - u32 *entries_to_delete = 0; - u32 fib_index; - int i; - - fib_index = fib_table_find (FIB_PROTOCOL_IP4, fib_id); - if (~0 == fib_index) - return VNET_API_ERROR_NO_SUCH_ENTRY; + ethernet_arp_interface_t *eai; - vec_foreach (pa, am->proxy_arps) + vec_foreach (eai, am->ethernet_arp_by_sw_if_index) { - if (pa->fib_index == fib_index) - { - vec_add1 (entries_to_delete, pa - am->proxy_arps); - } + if (eai->proxy_enabled) + cb (eai - am->ethernet_arp_by_sw_if_index, data); } - - for (i = 0; i < vec_len (entries_to_delete); i++) - { - vec_delete (am->proxy_arps, 1, entries_to_delete[i]); - } - - vec_free (entries_to_delete); - - return 0; } static clib_error_t * @@ -2087,9 +2488,10 @@ ip_arp_add_del_command_fn (vlib_main_t * vm, int count = 1; u32 fib_index = 0; u32 fib_id; - int is_static = 0; - int is_no_fib_entry = 0; int is_proxy = 0; + ip_neighbor_flags_t flags; + + flags = IP_NEIGHBOR_FLAG_NONE; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -2097,17 +2499,17 @@ ip_arp_add_del_command_fn (vlib_main_t * vm, if (unformat (input, "%U %U %U", unformat_vnet_sw_interface, vnm, &sw_if_index, unformat_ip4_address, &addr.ip4, - unformat_ethernet_address, &addr.ethernet)) + unformat_mac_address_t, &addr.mac)) addr_valid = 1; else if (unformat (input, "delete") || unformat (input, "del")) is_del = 1; else if (unformat (input, "static")) - is_static = 1; + flags |= IP_NEIGHBOR_FLAG_STATIC; else if (unformat (input, "no-fib-entry")) - is_no_fib_entry = 1; + flags |= IP_NEIGHBOR_FLAG_NO_FIB_ENTRY; else if (unformat (input, "count %d", &count)) ; @@ -2150,8 +2552,7 @@ ip_arp_add_del_command_fn (vlib_main_t * vm, (vnm, &addr.ip4, vlib_current_process (vm), 1 /* type */ , 0 /* data */ ); - vnet_arp_set_ip4_over_ethernet - (vnm, sw_if_index, &addr, is_static, is_no_fib_entry); + vnet_arp_set_ip4_over_ethernet (vnm, sw_if_index, &addr, flags); vlib_process_wait_for_event (vm); event_type = vlib_process_get_events (vm, &event_data); @@ -2218,15 +2619,15 @@ set_int_proxy_arp_command_fn (vlib_main_t * vm, { vnet_main_t *vnm = vnet_get_main (); u32 sw_if_index; - vnet_sw_interface_t *si; int enable = 0; - int intfc_set = 0; + + sw_if_index = ~0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { if (unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index)) - intfc_set = 1; + ; else if (unformat (input, "enable") || unformat (input, "on")) enable = 1; else if (unformat (input, "disable") || unformat (input, "off")) @@ -2235,16 +2636,11 @@ set_int_proxy_arp_command_fn (vlib_main_t * vm, break; } - if (intfc_set == 0) + if (~0 == sw_if_index) return clib_error_return (0, "unknown input '%U'", format_unformat_error, input); - si = vnet_get_sw_interface (vnm, sw_if_index); - ASSERT (si); - if (enable) - si->flags |= VNET_SW_INTERFACE_FLAG_PROXY_ARP; - else - si->flags &= ~VNET_SW_INTERFACE_FLAG_PROXY_ARP; + vnet_proxy_arp_enable_disable (vnm, sw_if_index, enable); return 0; } @@ -2324,7 +2720,6 @@ arp_term_l2bd (vlib_main_t * vm, u16 bd_index0; u32 ip0; u8 *macp0; - u8 is_vrrp_reply0; pi0 = from[0]; to_next[0] = pi0; @@ -2343,22 +2738,26 @@ arp_term_l2bd (vlib_main_t * vm, ethertype0 = clib_net_to_host_u16 (*(u16 *) (l3h0 - 2)); arp0 = (ethernet_arp_header_t *) l3h0; - if (PREDICT_FALSE ((ethertype0 != ETHERNET_TYPE_ARP) || - (arp0->opcode != - clib_host_to_net_u16 - (ETHERNET_ARP_OPCODE_request)))) + if (ethertype0 != ETHERNET_TYPE_ARP) + goto check_ip6_nd; + + if ((arp0->opcode != + clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_request)) && + (arp0->opcode != + clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply))) goto check_ip6_nd; - /* Must be ARP request packet here */ + /* Must be ARP request/reply packet here */ if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) && (p0->flags & VLIB_BUFFER_IS_TRACED))) { u8 *t0 = vlib_add_trace (vm, node, p0, sizeof (ethernet_arp_input_trace_t)); - clib_memcpy (t0, l3h0, sizeof (ethernet_arp_input_trace_t)); + clib_memcpy_fast (t0, l3h0, + sizeof (ethernet_arp_input_trace_t)); } - error0 = ETHERNET_ARP_ERROR_replies_sent; + error0 = 0; error0 = (arp0->l2_type != clib_net_to_host_u16 (ETHERNET_ARP_HARDWARE_TYPE_ethernet) @@ -2373,22 +2772,26 @@ arp_term_l2bd (vlib_main_t * vm, if (error0) goto drop; - is_vrrp_reply0 = - ((arp0->opcode == - clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply)) - && - (!memcmp - (arp0->ip4_over_ethernet[0].ethernet, vrrp_prefix, - sizeof (vrrp_prefix)))); - /* Trash ARP packets whose ARP-level source addresses do not - match their L2-frame-level source addresses, unless it's - a reply from a VRRP virtual router */ + match, or if requester address is mcast */ if (PREDICT_FALSE - (memcmp (eth0->src_address, arp0->ip4_over_ethernet[0].ethernet, - sizeof (eth0->src_address)) && !is_vrrp_reply0)) + (!ethernet_mac_address_equal (eth0->src_address, + arp0->ip4_over_ethernet[0]. + mac.bytes)) + || ethernet_address_cast (arp0->ip4_over_ethernet[0].mac.bytes)) { - error0 = ETHERNET_ARP_ERROR_l2_address_mismatch; + /* VRRP virtual MAC may be different to SMAC in ARP reply */ + if (!ethernet_mac_address_equal + (arp0->ip4_over_ethernet[0].mac.bytes, vrrp_prefix)) + { + error0 = ETHERNET_ARP_ERROR_l2_address_mismatch; + goto drop; + } + } + if (PREDICT_FALSE + (ip4_address_is_multicast (&arp0->ip4_over_ethernet[0].ip4))) + { + error0 = ETHERNET_ARP_ERROR_l3_src_address_not_local; goto drop; } @@ -2412,15 +2815,18 @@ arp_term_l2bd (vlib_main_t * vm, if (PREDICT_FALSE (!macp0)) goto next_l2_feature; /* MAC not found */ + if (PREDICT_FALSE (arp0->ip4_over_ethernet[0].ip4.as_u32 == + arp0->ip4_over_ethernet[1].ip4.as_u32)) + goto next_l2_feature; /* GARP */ /* MAC found, send ARP reply - Convert ARP request packet to ARP reply */ arp0->opcode = clib_host_to_net_u16 (ETHERNET_ARP_OPCODE_reply); arp0->ip4_over_ethernet[1] = arp0->ip4_over_ethernet[0]; arp0->ip4_over_ethernet[0].ip4.as_u32 = ip0; - clib_memcpy (arp0->ip4_over_ethernet[0].ethernet, macp0, 6); - clib_memcpy (eth0->dst_address, eth0->src_address, 6); - clib_memcpy (eth0->src_address, macp0, 6); + mac_address_from_bytes (&arp0->ip4_over_ethernet[0].mac, macp0); + clib_memcpy_fast (eth0->dst_address, eth0->src_address, 6); + clib_memcpy_fast (eth0->src_address, macp0, 6); n_replies_sent += 1; output_response: @@ -2585,10 +2991,8 @@ send_ip4_garp_w_addr (vlib_main_t * vm, if (!h) return; - clib_memcpy (h->ip4_over_ethernet[0].ethernet, hi->hw_address, - sizeof (h->ip4_over_ethernet[0].ethernet)); - clib_memcpy (h->ip4_over_ethernet[1].ethernet, hi->hw_address, - sizeof (h->ip4_over_ethernet[1].ethernet)); + mac_address_from_bytes (&h->ip4_over_ethernet[0].mac, hi->hw_address); + mac_address_from_bytes (&h->ip4_over_ethernet[1].mac, hi->hw_address); h->ip4_over_ethernet[0].ip4 = ip4_addr[0]; h->ip4_over_ethernet[1].ip4 = ip4_addr[0]; @@ -2600,7 +3004,7 @@ send_ip4_garp_w_addr (vlib_main_t * vm, rewrite_len = vec_len (rewrite); vlib_buffer_advance (b, -rewrite_len); ethernet_header_t *e = vlib_buffer_get_current (b); - clib_memcpy (e->dst_address, rewrite, rewrite_len); + clib_memcpy_fast (e->dst_address, rewrite, rewrite_len); vec_free (rewrite); /* Send GARP packet out the specified interface */ @@ -2614,6 +3018,41 @@ send_ip4_garp_w_addr (vlib_main_t * vm, } } +/* + * Remove any arp entries associated with the specified interface + */ +static clib_error_t * +vnet_arp_delete_sw_interface (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) +{ + ethernet_arp_main_t *am = ðernet_arp_main; + + if (!is_add && sw_if_index != ~0) + { + ethernet_arp_ip4_entry_t *e; + /* *INDENT-OFF* */ + pool_foreach (e, am->ip4_entry_pool, ({ + if (e->sw_if_index != sw_if_index) + continue; + vnet_arp_set_ip4_over_ethernet_rpc_args_t args = { + .sw_if_index = sw_if_index, + .ip4 = e->ip4_address, + }; + vnet_arp_unset_ip4_over_ethernet_internal (vnm, &args); + })); + /* *INDENT-ON* */ + arp_disable (am, sw_if_index); + } + else if (is_add) + { + vnet_feature_enable_disable ("arp", "arp-disabled", + sw_if_index, 1, NULL, 0); + } + + return (NULL); +} + +VNET_SW_INTERFACE_ADD_DEL_FUNCTION (vnet_arp_delete_sw_interface); + /* * fd.io coding-style-patch-verification: ON *