X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fmemory_shared.c;h=77a610b94346c70459233b3b69e0b5d09473fd96;hb=bf12efc432823c83dc06ead6be2094ac605f0021;hp=1ccd563639f716dd87fb2bad64dc3edb9924714d;hpb=22af447454cf097ac4fc59f9072d805c371ab803;p=vpp.git diff --git a/src/vlibmemory/memory_shared.c b/src/vlibmemory/memory_shared.c index 1ccd563639f..77a610b9434 100644 --- a/src/vlibmemory/memory_shared.c +++ b/src/vlibmemory/memory_shared.c @@ -29,11 +29,13 @@ #include #include #include +#include #include #include #include #include #include +#include #define vl_typedefs #include @@ -41,8 +43,9 @@ #define DEBUG_MESSAGE_BUFFER_OVERRUN 0 -static inline void * -vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null) +__clib_nosanitize_addr static inline void * +vl_msg_api_alloc_internal (svm_region_t *vlib_rp, int nbytes, int pool, + int may_return_null) { int i; msgbuf_t *rv; @@ -50,9 +53,9 @@ vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null) svm_queue_t *q; void *oldheap; vl_shmem_hdr_t *shmem_hdr; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); - shmem_hdr = am->shmem_hdr; + shmem_hdr = (void *) vlib_rp->user_ctx; #if DEBUG_MESSAGE_BUFFER_OVERRUN > 0 nbytes += 4; @@ -114,14 +117,16 @@ vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null) if (CLIB_DEBUG > 0) { u16 *msg_idp, msg_id; + vl_api_msg_data_t *m; clib_warning ("garbage collect pool %d ring %d index %d", pool, i, q->head); msg_idp = (u16 *) (rv->data); msg_id = clib_net_to_host_u16 (*msg_idp); - if (msg_id < vec_len (api_main.msg_names)) + m = vl_api_get_msg_data (am, msg_id); + if (m) clib_warning ("msg id %d name %s", (u32) msg_id, - api_main.msg_names[msg_id]); + m->name); } shmem_hdr->garbage_collects++; goto collected; @@ -160,15 +165,13 @@ vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null) */ am->ring_misses++; - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); + oldheap = vl_msg_push_heap_w_region (vlib_rp); if (may_return_null) { rv = clib_mem_alloc_or_null (nbytes); if (PREDICT_FALSE (rv == 0)) { - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); + vl_msg_pop_heap_w_region (vlib_rp, oldheap); return 0; } } @@ -176,8 +179,8 @@ vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null) rv = clib_mem_alloc (nbytes); rv->q = 0; - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); + rv->gc_mark_timestamp = 0; + vl_msg_pop_heap_w_region (vlib_rp, oldheap); out: #if DEBUG_MESSAGE_BUFFER_OVERRUN > 0 @@ -190,6 +193,7 @@ out: #endif rv->data_len = htonl (nbytes - sizeof (msgbuf_t)); + VL_MSG_API_UNPOISON (rv->data); return (rv->data); } @@ -197,64 +201,77 @@ void * vl_msg_api_alloc (int nbytes) { int pool; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr; /* * Clients use pool-0, vlib proc uses pool 1 */ pool = (am->our_pid == shmem_hdr->vl_pid); - return vl_msg_api_alloc_internal (nbytes, pool, 0 /* may_return_null */ ); + return vl_msg_api_alloc_internal (am->vlib_rp, nbytes, pool, + 0 /* may_return_null */ ); +} + +void * +vl_msg_api_alloc_zero (int nbytes) +{ + void *ret; + + ret = vl_msg_api_alloc (nbytes); + clib_memset (ret, 0, nbytes); + return ret; } void * vl_msg_api_alloc_or_null (int nbytes) { int pool; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); vl_shmem_hdr_t *shmem_hdr = am->shmem_hdr; pool = (am->our_pid == shmem_hdr->vl_pid); - return vl_msg_api_alloc_internal (nbytes, pool, 1 /* may_return_null */ ); + return vl_msg_api_alloc_internal (am->vlib_rp, nbytes, pool, + 1 /* may_return_null */ ); } void * vl_msg_api_alloc_as_if_client (int nbytes) { - return vl_msg_api_alloc_internal (nbytes, 0, 0 /* may_return_null */ ); + api_main_t *am = vlibapi_get_main (); + return vl_msg_api_alloc_internal (am->vlib_rp, nbytes, 0, + 0 /* may_return_null */ ); +} + +void * +vl_msg_api_alloc_zero_as_if_client (int nbytes) +{ + void *ret; + + ret = vl_msg_api_alloc_as_if_client (nbytes); + clib_memset (ret, 0, nbytes); + return ret; } void * vl_msg_api_alloc_as_if_client_or_null (int nbytes) { - return vl_msg_api_alloc_internal (nbytes, 0, 1 /* may_return_null */ ); + api_main_t *am = vlibapi_get_main (); + return vl_msg_api_alloc_internal (am->vlib_rp, nbytes, 0, + 1 /* may_return_null */ ); } void * vl_mem_api_alloc_as_if_client_w_reg (vl_api_registration_t * reg, int nbytes) { - api_main_t *am = &api_main; - vl_shmem_hdr_t *save_shmem_hdr = am->shmem_hdr; - svm_region_t *vlib_rp, *save_vlib_rp = am->vlib_rp; - void *msg; - - vlib_rp = am->vlib_rp = reg->vlib_rp; - am->shmem_hdr = (void *) vlib_rp->user_ctx; - - msg = vl_msg_api_alloc_internal (nbytes, 0, 0 /* may_return_null */ ); - - am->shmem_hdr = save_shmem_hdr; - am->vlib_rp = save_vlib_rp; - - return msg; + return vl_msg_api_alloc_internal (reg->vlib_rp, nbytes, 0, + 0 /* may_return_null */ ); } void -vl_msg_api_free (void *a) +vl_msg_api_free_w_region (svm_region_t * vlib_rp, void *a) { msgbuf_t *rv; void *oldheap; - api_main_t *am = &api_main; rv = (msgbuf_t *) (((u8 *) a) - offsetof (msgbuf_t, data)); @@ -274,11 +291,11 @@ vl_msg_api_free (void *a) ASSERT (*overrun == 0x1badbabe); } #endif + VL_MSG_API_POISON (rv->data); return; } - pthread_mutex_lock (&am->vlib_rp->mutex); - oldheap = svm_push_data_heap (am->vlib_rp); + oldheap = vl_msg_push_heap_w_region (vlib_rp); #if DEBUG_MESSAGE_BUFFER_OVERRUN > 0 { @@ -289,8 +306,14 @@ vl_msg_api_free (void *a) #endif clib_mem_free (rv); - svm_pop_heap (oldheap); - pthread_mutex_unlock (&am->vlib_rp->mutex); + vl_msg_pop_heap_w_region (vlib_rp, oldheap); +} + +void +vl_msg_api_free (void *a) +{ + api_main_t *am = vlibapi_get_main (); + vl_msg_api_free_w_region (am->vlib_rp, a); } static void @@ -298,7 +321,7 @@ vl_msg_api_free_nolock (void *a) { msgbuf_t *rv; void *oldheap; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); rv = (msgbuf_t *) (((u8 *) a) - offsetof (msgbuf_t, data)); /* @@ -309,6 +332,7 @@ vl_msg_api_free_nolock (void *a) if (rv->q) { rv->q = 0; + VL_MSG_API_POISON (rv->data); return; } @@ -320,7 +344,7 @@ vl_msg_api_free_nolock (void *a) void vl_set_memory_root_path (const char *name) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->root_path = name; } @@ -328,7 +352,7 @@ vl_set_memory_root_path (const char *name) void vl_set_memory_uid (int uid) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->api_uid = uid; } @@ -336,7 +360,7 @@ vl_set_memory_uid (int uid) void vl_set_memory_gid (int gid) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->api_gid = gid; } @@ -344,7 +368,7 @@ vl_set_memory_gid (int gid) void vl_set_global_memory_baseva (u64 baseva) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->global_baseva = baseva; } @@ -352,7 +376,7 @@ vl_set_global_memory_baseva (u64 baseva) void vl_set_global_memory_size (u64 size) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->global_size = size; } @@ -360,7 +384,7 @@ vl_set_global_memory_size (u64 size) void vl_set_api_memory_size (u64 size) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->api_size = size; } @@ -368,7 +392,7 @@ vl_set_api_memory_size (u64 size) void vl_set_global_pvt_heap_size (u64 size) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->global_pvt_heap_size = size; } @@ -376,7 +400,7 @@ vl_set_global_pvt_heap_size (u64 size) void vl_set_api_pvt_heap_size (u64 size) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); am->api_pvt_heap_size = size; } @@ -384,7 +408,7 @@ vl_set_api_pvt_heap_size (u64 size) static void vl_api_default_mem_config (vl_shmem_hdr_t * shmem_hdr) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); u32 vlib_input_queue_length; /* vlib main input queue */ @@ -470,7 +494,7 @@ void vl_init_shmem (svm_region_t * vlib_rp, vl_api_shm_elem_config_t * config, int is_vlib, int is_private_region) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); vl_shmem_hdr_t *shmem_hdr = 0; void *oldheap; ASSERT (vlib_rp); @@ -513,8 +537,8 @@ vl_map_shmem (const char *region_name, int is_vlib) { svm_map_region_args_t _a, *a = &_a; svm_region_t *vlib_rp, *root_rp; - api_main_t *am = &api_main; - int i, rv; + api_main_t *am = vlibapi_get_main (); + int i; struct timespec ts, tsrem; char *vpe_api_region_suffix = "-vpe-api"; @@ -523,8 +547,8 @@ vl_map_shmem (const char *region_name, int is_vlib) if (strstr (region_name, vpe_api_region_suffix)) { u8 *root_path = format (0, "%s", region_name); - _vec_len (root_path) = (vec_len (root_path) - - strlen (vpe_api_region_suffix)); + vec_set_len (root_path, + vec_len (root_path) - strlen (vpe_api_region_suffix)); vec_terminate_c_string (root_path); a->root_path = (const char *) root_path; am->root_path = (const char *) root_path; @@ -551,7 +575,7 @@ vl_map_shmem (const char *region_name, int is_vlib) while (nanosleep (&ts, &tsrem) < 0) ts = tsrem; tfd = open ((char *) api_name, O_RDWR); - if (tfd > 0) + if (tfd >= 0) break; } vec_free (api_name); @@ -561,9 +585,7 @@ vl_map_shmem (const char *region_name, int is_vlib) return -2; } close (tfd); - rv = svm_region_init_chroot (am->root_path); - if (rv) - return rv; + svm_region_init_chroot_uid_gid (am->root_path, getuid (), getgid ()); } if (a->root_path != NULL) @@ -685,7 +707,7 @@ vl_map_shmem (const char *region_name, int is_vlib) void vl_register_mapped_shmem_region (svm_region_t * rp) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); vec_add1 (am->mapped_shmem_regions, rp); } @@ -695,7 +717,7 @@ vl_unmap_shmem_internal (u8 is_client) { svm_region_t *rp; int i; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); if (!svm_get_root_rp ()) return; @@ -711,10 +733,7 @@ vl_unmap_shmem_internal (u8 is_client) is_client ? svm_region_exit_client () : svm_region_exit (); - /* $$$ more careful cleanup, valgrind run... */ - vec_free (am->msg_handlers); - vec_free (am->msg_endian_handlers); - vec_free (am->msg_print_handlers); + vec_free (am->msg_data); } void @@ -732,11 +751,11 @@ vl_unmap_shmem_client (void) void vl_msg_api_send_shmem (svm_queue_t * q, u8 * elem) { - api_main_t *am = &api_main; - uword *trace = (uword *) elem; + api_main_t *am = vlibapi_get_main (); + void *msg = (void *) *(uword *) elem; if (am->tx_trace && am->tx_trace->enabled) - vl_msg_api_trace (am, am->tx_trace, (void *) trace[0]); + vl_msg_api_trace (am, am->tx_trace, msg); /* * Announce a probable binary API client bug: @@ -745,7 +764,28 @@ vl_msg_api_send_shmem (svm_queue_t * q, u8 * elem) */ if (PREDICT_FALSE (am->vl_clients /* vpp side */ && (q->cursize == q->maxsize))) - clib_warning ("WARNING: client input queue at %llx is stuffed...", q); + { + if (PREDICT_FALSE (am->elog_trace_api_messages)) + { + /* *INDENT-OFF* */ + ELOG_TYPE_DECLARE (e) = + { + .format = "api-client-queue-stuffed: %x%x", + .format_args = "i4i4", + }; + /* *INDENT-ON* */ + struct + { + u32 hi, low; + } *ed; + ed = ELOG_DATA (am->elog_main, e); + ed->hi = (uword) q >> 32; + ed->low = (uword) q & 0xFFFFFFFF; + clib_warning ("WARNING: client input queue at %llx is stuffed...", + q); + } + } + VL_MSG_API_POISON (msg); (void) svm_queue_add (q, elem, 0 /* nowait */ ); } @@ -758,13 +798,14 @@ vl_mem_api_can_send (svm_queue_t * q) void vl_msg_api_send_shmem_nolock (svm_queue_t * q, u8 * elem) { - api_main_t *am = &api_main; - uword *trace = (uword *) elem; + api_main_t *am = vlibapi_get_main (); + void *msg = (void *) *(uword *) elem; if (am->tx_trace && am->tx_trace->enabled) - vl_msg_api_trace (am, am->tx_trace, (void *) trace[0]); + vl_msg_api_trace (am, am->tx_trace, msg); (void) svm_queue_add_nolock (q, elem); + VL_MSG_API_POISON (msg); } /*