X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fl2%2Fl2_api.c;h=fa852742f9fbee32ca3cdac6ee23571b7f5cd5e6;hb=cbe25aab3be72154f2c706c39eeba6a77f34450f;hp=39e52b1ecef61b19b7fa658824d250e56e008aa7;hpb=b24dfec57e7a272e2da4d99191340bbfbef19a45;p=vpp.git diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c index 39e52b1ecef..fa852742f9f 100644 --- a/src/vnet/l2/l2_api.c +++ b/src/vnet/l2/l2_api.c @@ -26,6 +26,11 @@ #include #include #include +#include +#include +#include +#include +#include #include @@ -63,6 +68,7 @@ _(SW_INTERFACE_SET_L2_BRIDGE, sw_interface_set_l2_bridge) \ _(L2_PATCH_ADD_DEL, l2_patch_add_del) \ _(L2_INTERFACE_EFP_FILTER, l2_interface_efp_filter) \ _(BD_IP_MAC_ADD_DEL, bd_ip_mac_add_del) \ +_(BD_IP_MAC_FLUSH, bd_ip_mac_flush) \ _(BD_IP_MAC_DUMP, bd_ip_mac_dump) \ _(BRIDGE_DOMAIN_ADD_DEL, bridge_domain_add_del) \ _(BRIDGE_DOMAIN_DUMP, bridge_domain_dump) \ @@ -70,7 +76,10 @@ _(BRIDGE_FLAGS, bridge_flags) \ _(L2_INTERFACE_VLAN_TAG_REWRITE, l2_interface_vlan_tag_rewrite) \ _(L2_INTERFACE_PBB_TAG_REWRITE, l2_interface_pbb_tag_rewrite) \ _(BRIDGE_DOMAIN_SET_MAC_AGE, bridge_domain_set_mac_age) \ -_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath) +_(SW_INTERFACE_SET_VPATH, sw_interface_set_vpath) \ +_(BVI_CREATE, bvi_create) \ +_(BVI_DELETE, bvi_delete) \ +_(WANT_L2_ARP_TERM_EVENTS, want_l2_arp_term_events) static void send_l2_xconnect_details (vl_api_registration_t * reg, u32 context, @@ -79,7 +88,7 @@ send_l2_xconnect_details (vl_api_registration_t * reg, u32 context, vl_api_l2_xconnect_details_t *mp; mp = vl_msg_api_alloc (sizeof (*mp)); - memset (mp, 0, sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = ntohs (VL_API_L2_XCONNECT_DETAILS); mp->context = context; mp->rx_sw_if_index = htonl (rx_sw_if_index); @@ -134,7 +143,7 @@ send_l2fib_table_entry (vpe_api_main_t * am, vl_api_l2_fib_table_details_t *mp; mp = vl_msg_api_alloc (sizeof (*mp)); - memset (mp, 0, sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = ntohs (VL_API_L2_FIB_TABLE_DETAILS); mp->bd_id = @@ -142,9 +151,9 @@ send_l2fib_table_entry (vpe_api_main_t * am, clib_memcpy (mp->mac, l2fe_key->fields.mac, 6); mp->sw_if_index = ntohl (l2fe_res->fields.sw_if_index); - mp->static_mac = l2fe_res->fields.static_mac; - mp->filter_mac = l2fe_res->fields.filter; - mp->bvi_mac = l2fe_res->fields.bvi; + mp->static_mac = (l2fib_entry_result_is_set_STATIC (l2fe_res) ? 1 : 0); + mp->filter_mac = (l2fib_entry_result_is_set_FILTER (l2fe_res) ? 1 : 0); + mp->bvi_mac = (l2fib_entry_result_is_set_BVI (l2fe_res) ? 1 : 0); mp->context = context; vl_api_send_msg (reg, (u8 *) mp); @@ -215,6 +224,7 @@ vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp) l2fib_add_filter_entry (mac, bd_index); else { + l2fib_entry_result_flags_t flags = L2FIB_ENTRY_RESULT_FLAG_NONE; u32 sw_if_index = ntohl (mp->sw_if_index); VALIDATE_SW_IF_INDEX (mp); if (vec_len (l2im->configs) <= sw_if_index) @@ -232,10 +242,11 @@ vl_api_l2fib_add_del_t_handler (vl_api_l2fib_add_del_t * mp) goto bad_sw_if_index; } } - u8 static_mac = mp->static_mac ? 1 : 0; - u8 bvi_mac = mp->bvi_mac ? 1 : 0; - l2fib_add_fwd_entry (mac, bd_index, sw_if_index, static_mac, - bvi_mac); + if (mp->static_mac) + flags |= L2FIB_ENTRY_RESULT_FLAG_STATIC; + if (mp->bvi_mac) + flags |= L2FIB_ENTRY_RESULT_FLAG_BVI; + l2fib_add_entry (mac, bd_index, sw_if_index, flags); } } else @@ -429,6 +440,7 @@ vl_api_bridge_domain_add_del_t_handler (vl_api_bridge_domain_add_del_t * mp) .forward = mp->forward, .learn = mp->learn, .arp_term = mp->arp_term, + .arp_ufwd = mp->arp_ufwd, .mac_age = mp->mac_age, .bd_id = ntohl (mp->bd_id), .bd_tag = mp->bd_tag @@ -453,7 +465,7 @@ send_bridge_domain_details (l2input_main_t * l2im, mp = vl_msg_api_alloc (sizeof (*mp) + (n_sw_ifs * sizeof (vl_api_bridge_domain_sw_if_t))); - memset (mp, 0, sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = ntohs (VL_API_BRIDGE_DOMAIN_DETAILS); mp->bd_id = ntohl (bd_config->bd_id); mp->flood = bd_feature_flood (bd_config); @@ -461,7 +473,9 @@ send_bridge_domain_details (l2input_main_t * l2im, mp->forward = bd_feature_forward (bd_config); mp->learn = bd_feature_learn (bd_config); mp->arp_term = bd_feature_arp_term (bd_config); + mp->arp_ufwd = bd_feature_arp_ufwd (bd_config); mp->bvi_sw_if_index = ntohl (bd_config->bvi_sw_if_index); + mp->uu_fwd_sw_if_index = ntohl (bd_config->uu_fwd_sw_if_index); mp->mac_age = bd_config->mac_age; if (bd_config->bd_tag) { @@ -525,15 +539,39 @@ vl_api_bridge_domain_dump_t_handler (vl_api_bridge_domain_dump_t * mp) } } +static bd_flags_t +bd_flags_decode (vl_api_bd_flags_t v) +{ + bd_flags_t f = L2_NONE; + + v = ntohl (v); + + if (v & BRIDGE_API_FLAG_LEARN) + f |= L2_LEARN; + if (v & BRIDGE_API_FLAG_FWD) + f |= L2_FWD; + if (v & BRIDGE_API_FLAG_FLOOD) + f |= L2_FLOOD; + if (v & BRIDGE_API_FLAG_UU_FLOOD) + f |= L2_UU_FLOOD; + if (v & BRIDGE_API_FLAG_ARP_TERM) + f |= L2_ARP_TERM; + if (v & BRIDGE_API_FLAG_ARP_UFWD) + f |= L2_ARP_UFWD; + + return (f); +} + static void vl_api_bridge_flags_t_handler (vl_api_bridge_flags_t * mp) { vlib_main_t *vm = vlib_get_main (); bd_main_t *bdm = &bd_main; vl_api_bridge_flags_reply_t *rmp; + u32 bitmap = 0; int rv = 0; - u32 flags = ntohl (mp->feature_bitmap); + bd_flags_t flags = bd_flags_decode (mp->flags); u32 bd_id = ntohl (mp->bd_id); if (bd_id == 0) { @@ -548,7 +586,7 @@ vl_api_bridge_flags_t_handler (vl_api_bridge_flags_t * mp) goto out; } - u32 bitmap = bd_set_flags (vm, bd_index, flags, mp->is_set); + bitmap = bd_set_flags (vm, bd_index, flags, mp->is_set); out: /* *INDENT-OFF* */ @@ -654,11 +692,23 @@ static void { VALIDATE_TX_SW_IF_INDEX (mp); rv = set_int_l2_mode (vm, vnm, MODE_L2_XC, - rx_sw_if_index, 0, 0, 0, tx_sw_if_index); + rx_sw_if_index, 0, + L2_BD_PORT_TYPE_NORMAL, 0, tx_sw_if_index); } else { - rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0); + rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, + L2_BD_PORT_TYPE_NORMAL, 0, 0); + } + + switch (rv) + { + case MODE_ERROR_ETH: + rv = VNET_API_ERROR_NON_ETHERNET; + break; + case MODE_ERROR_BVI_DEF: + rv = VNET_API_ERROR_BD_ALREADY_HAS_BVI; + break; } BAD_RX_SW_IF_INDEX_LABEL; @@ -667,6 +717,27 @@ static void REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_XCONNECT_REPLY); } +static int +l2_bd_port_type_decode (vl_api_l2_port_type_t v, l2_bd_port_type_t * l) +{ + v = clib_net_to_host_u32 (v); + + switch (v) + { + case L2_API_PORT_TYPE_NORMAL: + *l = L2_BD_PORT_TYPE_NORMAL; + return 0; + case L2_API_PORT_TYPE_BVI: + *l = L2_BD_PORT_TYPE_BVI; + return 0; + case L2_API_PORT_TYPE_UU_FWD: + *l = L2_BD_PORT_TYPE_UU_FWD; + return 0; + } + + return (VNET_API_ERROR_INVALID_VALUE); +} + static void vl_api_sw_interface_set_l2_bridge_t_handler (vl_api_sw_interface_set_l2_bridge_t * mp) @@ -676,50 +747,63 @@ static void int rv = 0; vlib_main_t *vm = vlib_get_main (); vnet_main_t *vnm = vnet_get_main (); + l2_bd_port_type_t pt; VALIDATE_RX_SW_IF_INDEX (mp); u32 rx_sw_if_index = ntohl (mp->rx_sw_if_index); + rv = l2_bd_port_type_decode (mp->port_type, &pt); - + if (0 != rv) + goto out; if (mp->enable) { VALIDATE_BD_ID (mp); u32 bd_id = ntohl (mp->bd_id); u32 bd_index = bd_find_or_add_bd_index (bdm, bd_id); - u32 bvi = mp->bvi; - u8 shg = mp->shg; + rv = set_int_l2_mode (vm, vnm, MODE_L2_BRIDGE, - rx_sw_if_index, bd_index, bvi, shg, 0); + rx_sw_if_index, bd_index, pt, mp->shg, 0); } else { - rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, 0, 0, 0); + rv = set_int_l2_mode (vm, vnm, MODE_L3, rx_sw_if_index, 0, pt, 0, 0); + } + + switch (rv) + { + case MODE_ERROR_ETH: + rv = VNET_API_ERROR_NON_ETHERNET; + break; + case MODE_ERROR_BVI_DEF: + rv = VNET_API_ERROR_BD_ALREADY_HAS_BVI; + break; } BAD_RX_SW_IF_INDEX_LABEL; BAD_BD_ID_LABEL; - +out: REPLY_MACRO (VL_API_SW_INTERFACE_SET_L2_BRIDGE_REPLY); } static void send_bd_ip_mac_entry (vpe_api_main_t * am, vl_api_registration_t * reg, - u32 bd_id, u8 is_ipv6, - u8 * ip_address, u8 * mac_address, u32 context) + u32 bd_id, + const ip46_address_t * ip, + ip46_type_t itype, + const mac_address_t * mac, u32 context) { vl_api_bd_ip_mac_details_t *mp; mp = vl_msg_api_alloc (sizeof (*mp)); - memset (mp, 0, sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = ntohs (VL_API_BD_IP_MAC_DETAILS); - mp->bd_id = ntohl (bd_id); - - clib_memcpy (mp->mac_address, mac_address, 6); - mp->is_ipv6 = is_ipv6; - clib_memcpy (mp->ip_address, ip_address, (is_ipv6) ? 16 : 4); mp->context = context; + mp->entry.bd_id = ntohl (bd_id); + + ip_address_encode (ip, itype, &mp->entry.ip); + mac_address_encode (mac, mp->entry.mac); vl_api_send_msg (reg, (u8 *) mp); } @@ -764,18 +848,31 @@ vl_api_bd_ip_mac_dump_t_handler (vl_api_bd_ip_mac_dump_t * mp) { ip4_address_t ip4_addr; ip6_address_t *ip6_addr; - u64 mac_addr; + mac_address_t mac; + u64 mac64; bd_id = bd_config->bd_id; /* *INDENT-OFF* */ - hash_foreach (ip4_addr.as_u32, mac_addr, bd_config->mac_by_ip4, + hash_foreach (ip4_addr.as_u32, mac64, bd_config->mac_by_ip4, ({ - send_bd_ip_mac_entry (am, reg, bd_id, 0, (u8 *) &(ip4_addr.as_u8), (u8 *) &mac_addr, mp->context); + ip46_address_t ip = { + .ip4 = ip4_addr, + }; + mac_address_from_u64(&mac, mac64); + + send_bd_ip_mac_entry (am, reg, bd_id, &ip, IP46_TYPE_IP4, + &mac, mp->context); })); - hash_foreach_mem (ip6_addr, mac_addr, bd_config->mac_by_ip6, + hash_foreach_mem (ip6_addr, mac64, bd_config->mac_by_ip6, ({ - send_bd_ip_mac_entry (am, reg, bd_id, 1, (u8 *) &(ip6_addr->as_u8), (u8 *) &mac_addr, mp->context); + ip46_address_t ip = { + .ip6 = *ip6_addr, + }; + mac_address_from_u64(&mac, mac64); + + send_bd_ip_mac_entry (am, reg, bd_id, &ip, IP46_TYPE_IP6, + &mac, mp->context); })); /* *INDENT-ON* */ } @@ -785,13 +882,17 @@ vl_api_bd_ip_mac_dump_t_handler (vl_api_bd_ip_mac_dump_t * mp) static void vl_api_bd_ip_mac_add_del_t_handler (vl_api_bd_ip_mac_add_del_t * mp) { - bd_main_t *bdm = &bd_main; + ip46_address_t ip_addr = ip46_address_initializer; vl_api_bd_ip_mac_add_del_reply_t *rmp; + bd_main_t *bdm = &bd_main; + u32 bd_index, bd_id; + mac_address_t mac; + ip46_type_t type; int rv = 0; - u32 bd_id = ntohl (mp->bd_id); - u32 bd_index; uword *p; + bd_id = ntohl (mp->entry.bd_id); + if (bd_id == 0) { rv = VNET_API_ERROR_BD_NOT_MODIFIABLE; @@ -804,16 +905,49 @@ vl_api_bd_ip_mac_add_del_t_handler (vl_api_bd_ip_mac_add_del_t * mp) rv = VNET_API_ERROR_NO_SUCH_ENTRY; goto out; } - bd_index = p[0]; - if (bd_add_del_ip_mac (bd_index, mp->ip_address, - mp->mac_address, mp->is_ipv6, mp->is_add)) + + type = ip_address_decode (&mp->entry.ip, &ip_addr); + mac_address_decode (mp->entry.mac, &mac); + + if (bd_add_del_ip_mac (bd_index, type, &ip_addr, &mac, mp->is_add)) rv = VNET_API_ERROR_UNSPECIFIED; out: REPLY_MACRO (VL_API_BD_IP_MAC_ADD_DEL_REPLY); } +static void +vl_api_bd_ip_mac_flush_t_handler (vl_api_bd_ip_mac_flush_t * mp) +{ + vl_api_bd_ip_mac_flush_reply_t *rmp; + bd_main_t *bdm = &bd_main; + u32 bd_index, bd_id; + int rv = 0; + uword *p; + + bd_id = ntohl (mp->bd_id); + + if (bd_id == 0) + { + rv = VNET_API_ERROR_BD_NOT_MODIFIABLE; + goto out; + } + + p = hash_get (bdm->bd_index_by_bd_id, bd_id); + if (p == 0) + { + rv = VNET_API_ERROR_NO_SUCH_ENTRY; + goto out; + } + bd_index = p[0]; + + bd_flush_ip_mac (bd_index); + +out: + REPLY_MACRO (VL_API_BD_IP_MAC_FLUSH_REPLY); +} + extern void l2_efp_filter_configure (vnet_main_t * vnet_main, u32 sw_if_index, u8 enable); @@ -882,10 +1016,204 @@ vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp) REPLY_MACRO (VL_API_SW_INTERFACE_SET_VPATH_REPLY); } +static void +vl_api_bvi_create_t_handler (vl_api_bvi_create_t * mp) +{ + vl_api_bvi_create_reply_t *rmp; + mac_address_t mac; + u32 sw_if_index; + int rv; + + mac_address_decode (mp->mac, &mac); + + rv = l2_bvi_create (ntohl (mp->user_instance), &mac, &sw_if_index); + + /* *INDENT-OFF* */ + REPLY_MACRO2(VL_API_BVI_CREATE_REPLY, + ({ + rmp->sw_if_index = ntohl (sw_if_index); + })); + /* *INDENT-ON* */ +} + +static void +vl_api_bvi_delete_t_handler (vl_api_bvi_delete_t * mp) +{ + vl_api_bvi_delete_reply_t *rmp; + int rv; + + rv = l2_bvi_delete (ntohl (mp->sw_if_index)); + + REPLY_MACRO (VL_API_BVI_DELETE_REPLY); +} + +static bool +l2_arp_term_publish_event_is_equal (const l2_arp_term_publish_event_t * e1, + const l2_arp_term_publish_event_t * e2) +{ + if (e1 == NULL || e2 == NULL) + return false; + return (ip46_address_is_equal (&e1->ip, &e2->ip) && + (e1->sw_if_index == e2->sw_if_index) && + (mac_address_equal (&e1->mac, &e2->mac))); +} + +static uword +l2_arp_term_process (vlib_main_t * vm, vlib_node_runtime_t * rt, + vlib_frame_t * f) +{ + /* These cross the longjmp boundary (vlib_process_wait_for_event) + * and need to be volatile - to prevent them from being optimized into + * a register - which could change during suspension */ + volatile f64 last = vlib_time_now (vm); + volatile l2_arp_term_publish_event_t last_event = { }; + + l2_arp_term_main_t *l2am = &l2_arp_term_main; + + while (1) + { + uword event_type = L2_ARP_TERM_EVENT_PUBLISH; + vpe_client_registration_t *reg; + f64 now; + + vlib_process_wait_for_event (vm); + + vlib_process_get_event_data (vm, &event_type); + now = vlib_time_now (vm); + + if (event_type == L2_ARP_TERM_EVENT_PUBLISH) + { + l2_arp_term_publish_event_t *event; + + vec_foreach (event, l2am->publish_events) + { + /* dampen duplicate events - cast away volatile */ + if (l2_arp_term_publish_event_is_equal + (event, (l2_arp_term_publish_event_t *) & last_event) && + (now - last) < 10.0) + { + continue; + } + last_event = *event; + last = now; + + /* *INDENT-OFF* */ + pool_foreach(reg, vpe_api_main.l2_arp_term_events_registrations, + ({ + vl_api_registration_t *vl_reg; + vl_reg = vl_api_client_index_to_registration (reg->client_index); + ASSERT (vl_reg != NULL); + + if (reg && vl_api_can_send_msg (vl_reg)) + { + vl_api_l2_arp_term_event_t * vevent; + vevent = vl_msg_api_alloc (sizeof *vevent); + clib_memset (vevent, 0, sizeof *vevent); + vevent->_vl_msg_id = htons (VL_API_L2_ARP_TERM_EVENT); + vevent->client_index = reg->client_index; + vevent->pid = reg->client_pid; + ip_address_encode(&event->ip, + event->type, + &vevent->ip); + vevent->sw_if_index = htonl(event->sw_if_index); + mac_address_encode(&event->mac, vevent->mac); + vl_api_send_msg (vl_reg, (u8 *) vevent); + } + })); + /* *INDENT-ON* */ + } + vec_reset_length (l2am->publish_events); + } + } + + return 0; +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (l2_arp_term_process_node) = { + .function = l2_arp_term_process, + .type = VLIB_NODE_TYPE_PROCESS, + .name = "l2-arp-term-publisher", +}; +/* *INDENT-ON* */ + +static void +vl_api_want_l2_arp_term_events_t_handler (vl_api_want_l2_arp_term_events_t * + mp) +{ + vl_api_want_l2_arp_term_events_reply_t *rmp; + vpe_api_main_t *am = &vpe_api_main; + vpe_client_registration_t *rp; + int rv = 0; + uword *p; + + p = hash_get (am->l2_arp_term_events_registration_hash, mp->client_index); + + if (p) + { + if (mp->enable) + { + clib_warning ("pid %d: already enabled...", mp->pid); + rv = VNET_API_ERROR_INVALID_REGISTRATION; + goto reply; + } + else + { + rp = pool_elt_at_index (am->l2_arp_term_events_registrations, p[0]); + pool_put (am->l2_arp_term_events_registrations, rp); + hash_unset (am->l2_arp_term_events_registration_hash, + mp->client_index); + if (pool_elts (am->l2_arp_term_events_registrations) == 0) + l2_arp_term_set_publisher_node (false); + goto reply; + } + } + if (mp->enable == 0) + { + clib_warning ("pid %d: already disabled...", mp->pid); + rv = VNET_API_ERROR_INVALID_REGISTRATION; + goto reply; + } + pool_get (am->l2_arp_term_events_registrations, rp); + rp->client_index = mp->client_index; + rp->client_pid = mp->pid; + hash_set (am->l2_arp_term_events_registration_hash, rp->client_index, + rp - am->l2_arp_term_events_registrations); + l2_arp_term_set_publisher_node (true); + +reply: + REPLY_MACRO (VL_API_WANT_L2_ARP_TERM_EVENTS_REPLY); +} + +static clib_error_t * +want_l2_arp_term_events_reaper (u32 client_index) +{ + vpe_client_registration_t *rp; + vpe_api_main_t *am; + uword *p; + + am = &vpe_api_main; + + /* remove from the registration hash */ + p = hash_get (am->l2_arp_term_events_registration_hash, client_index); + + if (p) + { + rp = pool_elt_at_index (am->l2_arp_term_events_registrations, p[0]); + pool_put (am->l2_arp_term_events_registrations, rp); + hash_unset (am->l2_arp_term_events_registration_hash, client_index); + if (pool_elts (am->l2_arp_term_events_registrations) == 0) + l2_arp_term_set_publisher_node (false); + } + return (NULL); +} + +VL_MSG_API_REAPER_FUNCTION (want_l2_arp_term_events_reaper); + /* * l2_api_hookup * Add vpe's API message handlers to the table. - * vlib has alread mapped shared memory and + * vlib has already mapped shared memory and * added the client registration handlers. * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() */ @@ -904,7 +1232,7 @@ setup_message_id_table (api_main_t * am) static clib_error_t * l2_api_hookup (vlib_main_t * vm) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); #define _(N,n) \ vl_msg_api_set_handlers(VL_API_##N, #n, \ @@ -916,6 +1244,9 @@ l2_api_hookup (vlib_main_t * vm) foreach_vpe_api_msg; #undef _ + /* Mark VL_API_BRIDGE_DOMAIN_DUMP as mp safe */ + am->is_mp_safe[VL_API_BRIDGE_DOMAIN_DUMP] = 1; + /* * Set up the (msg_name, crc, message-id) table */