X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fmemif_test.c;h=1ec6703d135c54372903549e0cc0d5bd279c3971;hb=2dbee9361e74d03727a8b618ba80a5e28c006011;hp=c1ba9273f94bfd4cf72494217c82902db7a06d2b;hpb=7c2ea751992bb6a02b435022224314b943f75d48;p=vpp.git diff --git a/src/plugins/memif/memif_test.c b/src/plugins/memif/memif_test.c index c1ba9273f94..1ec6703d135 100644 --- a/src/plugins/memif/memif_test.c +++ b/src/plugins/memif/memif_test.c @@ -20,44 +20,21 @@ #include #include #include -#include + #include #include #include +#include #define __plugin_msg_base memif_test_main.msg_id_base #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 /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#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 +#include +//#include typedef struct { @@ -69,35 +46,6 @@ typedef struct memif_test_main_t memif_test_main; -/* standard reply handlers */ -#define foreach_standard_reply_retval_handler \ -_(memif_delete_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = memif_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 _ - -/* - * Table of message reply handlers, must include boilerplate handlers - * we just generated - */ -#define foreach_vpe_api_reply_msg \ -_(MEMIF_CREATE_REPLY, memif_create_reply) \ -_(MEMIF_DELETE_REPLY, memif_delete_reply) \ -_(MEMIF_DETAILS, memif_details) - static uword unformat_memif_queues (unformat_input_t * input, va_list * args) { @@ -112,14 +60,90 @@ unformat_memif_queues (unformat_input_t * input, va_list * args) return 1; } +/* memif_socket_filename_add_del API */ +static int +api_memif_socket_filename_add_del (vat_main_t * vam) +{ + unformat_input_t *i = vam->input; + vl_api_memif_socket_filename_add_del_t *mp; + u8 is_add; + u32 socket_id; + u8 *socket_filename; + int ret; + + is_add = 1; + socket_id = ~0; + socket_filename = 0; + + while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) + { + if (unformat (i, "id %u", &socket_id)) + ; + else if (unformat (i, "filename %s", &socket_filename)) + ; + else if (unformat (i, "del")) + is_add = 0; + else if (unformat (i, "add")) + is_add = 1; + else + { + vec_free (socket_filename); + clib_warning ("unknown input `%U'", format_unformat_error, i); + return -99; + } + } + + if (socket_id == 0 || socket_id == ~0) + { + vec_free (socket_filename); + errmsg ("Invalid socket id"); + return -99; + } + + if (is_add && (!socket_filename || *socket_filename == 0)) + { + vec_free (socket_filename); + errmsg ("Invalid socket filename"); + return -99; + } + + M2 (MEMIF_SOCKET_FILENAME_ADD_DEL, mp, strlen ((char *) socket_filename)); + + mp->is_add = is_add; + mp->socket_id = htonl (socket_id); + char *p = (char *) &mp->socket_filename; + p += vl_api_vec_to_api_string (socket_filename, (vl_api_string_t *) p); + + vec_free (socket_filename); + + S (mp); + W (ret); + + return ret; +} + +/* memif_socket_filename_add_del reply handler */ +#define VL_API_MEMIF_SOCKET_FILENAME_ADD_DEL_REPLY_T_HANDLER +static void vl_api_memif_socket_filename_add_del_reply_t_handler + (vl_api_memif_socket_filename_add_del_reply_t * mp) +{ + vat_main_t *vam = memif_test_main.vat_main; + i32 retval = ntohl (mp->retval); + + vam->retval = retval; + vam->result_ready = 1; + vam->regenerate_interface_table = 1; +} + /* memif-create API */ static int api_memif_create (vat_main_t * vam) { unformat_input_t *i = vam->input; vl_api_memif_create_t *mp; - u64 key = 0; - u8 *socket_filename = 0; + u32 id = 0; + u32 socket_id = 0; + u8 *secret = 0; u8 role = 1; u32 ring_size = 0; u32 buffer_size = 0; @@ -127,13 +151,15 @@ api_memif_create (vat_main_t * vam) u32 rx_queues = MEMIF_DEFAULT_RX_QUEUES; u32 tx_queues = MEMIF_DEFAULT_TX_QUEUES; int ret; - + u8 mode = MEMIF_INTERFACE_MODE_ETHERNET; while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT) { - if (unformat (i, "key 0x%" PRIx64, &key)) + if (unformat (i, "id %u", &id)) + ; + else if (unformat (i, "socket-id %u", &socket_id)) ; - else if (unformat (i, "socket %s", &socket_filename)) + else if (unformat (i, "secret %s", &secret)) ; else if (unformat (i, "ring_size %u", &ring_size)) ; @@ -144,6 +170,8 @@ api_memif_create (vat_main_t * vam) else if (unformat (i, "slave %U", unformat_memif_queues, &rx_queues, &tx_queues)) role = 1; + else if (unformat (i, "mode ip")) + mode = MEMIF_INTERFACE_MODE_IP; else if (unformat (i, "hw_addr %U", unformat_ethernet_address, hw_addr)) ; else @@ -153,6 +181,12 @@ api_memif_create (vat_main_t * vam) } } + if (socket_id == ~0) + { + errmsg ("invalid socket-id\n"); + return -99; + } + if (!is_pow2 (ring_size)) { errmsg ("ring size must be power of 2\n"); @@ -171,16 +205,19 @@ api_memif_create (vat_main_t * vam) return -99; } - M (MEMIF_CREATE, mp); + M2 (MEMIF_CREATE, mp, strlen ((char *) secret)); - mp->key = clib_host_to_net_u64 (key); + mp->mode = mode; + mp->id = clib_host_to_net_u32 (id); mp->role = role; mp->ring_size = clib_host_to_net_u32 (ring_size); mp->buffer_size = clib_host_to_net_u16 (buffer_size & 0xffff); - if (socket_filename != 0) + mp->socket_id = clib_host_to_net_u32 (socket_id); + if (secret != 0) { - strncpy ((char *) mp->socket_filename, (char *) socket_filename, 127); - vec_free (socket_filename); + char *p = (char *) &mp->secret; + p += vl_api_vec_to_api_string (secret, (vl_api_string_t *) p); + vec_free (secret); } memcpy (mp->hw_addr, hw_addr, 6); mp->rx_queues = rx_queues; @@ -206,6 +243,7 @@ static void vl_api_memif_create_reply_t_handler vam->retval = retval; vam->result_ready = 1; + vam->regenerate_interface_table = 1; } /* memif-delete API */ @@ -263,6 +301,8 @@ api_memif_dump (vat_main_t * vam) S (mp); /* Use a control ping for synchronization */ + if (!mm->ping_id) + mm->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 (mm->ping_id); mp_ping->client_index = vam->my_client_index; @@ -277,84 +317,76 @@ api_memif_dump (vat_main_t * vam) } /* memif-details message handler */ -static void vl_api_memif_details_t_handler (vl_api_memif_details_t * mp) +static void +vl_api_memif_details_t_handler (vl_api_memif_details_t * mp) { vat_main_t *vam = memif_test_main.vat_main; fformat (vam->ofp, "%s: sw_if_index %u mac %U\n" - " key 0x%" PRIx64 " socket %s role %s\n" + " id %u socket-id %u role %s\n" " ring_size %u buffer_size %u\n" " state %s link %s\n", mp->if_name, ntohl (mp->sw_if_index), format_ethernet_address, - mp->hw_addr, clib_net_to_host_u64 (mp->key), mp->socket_filename, + mp->hw_addr, clib_net_to_host_u32 (mp->id), + clib_net_to_host_u32 (mp->socket_id), mp->role ? "slave" : "master", ntohl (mp->ring_size), ntohs (mp->buffer_size), - mp->admin_up_down ? "up" : "down", - mp->link_up_down ? "up" : "down"); -} - -/* - * List of messages that the api test plugin sends, - * and that the data plane plugin processes - */ -#define foreach_vpe_api_msg \ -_(memif_create, "[key ] [socket ] [ring_size ] " \ - "[buffer_size ] [hw_addr ] " \ - "") \ -_(memif_delete, "") \ -_(memif_dump, "") - -static void -memif_vat_api_hookup (vat_main_t * vam) -{ - memif_test_main_t *mm __attribute__ ((unused)) = &memif_test_main; - /* Hook up handlers for replies from the data plane plug-in */ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + mm->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 _ - - /* API messages we can send */ -#define _(n,h) \ - hash_set_mem (vam->function_by_name, #n, api_##n); - foreach_vpe_api_msg; -#undef _ - - /* Help strings */ -#define _(n,h) hash_set_mem (vam->help_by_name, #n, h); - foreach_vpe_api_msg; -#undef _ + (mp->flags & IF_STATUS_API_FLAG_ADMIN_UP) ? "up" : "down", + (mp->flags & IF_STATUS_API_FLAG_LINK_UP) ? "up" : "down"); } -clib_error_t * -vat_plugin_register (vat_main_t * vam) +/* memif_socket_filename_dump API */ +static int +api_memif_socket_filename_dump (vat_main_t * vam) { memif_test_main_t *mm = &memif_test_main; - u8 *name; + vl_api_memif_socket_filename_dump_t *mp; + vl_api_control_ping_t *mp_ping; + int ret; - mm->vat_main = vam; + if (vam->json_output) + { + clib_warning + ("JSON output not supported for memif_socket_filename_dump"); + return -99; + } + + M (MEMIF_SOCKET_FILENAME_DUMP, mp); + S (mp); - /* Ask the vpp engine for the first assigned message-id */ - name = format (0, "memif_%08x%c", api_version, 0); - mm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name); + /* Use a control ping for synchronization */ + if (!mm->ping_id) + mm->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 (mm->ping_id); + mp_ping->client_index = vam->my_client_index; + + fformat (vam->ofp, "Sending ping id=%d\n", mm->ping_id); - /* Get the control ping ID */ -#define _(id,n,crc) \ - const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc; - foreach_vl_msg_name_crc_vpe; -#undef _ - mm->ping_id = vl_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC)); + vam->result_ready = 0; + S (mp_ping); - if (mm->msg_id_base != (u16) ~0) - memif_vat_api_hookup (vam); + W (ret); + return ret; +} - vec_free (name); +/* memif_socket_format_details message handler */ +static void vl_api_memif_socket_filename_details_t_handler + (vl_api_memif_socket_filename_details_t * mp) +{ + vat_main_t *vam = memif_test_main.vat_main; - return 0; + fformat (vam->ofp, + "id %u : filename %s\n", + ntohl (mp->socket_id), mp->socket_filename); } + +#include + +/* + * fd.io coding-style-patch-verification: ON + * + * Local Variables: + * eval: (c-set-style "gnu") + * End: + */