ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix debug CLI node recycling bugs

Browse Source 
When creating a new - as opposed to recycled - debug CLI process node,
perform a proper barrier sync and node runtime update. Otherwise, the
graph replicas diverge for some period of time. That's not immediately
fatal, but it's not a good idea, either.

When renaming a debug cli process node, fix all of the name-vector
replicas before freeing the [one-and-only] name vector.

This fixes the so-called stats segment node runtime scraper crash,
which tripped over a replicated dangling reference to the
recently-freed debug CLI node name.

Change-Id: Ieffabd9f003139e534b9d79b88370439907930e5
Signed-off-by: Dave Barach <dbarach@cisco.com>
This commit is contained in:
Dave Barach
2018-07-12 13:00:47 -04:00
committed by Dave Barach
parent 93c90a5c97
commit 0610039fd0
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/vlib/unix/cli.c
View File

@ -2670,7 +2670,7 @@ unix_cli_file_add (unix_cli_main_t * cm, char *name, int fd)
unix_cli_file_t *cf; unix_cli_file_t *cf;
clib_file_t template = { 0 }; clib_file_t template = { 0 };
vlib_main_t *vm = um->vlib_main; vlib_main_t *vm = um->vlib_main;
vlib_node_t *n; vlib_node_t *n = 0;
u8 *file_desc = 0; u8 *file_desc = 0;
file_desc = format (0, "%s", name); file_desc = format (0, "%s", name);
@ -2680,11 +2680,27 @@ unix_cli_file_add (unix_cli_main_t * cm, char *name, int fd)
if (vec_len (cm->unused_cli_process_node_indices) > 0) if (vec_len (cm->unused_cli_process_node_indices) > 0)
{ {
uword l = vec_len (cm->unused_cli_process_node_indices); uword l = vec_len (cm->unused_cli_process_node_indices);
int i;
vlib_main_t *this_vlib_main;
u8 *old_name = 0;
/* Find node and give it new name. */ /*
n = vlib_get_node (vm, cm->unused_cli_process_node_indices[l - 1]); * Nodes are bulk-copied, so node name pointers are shared.
vec_free (n->name); * Find the cli node in all graph replicas, and give all of them
n->name = (u8 *) name; * the same new name.
* Then, throw away the old shared name-vector.
*/
for (i = 0; i < vec_len (vlib_mains); i++)
{
this_vlib_main = vlib_mains[i];
if (this_vlib_main == 0)
continue;
n = vlib_get_node (this_vlib_main,
cm->unused_cli_process_node_indices[l - 1]);
old_name = n->name;
n->name = (u8 *) name;
}
vec_free (old_name);
vlib_node_set_state (vm, n->index, VLIB_NODE_STATE_POLLING); vlib_node_set_state (vm, n->index, VLIB_NODE_STATE_POLLING);
@ -2699,10 +2715,15 @@ unix_cli_file_add (unix_cli_main_t * cm, char *name, int fd)
}; };
r.name = name; r.name = name;
vlib_worker_thread_barrier_sync (vm);
vlib_register_node (vm, &r); vlib_register_node (vm, &r);
vec_free (name); vec_free (name);
n = vlib_get_node (vm, r.index); n = vlib_get_node (vm, r.index);
vlib_worker_thread_node_runtime_update ();
vlib_worker_thread_barrier_release (vm);
} }
pool_get (cm->cli_file_pool, cf); pool_get (cm->cli_file_pool, cf);