X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_api.c;h=ab9d04af2d80e913a21050d0225ef14675f927d4;hb=9fecbe1841dbdb6d29fbeae4c3d7ebc728e9692a;hp=8b0cd8e4a339301053f4e48f602cc39d811da657;hpb=4a72406360270a4ff0197c9c8cca43366f515aa8;p=vpp.git diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index 8b0cd8e4a33..ab9d04af2d8 100644 --- a/src/vnet/interface_api.c +++ b/src/vnet/interface_api.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -31,6 +32,11 @@ #include #include +#include + +#include +#include + #define vl_typedefs /* define message structures */ #include #undef vl_typedefs @@ -63,6 +69,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) \ @@ -73,8 +80,12 @@ _(CREATE_LOOPBACK_INSTANCE, create_loopback_instance) \ _(DELETE_LOOPBACK, delete_loopback) \ _(INTERFACE_NAME_RENUMBER, interface_name_renumber) \ _(COLLECT_DETAILED_INTERFACE_STATS, collect_detailed_interface_stats) \ -_(SW_INTERFACE_SET_IP_DIRECTED_BROADCAST, \ - sw_interface_set_ip_directed_broadcast) +_(SW_INTERFACE_SET_IP_DIRECTED_BROADCAST, \ + sw_interface_set_ip_directed_broadcast) \ +_(SW_INTERFACE_ADDRESS_REPLACE_BEGIN, \ + sw_interface_address_replace_begin) \ +_(SW_INTERFACE_ADDRESS_REPLACE_END, \ + sw_interface_address_replace_end) static void vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp) @@ -87,7 +98,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 +172,9 @@ 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]); + } vnet_sw_interface_set_protocol_mtu (vnm, sw_if_index, per_protocol_mtu); BAD_SW_IF_INDEX_LABEL; @@ -192,14 +206,37 @@ 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); + vnet_device_class_t *dev_class = + vnet_get_device_class (am->vnet_main, hi->dev_class_index); 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); - 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); @@ -214,6 +251,10 @@ send_sw_interface_details (vpe_api_main_t * am, strncpy ((char *) mp->interface_name, (char *) interface_name, ARRAY_LEN (mp->interface_name) - 1); + if (dev_class && dev_class->name) + strncpy ((char *) mp->interface_dev_type, (char *) dev_class->name, + ARRAY_LEN (mp->interface_dev_type) - 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) @@ -222,61 +263,55 @@ send_sw_interface_details (vpe_api_main_t * am, ethernet_interface_t *ei; 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)); + ASSERT (sizeof (mp->l2_address) >= sizeof (ei->address.mac)); + mac_address_encode (&ei->address.mac, 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 */ 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_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; } @@ -308,10 +343,10 @@ 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) + 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) + /* 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); @@ -327,14 +362,14 @@ 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 = vl_api_from_api_to_new_vec (mp, &mp->name_filter); + vec_add1 (filter, 0); /* Ensure it's a C string for strcasecmp() */ } char *strcasestr (char *, char *); /* lnx hdr file botch */ /* *INDENT-OFF* */ - pool_foreach (swif, im->sw_interfaces, - ({ + pool_foreach (swif, im->sw_interfaces) + { if (!vnet_swif_is_api_visible (swif)) continue; vec_reset_length(name); @@ -345,7 +380,7 @@ vl_api_sw_interface_dump_t_handler (vl_api_sw_interface_dump_t * mp) continue; send_sw_interface_details (am, rp, swif, name, mp->context); - })); + } /* *INDENT-ON* */ vec_free (name); @@ -362,6 +397,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 +406,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 +428,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 +438,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 +681,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 +743,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); } @@ -784,12 +790,12 @@ link_state_process (vlib_main_t * vm, continue; /* *INDENT-OFF* */ - pool_foreach(reg, vam->interface_events_registrations, - ({ + pool_foreach (reg, vam->interface_events_registrations) + { vl_reg = vl_api_client_index_to_registration (reg->client_index); if (vl_reg) send_sw_interface_event (vam, reg, vl_reg, i, event_by_sw_if_index[i]); - })); + } /* *INDENT-ON* */ } vec_reset_length (event_by_sw_if_index); @@ -826,8 +832,9 @@ link_up_down_function (vnet_main_t * vm, u32 hw_if_index, u32 flags) if (vam->link_state_process_up) { - enum api_events event = - flags ? API_LINK_STATE_UP_EVENT : API_LINK_STATE_DOWN_EVENT; + enum api_events event = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? + 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); @@ -847,8 +854,8 @@ admin_up_down_function (vnet_main_t * vm, u32 sw_if_index, u32 flags) */ if (vam->link_state_process_up) { - enum api_events event = - flags ? API_ADMIN_UP_EVENT : API_ADMIN_DOWN_EVENT; + enum api_events event = ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? + API_ADMIN_UP_EVENT : API_ADMIN_DOWN_EVENT); vlib_process_signal_event (vam->vlib_main, link_state_process_node.index, event, sw_if_index); @@ -903,6 +910,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 +947,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 +994,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 (ð_if->address.mac, rmp->mac_address); vl_api_send_msg (reg, (u8 *) rmp); } @@ -970,6 +1007,7 @@ static void vl_api_sw_interface_set_rx_mode_t_handler vnet_sw_interface_t *si; clib_error_t *error; int rv = 0; + vnet_hw_if_rx_mode rx_mode; VALIDATE_SW_IF_INDEX (mp); @@ -980,9 +1018,12 @@ static void vl_api_sw_interface_set_rx_mode_t_handler goto bad_sw_if_index; } + rx_mode = (vnet_hw_if_rx_mode) ntohl (mp->mode); 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_if_rx_mode) rx_mode); + if (error) { rv = VNET_API_ERROR_UNIMPLEMENTED; @@ -1009,7 +1050,7 @@ send_interface_rx_placement_details (vpe_api_main_t * am, mp->sw_if_index = htonl (sw_if_index); mp->queue_id = htonl (queue_id); mp->worker_id = htonl (worker_id); - mp->mode = mode; + mp->mode = htonl (mode); mp->context = context; vl_api_send_msg (rp, (u8 *) mp); @@ -1029,29 +1070,24 @@ static void vl_api_sw_interface_rx_placement_dump_t_handler if (sw_if_index == ~0) { - vnet_device_input_runtime_t *rt; - vnet_device_and_queue_t *dq; - vlib_node_t *pn = vlib_get_node_by_name (am->vlib_main, - (u8 *) "device-input"); - uword si; - int index = 0; - - /* *INDENT-OFF* */ - foreach_vlib_main (({ - clib_bitmap_foreach (si, pn->sibling_bitmap, - ({ - rt = vlib_node_get_runtime_data (this_vlib_main, si); - vec_foreach (dq, rt->devices_and_queues) - { - vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, - dq->hw_if_index); - send_interface_rx_placement_details (am, reg, hw->sw_if_index, index, - dq->queue_id, dq->mode, mp->context); - } - })); - index++; - })); - /* *INDENT-ON* */ + vnet_hw_if_rx_queue_t **all_queues = 0; + vnet_hw_if_rx_queue_t **qptr; + vnet_hw_if_rx_queue_t *q; + vec_foreach (q, vnm->interface_main.hw_if_rx_queues) + vec_add1 (all_queues, q); + vec_sort_with_function (all_queues, vnet_hw_if_rxq_cmp_cli_api); + + vec_foreach (qptr, all_queues) + { + u32 current_thread = qptr[0]->thread_index; + u32 hw_if_index = qptr[0]->hw_if_index; + vnet_hw_interface_t *hw_if = + vnet_get_hw_interface (vnm, hw_if_index); + send_interface_rx_placement_details ( + am, reg, hw_if->sw_if_index, current_thread, qptr[0]->queue_id, + qptr[0]->mode, mp->context); + } + vec_free (all_queues); } else { @@ -1074,13 +1110,13 @@ static void vl_api_sw_interface_rx_placement_dump_t_handler vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, si->hw_if_index); - for (i = 0; i < vec_len (hw->dq_runtime_index_by_queue); i++) + for (i = 0; i < vec_len (hw->rx_queue_indices); i++) { - send_interface_rx_placement_details (am, reg, hw->sw_if_index, - hw->input_node_thread_index_by_queue - [i], i, - hw->rx_mode_by_queue[i], - mp->context); + vnet_hw_if_rx_queue_t *rxq = + vnet_hw_if_get_rx_queue (vnm, hw->rx_queue_indices[i]); + send_interface_rx_placement_details ( + am, reg, hw->sw_if_index, rxq->thread_index, rxq->queue_id, + rxq->mode, mp->context); } } @@ -1207,81 +1243,30 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp) { vl_api_create_subif_reply_t *rmp; vnet_main_t *vnm = vnet_get_main (); - u32 sw_if_index = ~0; - int rv = 0; - u32 sub_id; - vnet_sw_interface_t *si; + u32 sub_sw_if_index = ~0; vnet_hw_interface_t *hi; - vnet_sw_interface_t template; - uword *p; - vnet_interface_main_t *im = &vnm->interface_main; - u64 sup_and_sub_key; - clib_error_t *error; + int rv = 0; VALIDATE_SW_IF_INDEX (mp); - si = vnet_get_sup_sw_interface (vnm, ntohl (mp->sw_if_index)); hi = vnet_get_sup_hw_interface (vnm, ntohl (mp->sw_if_index)); if (hi->bond_info == VNET_HW_INTERFACE_BOND_INFO_SLAVE) - { - rv = VNET_API_ERROR_BOND_SLAVE_NOT_ALLOWED; - goto out; - } - - sw_if_index = si->sw_if_index; - sub_id = ntohl (mp->sub_id); - - sup_and_sub_key = ((u64) (sw_if_index) << 32) | (u64) sub_id; - - p = hash_get_mem (im->sw_if_index_by_sup_and_sub, &sup_and_sub_key); - if (p) - { - if (CLIB_DEBUG > 0) - clib_warning ("sup sw_if_index %d, sub id %d already exists\n", - sw_if_index, sub_id); - rv = VNET_API_ERROR_SUBIF_ALREADY_EXISTS; - goto out; - } - - clib_memset (&template, 0, sizeof (template)); - template.type = VNET_SW_INTERFACE_TYPE_SUB; - 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.outer_vlan_id = ntohs (mp->outer_vlan_id); - template.sub.eth.inner_vlan_id = ntohs (mp->inner_vlan_id); - - error = vnet_create_sw_interface (vnm, &template, &sw_if_index); - if (error) - { - clib_error_report (error); - rv = VNET_API_ERROR_SUBIF_CREATE_FAILED; - goto out; - } - - u64 *kp = clib_mem_alloc (sizeof (*kp)); - *kp = sup_and_sub_key; - - hash_set (hi->sub_interface_sw_if_index_by_id, sub_id, sw_if_index); - hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index); + rv = VNET_API_ERROR_BOND_SLAVE_NOT_ALLOWED; + else + rv = vnet_create_sub_interface (ntohl (mp->sw_if_index), + ntohl (mp->sub_id), + ntohl (mp->sub_if_flags), + ntohs (mp->inner_vlan_id), + ntohs (mp->outer_vlan_id), + &sub_sw_if_index); BAD_SW_IF_INDEX_LABEL; -out: - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_CREATE_SUBIF_REPLY, ({ - rmp->sw_if_index = ntohl(sw_if_index); + rmp->sw_if_index = ntohl(sub_sw_if_index); })); /* *INDENT-ON* */ } @@ -1320,8 +1305,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 +1326,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* */ @@ -1378,6 +1367,30 @@ static void REPLY_MACRO (VL_API_COLLECT_DETAILED_INTERFACE_STATS_REPLY); } +static void + vl_api_sw_interface_address_replace_begin_t_handler + (vl_api_sw_interface_address_replace_begin_t * mp) +{ + vl_api_sw_interface_address_replace_begin_reply_t *rmp; + int rv = 0; + + ip_interface_address_mark (); + + REPLY_MACRO (VL_API_SW_INTERFACE_ADDRESS_REPLACE_BEGIN_REPLY); +} + +static void + vl_api_sw_interface_address_replace_end_t_handler + (vl_api_sw_interface_address_replace_end_t * mp) +{ + vl_api_sw_interface_address_replace_end_reply_t *rmp; + int rv = 0; + + ip_interface_address_sweep (); + + REPLY_MACRO (VL_API_SW_INTERFACE_ADDRESS_REPLACE_END_REPLY); +} + /* * vpe_api_hookup * Add vpe's API message handlers to the table. @@ -1402,7 +1415,7 @@ pub_sub_handler (interface_events, INTERFACE_EVENTS); static clib_error_t * interface_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, \ @@ -1414,6 +1427,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 */