X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimesync%2Ftimesyncd.c;h=ff76f978f30e41c55e12ffaf39ca02eb4294e0ed;hp=eb55bc068c17b4556028a58ba567468a7284478a;hb=6a5c7b7e41a036bfdc2474b4583fcfdd358a6db6;hpb=e0e5ce237b11f2d97189cd7725bf339b4b8a78de diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index eb55bc068..ff76f978f 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -33,6 +33,9 @@ #include #include #include +#include +#include +#include #include "missing.h" #include "util.h" @@ -49,6 +52,9 @@ #include "sd-network.h" #include "event-util.h" #include "network-util.h" +#include "clock-util.h" +#include "capability.h" +#include "mkdir.h" #include "timesyncd.h" #define TIME_T_MAX (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1) @@ -146,6 +152,56 @@ static double square(double d) { return d * d; } +static int load_clock_timestamp(uid_t uid, gid_t gid) { + _cleanup_close_ int fd = -1; + usec_t min = TIME_EPOCH * USEC_PER_SEC; + usec_t ct; + int r; + + /* Let's try to make sure that the clock is always + * monotonically increasing, by saving the clock whenever we + * have a new NTP time, or when we shut down, and restoring it + * when we start again. This is particularly helpful on + * systems lacking a battery backed RTC. We also will adjust + * the time to at least the build time of systemd. */ + + fd = open("/var/lib/systemd/clock", O_RDWR|O_CLOEXEC, 0644); + if (fd >= 0) { + struct stat st; + usec_t stamp; + + /* check if the recorded time is later than the compiled-in one */ + r = fstat(fd, &st); + if (r >= 0) { + stamp = timespec_load(&st.st_mtim); + if (stamp > min) + min = stamp; + } + + /* Try to fix the access mode, so that we can still + touch the file after dropping priviliges */ + fchmod(fd, 0644); + fchown(fd, uid, gid); + + } else + /* create stamp file with the compiled-in date */ + touch_file("/var/lib/systemd/clock", true, min, uid, gid, 0644); + + ct = now(CLOCK_REALTIME); + if (ct < min) { + struct timespec ts; + char date[FORMAT_TIMESTAMP_MAX]; + + log_info("System clock time unset or jumped backwards, restoring from recorded timestamp: %s", + format_timestamp(date, sizeof(date), min)); + + if (clock_settime(CLOCK_REALTIME, timespec_store(&ts, min)) < 0) + log_error("Failed to restore system clock: %m"); + } + + return 0; +} + static int manager_timeout(sd_event_source *source, usec_t usec, void *userdata) { _cleanup_free_ char *pretty = NULL; Manager *m = userdata; @@ -154,7 +210,7 @@ static int manager_timeout(sd_event_source *source, usec_t usec, void *userdata) assert(m->current_server_name); assert(m->current_server_address); - sockaddr_pretty(&m->current_server_address->sockaddr.sa, m->current_server_address->socklen, true, &pretty); + server_address_pretty(m->current_server_address, &pretty); log_info("Timed out waiting for reply from %s (%s).", strna(pretty), m->current_server_name->string); return manager_connect(m); @@ -189,12 +245,12 @@ static int manager_send_request(Manager *m) { * The actual value does not matter, We do not care about the correct * NTP UINT_MAX fraction; we just pass the plain nanosecond value. */ - assert_se(clock_gettime(CLOCK_MONOTONIC, &m->trans_time_mon) >= 0); + assert_se(clock_gettime(clock_boottime_or_monotonic(), &m->trans_time_mon) >= 0); assert_se(clock_gettime(CLOCK_REALTIME, &m->trans_time) >= 0); ntpmsg.trans_time.sec = htobe32(m->trans_time.tv_sec + OFFSET_1900_1970); ntpmsg.trans_time.frac = htobe32(m->trans_time.tv_nsec); - sockaddr_pretty(&m->current_server_address->sockaddr.sa, m->current_server_address->socklen, true, &pretty); + server_address_pretty(m->current_server_address, &pretty); len = sendto(m->server_socket, &ntpmsg, sizeof(ntpmsg), MSG_DONTWAIT, &m->current_server_address->sockaddr.sa, m->current_server_address->socklen); if (len == sizeof(ntpmsg)) { @@ -205,7 +261,7 @@ static int manager_send_request(Manager *m) { return manager_connect(m); } - /* re-arm timer with incresing timeout, in case the packets never arrive back */ + /* re-arm timer with increasing timeout, in case the packets never arrive back */ if (m->retry_interval > 0) { if (m->retry_interval < NTP_POLL_INTERVAL_MAX_SEC * USEC_PER_SEC) m->retry_interval *= 2; @@ -221,8 +277,8 @@ static int manager_send_request(Manager *m) { r = sd_event_add_time( m->event, &m->event_timeout, - CLOCK_MONOTONIC, - now(CLOCK_MONOTONIC) + TIMEOUT_USEC, 0, + clock_boottime_or_monotonic(), + now(clock_boottime_or_monotonic()) + TIMEOUT_USEC, 0, manager_timeout, m); if (r < 0) { log_error("Failed to arm timeout timer: %s", strerror(-r)); @@ -252,7 +308,7 @@ static int manager_arm_timer(Manager *m, usec_t next) { } if (m->event_timer) { - r = sd_event_source_set_time(m->event_timer, now(CLOCK_MONOTONIC) + next); + r = sd_event_source_set_time(m->event_timer, now(clock_boottime_or_monotonic()) + next); if (r < 0) return r; @@ -262,8 +318,8 @@ static int manager_arm_timer(Manager *m, usec_t next) { return sd_event_add_time( m->event, &m->event_timer, - CLOCK_MONOTONIC, - now(CLOCK_MONOTONIC) + next, 0, + clock_boottime_or_monotonic(), + now(clock_boottime_or_monotonic()) + next, 0, manager_timer, m); } @@ -330,9 +386,6 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) { /* * For small deltas, tell the kernel to gradually adjust the system * clock to the NTP time, larger deltas are just directly set. - * - * Clear STA_UNSYNC, it will enable the kernel's 11-minute mode, which - * syncs the system time periodically to the hardware clock. */ if (fabs(offset) < NTP_MAX_ADJUST) { tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_OFFSET | ADJ_TIMECONST | ADJ_MAXERROR | ADJ_ESTERROR; @@ -343,7 +396,7 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) { tmx.esterror = 0; log_debug(" adjust (slew): %+.3f sec\n", offset); } else { - tmx.modes = ADJ_SETOFFSET | ADJ_NANO; + tmx.modes = ADJ_STATUS | ADJ_NANO | ADJ_SETOFFSET; /* ADJ_NANO uses nanoseconds in the microseconds field */ tmx.time.tv_sec = (long)offset; @@ -359,6 +412,17 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) { log_debug(" adjust (jump): %+.3f sec\n", offset); } + /* + * An unset STA_UNSYNC will enable the kernel's 11-minute mode, + * which syncs the system time periodically to the RTC. + * + * In case the RTC runs in local time, never touch the RTC, + * we have no way to properly handle daylight saving changes and + * mobile devices moving between time zones. + */ + if (m->rtc_local_time) + tmx.status |= STA_UNSYNC; + switch (leap_sec) { case 1: tmx.status |= STA_INS; @@ -372,15 +436,17 @@ static int manager_adjust_clock(Manager *m, double offset, int leap_sec) { if (r < 0) return r; + touch("/var/lib/systemd/clock"); + m->drift_ppm = tmx.freq / 65536; log_debug(" status : %04i %s\n" - " time now : %li.%03lli\n" + " time now : %li.%03llu\n" " constant : %li\n" " offset : %+.3f sec\n" " freq offset : %+li (%i ppm)\n", - tmx.status, tmx.status & STA_UNSYNC ? "" : "sync", - tmx.time.tv_sec, tmx.time.tv_usec / NSEC_PER_MSEC, + tmx.status, tmx.status & STA_UNSYNC ? "unsync" : "sync", + tmx.time.tv_sec, (unsigned long long) (tmx.time.tv_usec / NSEC_PER_MSEC), tmx.constant, (double)tmx.offset / NSEC_PER_SEC, tmx.freq, m->drift_ppm); @@ -619,7 +685,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re * The round-trip delay, d, and system clock offset, t, are defined as: * d = (T4 - T1) - (T3 - T2) t = ((T2 - T1) + (T3 - T4)) / 2" */ - assert_se(clock_gettime(CLOCK_MONOTONIC, &now_ts) >= 0); + assert_se(clock_gettime(clock_boottime_or_monotonic(), &now_ts) >= 0); origin = tv_to_d(recv_time) - (ts_to_d(&now_ts) - ts_to_d(&m->trans_time_mon)) + OFFSET_1900_1970; receive = ntp_ts_to_d(&ntpmsg.recv_time); trans = ntp_ts_to_d(&ntpmsg.trans_time); @@ -647,7 +713,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re " delay : %+.3f sec\n" " packet count : %"PRIu64"\n" " jitter : %.3f%s\n" - " poll interval: %llu\n", + " poll interval: " USEC_FMT "\n", NTP_FIELD_LEAP(ntpmsg.field), NTP_FIELD_VERSION(ntpmsg.field), NTP_FIELD_MODE(ntpmsg.field), @@ -664,12 +730,13 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re m->poll_interval_usec / USEC_PER_SEC); if (!spike) { + m->sync = true; r = manager_adjust_clock(m, offset, leap_sec); if (r < 0) log_error("Failed to call clock_adjtime(): %m"); } - log_info("interval/delta/delay/jitter/drift %llus/%+.3fs/%.3fs/%.3fs/%+ippm%s", + log_info("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+ippm%s", m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_ppm, spike ? " (ignored)" : ""); @@ -723,7 +790,7 @@ static int manager_begin(Manager *m) { m->poll_interval_usec = NTP_POLL_INTERVAL_MIN_SEC * USEC_PER_SEC; - sockaddr_pretty(&m->current_server_address->sockaddr.sa, m->current_server_address->socklen, true, &pretty); + server_address_pretty(m->current_server_address, &pretty); log_info("Using NTP server %s (%s).", strna(pretty), m->current_server_name->string); sd_notifyf(false, "STATUS=Using Time Server %s (%s).", strna(pretty), m->current_server_name->string); @@ -775,7 +842,7 @@ static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct ad m->resolve_query = sd_resolve_query_unref(m->resolve_query); if (ret != 0) { - log_info("Failed to resolve %s: %s", m->current_server_name->string, gai_strerror(ret)); + log_debug("Failed to resolve %s: %s", m->current_server_name->string, gai_strerror(ret)); /* Try next host */ return manager_connect(m); @@ -845,7 +912,7 @@ static int manager_connect(Manager *m) { if (!ratelimit_test(&m->ratelimit)) { log_debug("Slowing down attempts to contact servers."); - r = sd_event_add_time(m->event, &m->event_retry, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + RETRY_USEC, 0, manager_retry, m); + r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + RETRY_USEC, 0, manager_retry, m); if (r < 0) { log_error("Failed to create retry timer: %s", strerror(-r)); return r; @@ -917,23 +984,25 @@ static int manager_add_server(Manager *m, const char *server) { } static int manager_add_server_string(Manager *m, const char *string) { - char *w, *state; + const char *word, *state; size_t l; int r; assert(m); assert(string); - FOREACH_WORD_QUOTED(w, l, string, state) { + FOREACH_WORD_QUOTED(word, l, string, state) { char t[l+1]; - memcpy(t, w, l); + memcpy(t, word, l); t[l] = 0; r = manager_add_server(m, t); if (r < 0) log_error("Failed to add server %s to configuration, ignoring: %s", t, strerror(-r)); } + if (!isempty(state)) + log_warning("Trailing garbage at the end of server list, ignoring."); return 0; } @@ -960,6 +1029,8 @@ static int manager_new(Manager **ret) { _cleanup_manager_free_ Manager *m = NULL; int r; + assert(ret); + m = new0(Manager, 1); if (!m) return -ENOMEM; @@ -972,18 +1043,16 @@ static int manager_new(Manager **ret) { if (r < 0) return r; - sd_event_add_signal(m->event, &m->sigterm, SIGTERM, NULL, NULL); - sd_event_add_signal(m->event, &m->sigint, SIGINT, NULL, NULL); + sd_event_set_watchdog(m->event, true); + + sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL); + sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL); r = sd_resolve_default(&m->resolve); if (r < 0) return r; r = sd_resolve_attach_event(m->resolve, m->event, 0); - if (r < 0) - return 0; - - r = manager_clock_watch_setup(m); if (r < 0) return r; @@ -1000,9 +1069,6 @@ static void manager_free(Manager *m) { manager_disconnect(m); manager_flush_names(m); - sd_event_source_unref(m->sigint); - sd_event_source_unref(m->sigterm); - sd_event_source_unref(m->event_retry); sd_event_source_unref(m->network_event_source); @@ -1039,48 +1105,19 @@ int config_parse_servers( } static int manager_parse_config_file(Manager *m) { - static const char fn[] = "/etc/systemd/timesyncd.conf"; - _cleanup_fclose_ FILE *f = NULL; - int r; - - assert(m); - - f = fopen(fn, "re"); - if (!f) { - if (errno == ENOENT) - return 0; - - log_warning("Failed to open configuration file %s: %m", fn); - return -errno; - } - - r = config_parse(NULL, fn, f, "Time\0", config_item_perf_lookup, - (void*) timesyncd_gperf_lookup, false, false, m); - if (r < 0) - log_warning("Failed to parse configuration file: %s", strerror(-r)); - - return r; + return config_parse(NULL, "/etc/systemd/timesyncd.conf", NULL, + "Time\0", + config_item_perf_lookup, timesyncd_gperf_lookup, + false, false, true, m); } static bool network_is_online(void) { - _cleanup_free_ unsigned *indices = NULL; - int r, n, i; - - n = sd_network_get_ifindices(&indices); - if (n <= 0) - return false; - - for (i = 0; i < n; i++) { - _cleanup_free_ char *oper_state = NULL; - - if (sd_network_link_is_loopback(indices[i])) - /* ignore loopback devices */ - continue; + _cleanup_free_ char *state = NULL; + int r; - r = sd_network_get_link_operational_state(indices[i], &oper_state); - if (r >= 0 && streq(oper_state, "carrier")) - return true; - } + r = sd_network_get_operational_state(&state); + if (r >= 0 && STR_IN_SET(state, "routable", "degraded")) + return true; return false; } @@ -1100,10 +1137,10 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re connected = (m->server_socket != -1); if (connected && !online) { - log_info("No network connectivity. Suspending."); + log_info("No network connectivity, watching for changes."); manager_disconnect(m); } else if (!connected && online) { - log_info("Network connectivity detected. Resuming."); + log_info("Network configuration changed, trying to establish connection."); if (m->current_server_address) { r = manager_begin(m); if (r < 0) @@ -1125,7 +1162,7 @@ static int manager_network_monitor_listen(Manager *m) { _cleanup_network_monitor_unref_ sd_network_monitor *monitor = NULL; int r, fd, events; - r = sd_network_monitor_new(NULL, &monitor); + r = sd_network_monitor_new(&monitor, NULL); if (r < 0) return r; @@ -1151,7 +1188,10 @@ static int manager_network_monitor_listen(Manager *m) { } int main(int argc, char *argv[]) { + const char *user = "systemd-timesync"; _cleanup_manager_free_ Manager *m = NULL; + uid_t uid; + gid_t gid; int r; if (argc > 1) { @@ -1166,6 +1206,20 @@ int main(int argc, char *argv[]) { umask(0022); + r = get_user_creds(&user, &uid, &gid, NULL, NULL); + if (r < 0) { + log_error("Cannot resolve user name %s: %s", user, strerror(-r)); + return r; + } + + r = load_clock_timestamp(uid, gid); + if (r < 0) + goto out; + + r = drop_privileges(uid, gid, (1ULL << CAP_SYS_TIME)); + if (r < 0) + goto out; + assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); r = manager_new(&m); @@ -1174,6 +1228,12 @@ int main(int argc, char *argv[]) { goto out; } + if (clock_is_localtime() > 0) { + log_info("The system is configured to read the RTC time in the local time zone. " + "This mode can not be fully supported. All system time to RTC updates are disabled."); + m->rtc_local_time = true; + } + manager_add_server_string(m, NTP_SERVERS); manager_parse_config_file(m); @@ -1200,6 +1260,10 @@ int main(int argc, char *argv[]) { sd_event_get_exit_code(m->event, &r); + /* if we got an authoritative time, store it in the file system */ + if (m->sync) + touch("/var/lib/systemd/clock"); + out: sd_notify(false, "STATUS=Shutting down...");