X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshutdown.c;h=23b9f1b545ef204e49790d3057e1be8d01ada795;hp=be3fff41c71f2fdf74f9f64bd04f5ebdd80e860b;hb=4e08da90d4df797308d4646af345cfc0486b06d1;hpb=2ca1b422530e0e1c3d354b2e95a82723fe3f7702 diff --git a/src/shutdown.c b/src/shutdown.c index be3fff41c..23b9f1b54 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -38,7 +38,6 @@ #define TIMEOUT_USEC (5 * USEC_PER_SEC) #define FINALIZE_ATTEMPTS 50 -#define FINALIZE_CRITICAL_ATTEMPTS 10 static bool ignore_proc(pid_t pid) { if (pid == 1) @@ -69,7 +68,7 @@ static bool is_kernel_thread(pid_t pid) static int killall(int sign) { DIR *dir; struct dirent *d; - unsigned int processes = 0; + unsigned int n_processes = 0; if ((dir = opendir("/proc")) == NULL) return -errno; @@ -87,20 +86,20 @@ static int killall(int sign) { continue; if (kill(pid, sign) == 0) - processes++; + n_processes++; else log_warning("Could not kill %d: %m", pid); } closedir(dir); - return processes; + return n_processes; } static int send_signal(int sign) { sigset_t mask, oldmask; usec_t until; - int processes; + int n_processes; struct timespec ts; assert_se(sigemptyset(&mask) == 0); @@ -109,29 +108,32 @@ static int send_signal(int sign) { return -errno; if (kill(-1, SIGSTOP) < 0) - log_warning("Failed kill(-1, SIGSTOP): %m"); + log_warning("kill(-1, SIGSTOP) failed: %m"); - processes = killall(sign); + n_processes = killall(sign); if (kill(-1, SIGCONT) < 0) - log_warning("Failed kill(-1, SIGCONT): %m"); + log_warning("kill(-1, SIGCONT) failed: %m"); - if (processes <= 0) + if (n_processes <= 0) goto finish; until = now(CLOCK_MONOTONIC) + TIMEOUT_USEC; for (;;) { + int k; usec_t n = now(CLOCK_MONOTONIC); + for (;;) { pid_t pid = waitpid(-1, NULL, WNOHANG); + if (pid == 0) break; else if (pid < 0 && errno == ECHILD) { - processes = 0; + n_processes = 0; goto finish; } - if (--processes == 0) + if (--n_processes == 0) goto finish; } @@ -139,14 +141,18 @@ static int send_signal(int sign) { goto finish; timespec_store(&ts, until - n); - if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD) - log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); + if ((k = sigtimedwait(&mask, NULL, &ts)) != SIGCHLD) { + if (k >= 0) + log_warning("sigtimedwait() returned unexpected signal."); + if (k < 0 && errno != EAGAIN) + log_warning("sigtimedwait() failed: %m"); + } } finish: sigprocmask(SIG_SETMASK, &oldmask, NULL); - return processes; + return n_processes; } static int rescue_send_signal(int sign) { @@ -161,21 +167,23 @@ static int rescue_send_signal(int sign) { return -errno; if (kill(-1, SIGSTOP) < 0) - log_warning("Failed kill(-1, SIGSTOP): %m"); + log_warning("kill(-1, SIGSTOP) failed: %m"); r = kill(-1, sign); if (r < 0) - log_warning("Failed kill(-1, %d): %m", sign); + log_warning("kill(-1, %d) failed: %m", sign); if (kill(-1, SIGCONT) < 0) - log_warning("Failed kill(-1, SIGCONT): %m"); + log_warning("kill(-1, SIGCONT) failed: %m"); if (r < 0) goto finish; until = now(CLOCK_MONOTONIC) + TIMEOUT_USEC; for (;;) { + int k; usec_t n = now(CLOCK_MONOTONIC); + for (;;) { pid_t pid = waitpid(-1, NULL, WNOHANG); if (pid == 0) @@ -188,8 +196,12 @@ static int rescue_send_signal(int sign) { goto finish; timespec_store(&ts, until - n); - if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD) - log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); + if ((k = sigtimedwait(&mask, NULL, &ts)) != SIGCHLD) { + if (k >= 0) + log_warning("sigtimedwait() returned unexpected signal."); + if (k < 0 && errno != EAGAIN) + log_warning("sigtimedwait() failed: %m"); + } } finish: @@ -199,8 +211,10 @@ finish: } int main(int argc, char *argv[]) { - int cmd, r, retries; - bool need_umount = true, need_swapoff = true, need_loop_detach = true; + int cmd, r; + unsigned retries; + bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true; + bool killed_everbody = false; log_parse_environment(); log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */ @@ -236,77 +250,100 @@ int main(int argc, char *argv[]) { if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) log_warning("Cannot lock process memory: %m"); - log_info("Sending SIGTERM to processes"); + log_info("Sending SIGTERM to remaining processes..."); r = send_signal(SIGTERM); if (r < 0) - log_warning("Cannot send SIGTERM to all process: %s", strerror(r)); + log_warning("Failed to send SIGTERM to remaining processes: %s", strerror(r)); - log_info("Sending SIGKILL to processes"); + log_info("Sending SIGKILL to remaining processes..."); r = send_signal(SIGKILL); if (r < 0) - log_warning("Cannot send SIGKILL to all process: %s", strerror(r)); + log_warning("Failed to send SIGKILL to remaining processes: %s", strerror(r)); /* Unmount all mountpoints, swaps, and loopback devices */ - retries = FINALIZE_ATTEMPTS; - while (need_umount || need_swapoff || need_loop_detach) { + for (retries = 0; retries < FINALIZE_ATTEMPTS; retries++) { + bool changed = false; + if (need_umount) { - log_info("Unmounting filesystems."); - r = umount_all(); + log_info("Unmounting file systems."); + r = umount_all(&changed); if (r == 0) need_umount = false; else if (r > 0) - log_warning("Not all filesystems unmounted, %d left.", r); + log_info("Not all file systems unmounted, %d left.", r); else - log_error("Error unmounting filesystems: %s", strerror(-r)); + log_error("Failed to unmount file systems: %s", strerror(-r)); } if (need_swapoff) { log_info("Disabling swaps."); - r = swapoff_all(); + r = swapoff_all(&changed); if (r == 0) need_swapoff = false; else if (r > 0) - log_warning("Not all swaps are off, %d left.", r); + log_info("Not all swaps are turned off, %d left.", r); else - log_error("Error turning off swaps: %s", strerror(-r)); + log_error("Failed to turn off swaps: %s", strerror(-r)); } if (need_loop_detach) { log_info("Detaching loop devices."); - r = loopback_detach_all(); + r = loopback_detach_all(&changed); if (r == 0) need_loop_detach = false; else if (r > 0) - log_warning("Not all loop devices detached, %d left.", r); + log_info("Not all loop devices detached, %d left.", r); else - log_error("Error detaching loop devices: %s", strerror(-r)); + log_error("Failed to detach loop devices: %s", strerror(-r)); + } + if (need_dm_detach) { + log_info("Detaching DM devices."); + r = dm_detach_all(&changed); + if (r == 0) + need_dm_detach = false; + else if (r > 0) + log_warning("Not all DM devices detached, %d left.", r); + else + log_error("Failed to detach DM devices: %s", strerror(-r)); } - if (need_umount || need_swapoff || need_loop_detach) { - retries--; + if (!need_umount && !need_swapoff && !need_loop_detach && !need_dm_detach) + /* Yay, done */ + break; - if (retries == FINALIZE_CRITICAL_ATTEMPTS) { - log_warning("Approaching critical level to finalize filesystem and devices, try to kill all processes."); - rescue_send_signal(SIGTERM); - rescue_send_signal(SIGKILL); - } + /* If in this iteration we didn't manage to + * unmount/deactivate anything, we either kill more + * processes, or simply give up */ + if (!changed) { - if (retries > 0) - log_info("Action still required, %d tries left.", retries); - else { - log_error("Giving up. Actions left: Umount=%s, Swap off=%s, Loop detach=%s", - yes_no(need_umount), yes_no(need_swapoff), yes_no(need_loop_detach)); + if (killed_everbody) { + /* Hmm, we already killed everybody, + * let's just give up */ + log_error("Cannot finalize remaining file systems and devices, giving up."); break; } + + log_warning("Cannot finalize remaining file systems and devices, trying to kill remaining processes."); + rescue_send_signal(SIGTERM); + rescue_send_signal(SIGKILL); + killed_everbody = true; } + + log_debug("Couldn't finalize remaining file systems and devices after %u retries, trying again.", retries+1); } + if (retries >= FINALIZE_ATTEMPTS) + log_error("Too many interations, giving up."); + + execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, NULL); + sync(); if (cmd == LINUX_REBOOT_CMD_KEXEC) { - /* we cheat and exec kexec to avoid doing all its work */ + /* We cheat and exec kexec to avoid doing all its work */ pid_t pid = fork(); + if (pid < 0) log_error("Could not fork: %m. Falling back to normal reboot."); else if (pid > 0) { @@ -314,7 +351,7 @@ int main(int argc, char *argv[]) { log_warning("kexec failed. Falling back to normal reboot."); } else { /* Child */ - const char *args[5] = { KEXEC_BINARY_PATH, "-e", "-f", "-x", NULL }; + const char *args[3] = { "/sbin/kexec", "-e", NULL }; execv(args[0], (char * const *) args); return EXIT_FAILURE; } @@ -327,7 +364,6 @@ int main(int argc, char *argv[]) { r = -errno; error: - sync(); log_error("Critical error while doing system shutdown: %s", strerror(-r)); freeze();