X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fvlib_api_cli.c;h=c57f333ba68b2ad5632e6350281155d03d3d56e1;hb=774b5dbe7f2f69eabb38fee300f32dc7ee687e7f;hp=08db458612ff63040f28b96509f00c695e42212b;hpb=33a58171e5995d9e649b414bfc77f2aab26e4c58;p=vpp.git diff --git a/src/vlibmemory/vlib_api_cli.c b/src/vlibmemory/vlib_api_cli.c index 08db458612f..c57f333ba68 100755 --- a/src/vlibmemory/vlib_api_cli.c +++ b/src/vlibmemory/vlib_api_cli.c @@ -101,7 +101,7 @@ vl_api_client_command (vlib_main_t * vm, vl_api_registration_t **regpp, *regp; svm_queue_t *q; char *health; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); u32 *confused_indices = 0; if (!pool_elts (am->vl_clients)) @@ -161,7 +161,7 @@ static clib_error_t * vl_api_status_command (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cli_cmd) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); /* check if rx_trace and tx_trace are not null pointers */ if (am->rx_trace == 0) @@ -228,7 +228,7 @@ vl_api_message_table_command (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cli_cmd) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); int i; int verbose = 0; @@ -304,7 +304,7 @@ vl_api_show_plugin_command (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cli_cmd) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); vl_api_msg_range_t *rp = 0; int i; @@ -402,7 +402,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, struct stat statb; size_t file_size; u8 *msg; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); u8 *tmpbuf = 0; u32 nitems, nitems_msgtbl; void **saved_print_handlers = 0; @@ -430,7 +430,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, } file_size = statb.st_size; - file_size = (file_size + 4095) & ~(4096); + file_size = (file_size + 4095) & ~(4095); hp = mmap (0, file_size, PROT_READ, MAP_PRIVATE, fd, 0); @@ -442,6 +442,8 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, } close (fd); + CLIB_MEM_UNPOISON (hp, file_size); + nitems = ntohl (hp->nitems); if (last_index == (u32) ~ 0) @@ -454,6 +456,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, vlib_cli_output (vm, "Range (%d, %d) outside file range (0, %d)\n", first_index, last_index, nitems - 1); munmap (hp, file_size); + CLIB_MEM_POISON (hp, file_size); return; } if (hp->wrapped) @@ -465,6 +468,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, saved_print_handlers = (void **) vec_dup (am->msg_print_handlers); vl_msg_api_custom_dump_configure (am); } + msg = (u8 *) (hp + 1); u16 *msgid_vec = 0; @@ -503,6 +507,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, { vlib_cli_output (vm, "Ugh: msg id %d no trace config\n", msg_id); munmap (hp, file_size); + CLIB_MEM_POISON (hp, file_size); return; } msg += size; @@ -534,6 +539,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, { vlib_cli_output (vm, "Ugh: msg id %d no trace config\n", msg_id); munmap (hp, file_size); + CLIB_MEM_POISON (hp, file_size); vec_free (tmpbuf); am->replay_in_progress = 0; return; @@ -557,6 +563,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, { vlib_cli_output (vm, "Ugh: msg id %d no endian swap\n", msg_id); munmap (hp, file_size); + CLIB_MEM_POISON (hp, file_size); vec_free (tmpbuf); am->replay_in_progress = 0; return; @@ -659,16 +666,27 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, } munmap (hp, file_size); + CLIB_MEM_POISON (hp, file_size); vec_free (tmpbuf); am->replay_in_progress = 0; } +/** api_trace_command_fn - control the binary API trace / replay feature + + Note: this command MUST be marked thread-safe. Replay with + multiple worker threads depends in many cases on worker thread + graph replica maintenance. If we (implicitly) assert a worker + thread barrier at the debug CLI level, all graph replica changes + are deferred until the replay operation completes. If an interface + is deleted, the wheels fall off. + */ + static clib_error_t * api_trace_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { u32 nitems = 256 << 10; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); vl_api_trace_which_t which = VL_API_TRACE_RX; u8 *filename = 0; u8 *chroot_filename = 0; @@ -683,12 +701,16 @@ api_trace_command_fn (vlib_main_t * vm, { if (unformat (input, "nitems %d", &nitems)) ; + vlib_worker_thread_barrier_sync (vm); vl_msg_api_trace_configure (am, which, nitems); vl_msg_api_trace_onoff (am, which, 1 /* on */ ); + vlib_worker_thread_barrier_release (vm); } else if (unformat (input, "off")) { + vlib_worker_thread_barrier_sync (vm); vl_msg_api_trace_onoff (am, which, 0); + vlib_worker_thread_barrier_release (vm); } else if (unformat (input, "save %s", &filename)) { @@ -710,7 +732,9 @@ api_trace_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "Couldn't create %s\n", chroot_filename); goto out; } + vlib_worker_thread_barrier_sync (vm); rv = vl_msg_api_trace_save (am, which, fp); + vlib_worker_thread_barrier_release (vm); fclose (fp); if (rv == -1) vlib_cli_output (vm, "API Trace data not present\n"); @@ -767,8 +791,10 @@ api_trace_command_fn (vlib_main_t * vm, } else if (unformat (input, "free")) { + vlib_worker_thread_barrier_sync (vm); vl_msg_api_trace_onoff (am, which, 0); vl_msg_api_trace_free (am, which); + vlib_worker_thread_barrier_release (vm); } else if (unformat (input, "post-mortem-on")) vl_msg_api_post_mortem_dump_enable_disable (1 /* enable */ ); @@ -793,8 +819,9 @@ VLIB_CLI_COMMAND (api_trace_command, static) = { .path = "api trace", .short_help = "api trace [on|off][first ][last ][status][free]" - "[post-mortem-on][dump|custom-dump|save|replay ]", + "[post-mortem-on][dump|custom-dump|save|replay ]", .function = api_trace_command_fn, + .is_mp_safe = 1, }; /* *INDENT-ON* */ @@ -804,7 +831,7 @@ vl_api_trace_command (vlib_main_t * vm, { u32 nitems = 1024; vl_api_trace_which_t which = VL_API_TRACE_RX; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -881,7 +908,7 @@ api_trace_config_fn (vlib_main_t * vm, unformat_input_t * input) { u32 nitems = 256 << 10; vl_api_trace_which_t which = VL_API_TRACE_RX; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -914,7 +941,7 @@ VLIB_CONFIG_FUNCTION (api_trace_config_fn, "api-trace"); static clib_error_t * api_queue_config_fn (vlib_main_t * vm, unformat_input_t * input) { - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); u32 nitems; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -1004,7 +1031,7 @@ dump_api_table_file_command_fn (vlib_main_t * vm, vlib_cli_command_t * cmd) { u8 *filename = 0; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); serialize_main_t _sm, *sm = &_sm; clib_error_t *error; u32 nmsgs;