X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fvmxnet3%2Fvmxnet3_test.c;h=9b73c09d03c9b31470df954f7355e35ab3db0cf8;hb=a1400cecb;hp=7a70f619a552bed7d1efafb824e80d2947f84a04;hpb=21a438465ca0dee88d13d9dd9621929116c95614;p=vpp.git diff --git a/src/plugins/vmxnet3/vmxnet3_test.c b/src/plugins/vmxnet3/vmxnet3_test.c index 7a70f619a55..9b73c09d03c 100644 --- a/src/plugins/vmxnet3/vmxnet3_test.c +++ b/src/plugins/vmxnet3/vmxnet3_test.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -31,34 +32,9 @@ #include /* declare message IDs */ -#include - -/* Get CRC codes of the messages defined outside of this plugin */ -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -/* define message structures */ -#define vl_typedefs -#include -#include -#undef vl_typedefs - -/* declare message handlers for each api */ -#define vl_endianfun -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include -#undef vl_printfun - -/* get API version number */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vp_api_version +#include +#include +#include typedef struct { @@ -70,30 +46,6 @@ typedef struct vmxnet3_test_main_t vmxnet3_test_main; -#define foreach_standard_reply_retval_handler \ -_(vmxnet3_delete_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = vmxnet3_test_main.vat_main; \ - i32 retval = ntohl(mp->retval); \ - if (vam->async_mode) { \ - vam->async_errors += (retval < 0); \ - } else { \ - vam->retval = retval; \ - vam->result_ready = 1; \ - } \ - } -foreach_standard_reply_retval_handler; -#undef _ - -#define foreach_vpe_api_reply_msg \ -_(VMXNET3_CREATE_REPLY, vmxnet3_create_reply) \ -_(VMXNET3_DELETE_REPLY, vmxnet3_delete_reply) \ -_(VMXNET3_DETAILS, vmxnet3_details) - /* vmxnet3 create API */ static int api_vmxnet3_create (vat_main_t * vam) @@ -114,6 +66,8 @@ api_vmxnet3_create (vat_main_t * vam) args.enable_elog = 1; else if (unformat (i, "bind")) args.bind = 1; + else if (unformat (i, "gso")) + args.enable_gso = 1; else if (unformat (i, "rx-queue-size %u", &size)) args.rxq_size = size; else if (unformat (i, "tx-queue-size %u", &size)) @@ -138,6 +92,7 @@ api_vmxnet3_create (vat_main_t * vam) mp->txq_num = clib_host_to_net_u16 (args.txq_num); mp->rxq_num = clib_host_to_net_u16 (args.rxq_num); mp->bind = args.bind; + mp->enable_gso = args.enable_gso; S (mp); W (ret); @@ -218,6 +173,54 @@ api_vmxnet3_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ + if (!vxm->ping_id) + vxm->ping_id = + vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); + mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); + mp_ping->_vl_msg_id = htons (vxm->ping_id); + mp_ping->client_index = vam->my_client_index; + + fformat (vam->ofp, "Sending ping id=%d\n", vxm->ping_id); + + vam->result_ready = 0; + S (mp_ping); + + W (ret); + return ret; +} + +static int +api_sw_vmxnet3_interface_dump (vat_main_t * vam) +{ + vmxnet3_test_main_t *vxm = &vmxnet3_test_main; + vl_api_sw_vmxnet3_interface_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; + u32 sw_if_index = ~0; + unformat_input_t *i = vam->input; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "sw_if_index %d", &sw_if_index)) + ; + else + break; + } + + if (vam->json_output) + { + clib_warning ("JSON output not supported for vmxnet3_dump"); + return -99; + } + + M (SW_VMXNET3_INTERFACE_DUMP, mp); + mp->sw_if_index = ntohl (sw_if_index); + S (mp); + + /* Use a control ping for synchronization */ + if (!vxm->ping_id) + vxm->ping_id = + vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping)); mp_ping->_vl_msg_id = htons (vxm->ping_id); mp_ping->client_index = vam->my_client_index; @@ -284,69 +287,53 @@ vl_api_vmxnet3_details_t_handler (vl_api_vmxnet3_details_t * mp) } } -/* - * List of messages that the api test plugin sends, - * and that the data plane plugin processes - */ -#define foreach_vpe_api_msg \ -_(vmxnet3_create, " [rx-queue-size ] " \ - "[tx-queue-size ] [num-tx-queues ]" \ - "[num-rx-queues ] [bind]") \ -_(vmxnet3_delete, "sw_if_index ") \ -_(vmxnet3_dump, "") - -static void -vmxnet3_vat_api_hookup (vat_main_t * vam) +static void vl_api_sw_vmxnet3_interface_details_t_handler + (vl_api_sw_vmxnet3_interface_details_t * mp) { - vmxnet3_test_main_t *vxm __attribute__ ((unused)) = &vmxnet3_test_main; -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + vxm->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_vpe_api_reply_msg; -#undef _ - -#define _(n,h) \ - hash_set_mem (vam->function_by_name, #n, api_##n); - foreach_vpe_api_msg; -#undef _ - -#define _(n,h) hash_set_mem (vam->help_by_name, #n, h); - foreach_vpe_api_msg; -#undef _ -} - -clib_error_t * -vat_plugin_register (vat_main_t * vam) -{ - vmxnet3_test_main_t *vxm = &vmxnet3_test_main; - u8 *name; - - vxm->vat_main = vam; - - name = format (0, "vmxnet3_%08x%c", api_version, 0); - vxm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name); - vec_free (name); - - if (vxm->msg_id_base == (u16) ~ 0) - return clib_error_return (0, "vmxnet3 plugin not loaded..."); - - /* Get the control ping ID */ -#define _(id,n,crc) \ - const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc; - foreach_vl_msg_name_crc_vpe; -#undef _ - vxm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); - - vmxnet3_vat_api_hookup (vam); + vat_main_t *vam = vmxnet3_test_main.vat_main; + u32 pci_addr = ntohl (mp->pci_addr); + u16 qid; - return 0; + fformat (vam->ofp, "%s: sw_if_index %u mac %U\n" + " version: %u\n" + " PCI Address: %U\n" + " state %s\n", + mp->if_name, ntohl (mp->sw_if_index), format_ethernet_address, + mp->hw_addr, mp->version, + format_pci_addr, &pci_addr, mp->admin_up_down ? "up" : "down"); + for (qid = 0; qid < mp->rx_count; qid++) + { + vl_api_vmxnet3_rx_list_t *rx_list = &mp->rx_list[qid]; + fformat (vam->ofp, + " RX Queue %u\n" + " RX completion next index %u\n" + " ring 0 size %u fill %u consume %u produce %u\n" + " ring 1 size %u fill %u consume %u produce %u\n", + qid, + ntohs (rx_list->rx_next), + ntohs (rx_list->rx_qsize), ntohs (rx_list->rx_fill[0]), + ntohs (rx_list->rx_consume[0]), + ntohs (rx_list->rx_produce[0]), + ntohs (rx_list->rx_qsize), ntohs (rx_list->rx_fill[1]), + ntohs (rx_list->rx_consume[1]), + ntohs (rx_list->rx_produce[1])); + } + for (qid = 0; qid < mp->tx_count; qid++) + { + vl_api_vmxnet3_tx_list_t *tx_list = &mp->tx_list[qid]; + fformat (vam->ofp, + " TX Queue %u\n" + " TX completion next index %u\n" + " size %u consume %u produce %u\n", + qid, + ntohs (tx_list->tx_next), + ntohs (tx_list->tx_qsize), ntohs (tx_list->tx_consume), + ntohs (tx_list->tx_produce)); + } } +#include + /* * fd.io coding-style-patch-verification: ON *