X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_api.c;h=e4faeed76b0ed492b1906b52a2c0afeedabac3a2;hb=5100aa9cb;hp=4ee3372ae284f835bb0734e0d4760187e2e2ec28;hpb=bdc0e6b7204ea0211d4f7881497e4306586fb9ef;p=vpp.git diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c index 4ee3372ae28..e4faeed76b0 100644 --- a/src/vnet/interface_api.c +++ b/src/vnet/interface_api.c @@ -56,6 +56,7 @@ _(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) \ @@ -193,7 +194,7 @@ send_sw_interface_details (vpe_api_main_t * am, vnet_get_sup_hw_interface (am->vnet_main, swif->sw_if_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); @@ -201,8 +202,7 @@ send_sw_interface_details (vpe_api_main_t * am, mp->link_up_down = (hi->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0; 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 = 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]); @@ -267,7 +267,7 @@ send_sw_interface_details (vpe_api_main_t * am, 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)) @@ -555,7 +555,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); @@ -718,7 +718,7 @@ send_sw_interface_event (vpe_api_main_t * am, 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->client_index = reg->client_index; @@ -958,6 +958,98 @@ 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) { @@ -1034,7 +1126,7 @@ 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.sup_sw_if_index = hi->sw_if_index; template.sub.id = id; @@ -1114,7 +1206,7 @@ vl_api_create_subif_t_handler (vl_api_create_subif_t * mp) goto out; } - memset (&template, 0, sizeof (template)); + clib_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;