X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fvlib_api_cli.c;h=5a06c654473e7f71870f150fa3388f25e842f8e4;hb=ecff1cb6dace2052a5c7f0e01318993309aa42e6;hp=2d8d407787119ce7d74b68fa8ad290231c9d2196;hpb=ae605b89035b26248f245597291474be6ae8ec5e;p=vpp.git diff --git a/src/vlibmemory/vlib_api_cli.c b/src/vlibmemory/vlib_api_cli.c index 2d8d4077871..5a06c654473 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,10 +402,9 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, struct stat statb; size_t file_size; u8 *msg; - u8 endian_swap_needed = 0; - api_main_t *am = &api_main; + api_main_t *am = vlibapi_get_main (); u8 *tmpbuf = 0; - u32 nitems; + u32 nitems, nitems_msgtbl; void **saved_print_handlers = 0; fd = open ((char *) filename, O_RDONLY); @@ -431,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); @@ -443,14 +442,9 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, } close (fd); - if ((clib_arch_is_little_endian && hp->endian == VL_API_BIG_ENDIAN) - || (clib_arch_is_big_endian && hp->endian == VL_API_LITTLE_ENDIAN)) - endian_swap_needed = 1; + CLIB_MEM_UNPOISON (hp, file_size); - if (endian_swap_needed) - nitems = ntohl (hp->nitems); - else - nitems = hp->nitems; + nitems = ntohl (hp->nitems); if (last_index == (u32) ~ 0) { @@ -474,9 +468,27 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, vl_msg_api_custom_dump_configure (am); } - msg = (u8 *) (hp + 1); + u16 *msgid_vec = 0; + serialize_main_t _sm, *sm = &_sm; + u32 msgtbl_size = ntohl (hp->msgtbl_size); + u8 *name_and_crc; + + unserialize_open_data (sm, msg, msgtbl_size); + unserialize_integer (sm, &nitems_msgtbl, sizeof (u32)); + + for (i = 0; i < nitems_msgtbl; i++) + { + u16 msg_index = unserialize_likely_small_unsigned_integer (sm); + unserialize_cstring (sm, (char **) &name_and_crc); + u16 msg_index2 = vl_msg_api_get_msg_index (name_and_crc); + vec_validate (msgid_vec, msg_index); + msgid_vec[msg_index] = msg_index2; + } + + msg += msgtbl_size; + for (i = 0; i < first_index; i++) { trace_cfg_t *cfgp; @@ -486,11 +498,9 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, size = clib_host_to_net_u32 (*(u32 *) msg); msg += sizeof (u32); - if (clib_arch_is_little_endian) - msg_id = ntohs (*((u16 *) msg)); - else - msg_id = *((u16 *) msg); - + msg_id = ntohs (*((u16 *) msg)); + if (msg_id < vec_len (msgid_vec)) + msg_id = msgid_vec[msg_id]; cfgp = am->api_trace_cfg + msg_id; if (!cfgp) { @@ -507,7 +517,6 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, for (; i <= last_index; i++) { trace_cfg_t *cfgp; - u16 *msg_idp; u16 msg_id; int size; @@ -517,10 +526,11 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, size = clib_host_to_net_u32 (*(u32 *) msg); msg += sizeof (u32); - if (clib_arch_is_little_endian) - msg_id = ntohs (*((u16 *) msg)); - else - msg_id = *((u16 *) msg); + msg_id = ntohs (*((u16 *) msg)); + if (msg_id < vec_len (msgid_vec)) + { + msg_id = msgid_vec[msg_id]; + } cfgp = am->api_trace_cfg + msg_id; if (!cfgp) @@ -538,12 +548,11 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, clib_memset (tmpbuf, 0xf, sizeof (uword)); /* - * Endian swap if needed. All msg data is supposed to be - * in network byte order. All msg handlers are supposed to - * know that. The generic message dumpers don't know that. - * One could fix apigen, I suppose. + * Endian swap if needed. All msg data is supposed to be in + * network byte order. */ - if ((which == DUMP && clib_arch_is_little_endian) || endian_swap_needed) + if (((which == DUMP || which == CUSTOM_DUMP) + && clib_arch_is_little_endian)) { void (*endian_fp) (void *); if (msg_id >= vec_len (am->msg_endian_handlers) @@ -562,7 +571,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, /* msg_id always in network byte order */ if (clib_arch_is_little_endian) { - msg_idp = (u16 *) (tmpbuf + sizeof (uword)); + u16 *msg_idp = (u16 *) (tmpbuf + sizeof (uword)); *msg_idp = msg_id; } @@ -657,41 +666,60 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, 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) { + unformat_input_t _line_input, *line_input = &_line_input; 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; + u8 *filename = 0; + u8 *chroot_filename = 0; u32 first = 0; u32 last = (u32) ~ 0; FILE *fp; int rv; - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + /* Get a line of input. */ + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "on") || unformat (input, "enable")) + if (unformat (line_input, "on") || unformat (line_input, "enable")) { - if (unformat (input, "nitems %d", &nitems)) + if (unformat (line_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")) + else if (unformat (line_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)) + else if (unformat (line_input, "save %s", &filename)) { - u8 *chroot_filename; if (strstr ((char *) filename, "..") || index ((char *) filename, '/')) { vlib_cli_output (vm, "illegal characters in filename '%s'", filename); - return 0; + goto out; } chroot_filename = format (0, "/tmp/%s%c", filename, 0); @@ -702,9 +730,11 @@ api_trace_command_fn (vlib_main_t * vm, if (fp == NULL) { vlib_cli_output (vm, "Couldn't create %s\n", chroot_filename); - return 0; + 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"); @@ -724,54 +754,60 @@ api_trace_command_fn (vlib_main_t * vm, vlib_cli_output (vm, "Unknown error while saving: %d", rv); else vlib_cli_output (vm, "API trace saved to %s\n", chroot_filename); - vec_free (chroot_filename); + goto out; } - else if (unformat (input, "dump %s", &filename)) + else if (unformat (line_input, "dump %s", &filename)) { vl_msg_api_process_file (vm, filename, first, last, DUMP); } - else if (unformat (input, "custom-dump %s", &filename)) + else if (unformat (line_input, "custom-dump %s", &filename)) { vl_msg_api_process_file (vm, filename, first, last, CUSTOM_DUMP); } - else if (unformat (input, "replay %s", &filename)) + else if (unformat (line_input, "replay %s", &filename)) { vl_msg_api_process_file (vm, filename, first, last, REPLAY); } - else if (unformat (input, "initializers %s", &filename)) + else if (unformat (line_input, "initializers %s", &filename)) { vl_msg_api_process_file (vm, filename, first, last, INITIALIZERS); } - else if (unformat (input, "tx")) + else if (unformat (line_input, "tx")) { which = VL_API_TRACE_TX; } - else if (unformat (input, "first %d", &first)) + else if (unformat (line_input, "first %d", &first)) { ; } - else if (unformat (input, "last %d", &last)) + else if (unformat (line_input, "last %d", &last)) { ; } - else if (unformat (input, "status")) + else if (unformat (line_input, "status")) { vlib_cli_output (vm, "%U", format_vl_msg_api_trace_status, am, which); } - else if (unformat (input, "free")) + else if (unformat (line_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")) + else if (unformat (line_input, "post-mortem-on")) vl_msg_api_post_mortem_dump_enable_disable (1 /* enable */ ); - else if (unformat (input, "post-mortem-off")) + else if (unformat (line_input, "post-mortem-off")) vl_msg_api_post_mortem_dump_enable_disable (0 /* enable */ ); else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input); } +out: + vec_free (filename); + vec_free (chroot_filename); + unformat_free (line_input); return 0; } @@ -784,8 +820,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* */ @@ -795,7 +832,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) { @@ -872,7 +909,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) { @@ -905,7 +942,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) @@ -995,7 +1032,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; @@ -1048,7 +1085,7 @@ dump_api_table_file_command_fn (vlib_main_t * vm, item->crc = extract_crc (name_and_crc); item->which = 0; /* file */ } - serialize_close (sm); + unserialize_close (sm); /* Compare with the current image? */ if (compare_current) @@ -1082,6 +1119,7 @@ dump_api_table_file_command_fn (vlib_main_t * vm, if (compare_current) { + u8 *dashes = 0; ndifferences = 0; /* @@ -1090,8 +1128,11 @@ dump_api_table_file_command_fn (vlib_main_t * vm, * are identical. Otherwise, the crc is different, or a message is * present in only one of the tables. */ - vlib_cli_output (vm, "%=60s %s", "Message Name", "Result"); - + vlib_cli_output (vm, "%-60s | %s", "Message Name", "Result"); + vec_validate_init_empty (dashes, 60, '-'); + vec_terminate_c_string (dashes); + vlib_cli_output (vm, "%60s-|-%s", dashes, "-----------------"); + vec_free (dashes); for (i = 0; i < vec_len (table);) { /* Last message lonely? */ @@ -1118,20 +1159,20 @@ dump_api_table_file_command_fn (vlib_main_t * vm, || strcmp ((char *) table[i].name, (char *) table[i + 1].name)) { last_unique: - vlib_cli_output (vm, "%-60s only in %s", + vlib_cli_output (vm, "%-60s | only in %s", table[i].name, table[i].which ? "image" : "file"); i++; continue; } /* In both tables, but with different signatures */ - vlib_cli_output (vm, "%-60s definition changed", table[i].name); + vlib_cli_output (vm, "%-60s | definition changed", table[i].name); i += 2; } if (ndifferences == 0) vlib_cli_output (vm, "No api message signature differences found."); else - vlib_cli_output (vm, "Found %u api message signature differences", + vlib_cli_output (vm, "\nFound %u api message signature differences", ndifferences); goto cleanup; }