X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Funix%2Fmain.c;h=ba1c9d1bd63eecf33b414053e5c3174d95a1b4df;hb=4859d8d8e8a4bbaac0117db827001fae6c9062b9;hp=42c3064bc325245f88d5ad027ab241c73f271d32;hpb=d991a798ff5eb6d151b6641e61fefc6315bab0ac;p=vpp.git diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c old mode 100755 new mode 100644 index 42c3064bc32..ba1c9d1bd63 --- a/src/vlib/unix/main.c +++ b/src/vlib/unix/main.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include @@ -91,10 +92,10 @@ unsetup_signal_handlers (int sig) /* allocate this buffer from mheap when setting up the signal handler. dangerous to vec_resize it when crashing, mheap itself might have been - corruptted already */ + corrupted already */ static u8 *syslog_msg = 0; -static int last_signum = 0; -static uword last_faulting_address = 0; +int vlib_last_signum = 0; +uword vlib_last_faulting_address = 0; static void unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc) @@ -102,8 +103,8 @@ unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc) uword fatal = 0; /* These come in handy when looking at core files from optimized images */ - last_signum = signum; - last_faulting_address = (uword) si->si_addr; + vlib_last_signum = signum; + vlib_last_faulting_address = (uword) si->si_addr; syslog_msg = format (syslog_msg, "received signal %U, PC %U", format_signal, signum, format_ucontext_pc, uc); @@ -177,10 +178,14 @@ unix_signal_handler (int signum, siginfo_t * si, ucontext_t * uc) syslog (LOG_ERR | LOG_DAEMON, "%s", syslog_msg); } - /* have to remove SIGABRT to avoid recusive - os_exit calling abort() */ + /* have to remove SIGABRT to avoid recursive - os_exit calling abort() */ unsetup_signal_handlers (SIGABRT); - os_exit (1); + /* os_exit(1) causes core generation, skip that for SIGINT, SIGHUP */ + if (signum == SIGINT || signum == SIGHUP) + os_exit (0); + else + os_exit (1); } else clib_warning ("%s", syslog_msg); @@ -206,9 +211,11 @@ setup_signal_handlers (unix_main_t * um) { /* these signals take the default action */ case SIGKILL: + case SIGCONT: case SIGSTOP: case SIGUSR1: case SIGUSR2: + case SIGPROF: continue; /* ignore SIGPIPE, SIGCHLD */ @@ -234,21 +241,14 @@ unix_error_handler (void *arg, u8 * msg, int msg_len) { unix_main_t *um = arg; - /* Echo to stderr when interactive. */ - if (um->flags & UNIX_FLAG_INTERACTIVE) + /* Echo to stderr when interactive or syslog is disabled. */ + if (um->flags & (UNIX_FLAG_INTERACTIVE | UNIX_FLAG_NOSYSLOG)) { CLIB_UNUSED (int r) = write (2, msg, msg_len); } else { - char save = msg[msg_len - 1]; - - /* Null Terminate. */ - msg[msg_len - 1] = 0; - - syslog (LOG_ERR | LOG_DAEMON, "%s", msg); - - msg[msg_len - 1] = save; + syslog (LOG_ERR | LOG_DAEMON, "%.*s", msg_len, msg); } } @@ -261,20 +261,10 @@ vlib_unix_error_report (vlib_main_t * vm, clib_error_t * error) return; { - char save; - u8 *msg; - u32 msg_len; - - msg = error->what; - msg_len = vec_len (msg); - - /* Null Terminate. */ - save = msg[msg_len - 1]; - msg[msg_len - 1] = 0; - - syslog (LOG_ERR | LOG_DAEMON, "%s", msg); - - msg[msg_len - 1] = save; + u8 *msg = error->what; + u32 len = vec_len (msg); + int msg_len = (len > INT_MAX) ? INT_MAX : len; + syslog (LOG_ERR | LOG_DAEMON, "%.*s", msg_len, msg); } } @@ -372,12 +362,14 @@ VLIB_REGISTER_NODE (startup_config_node,static) = { .function = startup_config_process, .type = VLIB_NODE_TYPE_PROCESS, .name = "startup-config-process", + .process_log2_n_stack_bytes = 18, }; /* *INDENT-ON* */ static clib_error_t * unix_config (vlib_main_t * vm, unformat_input_t * input) { + vlib_global_main_t *vgm = vlib_get_global_main (); unix_main_t *um = &unix_main; clib_error_t *error = 0; gid_t gid; @@ -394,6 +386,12 @@ unix_config (vlib_main_t * vm, unformat_input_t * input) um->flags |= UNIX_FLAG_INTERACTIVE; else if (unformat (input, "nodaemon")) um->flags |= UNIX_FLAG_NODAEMON; + else if (unformat (input, "nosyslog")) + um->flags |= UNIX_FLAG_NOSYSLOG; + else if (unformat (input, "nocolor")) + um->flags |= UNIX_FLAG_NOCOLOR; + else if (unformat (input, "nobanner")) + um->flags |= UNIX_FLAG_NOBANNER; else if (unformat (input, "cli-prompt %s", &cli_prompt)) vlib_unix_cli_set_prompt (cli_prompt); else @@ -523,9 +521,9 @@ unix_config (vlib_main_t * vm, unformat_input_t * input) } } - if (!(um->flags & UNIX_FLAG_INTERACTIVE)) + if (!(um->flags & (UNIX_FLAG_INTERACTIVE | UNIX_FLAG_NOSYSLOG))) { - openlog (vm->name, LOG_CONS | LOG_PERROR | LOG_PID, LOG_DAEMON); + openlog (vgm->name, LOG_CONS | LOG_PERROR | LOG_PID, LOG_DAEMON); clib_error_register_handler (unix_error_handler, um); if (!(um->flags & UNIX_FLAG_NODAEMON) && daemon ( /* chdir to / */ 0, @@ -563,6 +561,17 @@ unix_config (vlib_main_t * vm, unformat_input_t * input) * Do not fork or background the VPP process. Typically used when invoking * VPP applications from a process monitor. * + * @cfgcmd{nosyslog} + * Do not send e.g. clib_warning(...) output to syslog. Used + * when invoking VPP applications from a process monitor which + * pipe stdout/stderr to a dedicated logger service. + * + * @cfgcmd{nocolor} + * Do not use colors in outputs. + * * + * @cfgcmd{nobanner} + * Do not display startup banner. + * * @cfgcmd{exec, <filename>} * @par startup-config <filename> * Read startup operational configuration from @c filename. @@ -641,6 +650,8 @@ thread0 (uword arg) unformat_input_t input; int i; + vlib_process_finish_switch_stack (vm); + unformat_init_command_line (&input, (char **) vm->argv); i = vlib_main (vm, &input); unformat_free (&input); @@ -651,35 +662,44 @@ thread0 (uword arg) u8 * vlib_thread_stack_init (uword thread_index) { + void *stack; ASSERT (thread_index < vec_len (vlib_thread_stacks)); - vlib_thread_stacks[thread_index] = clib_mem_alloc_aligned - (VLIB_THREAD_STACK_SIZE, clib_mem_get_page_size ()); + stack = clib_mem_vm_map_stack (VLIB_THREAD_STACK_SIZE, + CLIB_MEM_PAGE_SZ_DEFAULT, + "thread stack: thread %u", thread_index); - /* - * Disallow writes to the bottom page of the stack, to - * catch stack overflows. - */ - if (mprotect (vlib_thread_stacks[thread_index], - clib_mem_get_page_size (), PROT_READ) < 0) - clib_unix_warning ("thread stack"); - return vlib_thread_stacks[thread_index]; + if (stack == CLIB_MEM_VM_MAP_FAILED) + clib_panic ("failed to allocate thread %u stack", thread_index); + + vlib_thread_stacks[thread_index] = stack; + return stack; } int vlib_unix_main (int argc, char *argv[]) { - vlib_main_t *vm = &vlib_global_main; /* one and only time for this! */ + vlib_global_main_t *vgm = vlib_get_global_main (); + vlib_main_t *vm = vlib_get_first_main (); /* one and only time for this! */ unformat_input_t input; clib_error_t *e; int i; + vec_validate_aligned (vgm->vlib_mains, 0, CLIB_CACHE_LINE_BYTES); + vm->argv = (u8 **) argv; - vm->name = argv[0]; + vgm->name = argv[0]; vm->heap_base = clib_mem_get_heap (); - vm->heap_aligned_base = (void *) - (((uword) vm->heap_base) & ~(VLIB_FRAME_ALIGN - 1)); + vm->heap_aligned_base = + (void *) (((uword) vm->heap_base) & ~(CLIB_CACHE_LINE_BYTES - 1)); ASSERT (vm->heap_base); + clib_time_init (&vm->clib_time); + + /* Turn on the event logger at the first possible moment */ + vgm->configured_elog_ring_size = 128 << 10; + elog_init (vlib_get_elog_main (), vgm->configured_elog_ring_size); + elog_enable_disable (vlib_get_elog_main (), 1); + unformat_init_command_line (&input, (char **) vm->argv); if ((e = vlib_plugin_config (vm, &input))) { @@ -693,8 +713,8 @@ vlib_unix_main (int argc, char *argv[]) return i; unformat_init_command_line (&input, (char **) vm->argv); - if (vm->init_functions_called == 0) - vm->init_functions_called = hash_create (0, /* value bytes */ 0); + if (vgm->init_functions_called == 0) + vgm->init_functions_called = hash_create (0, /* value bytes */ 0); e = vlib_call_all_config_functions (vm, &input, 1 /* early */ ); if (e != 0) { @@ -704,7 +724,7 @@ vlib_unix_main (int argc, char *argv[]) unformat_free (&input); /* always load symbols, for signal handler and mheap memory get/put backtrace */ - clib_elf_main_init (vm->name); + clib_elf_main_init (vgm->name); vec_validate (vlib_thread_stacks, 0); vlib_thread_stack_init (0); @@ -712,6 +732,7 @@ vlib_unix_main (int argc, char *argv[]) __os_thread_index = 0; vm->thread_index = 0; + vlib_process_start_switch_stack (vm, 0); i = clib_calljmp (thread0, (uword) vm, (void *) (vlib_thread_stacks[0] + VLIB_THREAD_STACK_SIZE));