X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.c;h=a39076838b205f80fc0b2110131bfa78566adcf9;hb=a2c0e528b8b5ba370527db279605e4e4135689c1;hp=b571db946d4f01c128398a70543afb005353ab6c;hpb=056edeb9102c5ba455e1a54af70f282b6138ca33;p=elogind.git diff --git a/src/core/mount.c b/src/core/mount.c index b571db946..a39076838 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "manager.h" #include "unit.h" @@ -43,6 +45,9 @@ #include "exit-status.h" #include "def.h" +DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_table*, mnt_free_table); +DEFINE_TRIVIAL_CLEANUP_FUNC(struct libmnt_iter*, mnt_free_iter); + static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { [MOUNT_DEAD] = UNIT_INACTIVE, [MOUNT_MOUNTING] = UNIT_ACTIVATING, @@ -62,19 +67,23 @@ static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *userdata); static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents, void *userdata); -static bool mount_is_network(MountParameters *p) { - assert(p); - - if (mount_test_option(p->options, "_netdev")) +static bool mount_needs_network(const char *options, const char *fstype) { + if (mount_test_option(options, "_netdev")) return true; - if (p->fstype && fstype_is_network(p->fstype)) + if (fstype && fstype_is_network(fstype)) return true; return false; } -static bool mount_is_bind(MountParameters *p) { +static bool mount_is_network(const MountParameters *p) { + assert(p); + + return mount_needs_network(p->options, p->fstype); +} + +static bool mount_is_bind(const MountParameters *p) { assert(p); if (mount_test_option(p->options, "bind")) @@ -92,13 +101,13 @@ static bool mount_is_bind(MountParameters *p) { return false; } -static bool mount_is_auto(MountParameters *p) { +static bool mount_is_auto(const MountParameters *p) { assert(p); return !mount_test_option(p->options, "noauto"); } -static bool needs_quota(MountParameters *p) { +static bool needs_quota(const MountParameters *p) { assert(p); if (mount_is_network(p)) @@ -437,22 +446,22 @@ static int mount_verify(Mount *m) { b = unit_has_name(UNIT(m), e); if (!b) { - log_error_unit(UNIT(m)->id, "%s's Where= setting doesn't match unit name. Refusing.", UNIT(m)->id); + log_unit_error(UNIT(m)->id, "%s's Where= setting doesn't match unit name. Refusing.", UNIT(m)->id); return -EINVAL; } if (mount_point_is_api(m->where) || mount_point_ignore(m->where)) { - log_error_unit(UNIT(m)->id, "Cannot create mount unit for API file system %s. Refusing.", m->where); + log_unit_error(UNIT(m)->id, "Cannot create mount unit for API file system %s. Refusing.", m->where); return -EINVAL; } if (UNIT(m)->fragment_path && !m->parameters_fragment.what) { - log_error_unit(UNIT(m)->id, "%s's What setting is missing. Refusing.", UNIT(m)->id); + log_unit_error(UNIT(m)->id, "%s's What setting is missing. Refusing.", UNIT(m)->id); return -EBADMSG; } if (m->exec_context.pam_name && m->kill_context.kill_mode != KILL_CONTROL_GROUP) { - log_error_unit(UNIT(m)->id, "%s has PAM enabled. Kill mode must be set to control-group'. Refusing.",UNIT(m)->id); + log_unit_error(UNIT(m)->id, "%s has PAM enabled. Kill mode must be set to control-group'. Refusing.",UNIT(m)->id); return -EINVAL; } @@ -597,7 +606,7 @@ static void mount_set_state(Mount *m, MountState state) { } if (state != old_state) - log_debug_unit(UNIT(m)->id, + log_unit_debug(UNIT(m)->id, "%s changed %s -> %s", UNIT(m)->id, mount_state_to_string(old_state), @@ -804,7 +813,7 @@ static void mount_enter_signal(Mount *m, MountState state, MountResult f) { return; fail: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s failed to kill processes: %s", UNIT(m)->id, strerror(-r)); if (state == MOUNT_REMOUNTING_SIGTERM || state == MOUNT_REMOUNTING_SIGKILL) @@ -823,15 +832,15 @@ void warn_if_dir_nonempty(const char *unit, const char* where) { if (r > 0) return; else if (r == 0) - log_struct_unit(LOG_NOTICE, - unit, - "MESSAGE=%s: Directory %s to mount over is not empty, mounting anyway.", - unit, where, + log_unit_struct(unit, + LOG_NOTICE, + LOG_MESSAGE_ID(SD_MESSAGE_OVERMOUNTING), + LOG_MESSAGE("%s: Directory %s to mount over is not empty, mounting anyway.", + unit, where), "WHERE=%s", where, - MESSAGE_ID(SD_MESSAGE_OVERMOUNTING), NULL); else - log_warning_unit(unit, + log_unit_warning(unit, "MESSAGE=Failed to check directory %s: %s", where, strerror(-r)); } @@ -840,12 +849,12 @@ static int fail_if_symlink(const char *unit, const char* where) { assert(where); if (is_symlink(where) > 0) { - log_struct_unit(LOG_WARNING, - unit, - "MESSAGE=%s: Mount on symlink %s not allowed.", - unit, where, + log_unit_struct(unit, + LOG_ERR, + LOG_MESSAGE_ID(SD_MESSAGE_OVERMOUNTING), + LOG_MESSAGE("%s: Mount on symlink %s not allowed.", + unit, where), "WHERE=%s", where, - MESSAGE_ID(SD_MESSAGE_OVERMOUNTING), NULL); return -ELOOP; @@ -879,7 +888,7 @@ static void mount_enter_unmounting(Mount *m) { return; fail: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s failed to run 'umount' task: %s", UNIT(m)->id, strerror(-r)); mount_enter_mounted(m, MOUNT_FAILURE_RESOURCES); @@ -934,7 +943,7 @@ static void mount_enter_mounting(Mount *m) { return; fail: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s failed to run 'mount' task: %s", UNIT(m)->id, strerror(-r)); mount_enter_dead(m, MOUNT_FAILURE_RESOURCES); @@ -982,7 +991,7 @@ static void mount_enter_remounting(Mount *m) { return; fail: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s failed to run 'remount' task: %s", UNIT(m)->id, strerror(-r)); m->reload_result = MOUNT_FAILURE_RESOURCES; @@ -1086,7 +1095,7 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F MountState state; if ((state = mount_state_from_string(value)) < 0) - log_debug_unit(u->id, "Failed to parse state value %s", value); + log_unit_debug(u->id, "Failed to parse state value %s", value); else m->deserialized_state = state; } else if (streq(key, "result")) { @@ -1094,7 +1103,7 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F f = mount_result_from_string(value); if (f < 0) - log_debug_unit(UNIT(m)->id, + log_unit_debug(UNIT(m)->id, "Failed to parse result value %s", value); else if (f != MOUNT_SUCCESS) m->result = f; @@ -1104,7 +1113,7 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F f = mount_result_from_string(value); if (f < 0) - log_debug_unit(UNIT(m)->id, + log_unit_debug(UNIT(m)->id, "Failed to parse reload result value %s", value); else if (f != MOUNT_SUCCESS) m->reload_result = f; @@ -1113,7 +1122,7 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F pid_t pid; if (parse_pid(value, &pid) < 0) - log_debug_unit(UNIT(m)->id, + log_unit_debug(UNIT(m)->id, "Failed to parse control-pid value %s", value); else m->control_pid = pid; @@ -1121,14 +1130,14 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F MountExecCommand id; if ((id = mount_exec_command_from_string(value)) < 0) - log_debug_unit(UNIT(m)->id, + log_unit_debug(UNIT(m)->id, "Failed to parse exec-command value %s", value); else { m->control_command_id = id; m->control_command = m->exec_command + id; } } else - log_debug_unit(UNIT(m)->id, + log_unit_debug(UNIT(m)->id, "Unknown serialization key '%s'", key); return 0; @@ -1187,7 +1196,8 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID; } - log_full_unit(f == MOUNT_SUCCESS ? LOG_DEBUG : LOG_NOTICE, u->id, + log_unit_full(u->id, + f == MOUNT_SUCCESS ? LOG_DEBUG : LOG_NOTICE, "%s mount process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status); @@ -1255,31 +1265,31 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user case MOUNT_MOUNTING: case MOUNT_MOUNTING_DONE: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s mounting timed out. Stopping.", UNIT(m)->id); mount_enter_signal(m, MOUNT_MOUNTING_SIGTERM, MOUNT_FAILURE_TIMEOUT); break; case MOUNT_REMOUNTING: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s remounting timed out. Stopping.", UNIT(m)->id); m->reload_result = MOUNT_FAILURE_TIMEOUT; mount_enter_mounted(m, MOUNT_SUCCESS); break; case MOUNT_UNMOUNTING: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s unmounting timed out. Stopping.", UNIT(m)->id); mount_enter_signal(m, MOUNT_UNMOUNTING_SIGTERM, MOUNT_FAILURE_TIMEOUT); break; case MOUNT_MOUNTING_SIGTERM: if (m->kill_context.send_sigkill) { - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s mounting timed out. Killing.", UNIT(m)->id); mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, MOUNT_FAILURE_TIMEOUT); } else { - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s mounting timed out. Skipping SIGKILL. Ignoring.", UNIT(m)->id); @@ -1292,11 +1302,11 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user case MOUNT_REMOUNTING_SIGTERM: if (m->kill_context.send_sigkill) { - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s remounting timed out. Killing.", UNIT(m)->id); mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, MOUNT_FAILURE_TIMEOUT); } else { - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s remounting timed out. Skipping SIGKILL. Ignoring.", UNIT(m)->id); @@ -1309,11 +1319,11 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user case MOUNT_UNMOUNTING_SIGTERM: if (m->kill_context.send_sigkill) { - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s unmounting timed out. Killing.", UNIT(m)->id); mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, MOUNT_FAILURE_TIMEOUT); } else { - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s unmounting timed out. Skipping SIGKILL. Ignoring.", UNIT(m)->id); @@ -1327,7 +1337,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user case MOUNT_MOUNTING_SIGKILL: case MOUNT_REMOUNTING_SIGKILL: case MOUNT_UNMOUNTING_SIGKILL: - log_warning_unit(UNIT(m)->id, + log_unit_warning(UNIT(m)->id, "%s mount process still around after SIGKILL. Ignoring.", UNIT(m)->id); @@ -1409,8 +1419,7 @@ static int mount_add_one( if (m->running_as == SYSTEMD_SYSTEM) { const char* target; - target = fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET; - + target = mount_needs_network(options, fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET; r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true); if (r < 0) goto fail; @@ -1435,6 +1444,15 @@ static int mount_add_one( } } + if (m->running_as == SYSTEMD_SYSTEM && + mount_needs_network(options, fstype)) { + /* _netdev option may have shown up late, or on a + * remount. Add remote-fs dependencies, even though + * local-fs ones may already be there. */ + unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_REMOTE_FS_TARGET, NULL, true); + load_extras = true; + } + if (u->load_state == UNIT_NOT_FOUND) { u->load_state = UNIT_LOADED; u->load_error = 0; @@ -1500,55 +1518,46 @@ fail: } static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) { + _cleanup_(mnt_free_tablep) struct libmnt_table *tb = NULL; + _cleanup_(mnt_free_iterp) struct libmnt_iter *itr = NULL; + struct libmnt_fs *fs; int r = 0; - unsigned i; assert(m); - rewind(m->proc_self_mountinfo); + tb = mnt_new_table(); + itr = mnt_new_iter(MNT_ITER_FORWARD); + if (!tb || !itr) + return log_oom(); + + r = mnt_table_parse_mtab(tb, NULL); + if (r < 0) + return r; - for (i = 1;; i++) { - _cleanup_free_ char *device = NULL, *path = NULL, *options = NULL, *options2 = NULL, *fstype = NULL, *d = NULL, *p = NULL, *o = NULL; + r = 0; + for (;;) { + const char *device, *path, *options, *fstype; + _cleanup_free_ const char *d = NULL, *p = NULL; int k; - k = fscanf(m->proc_self_mountinfo, - "%*s " /* (1) mount id */ - "%*s " /* (2) parent id */ - "%*s " /* (3) major:minor */ - "%*s " /* (4) root */ - "%ms " /* (5) mount point */ - "%ms" /* (6) mount options */ - "%*[^-]" /* (7) optional fields */ - "- " /* (8) separator */ - "%ms " /* (9) file system type */ - "%ms" /* (10) mount source */ - "%ms" /* (11) mount options 2 */ - "%*[^\n]", /* some rubbish at the end */ - &path, - &options, - &fstype, - &device, - &options2); - - if (k == EOF) + k = mnt_table_next_fs(tb, itr, &fs); + if (k == 1) break; + else if (k < 0) + return log_error_errno(k, "Failed to get next entry from /etc/fstab: %m"); - if (k != 5) { - log_warning("Failed to parse /proc/self/mountinfo:%u.", i); - continue; - } - - o = strjoin(options, ",", options2, NULL); - if (!o) - return log_oom(); + device = mnt_fs_get_source(fs); + path = mnt_fs_get_target(fs); + options = mnt_fs_get_options(fs); + fstype = mnt_fs_get_fstype(fs); d = cunescape(device); p = cunescape(path); if (!d || !p) return log_oom(); - k = mount_add_one(m, d, p, o, fstype, set_flags); - if (k < 0) + k = mount_add_one(m, d, p, options, fstype, set_flags); + if (r == 0 && k < 0) r = k; } @@ -1559,11 +1568,13 @@ static void mount_shutdown(Manager *m) { assert(m); m->mount_event_source = sd_event_source_unref(m->mount_event_source); + m->mount_utab_event_source = sd_event_source_unref(m->mount_utab_event_source); if (m->proc_self_mountinfo) { fclose(m->proc_self_mountinfo); m->proc_self_mountinfo = NULL; } + m->utab_inotify_fd = safe_close(m->utab_inotify_fd); } static int mount_get_timeout(Unit *u, uint64_t *timeout) { @@ -1584,6 +1595,8 @@ static int mount_enumerate(Manager *m) { int r; assert(m); + mnt_init_debug(0); + if (!m->proc_self_mountinfo) { m->proc_self_mountinfo = fopen("/proc/self/mountinfo", "re"); if (!m->proc_self_mountinfo) @@ -1601,12 +1614,34 @@ static int mount_enumerate(Manager *m) { goto fail; } + if (m->utab_inotify_fd < 0) { + m->utab_inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC); + if (m->utab_inotify_fd < 0) + goto fail_with_errno; + + (void) mkdir_p_label("/run/mount", 0755); + + r = inotify_add_watch(m->utab_inotify_fd, "/run/mount", IN_MOVED_TO); + if (r < 0) + goto fail_with_errno; + + r = sd_event_add_io(m->event, &m->mount_utab_event_source, m->utab_inotify_fd, EPOLLIN, mount_dispatch_io, m); + if (r < 0) + goto fail; + + r = sd_event_source_set_priority(m->mount_utab_event_source, -10); + if (r < 0) + goto fail; + } + r = mount_load_proc_self_mountinfo(m, false); if (r < 0) goto fail; return 0; +fail_with_errno: + r = -errno; fail: mount_shutdown(m); return r; @@ -1618,15 +1653,38 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents, int r; assert(m); - assert(revents & EPOLLPRI); + assert(revents & (EPOLLPRI | EPOLLIN)); /* The manager calls this for every fd event happening on the * /proc/self/mountinfo file, which informs us about mounting - * table changes */ + * table changes, and for /run/mount events which we watch + * for mount options. */ + + if (fd == m->utab_inotify_fd) { + char inotify_buffer[sizeof(struct inotify_event) + NAME_MAX + 1]; + struct inotify_event *event; + char *p; + int rescan = 0; + + while ((r = read(fd, inotify_buffer, sizeof(inotify_buffer))) > 0) + for (p = inotify_buffer; p < inotify_buffer + r; ) { + event = (struct inotify_event *) p; + /* only care about changes to utab, but we have + * to monitor the directory to reliably get + * notifications about when utab is replaced + * using rename(2) */ + if ((event->mask & IN_Q_OVERFLOW) || streq(event->name, "utab")) + rescan = 1; + p += sizeof(struct inotify_event) + event->len; + } + + if (!rescan) + return 0; + } r = mount_load_proc_self_mountinfo(m, true); if (r < 0) { - log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-r)); + log_error_errno(r, "Failed to reread /proc/self/mountinfo: %m"); /* Reset flags, just in case, for later calls */ LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_MOUNT]) {