X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_api.c;h=4d5dab30f3801c83c5fc2db8498479ae7fc4008f;hb=e0792fdff;hp=b896433e95944f3367e54ba10f71ba9067b81c73;hpb=fdea5c6a00b74971dbb1b7ec4e25839a871006ca;p=vpp.git diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index b896433e959..4d5dab30f38 100644 --- a/src/vnet/interface_api.c +++ b/src/vnet/interface_api.c @@ -31,6 +31,11 @@ #include #include +#include + +#include +#include + #define vl_typedefs /* define message structures */ #include #undef vl_typedefs @@ -63,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) \ @@ -87,7 +93,9 @@ vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp) VALIDATE_SW_IF_INDEX (mp); - flags = mp->admin_up_down ? VNET_SW_INTERFACE_FLAG_ADMIN_UP : 0; + flags = + ((ntohl (mp->flags)) & IF_STATUS_API_FLAG_ADMIN_UP) ? + VNET_SW_INTERFACE_FLAG_ADMIN_UP : 0; error = vnet_sw_interface_set_flags (vnm, ntohl (mp->sw_if_index), flags); if (error) @@ -159,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; @@ -198,8 +208,29 @@ send_sw_interface_details (vpe_api_main_t * am, 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); - mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0; - mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0; + + mp->flags |= (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? + IF_STATUS_API_FLAG_ADMIN_UP : 0; + mp->flags |= (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? + 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); @@ -223,42 +254,38 @@ send_sw_interface_details (vpe_api_main_t * am, ei = pool_elt_at_index (em->interfaces, hi->hw_instance); ASSERT (sizeof (mp->l2_address) >= sizeof (ei->address)); - clib_memcpy (mp->l2_address, ei->address, sizeof (ei->address)); - mp->l2_address_length = ntohl (sizeof (ei->address)); + mac_address_encode ((mac_address_t *) ei->address, mp->l2_address); } else if (swif->sup_sw_if_index != swif->sw_if_index) { vnet_sub_interface_t *sub = &swif->sub; mp->sub_id = ntohl (sub->id); - mp->sub_dot1ad = sub->eth.flags.dot1ad; mp->sub_number_of_tags = sub->eth.flags.one_tag + sub->eth.flags.two_tags * 2; mp->sub_outer_vlan_id = ntohs (sub->eth.outer_vlan_id); mp->sub_inner_vlan_id = ntohs (sub->eth.inner_vlan_id); - mp->sub_exact_match = sub->eth.flags.exact_match; - mp->sub_default = sub->eth.flags.default_sub; - mp->sub_outer_vlan_id_any = sub->eth.flags.outer_vlan_id_any; - mp->sub_inner_vlan_id_any = sub->eth.flags.inner_vlan_id_any; - } + mp->sub_if_flags = + ntohl (sub->eth.raw_flags & SUB_IF_API_FLAG_MASK_VNET); - /* vlan tag rewrite data */ - u32 vtr_op = L2_VTR_DISABLED; - u32 vtr_push_dot1q = 0, vtr_tag1 = 0, vtr_tag2 = 0; + /* vlan tag rewrite data */ + u32 vtr_op = L2_VTR_DISABLED; + u32 vtr_push_dot1q = 0, vtr_tag1 = 0, vtr_tag2 = 0; - if (l2vtr_get (am->vlib_main, am->vnet_main, swif->sw_if_index, - &vtr_op, &vtr_push_dot1q, &vtr_tag1, &vtr_tag2) != 0) - { - // error - default to disabled - mp->vtr_op = ntohl (L2_VTR_DISABLED); - clib_warning ("cannot get vlan tag rewrite for sw_if_index %d", - swif->sw_if_index); - } - else - { - mp->vtr_op = ntohl (vtr_op); - mp->vtr_push_dot1q = ntohl (vtr_push_dot1q); - mp->vtr_tag1 = ntohl (vtr_tag1); - mp->vtr_tag2 = ntohl (vtr_tag2); + if (l2vtr_get (am->vlib_main, am->vnet_main, swif->sw_if_index, + &vtr_op, &vtr_push_dot1q, &vtr_tag1, &vtr_tag2) != 0) + { + // error - default to disabled + mp->vtr_op = ntohl (L2_VTR_DISABLED); + clib_warning ("cannot get vlan tag rewrite for sw_if_index %d", + swif->sw_if_index); + } + else + { + mp->vtr_op = ntohl (vtr_op); + mp->vtr_push_dot1q = ntohl (vtr_push_dot1q); + mp->vtr_tag1 = ntohl (vtr_tag1); + mp->vtr_tag2 = ntohl (vtr_tag2); + } } /* pbb tag rewrite data */ @@ -272,11 +299,9 @@ send_sw_interface_details (vpe_api_main_t * am, if (!l2pbb_get (am->vlib_main, am->vnet_main, swif->sw_if_index, &pbb_vtr_op, &outer_tag, ð_hdr, &b_vlanid, &i_sid)) { - mp->sub_dot1ah = 1; - clib_memcpy (mp->b_dmac, eth_hdr.dst_address, - sizeof (eth_hdr.dst_address)); - clib_memcpy (mp->b_smac, eth_hdr.src_address, - sizeof (eth_hdr.src_address)); + mp->sub_if_flags |= ntohl (SUB_IF_API_FLAG_DOT1AH); + mac_address_encode ((mac_address_t *) eth_hdr.dst_address, mp->b_dmac); + mac_address_encode ((mac_address_t *) eth_hdr.src_address, mp->b_smac); mp->b_vlanid = b_vlanid; mp->i_sid = i_sid; } @@ -311,7 +336,7 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp) if (!mp->name_filter_valid && sw_if_index != ~0 && sw_if_index != 0) { /* is it a valid sw_if_index? */ - if (vec_len (im->sw_interfaces) <= 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); @@ -327,8 +352,9 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp) if (mp->name_filter_valid) { - mp->name_filter[ARRAY_LEN (mp->name_filter) - 1] = 0; - filter = format (0, "%s%c", mp->name_filter, 0); + filter = + 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 */ @@ -362,6 +388,7 @@ static void int rv = 0; u32 is_del; clib_error_t *error = 0; + ip46_address_t address; VALIDATE_SW_IF_INDEX (mp); @@ -370,14 +397,14 @@ static void if (mp->del_all) ip_del_all_interface_addresses (vm, ntohl (mp->sw_if_index)); - else if (mp->is_ipv6) + 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 *) mp->address, - mp->address_length, is_del); + (void *) &address.ip6, + mp->prefix.len, is_del); else error = ip4_add_del_interface_address (vm, ntohl (mp->sw_if_index), - (void *) mp->address, - mp->address_length, is_del); + (void *) &address.ip4, + mp->prefix.len, is_del); if (error) { @@ -392,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) { @@ -414,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); @@ -661,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; @@ -741,9 +734,13 @@ send_sw_interface_event (vpe_api_main_t * am, mp->sw_if_index = ntohl (sw_if_index); mp->client_index = reg->client_index; mp->pid = reg->client_pid; - mp->admin_up_down = events & API_ADMIN_UP_EVENT ? 1 : 0; - mp->link_up_down = events & API_LINK_STATE_UP_EVENT ? 1 : 0; - mp->deleted = events & API_SW_INTERFACE_DEL_EVENT ? 1 : 0; + mp->flags = 0; + mp->flags |= (events & API_ADMIN_UP_EVENT) ? + IF_STATUS_API_FLAG_ADMIN_UP : 0; + 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); } @@ -903,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) { @@ -912,12 +937,14 @@ static void vl_api_sw_interface_set_mac_address_t_handler vnet_sw_interface_t *si; clib_error_t *error; int rv = 0; + mac_address_t mac; VALIDATE_SW_IF_INDEX (mp); si = vnet_get_sw_interface (vnm, sw_if_index); - error = vnet_hw_interface_change_mac_address (vnm, si->hw_if_index, - mp->mac_address); + mac_address_decode (mp->mac_address, &mac); + error = + vnet_hw_interface_change_mac_address (vnm, si->hw_if_index, (u8 *) & mac); if (error) { rv = VNET_API_ERROR_UNIMPLEMENTED; @@ -957,7 +984,7 @@ static void vl_api_sw_interface_get_mac_address_t_handler rmp->context = mp->context; rmp->retval = htonl (rv); if (!rv && eth_if) - memcpy (rmp->mac_address, eth_if->address, 6); + mac_address_encode ((mac_address_t *) eth_if->address, rmp->mac_address); vl_api_send_msg (reg, (u8 *) rmp); } @@ -982,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; @@ -1249,14 +1279,7 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp) template.flood_class = VNET_FLOOD_CLASS_NORMAL; template.sup_sw_if_index = sw_if_index; template.sub.id = sub_id; - template.sub.eth.flags.no_tags = mp->no_tags; - template.sub.eth.flags.one_tag = mp->one_tag; - template.sub.eth.flags.two_tags = mp->two_tags; - template.sub.eth.flags.dot1ad = mp->dot1ad; - template.sub.eth.flags.exact_match = mp->exact_match; - template.sub.eth.flags.default_sub = mp->default_sub; - template.sub.eth.flags.outer_vlan_id_any = mp->outer_vlan_id_any; - template.sub.eth.flags.inner_vlan_id_any = mp->inner_vlan_id_any; + template.sub.eth.raw_flags = ntohl (mp->sub_if_flags); template.sub.eth.outer_vlan_id = ntohs (mp->outer_vlan_id); template.sub.eth.inner_vlan_id = ntohs (mp->inner_vlan_id); @@ -1320,8 +1343,10 @@ vl_api_create_loopback_t_handler (vl_api_create_loopback_t * mp) vl_api_create_loopback_reply_t *rmp; u32 sw_if_index; int rv; + mac_address_t mac; - rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address, 0, 0); + mac_address_decode (mp->mac_address, &mac); + rv = vnet_create_loopback_interface (&sw_if_index, (u8 *) & mac, 0, 0); /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_CREATE_LOOPBACK_REPLY, @@ -1339,8 +1364,10 @@ static void vl_api_create_loopback_instance_t_handler u8 is_specified = mp->is_specified; u32 user_instance = ntohl (mp->user_instance); int rv; + mac_address_t mac; - rv = vnet_create_loopback_interface (&sw_if_index, mp->mac_address, + mac_address_decode (mp->mac_address, &mac); + rv = vnet_create_loopback_interface (&sw_if_index, (u8 *) & mac, is_specified, user_instance); /* *INDENT-OFF* */ @@ -1414,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 */