X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_api.c;h=4d5dab30f3801c83c5fc2db8498479ae7fc4008f;hb=e0792fdff;hp=eb5b57346ce66d61a61b126a6f2491e0e147745e;hpb=e63325e3ca03c847963863446345e6c80a2c0cfd;p=vpp.git diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index eb5b57346ce..4d5dab30f38 100644 --- a/src/vnet/interface_api.c +++ b/src/vnet/interface_api.c @@ -68,6 +68,7 @@ _(SW_INTERFACE_GET_TABLE, sw_interface_get_table) \ _(SW_INTERFACE_SET_UNNUMBERED, sw_interface_set_unnumbered) \ _(SW_INTERFACE_CLEAR_STATS, sw_interface_clear_stats) \ _(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del) \ +_(SW_INTERFACE_ADD_DEL_MAC_ADDRESS, sw_interface_add_del_mac_address) \ _(SW_INTERFACE_SET_MAC_ADDRESS, sw_interface_set_mac_address) \ _(SW_INTERFACE_GET_MAC_ADDRESS, sw_interface_get_mac_address) \ _(CREATE_VLAN_SUBIF, create_vlan_subif) \ @@ -166,8 +167,10 @@ vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp) VALIDATE_SW_IF_INDEX (mp); for (i = 0; i < VNET_N_MTU; i++) - per_protocol_mtu[i] = ntohl (mp->mtu[i]); - + { + per_protocol_mtu[i] = ntohl (mp->mtu[i]); + clib_warning ("MTU %u", per_protocol_mtu[i]); + } vnet_sw_interface_set_protocol_mtu (vnm, sw_if_index, per_protocol_mtu); BAD_SW_IF_INDEX_LABEL; @@ -200,14 +203,8 @@ send_sw_interface_details (vpe_api_main_t * am, vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (am->vnet_main, swif->sw_if_index); - uint32_t if_name_len = strlen ((char *) interface_name); - u8 *tag = vnet_get_sw_interface_tag (vnet_get_main (), swif->sw_if_index); - uint32_t tag_len = 0; - if (tag != NULL) - tag_len = strlen ((char *) tag); - vl_api_sw_interface_details_t *mp = - vl_msg_api_alloc (sizeof (*mp) + if_name_len + tag_len); - clib_memset (mp, 0, sizeof (*mp) + if_name_len + tag_len); + vl_api_sw_interface_details_t *mp = vl_msg_api_alloc (sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_DETAILS); mp->sw_if_index = ntohl (swif->sw_if_index); mp->sup_sw_if_index = ntohl (swif->sup_sw_if_index); @@ -218,6 +215,22 @@ send_sw_interface_details (vpe_api_main_t * am, IF_STATUS_API_FLAG_LINK_UP : 0; mp->flags = ntohl (mp->flags); + switch (swif->type) + { + case VNET_SW_INTERFACE_TYPE_SUB: + mp->type = IF_API_TYPE_SUB; + break; + case VNET_SW_INTERFACE_TYPE_P2P: + mp->type = IF_API_TYPE_P2P; + break; + case VNET_SW_INTERFACE_TYPE_PIPE: + mp->type = IF_API_TYPE_PIPE; + break; + default: + mp->type = IF_API_TYPE_HARDWARE; + } + mp->type = ntohl (mp->type); + mp->link_duplex = ((hi->flags & VNET_HW_INTERFACE_FLAG_DUPLEX_MASK) >> VNET_HW_INTERFACE_FLAG_DUPLEX_SHIFT); mp->link_speed = ntohl (hi->link_speed); @@ -229,6 +242,9 @@ send_sw_interface_details (vpe_api_main_t * am, mp->context = context; + strncpy ((char *) mp->interface_name, + (char *) interface_name, ARRAY_LEN (mp->interface_name) - 1); + /* Send the L2 address for ethernet physical intfcs */ if (swif->sup_sw_if_index == swif->sw_if_index && hi->hw_class_index == ethernet_hw_interface_class.index) @@ -274,14 +290,14 @@ send_sw_interface_details (vpe_api_main_t * am, /* pbb tag rewrite data */ ethernet_header_t eth_hdr; - u32 vtr_op = L2_VTR_DISABLED; + u32 pbb_vtr_op = L2_VTR_DISABLED; u16 outer_tag = 0; u16 b_vlanid = 0; u32 i_sid = 0; clib_memset (ð_hdr, 0, sizeof (eth_hdr)); if (!l2pbb_get (am->vlib_main, am->vnet_main, swif->sw_if_index, - &vtr_op, &outer_tag, ð_hdr, &b_vlanid, &i_sid)) + &pbb_vtr_op, &outer_tag, ð_hdr, &b_vlanid, &i_sid)) { mp->sub_if_flags |= ntohl (SUB_IF_API_FLAG_DOT1AH); mac_address_encode ((mac_address_t *) eth_hdr.dst_address, mp->b_dmac); @@ -290,12 +306,9 @@ send_sw_interface_details (vpe_api_main_t * am, mp->i_sid = i_sid; } - char *p = (char *) &mp->interface_name; - p += - vl_api_to_api_string (if_name_len, (char *) interface_name, - (vl_api_string_t *) p); - if (tag != NULL) - vl_api_to_api_string (tag_len, (char *) tag, (vl_api_string_t *) p); + u8 *tag = vnet_get_sw_interface_tag (vnet_get_main (), swif->sw_if_index); + if (tag) + strncpy ((char *) mp->tag, (char *) tag, ARRAY_LEN (mp->tag) - 1); vl_api_send_msg (rp, (u8 *) mp); } @@ -307,6 +320,7 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp) vnet_sw_interface_t *swif; vnet_interface_main_t *im = &am->vnet_main->interface_main; vl_api_registration_t *rp; + u32 sw_if_index; rp = vl_api_client_index_to_registration (mp->client_index); @@ -317,10 +331,30 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp) } u8 *filter = 0, *name = 0; + sw_if_index = ntohl (mp->sw_if_index); + + if (!mp->name_filter_valid && sw_if_index != ~0 && sw_if_index != 0) + { + /* is it a valid sw_if_index? */ + if (!vnet_sw_if_index_is_api_valid (sw_if_index)) + return; + + swif = vec_elt_at_index (im->sw_interfaces, sw_if_index); + + vec_reset_length (name); + name = + format (name, "%U%c", format_vnet_sw_interface_name, am->vnet_main, + swif, 0); + send_sw_interface_details (am, rp, swif, name, mp->context); + vec_free (name); + return; + } + if (mp->name_filter_valid) { filter = - format (0, "%s%c", vl_api_from_api_string_c (&mp->name_filter), 0); + format (0, ".*%s", vl_api_string_len (&mp->name_filter), + vl_api_from_api_string (&mp->name_filter), 0); } char *strcasestr (char *, char *); /* lnx hdr file botch */ @@ -366,11 +400,11 @@ static void else if (ip_address_decode (&mp->prefix.address, &address) == IP46_TYPE_IP6) error = ip6_add_del_interface_address (vm, ntohl (mp->sw_if_index), (void *) &address.ip6, - mp->prefix.address_length, is_del); + mp->prefix.len, is_del); else error = ip4_add_del_interface_address (vm, ntohl (mp->sw_if_index), (void *) &address.ip4, - mp->prefix.address_length, is_del); + mp->prefix.len, is_del); if (error) { @@ -385,18 +419,6 @@ done: REPLY_MACRO (VL_API_SW_INTERFACE_ADD_DEL_ADDRESS_REPLY); } -void stats_dslock_with_hint (int hint, int tag) __attribute__ ((weak)); -void -stats_dslock_with_hint (int hint, int tag) -{ -} - -void stats_dsunlock (void) __attribute__ ((weak)); -void -stats_dsunlock (void) -{ -} - static void vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t * mp) { @@ -407,15 +429,11 @@ vl_api_sw_interface_set_table_t_handler (vl_api_sw_interface_set_table_t * mp) VALIDATE_SW_IF_INDEX (mp); - stats_dslock_with_hint (1 /* release hint */ , 4 /* tag */ ); - if (mp->is_ipv6) rv = ip_table_bind (FIB_PROTOCOL_IP6, sw_if_index, table_id, 1); else rv = ip_table_bind (FIB_PROTOCOL_IP4, sw_if_index, table_id, 1); - stats_dsunlock (); - BAD_SW_IF_INDEX_LABEL; REPLY_MACRO (VL_API_SW_INTERFACE_SET_TABLE_REPLY); @@ -654,52 +672,34 @@ vl_api_sw_interface_clear_stats_t_handler (vl_api_sw_interface_clear_stats_t * vnet_interface_main_t *im = &vnm->interface_main; vlib_simple_counter_main_t *sm; vlib_combined_counter_main_t *cm; - static vnet_main_t **my_vnet_mains; - int i, j, n_counters; + int j, n_counters; int rv = 0; if (mp->sw_if_index != ~0) VALIDATE_SW_IF_INDEX (mp); - vec_reset_length (my_vnet_mains); - - for (i = 0; i < vec_len (vnet_mains); i++) - { - if (vnet_mains[i]) - vec_add1 (my_vnet_mains, vnet_mains[i]); - } - - if (vec_len (vnet_mains) == 0) - vec_add1 (my_vnet_mains, vnm); - n_counters = vec_len (im->combined_sw_if_counters); for (j = 0; j < n_counters; j++) { - for (i = 0; i < vec_len (my_vnet_mains); i++) - { - im = &my_vnet_mains[i]->interface_main; - cm = im->combined_sw_if_counters + j; - if (mp->sw_if_index == (u32) ~ 0) - vlib_clear_combined_counters (cm); - else - vlib_zero_combined_counter (cm, ntohl (mp->sw_if_index)); - } + im = &vnm->interface_main; + cm = im->combined_sw_if_counters + j; + if (mp->sw_if_index == (u32) ~ 0) + vlib_clear_combined_counters (cm); + else + vlib_zero_combined_counter (cm, ntohl (mp->sw_if_index)); } n_counters = vec_len (im->sw_if_counters); for (j = 0; j < n_counters; j++) { - for (i = 0; i < vec_len (my_vnet_mains); i++) - { - im = &my_vnet_mains[i]->interface_main; - sm = im->sw_if_counters + j; - if (mp->sw_if_index == (u32) ~ 0) - vlib_clear_simple_counters (sm); - else - vlib_zero_simple_counter (sm, ntohl (mp->sw_if_index)); - } + im = &vnm->interface_main; + sm = im->sw_if_counters + j; + if (mp->sw_if_index == (u32) ~ 0) + vlib_clear_simple_counters (sm); + else + vlib_zero_simple_counter (sm, ntohl (mp->sw_if_index)); } BAD_SW_IF_INDEX_LABEL; @@ -707,43 +707,40 @@ vl_api_sw_interface_clear_stats_t_handler (vl_api_sw_interface_clear_stats_t * REPLY_MACRO (VL_API_SW_INTERFACE_CLEAR_STATS_REPLY); } -#define API_LINK_STATE_EVENT 1 -#define API_ADMIN_UP_DOWN_EVENT 2 - -static int -event_data_cmp (void *a1, void *a2) +/* + * Events used for sw_interface_events + */ +enum api_events { - uword *e1 = a1; - uword *e2 = a2; - - return (word) e1[0] - (word) e2[0]; -} + API_LINK_STATE_UP_EVENT = 1 << 1, + API_LINK_STATE_DOWN_EVENT = 1 << 2, + API_ADMIN_UP_EVENT = 1 << 3, + API_ADMIN_DOWN_EVENT = 1 << 4, + API_SW_INTERFACE_ADD_EVENT = 1 << 5, + API_SW_INTERFACE_DEL_EVENT = 1 << 6, +}; static void send_sw_interface_event (vpe_api_main_t * am, vpe_client_registration_t * reg, vl_api_registration_t * vl_reg, - vnet_sw_interface_t * swif) + u32 sw_if_index, enum api_events events) { vl_api_sw_interface_event_t *mp; - vnet_main_t *vnm = am->vnet_main; - vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, - swif->sw_if_index); mp = vl_msg_api_alloc (sizeof (*mp)); clib_memset (mp, 0, sizeof (*mp)); mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_EVENT); - mp->sw_if_index = ntohl (swif->sw_if_index); + mp->sw_if_index = ntohl (sw_if_index); mp->client_index = reg->client_index; mp->pid = reg->client_pid; - mp->flags = 0; - mp->flags |= (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? + mp->flags |= (events & API_ADMIN_UP_EVENT) ? IF_STATUS_API_FLAG_ADMIN_UP : 0; - mp->flags |= (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? + mp->flags |= (events & API_LINK_STATE_UP_EVENT) ? IF_STATUS_API_FLAG_LINK_UP : 0; mp->flags = ntohl (mp->flags); - + mp->deleted = events & API_SW_INTERFACE_DEL_EVENT ? true : false; vl_api_send_msg (vl_reg, (u8 *) mp); } @@ -752,13 +749,13 @@ link_state_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) { vpe_api_main_t *vam = &vpe_api_main; - vnet_main_t *vnm = vam->vnet_main; - vnet_sw_interface_t *swif; - uword *event_data = 0; + uword *event_by_sw_if_index = 0; vpe_client_registration_t *reg; int i; - u32 prev_sw_if_index; vl_api_registration_t *vl_reg; + uword event_type; + uword *event_data = 0; + u32 sw_if_index; vam->link_state_process_up = 1; @@ -766,42 +763,33 @@ link_state_process (vlib_main_t * vm, { vlib_process_wait_for_event (vm); - /* Unified list of changed link or admin state sw_if_indices */ - vlib_process_get_events_with_type - (vm, &event_data, API_LINK_STATE_EVENT); - vlib_process_get_events_with_type - (vm, &event_data, API_ADMIN_UP_DOWN_EVENT); - - /* Sort, so we can eliminate duplicates */ - vec_sort_with_function (event_data, event_data_cmp); - - prev_sw_if_index = ~0; + /* Batch up events */ + while ((event_type = vlib_process_get_events (vm, &event_data)) != ~0) + { + for (i = 0; i < vec_len (event_data); i++) + { + sw_if_index = event_data[i]; + vec_validate_init_empty (event_by_sw_if_index, sw_if_index, 0); + event_by_sw_if_index[sw_if_index] |= event_type; + } + vec_reset_length (event_data); + } - for (i = 0; i < vec_len (event_data); i++) + for (i = 0; i < vec_len (event_by_sw_if_index); i++) { - /* Only one message per swif */ - if (prev_sw_if_index == event_data[i]) + if (event_by_sw_if_index[i] == 0) continue; - prev_sw_if_index = event_data[i]; /* *INDENT-OFF* */ pool_foreach(reg, vam->interface_events_registrations, ({ vl_reg = vl_api_client_index_to_registration (reg->client_index); if (vl_reg) - { - /* sw_interface may be deleted already */ - if (!pool_is_free_index (vnm->interface_main.sw_interfaces, - event_data[i])) - { - swif = vnet_get_sw_interface (vnm, event_data[i]); - send_sw_interface_event (vam, reg, vl_reg, swif); - } - } + send_sw_interface_event (vam, reg, vl_reg, i, event_by_sw_if_index[i]); })); /* *INDENT-ON* */ } - vec_reset_length (event_data); + vec_reset_length (event_by_sw_if_index); } return 0; @@ -811,6 +799,9 @@ static clib_error_t *link_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags); static clib_error_t *admin_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags); +static clib_error_t *sw_interface_add_del_function (vnet_main_t * vm, + u32 sw_if_index, + u32 flags); /* *INDENT-OFF* */ VLIB_REGISTER_NODE (link_state_process_node,static) = { @@ -822,6 +813,7 @@ VLIB_REGISTER_NODE (link_state_process_node,static) = { VNET_SW_INTERFACE_ADMIN_UP_DOWN_FUNCTION (admin_up_down_function); VNET_HW_INTERFACE_LINK_UP_DOWN_FUNCTION (link_up_down_function); +VNET_SW_INTERFACE_ADD_DEL_FUNCTION (sw_interface_add_del_function); static clib_error_t * link_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags) @@ -830,9 +822,13 @@ link_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags) vnet_hw_interface_t *hi = vnet_get_hw_interface (vm, hw_if_index); if (vam->link_state_process_up) - vlib_process_signal_event (vam->vlib_main, - link_state_process_node.index, - API_LINK_STATE_EVENT, hi->sw_if_index); + { + enum api_events event = + flags ? API_LINK_STATE_UP_EVENT : API_LINK_STATE_DOWN_EVENT; + vlib_process_signal_event (vam->vlib_main, + link_state_process_node.index, event, + hi->sw_if_index); + } return 0; } @@ -847,9 +843,29 @@ admin_up_down_function (vnet_main_t * vm, u32 sw_if_index, u32 flags) * routine. */ if (vam->link_state_process_up) - vlib_process_signal_event (vam->vlib_main, - link_state_process_node.index, - API_ADMIN_UP_DOWN_EVENT, sw_if_index); + { + enum api_events event = + flags ? API_ADMIN_UP_EVENT : API_ADMIN_DOWN_EVENT; + vlib_process_signal_event (vam->vlib_main, + link_state_process_node.index, event, + sw_if_index); + } + return 0; +} + +static clib_error_t * +sw_interface_add_del_function (vnet_main_t * vm, u32 sw_if_index, u32 flags) +{ + vpe_api_main_t *vam = &vpe_api_main; + + if (vam->link_state_process_up) + { + enum api_events event = + flags ? API_SW_INTERFACE_ADD_EVENT : API_SW_INTERFACE_DEL_EVENT; + vlib_process_signal_event (vam->vlib_main, + link_state_process_node.index, event, + sw_if_index); + } return 0; } @@ -866,13 +882,14 @@ static void vl_api_sw_interface_tag_add_del_t_handler if (mp->is_add) { - if (vl_api_from_api_string_c (&mp->tag)[0] == 0) + if (mp->tag[0] == 0) { rv = VNET_API_ERROR_INVALID_VALUE; goto out; } - tag = format (0, "%s%c", vl_api_from_api_string_c (&mp->tag), 0); + mp->tag[ARRAY_LEN (mp->tag) - 1] = 0; + tag = format (0, "%s%c", mp->tag, 0); vnet_set_sw_interface_tag (vnm, tag, sw_if_index); } else @@ -883,6 +900,34 @@ out: REPLY_MACRO (VL_API_SW_INTERFACE_TAG_ADD_DEL_REPLY); } +static void vl_api_sw_interface_add_del_mac_address_t_handler + (vl_api_sw_interface_add_del_mac_address_t * mp) +{ + vl_api_sw_interface_add_del_mac_address_reply_t *rmp; + vnet_main_t *vnm = vnet_get_main (); + u32 sw_if_index = ntohl (mp->sw_if_index); + vnet_hw_interface_t *hi; + clib_error_t *error; + int rv = 0; + + VALIDATE_SW_IF_INDEX (mp); + + /* for subifs, the MAC should be changed on the actual hw if */ + hi = vnet_get_sup_hw_interface (vnm, sw_if_index); + error = vnet_hw_interface_add_del_mac_address (vnm, hi->hw_if_index, + mp->addr, mp->is_add); + if (error) + { + rv = VNET_API_ERROR_UNIMPLEMENTED; + clib_error_report (error); + goto out; + } + + BAD_SW_IF_INDEX_LABEL; +out: + REPLY_MACRO (VL_API_SW_INTERFACE_ADD_DEL_MAC_ADDRESS_REPLY); +} + static void vl_api_sw_interface_set_mac_address_t_handler (vl_api_sw_interface_set_mac_address_t * mp) { @@ -964,7 +1009,10 @@ static void vl_api_sw_interface_set_rx_mode_t_handler error = set_hw_interface_change_rx_mode (vnm, si->hw_if_index, mp->queue_id_valid, - ntohl (mp->queue_id), mp->mode); + ntohl (mp->queue_id), + (vnet_hw_interface_rx_mode) + mp->mode); + if (error) { rv = VNET_API_ERROR_UNIMPLEMENTED; @@ -1393,6 +1441,14 @@ interface_api_hookup (vlib_main_t * vm) foreach_vpe_api_msg; #undef _ + /* Mark these APIs as mp safe */ + am->is_mp_safe[VL_API_SW_INTERFACE_DUMP] = 1; + am->is_mp_safe[VL_API_SW_INTERFACE_DETAILS] = 1; + am->is_mp_safe[VL_API_SW_INTERFACE_TAG_ADD_DEL] = 1; + + /* Do not replay VL_API_SW_INTERFACE_DUMP messages */ + am->api_trace_cfg[VL_API_SW_INTERFACE_DUMP].replay_enable = 0; + /* * Set up the (msg_name, crc, message-id) table */