X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fmemif%2Fmemif.c;h=c2df8d3b12e929d3ffaaa0f7c3ecf2af2361f75a;hb=7ff07354c3a6969e306f75bf28502a46697abcda;hp=f533ab97e804162f1ac396c4a7061aaf2588c10b;hpb=cef1db9c13f57a1fc49c9e500adffafa0b9ca728;p=vpp.git diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c index f533ab97e80..c2df8d3b12e 100644 --- a/src/plugins/memif/memif.c +++ b/src/plugins/memif/memif.c @@ -77,7 +77,8 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err) if (mif == 0) return; - DBG ("disconnect %u (%v)", mif->dev_instance, err ? err->what : 0); + memif_log_debug (mif, "disconnect %u (%v)", mif->dev_instance, + err ? err->what : 0); if (err) { @@ -106,7 +107,10 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err) clib_error_t *err; err = clib_socket_close (mif->sock); if (err) - clib_error_report (err); + { + memif_log_err (mif, "%U", format_clib_error, err); + clib_error_free (err); + } clib_mem_free (mif->sock); } @@ -119,8 +123,9 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err) int rv; rv = vnet_hw_interface_unassign_rx_thread (vnm, mif->hw_if_index, i); if (rv) - DBG ("Warning: unable to unassign interface %d, " - "queue %d: rc=%d", mif->hw_if_index, i, rv); + memif_log_warn (mif, + "Unable to unassign interface %d, queue %d: rc=%d", + mif->hw_if_index, i, rv); mq->ring = 0; } } @@ -141,7 +146,7 @@ memif_disconnect (memif_if_t * mif, clib_error_t * err) if (mr->is_external) continue; if ((rv = munmap (mr->shm, mr->region_size))) - clib_warning ("munmap failed, rv = %d", rv); + memif_log_err (mif, "munmap failed, rv = %d", rv); if (mr->fd > -1) close (mr->fd); } @@ -166,7 +171,7 @@ memif_int_fd_read_ready (clib_file_t * uf) size = read (uf->file_descriptor, &b, sizeof (b)); if (size < 0) { - DBG_UNIX_LOG ("Failed to read from socket"); + memif_log_debug (mif, "Failed to read form socket"); return 0; } @@ -180,12 +185,14 @@ memif_int_fd_read_ready (clib_file_t * uf) clib_error_t * memif_connect (memif_if_t * mif) { + vlib_main_t *vm = vlib_get_main (); vnet_main_t *vnm = vnet_get_main (); clib_file_t template = { 0 }; memif_region_t *mr; int i; + clib_error_t *err = NULL; - DBG ("connect %u", mif->dev_instance); + memif_log_debug (mif, "connect %u", mif->dev_instance); vec_free (mif->local_disc_string); vec_free (mif->remote_disc_string); @@ -197,11 +204,17 @@ memif_connect (memif_if_t * mif) continue; if (mr->fd < 0) - clib_error_return (0, "no memory region fd"); + { + err = clib_error_return (0, "no memory region fd"); + goto error; + } if ((mr->shm = mmap (NULL, mr->region_size, PROT_READ | PROT_WRITE, MAP_SHARED, mr->fd, 0)) == MAP_FAILED) - return clib_error_return_unix (0, "mmap"); + { + err = clib_error_return_unix (0, "mmap"); + goto error; + } } /* *INDENT-ON* */ @@ -214,17 +227,24 @@ memif_connect (memif_if_t * mif) mq->ring = mif->regions[mq->region].shm + mq->offset; if (mq->ring->cookie != MEMIF_COOKIE) - return clib_error_return (0, "wrong cookie on tx ring %u", i); + { + err = clib_error_return (0, "wrong cookie on tx ring %u", i); + goto error; + } } vec_foreach_index (i, mif->rx_queues) { memif_queue_t *mq = vec_elt_at_index (mif->rx_queues, i); + u32 ti; int rv; mq->ring = mif->regions[mq->region].shm + mq->offset; if (mq->ring->cookie != MEMIF_COOKIE) - return clib_error_return (0, "wrong cookie on tx ring %u", i); + { + err = clib_error_return (0, "wrong cookie on tx ring %u", i); + goto error; + } if (mq->int_fd > -1) { @@ -236,11 +256,14 @@ memif_connect (memif_if_t * mif) memif_file_add (&mq->int_clib_file_index, &template); } vnet_hw_interface_assign_rx_thread (vnm, mif->hw_if_index, i, ~0); + ti = vnet_get_device_input_thread_index (vnm, mif->hw_if_index, i); + mq->buffer_pool_index = + vlib_buffer_pool_get_default_for_numa (vm, vlib_mains[ti]->numa_node); rv = vnet_hw_interface_set_rx_mode (vnm, mif->hw_if_index, i, VNET_HW_INTERFACE_RX_MODE_DEFAULT); if (rv) - clib_warning - ("Warning: unable to set rx mode for interface %d queue %d: " + memif_log_err + (mif, "Warning: unable to set rx mode for interface %d queue %d: " "rc=%d", mif->hw_if_index, i, rv); else { @@ -261,6 +284,10 @@ memif_connect (memif_if_t * mif) vnet_hw_interface_set_flags (vnm, mif->hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); return 0; + +error: + memif_log_err (mif, "%U", format_clib_error, err); + return err; } static_always_inline memif_ring_t * @@ -307,7 +334,7 @@ memif_init_regions_and_queues (memif_if_t * mif) err = clib_mem_vm_ext_alloc (&alloc); if (err) - return err; + goto error; r->fd = alloc.fd; r->shm = alloc.addr; @@ -316,14 +343,14 @@ memif_init_regions_and_queues (memif_if_t * mif) { vlib_buffer_pool_t *bp; /* *INDENT-OFF* */ - vec_foreach (bp, buffer_main.buffer_pools) + vec_foreach (bp, vm->buffer_main->buffer_pools) { - vlib_physmem_region_t *pr; - pr = vlib_physmem_get_region (vm, bp->physmem_region); + vlib_physmem_map_t *pm; + pm = vlib_physmem_get_map (vm, bp->physmem_map_index); vec_add2_aligned (mif->regions, r, 1, CLIB_CACHE_LINE_BYTES); - r->fd = pr->fd; - r->region_size = pr->size; - r->shm = pr->mem; + r->fd = pm->fd; + r->region_size = pm->n_pages << pm->log2_page_size; + r->shm = pm->base; r->is_external = 1; } /* *INDENT-ON* */ @@ -376,7 +403,10 @@ memif_init_regions_and_queues (memif_if_t * mif) { memif_queue_t *mq = vec_elt_at_index (mif->tx_queues, i); if ((mq->int_fd = eventfd (0, EFD_NONBLOCK)) < 0) - return clib_error_return_unix (0, "eventfd[tx queue %u]", i); + { + err = clib_error_return_unix (0, "eventfd[tx queue %u]", i); + goto error; + } mq->int_clib_file_index = ~0; mq->ring = memif_get_ring (mif, MEMIF_RING_S2M, i); mq->log2_ring_size = mif->cfg.log2_ring_size; @@ -399,7 +429,10 @@ memif_init_regions_and_queues (memif_if_t * mif) { memif_queue_t *mq = vec_elt_at_index (mif->rx_queues, i); if ((mq->int_fd = eventfd (0, EFD_NONBLOCK)) < 0) - return clib_error_return_unix (0, "eventfd[rx queue %u]", i); + { + err = clib_error_return_unix (0, "eventfd[rx queue %u]", i); + goto error; + } mq->int_clib_file_index = ~0; mq->ring = memif_get_ring (mif, MEMIF_RING_M2S, i); mq->log2_ring_size = mif->cfg.log2_ring_size; @@ -414,6 +447,10 @@ memif_init_regions_and_queues (memif_if_t * mif) /* *INDENT-ON* */ return 0; + +error: + memif_log_err (mif, "%U", format_clib_error, err); + return err; } static uword @@ -428,7 +465,7 @@ memif_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) clib_error_t *err; sock = clib_mem_alloc (sizeof (clib_socket_t)); - memset (sock, 0, sizeof (clib_socket_t)); + clib_memset (sock, 0, sizeof (clib_socket_t)); while (1) { @@ -479,7 +516,7 @@ memif_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) if (mif->flags & MEMIF_IF_FLAG_IS_SLAVE) { - memset (sock, 0, sizeof(clib_socket_t)); + clib_memset (sock, 0, sizeof(clib_socket_t)); sock->config = (char *) msf->filename; sock->flags = CLIB_SOCKET_F_IS_CLIENT| CLIB_SOCKET_F_SEQPACKET; @@ -522,7 +559,6 @@ VLIB_REGISTER_NODE (memif_process_node,static) = { }; /* *INDENT-ON* */ - static int memif_add_socket_file (u32 sock_id, u8 * socket_filename) { @@ -544,10 +580,8 @@ memif_add_socket_file (u32 sock_id, u8 * socket_filename) return VNET_API_ERROR_ENTRY_ALREADY_EXISTS; } - DBG ("creating socket file (uninitialized) %s", msf->filename); - pool_get (mm->socket_files, msf); - memset (msf, 0, sizeof (memif_socket_file_t)); + clib_memset (msf, 0, sizeof (memif_socket_file_t)); msf->filename = socket_filename; msf->socket_id = sock_id; @@ -589,7 +623,11 @@ memif_delete_socket_file (u32 sock_id) int memif_socket_filename_add_del (u8 is_add, u32 sock_id, u8 * sock_filename) { - if (sock_id == 0 || sock_id == ~0) + char *dir = 0, *tmp; + u32 idx = 0; + + /* allow adding socket id 0 */ + if ((sock_id == 0 && is_add == 0) || sock_id == ~0) { return VNET_API_ERROR_INVALID_ARGUMENT; } @@ -607,7 +645,23 @@ memif_socket_filename_add_del (u8 is_add, u32 sock_id, u8 * sock_filename) if (sock_filename[0] != '/') { clib_error_t *error; - error = vlib_unix_recursive_mkdir (vlib_unix_get_runtime_dir ()); + + /* copy runtime dir path */ + vec_add (dir, vlib_unix_get_runtime_dir (), + strlen (vlib_unix_get_runtime_dir ())); + vec_add1 (dir, '/'); + + /* if sock_filename contains dirs, add them to path */ + tmp = strrchr ((char *) sock_filename, '/'); + if (tmp) + { + idx = tmp - (char *) sock_filename; + vec_add (dir, sock_filename, idx); + } + + vec_add1 (dir, '\0'); + /* create socket dir */ + error = vlib_unix_recursive_mkdir (dir); if (error) { clib_error_free (error); @@ -620,7 +674,27 @@ memif_socket_filename_add_del (u8 is_add, u32 sock_id, u8 * sock_filename) else { sock_filename = vec_dup (sock_filename); + + /* check if directory exists */ + tmp = strrchr ((char *) sock_filename, '/'); + if (tmp) + { + idx = tmp - (char *) sock_filename; + vec_add (dir, sock_filename, idx); + vec_add1 (dir, '\0'); + } + + /* check dir existance and access rights for effective user/group IDs */ + if ((dir == NULL) + || + (faccessat ( /* ignored */ -1, dir, F_OK | R_OK | W_OK, AT_EACCESS) + < 0)) + { + vec_free (dir); + return VNET_API_ERROR_INVALID_ARGUMENT; + } } + vec_free (dir); return memif_add_socket_file (sock_id, sock_filename); } @@ -679,12 +753,15 @@ memif_delete_if (vlib_main_t * vm, memif_if_t * mif) { err = clib_socket_close (msf->sock); if (err) - clib_error_report (err); + { + memif_log_err (mif, "%U", format_clib_error, err); + clib_error_free (err); + } clib_mem_free (msf->sock); } } - memset (mif, 0, sizeof (*mif)); + clib_memset (mif, 0, sizeof (*mif)); pool_put (mm->interfaces, mif); if (pool_elts (mm->interfaces) == 0) @@ -760,7 +837,6 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args) { error = clib_error_return (0, "File exists for %s", msf->filename); - clib_error_report (error); rv = VNET_API_ERROR_VALUE_EXIST; goto done; } @@ -771,25 +847,22 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args) msf->dev_instance_by_fd = hash_create (0, sizeof (uword)); msf->is_listener = (args->is_master != 0); - DBG ("initializing socket file %s", msf->filename); + memif_log_debug (0, "initializing socket file %s", msf->filename); } if (mm->per_thread_data == 0) { int i; - vlib_buffer_free_list_t *fl; vec_validate_aligned (mm->per_thread_data, tm->n_vlib_mains - 1, CLIB_CACHE_LINE_BYTES); - fl = - vlib_buffer_get_free_list (vm, VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX); for (i = 0; i < tm->n_vlib_mains; i++) { memif_per_thread_data_t *ptd = vec_elt_at_index (mm->per_thread_data, i); vlib_buffer_t *bt = &ptd->buffer_template; - vlib_buffer_init_for_free_list (bt, fl); + clib_memset (bt, 0, sizeof (vlib_buffer_t)); bt->flags = VLIB_BUFFER_TOTAL_LENGTH_VALID; bt->total_length_not_including_first_buffer = 0; vnet_buffer (bt)->sw_if_index[VLIB_TX] = (u32) ~ 0; @@ -804,7 +877,7 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args) } pool_get (mm->interfaces, mif); - memset (mif, 0, sizeof (*mif)); + clib_memset (mif, 0, sizeof (*mif)); mif->dev_instance = mif - mm->interfaces; mif->socket_file_index = msf - mm->socket_files; mif->id = args->id; @@ -848,7 +921,6 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args) if (error) { - clib_error_report (error); ret = VNET_API_ERROR_SYSCALL_ERROR_2; goto error; } @@ -874,7 +946,7 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args) ASSERT (msf->sock == 0); msf->sock = s; - memset (s, 0, sizeof (clib_socket_t)); + clib_memset (s, 0, sizeof (clib_socket_t)); s->config = (char *) msf->filename; s->flags = CLIB_SOCKET_F_IS_SERVER | CLIB_SOCKET_F_ALLOW_GROUP_WRITE | @@ -882,7 +954,6 @@ memif_create_if (vlib_main_t * vm, memif_create_if_args_t * args) if ((error = clib_socket_init (s))) { - clib_error_report (error); ret = VNET_API_ERROR_SYSCALL_ERROR_4; goto error; } @@ -934,20 +1005,26 @@ error: mif->hw_if_index = ~0; } memif_delete_if (vm, mif); + if (error) + { + memif_log_err (mif, "%U", format_clib_error, error); + clib_error_free (error); + } return ret; done: return rv; } - static clib_error_t * memif_init (vlib_main_t * vm) { memif_main_t *mm = &memif_main; - u8 *filename; - memset (mm, 0, sizeof (memif_main_t)); + clib_memset (mm, 0, sizeof (memif_main_t)); + + mm->log_class = vlib_log_register_class ("memif_plugin", 0); + memif_log_debug (0, "initialized"); /* initialize binary API */ memif_plugin_api_hookup (vm); @@ -957,10 +1034,7 @@ memif_init (vlib_main_t * vm) * for socket-id 0 to MEMIF_DEFAULT_SOCKET_FILENAME in the * default run-time directory. */ - filename = format (0, "%s/%s%c", - vlib_unix_get_runtime_dir (), - MEMIF_DEFAULT_SOCKET_FILENAME, 0); - memif_add_socket_file (0, filename); + memif_socket_filename_add_del (1, 0, (u8 *) MEMIF_DEFAULT_SOCKET_FILENAME); return 0; } @@ -970,7 +1044,7 @@ VLIB_INIT_FUNCTION (memif_init); /* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, - .description = "Packet Memory Interface (experimetal)", + .description = "Packet Memory Interface (memif) -- Experimental", }; /* *INDENT-ON* */