X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Finterface_api.c;h=5b24a29efc99a1855b72613daf3ed50dba80949d;hp=8d982e36b739542f20adb4e97faf3d781b2d93dd;hb=59f71132e;hpb=871dc4287d8c05ff76106dba4f5f8654c24347fe diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index 8d982e36b73..5b24a29efc9 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 @@ -50,16 +55,20 @@ vpe_api_main_t vpe_api_main; #define foreach_vpe_api_msg \ _(SW_INTERFACE_SET_FLAGS, sw_interface_set_flags) \ +_(HW_INTERFACE_SET_MTU, hw_interface_set_mtu) \ _(SW_INTERFACE_SET_MTU, sw_interface_set_mtu) \ _(WANT_INTERFACE_EVENTS, want_interface_events) \ _(SW_INTERFACE_DUMP, sw_interface_dump) \ _(SW_INTERFACE_ADD_DEL_ADDRESS, sw_interface_add_del_address) \ _(SW_INTERFACE_SET_RX_MODE, sw_interface_set_rx_mode) \ +_(SW_INTERFACE_RX_PLACEMENT_DUMP, sw_interface_rx_placement_dump) \ +_(SW_INTERFACE_SET_RX_PLACEMENT, sw_interface_set_rx_placement) \ _(SW_INTERFACE_SET_TABLE, sw_interface_set_table) \ _(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) \ @@ -69,7 +78,13 @@ _(CREATE_LOOPBACK, create_loopback) \ _(CREATE_LOOPBACK_INSTANCE, create_loopback_instance) \ _(DELETE_LOOPBACK, delete_loopback) \ _(INTERFACE_NAME_RENUMBER, interface_name_renumber) \ -_(COLLECT_DETAILED_INTERFACE_STATS, collect_detailed_interface_stats) +_(COLLECT_DETAILED_INTERFACE_STATS, collect_detailed_interface_stats) \ +_(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) @@ -82,7 +97,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) @@ -96,9 +113,9 @@ vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp) } static void -vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp) +vl_api_hw_interface_set_mtu_t_handler (vl_api_hw_interface_set_mtu_t * mp) { - vl_api_sw_interface_set_mtu_reply_t *rmp; + vl_api_hw_interface_set_mtu_reply_t *rmp; vnet_main_t *vnm = vnet_get_main (); u32 sw_if_index = ntohl (mp->sw_if_index); u16 mtu = ntohs (mp->mtu); @@ -137,10 +154,49 @@ vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp) vnet_hw_interface_set_mtu (vnm, si->hw_if_index, mtu); + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO (VL_API_HW_INTERFACE_SET_MTU_REPLY); +} + +static void +vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp) +{ + vl_api_sw_interface_set_mtu_reply_t *rmp; + vnet_main_t *vnm = vnet_get_main (); + u32 sw_if_index = ntohl (mp->sw_if_index); + int rv = 0; + int i; + u32 per_protocol_mtu[VNET_N_MTU]; + + VALIDATE_SW_IF_INDEX (mp); + + for (i = 0; i < VNET_N_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; REPLY_MACRO (VL_API_SW_INTERFACE_SET_MTU_REPLY); } +static void + vl_api_sw_interface_set_ip_directed_broadcast_t_handler + (vl_api_sw_interface_set_ip_directed_broadcast_t * mp) +{ + vl_api_sw_interface_set_ip_directed_broadcast_reply_t *rmp; + u32 sw_if_index = ntohl (mp->sw_if_index); + int rv = 0; + + VALIDATE_SW_IF_INDEX (mp); + + vnet_sw_interface_ip_directed_broadcast (vnet_get_main (), + sw_if_index, mp->enable); + + BAD_SW_IF_INDEX_LABEL; + REPLY_MACRO (VL_API_SW_INTERFACE_SET_IP_DIRECTED_BROADCAST_REPLY); +} + static void send_sw_interface_details (vpe_api_main_t * am, vl_api_registration_t * rp, @@ -149,24 +205,55 @@ 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)); - memset (mp, 0, 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 = ((hi->flags & VNET_HW_INTERFACE_FLAG_SPEED_MASK) >> - VNET_HW_INTERFACE_FLAG_SPEED_SHIFT); + mp->link_speed = ntohl (hi->link_speed); mp->link_mtu = ntohs (hi->max_packet_bytes); + mp->mtu[VNET_MTU_L3] = ntohl (swif->mtu[VNET_MTU_L3]); + mp->mtu[VNET_MTU_IP4] = ntohl (swif->mtu[VNET_MTU_IP4]); + mp->mtu[VNET_MTU_IP6] = ntohl (swif->mtu[VNET_MTU_IP6]); + mp->mtu[VNET_MTU_MPLS] = ntohl (swif->mtu[VNET_MTU_MPLS]); + mp->context = context; 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) @@ -176,60 +263,54 @@ 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 */ 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; - memset (ð_hdr, 0, sizeof (eth_hdr)); + 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; } @@ -248,6 +329,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); @@ -258,10 +340,29 @@ 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) { - 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->name_filter); + vec_add1 (filter, 0); /* Ensure it's a C string for strcasecmp() */ } char *strcasestr (char *, char *); /* lnx hdr file botch */ @@ -295,6 +396,7 @@ static void int rv = 0; u32 is_del; clib_error_t *error = 0; + ip46_address_t address; VALIDATE_SW_IF_INDEX (mp); @@ -303,14 +405,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) { @@ -325,18 +427,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) { @@ -347,15 +437,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); @@ -381,31 +467,16 @@ ip_table_bind (fib_protocol_t fproto, msrc = MFIB_SOURCE_CLI; } - /* - * This is temporary whilst I do the song and dance with the CSIT version - */ - if (0 != table_id) - { - fib_index = fib_table_find_or_create_and_lock (fproto, table_id, src); - mfib_index = - mfib_table_find_or_create_and_lock (fproto, table_id, msrc); - } - else - { - fib_index = 0; - mfib_index = 0; - } - /* * This if table does not exist = error is what we want in the end. */ - /* fib_index = fib_table_find (fproto, table_id); */ - /* mfib_index = mfib_table_find (fproto, table_id); */ + fib_index = fib_table_find (fproto, table_id); + mfib_index = mfib_table_find (fproto, table_id); - /* if (~0 == fib_index || ~0 == mfib_index) */ - /* { */ - /* return (VNET_API_ERROR_NO_SUCH_FIB); */ - /* } */ + if (~0 == fib_index || ~0 == mfib_index) + { + return (VNET_API_ERROR_NO_SUCH_FIB); + } if (FIB_PROTOCOL_IP6 == fproto) { @@ -413,7 +484,7 @@ ip_table_bind (fib_protocol_t fproto, * If the interface already has in IP address, then a change int * VRF is not allowed. The IP address applied must first be removed. * We do not do that automatically here, since VPP has no knowledge - * of whether thoses subnets are valid in the destination VRF. + * of whether those subnets are valid in the destination VRF. */ /* *INDENT-OFF* */ foreach_ip_interface_address (&ip6_main.lookup_main, @@ -464,7 +535,7 @@ ip_table_bind (fib_protocol_t fproto, * If the interface already has in IP address, then a change int * VRF is not allowed. The IP address applied must first be removed. * We do not do that automatically here, since VPP has no knowledge - * of whether thoses subnets are valid in the destination VRF. + * of whether those subnets are valid in the destination VRF. */ /* *INDENT-OFF* */ foreach_ip_interface_address (&ip4_main.lookup_main, @@ -513,15 +584,6 @@ ip_table_bind (fib_protocol_t fproto, ip4_main.mfib_index_by_sw_if_index[sw_if_index] = mfib_index; } - /* - * Temporary. undo the locks from the find and create at the staart - */ - if (0 != table_id) - { - fib_table_unlock (fib_index, fproto, src); - mfib_table_unlock (mfib_index, fproto, msrc); - } - return (0); } @@ -532,7 +594,7 @@ send_sw_interface_get_table_reply (vl_api_registration_t * reg, vl_api_sw_interface_get_table_reply_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_SW_INTERFACE_GET_TABLE_REPLY); mp->context = context; mp->retval = htonl (retval); @@ -618,52 +680,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; @@ -671,38 +715,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)); - memset (mp, 0, 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->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 = 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); } @@ -711,13 +757,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; @@ -725,42 +771,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; @@ -770,6 +807,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) = { @@ -781,6 +821,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) @@ -789,9 +830,14 @@ 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 & 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); + } return 0; } @@ -806,9 +852,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 & 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); + } + 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; } @@ -843,6 +909,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) { @@ -852,12 +946,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; @@ -897,7 +993,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); } @@ -914,9 +1010,18 @@ static void vl_api_sw_interface_set_rx_mode_t_handler VALIDATE_SW_IF_INDEX (mp); si = vnet_get_sw_interface (vnm, sw_if_index); + if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE) + { + rv = VNET_API_ERROR_INVALID_VALUE; + goto bad_sw_if_index; + } + 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; @@ -929,6 +1034,132 @@ out: REPLY_MACRO (VL_API_SW_INTERFACE_SET_RX_MODE_REPLY); } +static void +send_interface_rx_placement_details (vpe_api_main_t * am, + vl_api_registration_t * rp, + u32 sw_if_index, u32 worker_id, + u32 queue_id, u8 mode, u32 context) +{ + vl_api_sw_interface_rx_placement_details_t *mp; + mp = vl_msg_api_alloc (sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); + + mp->_vl_msg_id = htons (VL_API_SW_INTERFACE_RX_PLACEMENT_DETAILS); + mp->sw_if_index = htonl (sw_if_index); + mp->queue_id = htonl (queue_id); + mp->worker_id = htonl (worker_id); + mp->mode = mode; + mp->context = context; + + vl_api_send_msg (rp, (u8 *) mp); +} + +static void vl_api_sw_interface_rx_placement_dump_t_handler + (vl_api_sw_interface_rx_placement_dump_t * mp) +{ + vnet_main_t *vnm = vnet_get_main (); + vpe_api_main_t *am = &vpe_api_main; + u32 sw_if_index = ntohl (mp->sw_if_index); + vl_api_registration_t *reg; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + 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* */ + } + else + { + int i; + vnet_sw_interface_t *si; + + if (!vnet_sw_if_index_is_api_valid (sw_if_index)) + { + clib_warning ("sw_if_index %u does not exist", sw_if_index); + goto bad_sw_if_index; + } + + si = vnet_get_sw_interface (vnm, sw_if_index); + if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE) + { + clib_warning ("interface type is not HARDWARE! P2P, PIPE and SUB" + " interfaces are not supported"); + goto bad_sw_if_index; + } + + 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++) + { + 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); + } + } + + BAD_SW_IF_INDEX_LABEL; +} + +static void vl_api_sw_interface_set_rx_placement_t_handler + (vl_api_sw_interface_set_rx_placement_t * mp) +{ + vl_api_sw_interface_set_rx_placement_reply_t *rmp; + vnet_main_t *vnm = vnet_get_main (); + u32 sw_if_index = ntohl (mp->sw_if_index); + vnet_sw_interface_t *si; + clib_error_t *error = 0; + int rv = 0; + + VALIDATE_SW_IF_INDEX (mp); + + si = vnet_get_sw_interface (vnm, sw_if_index); + if (si->type != VNET_SW_INTERFACE_TYPE_HARDWARE) + { + rv = VNET_API_ERROR_INVALID_VALUE; + goto bad_sw_if_index; + } + + error = set_hw_interface_rx_placement (si->hw_if_index, + ntohl (mp->queue_id), + ntohl (mp->worker_id), mp->is_main); + 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_SET_RX_PLACEMENT_REPLY); +} + static void vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp) { @@ -971,8 +1202,9 @@ vl_api_create_vlan_subif_t_handler (vl_api_create_vlan_subif_t * mp) goto out; } - memset (&template, 0, sizeof (template)); + 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 = hi->sw_if_index; template.sub.id = id; template.sub.eth.raw_flags = 0; @@ -1014,80 +1246,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; - } - - memset (&template, 0, sizeof (template)); - template.type = VNET_SW_INTERFACE_TYPE_SUB; - 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* */ } @@ -1126,8 +1308,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, @@ -1145,8 +1329,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* */ @@ -1184,10 +1370,34 @@ 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. - * 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() */ @@ -1208,7 +1418,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, \ @@ -1220,6 +1430,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 */