X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fvmxnet3%2Fvmxnet3_api.c;h=cdb68708f579f4ef1a3074c776950c156894e03f;hb=277f03f06;hp=e0c2cfa6cf0d9f7588d6a2e0086c532cdcc85f9c;hpb=df7f8e8cffcc43531f7daeda44d436b60e538141;p=vpp.git diff --git a/src/plugins/vmxnet3/vmxnet3_api.c b/src/plugins/vmxnet3/vmxnet3_api.c index e0c2cfa6cf0..cdb68708f57 100644 --- a/src/plugins/vmxnet3/vmxnet3_api.c +++ b/src/plugins/vmxnet3/vmxnet3_api.c @@ -19,43 +19,18 @@ #include #include #include - +#include #include #include #include /* define message IDs */ -#include - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* define generated endian-swappers */ -#define vl_endianfun -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun - -/* get the API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version +#include +#include #include -#define foreach_vmxnet3_plugin_api_msg \ -_(VMXNET3_CREATE, vmxnet3_create) \ -_(VMXNET3_DELETE, vmxnet3_delete) \ -_(VMXNET3_DUMP, vmxnet3_dump) - static void vl_api_vmxnet3_create_t_handler (vl_api_vmxnet3_create_t * mp) { @@ -65,12 +40,16 @@ vl_api_vmxnet3_create_t_handler (vl_api_vmxnet3_create_t * mp) vmxnet3_create_if_args_t args; int rv; - memset (&args, 0, sizeof (vmxnet3_create_if_args_t)); + clib_memset (&args, 0, sizeof (vmxnet3_create_if_args_t)); args.enable_elog = ntohl (mp->enable_elog); args.addr.as_u32 = ntohl (mp->pci_addr); args.rxq_size = ntohs (mp->rxq_size); args.txq_size = ntohs (mp->txq_size); + args.txq_num = ntohs (mp->txq_num); + args.rxq_num = ntohs (mp->rxq_num); + args.bind = mp->bind; + args.enable_gso = mp->enable_gso; vmxnet3_create_if (vm, &args); rv = args.rv; @@ -94,10 +73,12 @@ vl_api_vmxnet3_delete_t_handler (vl_api_vmxnet3_delete_t * mp) vnet_hw_interface_t *hw; int rv = 0; - hw = vnet_get_sup_hw_interface (vnm, htonl (mp->sw_if_index)); + hw = + vnet_get_sup_hw_interface_api_visible_or_null (vnm, + htonl (mp->sw_if_index)); if (hw == NULL || vmxnet3_device_class.index != hw->dev_class_index) { - rv = VNET_API_ERROR_INVALID_INTERFACE; + rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; goto reply; } @@ -111,21 +92,20 @@ reply: static void send_vmxnet3_details (vl_api_registration_t * reg, vmxnet3_device_t * vd, - u16 rx_qid, vmxnet3_rxq_t * rxq, u16 tx_qid, - vmxnet3_txq_t * txq, vnet_sw_interface_t * swif, - u8 * interface_name, u32 context) + vnet_sw_interface_t * swif, u8 * interface_name, + u32 context) { vl_api_vmxnet3_details_t *mp; vnet_main_t *vnm = vnet_get_main (); vmxnet3_main_t *vmxm = &vmxnet3_main; vnet_hw_interface_t *hwif; vmxnet3_rx_ring *ring; - u16 rid; + u16 rid, qid; hwif = 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 = htons (VL_API_VMXNET3_DETAILS + vmxm->msg_id_base); mp->context = context; @@ -139,23 +119,39 @@ send_vmxnet3_details (vl_api_registration_t * reg, vmxnet3_device_t * vd, mp->version = vd->version; mp->pci_addr = ntohl (vd->pci_addr.as_u32); - - mp->rx_qsize = htons (rxq->size); - mp->rx_next = htons (rxq->rx_comp_ring.next); - for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++) - { - ring = &rxq->rx_ring[rid]; - mp->rx_fill[rid] = htons (ring->fill); - mp->rx_produce[rid] = htons (ring->produce); - mp->rx_consume[rid] = htons (ring->consume); - } - mp->tx_qsize = htons (txq->size); - mp->tx_next = htons (txq->tx_comp_ring.next); - mp->tx_produce = htons (txq->tx_ring.produce); - mp->tx_consume = htons (txq->tx_ring.consume); - mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0; + mp->rx_count = clib_min (vec_len (vd->rxqs), VMXNET3_RXQ_MAX); + vec_foreach_index (qid, vd->rxqs) + { + vmxnet3_rxq_t *rxq = vec_elt_at_index (vd->rxqs, qid); + vl_api_vmxnet3_rx_list_t *rx_list = &mp->rx_list[qid]; + + ASSERT (qid < VMXNET3_RXQ_MAX); + rx_list->rx_qsize = htons (rxq->size); + rx_list->rx_next = htons (rxq->rx_comp_ring.next); + for (rid = 0; rid < VMXNET3_RX_RING_SIZE; rid++) + { + ring = &rxq->rx_ring[rid]; + rx_list->rx_fill[rid] = htons (ring->fill); + rx_list->rx_produce[rid] = htons (ring->produce); + rx_list->rx_consume[rid] = htons (ring->consume); + } + } + + mp->tx_count = clib_min (vec_len (vd->txqs), VMXNET3_TXQ_MAX); + vec_foreach_index (qid, vd->txqs) + { + vmxnet3_txq_t *txq = vec_elt_at_index (vd->txqs, qid); + vl_api_vmxnet3_tx_list_t *tx_list = &mp->tx_list[qid]; + + ASSERT (qid < VMXNET3_TXQ_MAX); + tx_list->tx_qsize = htons (txq->size); + tx_list->tx_next = htons (txq->tx_comp_ring.next); + tx_list->tx_produce = htons (txq->tx_ring.produce); + tx_list->tx_consume = htons (txq->tx_ring.consume); + } + vl_api_send_msg (reg, (u8 *) mp); } @@ -172,9 +168,6 @@ vl_api_vmxnet3_dump_t_handler (vl_api_vmxnet3_dump_t * mp) vmxnet3_device_t *vd; u8 *if_name = 0; vl_api_registration_t *reg; - vmxnet3_rxq_t *rxq; - vmxnet3_txq_t *txq; - u16 qid = 0; reg = vl_api_client_index_to_registration (mp->client_index); if (!reg) @@ -186,10 +179,7 @@ vl_api_vmxnet3_dump_t_handler (vl_api_vmxnet3_dump_t * mp) swif = vnet_get_sw_interface (vnm, vd->sw_if_index); if_name = format (if_name, "%U%c", format_vnet_sw_interface_name, vnm, swif, 0); - rxq = vec_elt_at_index (vd->rxqs, qid); - txq = vec_elt_at_index (vd->txqs, qid); - send_vmxnet3_details (reg, vd, qid, rxq, qid, txq, swif, if_name, - mp->context); + send_vmxnet3_details (reg, vd, swif, if_name, mp->context); _vec_len (if_name) = 0; })); /* *INDENT-ON* */ @@ -197,49 +187,15 @@ vl_api_vmxnet3_dump_t_handler (vl_api_vmxnet3_dump_t * mp) vec_free (if_name); } -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (vmxnet3_main_t * vmxm, api_main_t * am) -{ -#define _(id,n,crc) \ - vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id + vmxm->msg_id_base); - foreach_vl_msg_name_crc_vmxnet3; -#undef _ -} - /* set tup the API message handling tables */ +#include clib_error_t * vmxnet3_plugin_api_hookup (vlib_main_t * vm) { vmxnet3_main_t *vmxm = &vmxnet3_main; - api_main_t *am = &api_main; - u8 *name; - - /* construct the API name */ - name = format (0, "vmxnet3_%08x%c", api_version, 0); /* ask for a correctly-sized block of API message decode slots */ - vmxm->msg_id_base = vl_msg_api_get_msg_ids - ((char *) name, VL_MSG_FIRST_AVAILABLE); - -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + vmxm->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vmxnet3_plugin_api_msg; -#undef _ - - /* set up the (msg_name, crc, message-id) table */ - setup_message_id_table (vmxm, am); - - vec_free (name); + vmxm->msg_id_base = setup_message_id_table (); return 0; }