X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fmemif_api.c;h=5dafea34f98f326cde0a4f7d33df489fe1cefbcd;hb=546f955b3;hp=684f53c5193df29495d178613e69665661d0f96a;hpb=59b2565cd91a67ced650739f36129650830211ac;p=vpp.git diff --git a/src/plugins/memif/memif_api.c b/src/plugins/memif/memif_api.c index 684f53c5193..5dafea34f98 100644 --- a/src/plugins/memif/memif_api.c +++ b/src/plugins/memif/memif_api.c @@ -26,6 +26,8 @@ #include #include +#include +#include /* define message IDs */ #include @@ -51,47 +53,62 @@ #include #undef vl_api_version -/* - * A handy macro to set up a message reply. - * Assumes that the following variables are available: - * mp - pointer to request message - * rmp - pointer to reply message type - * rv - return value +#define REPLY_MSG_ID_BASE mm->msg_id_base +#include + +#define foreach_memif_plugin_api_msg \ +_(MEMIF_SOCKET_FILENAME_ADD_DEL, memif_socket_filename_add_del) \ +_(MEMIF_CREATE, memif_create) \ +_(MEMIF_DELETE, memif_delete) \ +_(MEMIF_SOCKET_FILENAME_DUMP, memif_socket_filename_dump) \ +_(MEMIF_DUMP, memif_dump) \ + + +/** + * @brief Message handler for memif_socket_filename_add_del API. + * @param mp the vl_api_memif_socket_filename_add_del_t API message */ -#define REPLY_MACRO(t) \ -do { \ - unix_shared_memory_queue_t * q = \ - vl_api_client_index_to_input_queue (mp->client_index); \ - if (!q) \ - return; \ - \ - rmp = vl_msg_api_alloc (sizeof (*rmp)); \ - rmp->_vl_msg_id = htons ((t)+mm->msg_id_base); \ - rmp->context = mp->context; \ - rmp->retval = htonl (rv); \ - \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ -} while(0); - -#define REPLY_MACRO2(t, body) \ -do { \ - unix_shared_memory_queue_t * q = \ - vl_api_client_index_to_input_queue (mp->client_index); \ - if (!q) \ - return; \ - \ - rmp = vl_msg_api_alloc (sizeof (*rmp)); \ - rmp->_vl_msg_id = htons ((t)+mm->msg_id_base); \ - rmp->context = mp->context; \ - rmp->retval = htonl (rv); \ - do {body;} while (0); \ - vl_msg_api_send_shmem (q, (u8 *)&rmp); \ -} while(0); - -#define foreach_memif_plugin_api_msg \ -_(MEMIF_CREATE, memif_create) \ -_(MEMIF_DELETE, memif_delete) \ -_(MEMIF_DUMP, memif_dump) \ +void + vl_api_memif_socket_filename_add_del_t_handler + (vl_api_memif_socket_filename_add_del_t * mp) +{ + memif_main_t *mm = &memif_main; + u8 is_add; + u32 socket_id; + u32 len; + u8 *socket_filename; + vl_api_memif_socket_filename_add_del_reply_t *rmp; + int rv; + + /* is_add */ + is_add = mp->is_add; + + /* socket_id */ + socket_id = clib_net_to_host_u32 (mp->socket_id); + if (socket_id == 0 || socket_id == ~0) + { + rv = VNET_API_ERROR_INVALID_ARGUMENT; + goto reply; + } + + /* socket filename */ + socket_filename = 0; + mp->socket_filename[ARRAY_LEN (mp->socket_filename) - 1] = 0; + len = strlen ((char *) mp->socket_filename); + if (mp->is_add) + { + vec_validate (socket_filename, len); + memcpy (socket_filename, mp->socket_filename, len); + } + + rv = memif_socket_filename_add_del (is_add, socket_id, socket_filename); + + vec_free (socket_filename); + +reply: + REPLY_MACRO (VL_API_MEMIF_SOCKET_FILENAME_ADD_DEL_REPLY); +} + /** * @brief Message handler for memif_create API. @@ -107,19 +124,13 @@ vl_api_memif_create_t_handler (vl_api_memif_create_t * mp) u32 ring_size = MEMIF_DEFAULT_RING_SIZE; static const u8 empty_hw_addr[6]; int rv = 0; + mac_address_t mac; /* id */ args.id = clib_net_to_host_u32 (mp->id); - /* socket filename */ - mp->socket_filename[ARRAY_LEN (mp->socket_filename) - 1] = 0; - if (strlen ((char *) mp->socket_filename) > 0) - { - vec_validate (args.socket_filename, - strlen ((char *) mp->socket_filename)); - strncpy ((char *) args.socket_filename, (char *) mp->socket_filename, - vec_len (args.socket_filename)); - } + /* socket-id */ + args.socket_id = clib_net_to_host_u32 (mp->socket_id); /* secret */ mp->secret[ARRAY_LEN (mp->secret) - 1] = 0; @@ -131,10 +142,15 @@ vl_api_memif_create_t_handler (vl_api_memif_create_t * mp) } /* role */ - args.is_master = (mp->role == 0); + args.is_master = (ntohl (mp->role) == MEMIF_ROLE_API_MASTER); /* mode */ - args.mode = mp->mode; + args.mode = ntohl (mp->mode); + + args.is_zero_copy = mp->no_zero_copy ? 0 : 1; + + /* enable zero-copy */ + args.is_zero_copy = 1; /* rx/tx queues */ if (args.is_master == 0) @@ -171,22 +187,22 @@ vl_api_memif_create_t_handler (vl_api_memif_create_t * mp) } /* MAC address */ - if (memcmp (mp->hw_addr, empty_hw_addr, 6) != 0) + mac_address_decode (mp->hw_addr, &mac); + if (memcmp (&mac, empty_hw_addr, 6) != 0) { - memcpy (args.hw_addr, mp->hw_addr, 6); + memcpy (args.hw_addr, &mac, 6); args.hw_addr_set = 1; } rv = memif_create_if (vm, &args); - vec_free (args.socket_filename); vec_free (args.secret); reply: /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_MEMIF_CREATE_REPLY, ({ - rmp->sw_if_index = htonl (args.sw_if_index); + rmp->sw_if_index = htonl (args.sw_if_index); })); /* *INDENT-ON* */ } @@ -202,11 +218,14 @@ vl_api_memif_delete_t_handler (vl_api_memif_delete_t * mp) vlib_main_t *vm = vlib_get_main (); vnet_main_t *vnm = vnet_get_main (); vl_api_memif_delete_reply_t *rmp; - vnet_hw_interface_t *hi = - vnet_get_sup_hw_interface (vnm, ntohl (mp->sw_if_index)); + vnet_hw_interface_t *hi; memif_if_t *mif; int rv = 0; + hi = + vnet_get_sup_hw_interface_api_visible_or_null (vnm, + ntohl (mp->sw_if_index)); + if (hi == NULL || memif_device_class.index != hi->dev_class_index) rv = VNET_API_ERROR_INVALID_SW_IF_INDEX; else @@ -219,7 +238,7 @@ vl_api_memif_delete_t_handler (vl_api_memif_delete_t * mp) } static void -send_memif_details (unix_shared_memory_queue_t * q, +send_memif_details (vl_api_registration_t * reg, memif_if_t * mif, vnet_sw_interface_t * swif, u8 * interface_name, u32 context) @@ -227,14 +246,13 @@ send_memif_details (unix_shared_memory_queue_t * q, vl_api_memif_details_t *mp; vnet_main_t *vnm = vnet_get_main (); memif_main_t *mm = &memif_main; - memif_socket_file_t *msf = vec_elt_at_index (mm->socket_files, - mif->socket_file_index); vnet_hw_interface_t *hwif; + memif_socket_file_t *msf; 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_MEMIF_DETAILS + mm->msg_id_base); mp->context = context; @@ -242,20 +260,35 @@ send_memif_details (unix_shared_memory_queue_t * q, mp->sw_if_index = htonl (swif->sw_if_index); strncpy ((char *) mp->if_name, (char *) interface_name, ARRAY_LEN (mp->if_name) - 1); - memcpy (mp->hw_addr, hwif->hw_address, ARRAY_LEN (mp->hw_addr)); + + if (hwif->hw_address) + { + mac_address_encode ((mac_address_t *) hwif->hw_address, mp->hw_addr); + } mp->id = clib_host_to_net_u32 (mif->id); - mp->role = (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) ? 1 : 0; - strncpy ((char *) mp->socket_filename, - (char *) msf->filename, ARRAY_LEN (mp->socket_filename) - 1); + msf = pool_elt_at_index (mm->socket_files, mif->socket_file_index); + mp->socket_id = clib_host_to_net_u32 (msf->socket_id); + + mp->role = + (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) ? MEMIF_ROLE_API_SLAVE : + MEMIF_ROLE_API_MASTER; + mp->role = htonl (mp->role); + mp->mode = htonl (mif->mode); mp->ring_size = htonl (1 << mif->run.log2_ring_size); mp->buffer_size = htons (mif->run.buffer_size); + mp->zero_copy = (mif->flags & MEMIF_IF_FLAG_ZERO_COPY) ? 1 : 0; + + mp->flags = 0; + mp->flags |= (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? + IF_STATUS_API_FLAG_ADMIN_UP : 0; + mp->flags |= (hwif->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? + IF_STATUS_API_FLAG_LINK_UP : 0; + mp->flags = htonl (mp->flags); - mp->admin_up_down = (swif->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? 1 : 0; - mp->link_up_down = (hwif->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) ? 1 : 0; - vl_msg_api_send_shmem (q, (u8 *) & mp); + vl_api_send_msg (reg, (u8 *) mp); } /** @@ -270,10 +303,10 @@ vl_api_memif_dump_t_handler (vl_api_memif_dump_t * mp) vnet_sw_interface_t *swif; memif_if_t *mif; u8 *if_name = 0; - unix_shared_memory_queue_t *q; + vl_api_registration_t *reg; - q = vl_api_client_index_to_input_queue (mp->client_index); - if (q == 0) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) return; /* *INDENT-OFF* */ @@ -285,7 +318,7 @@ vl_api_memif_dump_t_handler (vl_api_memif_dump_t * mp) format_vnet_sw_interface_name, vnm, swif, 0); - send_memif_details (q, mif, swif, if_name, mp->context); + send_memif_details (reg, mif, swif, if_name, mp->context); _vec_len (if_name) = 0; })); /* *INDENT-ON* */ @@ -293,6 +326,58 @@ vl_api_memif_dump_t_handler (vl_api_memif_dump_t * mp) vec_free (if_name); } +static void +send_memif_socket_filename_details (vl_api_registration_t * reg, + u32 socket_id, + u8 * socket_filename, u32 context) +{ + vl_api_memif_socket_filename_details_t *mp; + memif_main_t *mm = &memif_main; + + mp = vl_msg_api_alloc (sizeof (*mp)); + clib_memset (mp, 0, sizeof (*mp)); + + mp->_vl_msg_id = htons (VL_API_MEMIF_SOCKET_FILENAME_DETAILS + + mm->msg_id_base); + mp->context = context; + + mp->socket_id = clib_host_to_net_u32 (socket_id); + strncpy ((char *) mp->socket_filename, + (char *) socket_filename, ARRAY_LEN (mp->socket_filename) - 1); + + vl_api_send_msg (reg, (u8 *) mp); +} + +/** + * @brief Message handler for memif_socket_filename_dump API. + * @param mp vl_api_memif_socket_filename_dump_t api message + */ +void + vl_api_memif_socket_filename_dump_t_handler + (vl_api_memif_socket_filename_dump_t * mp) +{ + memif_main_t *mm = &memif_main; + vl_api_registration_t *reg; + u32 sock_id; + u32 msf_idx; + + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + /* *INDENT-OFF* */ + hash_foreach (sock_id, msf_idx, mm->socket_file_index_by_sock_id, + ({ + memif_socket_file_t *msf; + u8 *filename; + + msf = pool_elt_at_index(mm->socket_files, msf_idx); + filename = msf->filename; + send_memif_socket_filename_details(reg, sock_id, filename, mp->context); + })); + /* *INDENT-ON* */ +} + #define vl_msg_name_crc_list #include #undef vl_msg_name_crc_list