From patchwork Fri Sep 22 18:24:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 9966753 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89F9F6035E for ; Fri, 22 Sep 2017 18:25:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77E11299C4 for ; Fri, 22 Sep 2017 18:25:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B27D299D8; Fri, 22 Sep 2017 18:25:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5D2B1299C4 for ; Fri, 22 Sep 2017 18:25:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iMOvVFRziYI/Z0um5POhtdF8xmNSSKC5LOyqPfKy+Ns=; b=E1stIwnnCFJlyw vdBjLZzOXEN3A1dR0vxSkzSagl7dvtpnzVKkILZ96EUftGQ9bA7L0lLgndp7fvoLquGfVuPsLA/0e BiFYg6yx/zsH34drwO4xF8jC5XfbOPbDYoc9zamjHkYn2UrUxa7nh6U7pmoNCjd4fzJ6o3niZtiEX tuz0ipX+N0aGacrBfWbBWbM+xQpWaOEO2Q1bmQO2jlv+iGMeqALtnFJ8YVxHajfHiySvXfP7rj/Go odHcnzYGaWtJ6j3+kwEQIL4yY3LQOibeYooGUvBJeqGiZyzEk+5GqFRaW6CtFoFaPKkqO8QWVYnN+ J13jgTfmNapUPjVtlb4A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dvSdQ-0002I8-Od; Fri, 22 Sep 2017 18:25:08 +0000 Received: from quartz.orcorp.ca ([184.70.90.242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dvSdL-0001Mz-OT for linux-arm-kernel@lists.infradead.org; Fri, 22 Sep 2017 18:25:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=obsidianresearch.com; s=rsa1; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=RCYsUN2BFxZMz3awJVyV6GREWK2BFHpdD/sDoxNH+Sw=; b=WkiYYDlRSk155vScXM2Ho/7AGi5UdOWX0TPLTr47hl9VLZW0jKoHs0GvxUYUXefz36M/DjRxfFZtp0bUPPvflUaEartiORGHsgW2FN8+/ty+lau9KceA6vAlxOmbFRvSTMy2+yeYDuAGFteUChzpdYyaVT3VeL1RLakx6rjrN0o=; Received: from jgg by quartz.orcorp.ca with local (Exim 4.84_2) (envelope-from ) id 1dvSci-0006eC-UV; Fri, 22 Sep 2017 12:24:24 -0600 Date: Fri, 22 Sep 2017 12:24:24 -0600 From: Jason Gunthorpe To: Russell King - ARM Linux Subject: Re: On NTP, RTCs and accurately setting their time Message-ID: <20170922182424.GA21945@obsidianresearch.com> References: <20170920165141.GP20805@n2100.armlinux.org.uk> <20170920224522.GB20974@obsidianresearch.com> <20170921075907.GR20805@n2100.armlinux.org.uk> <20170921093218.GS20805@n2100.armlinux.org.uk> <20170921220510.GA11395@obsidianresearch.com> <20170921224541.GC20805@n2100.armlinux.org.uk> <20170921232040.GA15130@obsidianresearch.com> <20170922095713.GD20805@n2100.armlinux.org.uk> <20170922164850.GA13235@obsidianresearch.com> <20170922172022.GJ20805@n2100.armlinux.org.uk> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170922172022.GJ20805@n2100.armlinux.org.uk> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170922_112503_971435_CF410D39 X-CRM114-Status: GOOD ( 45.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alessandro Zummo , Stephen Boyd , John Stultz , Alexandre Belloni , Thomas Gleixner , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Sep 22, 2017 at 06:20:22PM +0100, Russell King - ARM Linux wrote: > > This suggests the CMOS mechanism expects to set time 1.0 seconds at > > instant 1.5 s. ie when the RTC executes the time set it sets the seconds > > scaler to 0.5, not zero. With the v2 patch this would be a -0.5s > > set_offset_nsec value. > > See the comment in arch/x86/kernel/rtc.c: > > /* > * In order to set the CMOS clock precisely, set_rtc_mmss has to be > * called 500 ms after the second nowtime has started, because when > * nowtime is written into the registers of the CMOS clock, it will > * jump to the next second precisely 500 ms later. Check the Motorola > * MC146818A or Dallas DS12887 data sheet for details. > */ Right, I've seen that before, so this is all on the right track, and rtc_set_ntp_time is broken to do that old rounding when calling those chips.. We can probably even go ahead and patch those the RTC driver for the above chips to use set_offset_nsec = -0.5s I wonder if the default for set_offset_nsec should then be set to 0? Unclear to me if rtc_set_ntp_time ever actually worked at sub second resolution with any RTC .. > This, I think, is why the code reschedules the timer in the failure case > using as small a delay as possible, not 10s. That makes sense. > > + /* The ntp code must call this with the correct value in tv_nsec, if > > + * it does not we update target_nsec and return EPROTO to make the ntp > > + * code try again later. > > + */ > > + ok = rtc_tv_nsec_ok(rtc, &to_set, &now); > > This doesn't match the prototype. Arg, the compiler warning got lost during all my edits.. > > +static void sched_sync_hw_clock(struct timespec64 now, > > + unsigned long target_nsec, bool fail) > > { > > - return -ENODEV; > > + struct timespec64 next, delta; > > + > > + do { > > + /* > > + * Compute the next wall clock time to try and set the > > + * clock > > + */ > > + next = now; > > + if (!fail) > > + timespec64_add_ns(&next, 659ULL * NSEC_PER_SEC); > > + else > > + /* Update failed, try again in about 10 seconds */ > > + timespec64_add_ns(&next, 10ULL * NSEC_PER_SEC); > > + > > + /* > > + * The next call to sync_cmos_clock needs to have have a wall > > + * clock tv_nsec value equal to target_nsec. > > + */ > > + if (next.tv_nsec > target_nsec) > > + next.tv_sec++; > > + next.tv_nsec = target_nsec; > > + > > + /* > > + * Convert to a relative delay. If time set took a really long > > + * time, or the wall clock was changed, this might become > > + * negative, so try again. > > + */ > > + getnstimeofday64(&now); > > + delta = timespec64_sub(next, now); > > + } while (delta.tv_sec <= 0); > > If we re-read "now" at the start, do we need the complexity of this > loop? Nope, probably not. > attempt, so we ought to keep this code simple. At that point, we might > as well keep the whole thing simple - we don't need all the complexity > that the timespec64 math helpers above bring with it. Okay, this looks fine to me, thanks. For reference, here is the revised patch From 067bae114369a17d2e90b4522434dd568fe62558 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Fri, 22 Sep 2017 12:18:03 -0600 Subject: [PATCH v4] rtc: Allow rtc drivers to specify the tv_nsec value for ntp ntp is currently hardwired to try and call the rtc set when wall clock tv_nsec is 0.5 seconds. This historical behaviour works well with certain PC RTCs, but is not universal to all rtc hardware. Change how this works by introducing the driver specific concept of set_offset_nsec, the delay between current wall clock time and the target time to set (with a 0 tv_nsecs). For x86-style CMOS set_offset_nsec should be -0.5 s which causes the last second to be written 0.5 s after it has started. For compat with the old rtc_set_ntp_time, the value is defaulted to + 0.5 s, which causes the next second to be written 0.5s before it starts, as things were before this patch. Testing shows many non-x86 RTCs would like set_offset_nsec ~= 0, so ultimately each RTC driver should set the set_offset_nsec according to its needs, and non x86 architectures should stop using update_persistent_clock64 in order to access this feature. Future patches will revise the drivers as needed. Since CMOS and RTC now have very different handling they are split into two dedicated code paths, sharing the support code. Signed-off-by: Jason Gunthorpe --- drivers/rtc/class.c | 6 ++ drivers/rtc/systohc.c | 53 +++++++++++----- include/linux/rtc.h | 43 ++++++++++++- kernel/time/ntp.c | 164 +++++++++++++++++++++++++++++++++----------------- 4 files changed, 194 insertions(+), 72 deletions(-) diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 2ed970d61da140..eef4123a573504 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c @@ -161,6 +161,12 @@ static struct rtc_device *rtc_allocate_device(void) device_initialize(&rtc->dev); + /* Drivers can revise this default after allocating the device. It + * should be the value of wallclock tv_nsec that the driver needs in + * order to synchronize the second tick over during set. + */ + rtc->set_offset_nsec = NSEC_PER_SEC / 2; + rtc->irq_freq = 1; rtc->max_user_freq = 64; rtc->dev.class = rtc_class; diff --git a/drivers/rtc/systohc.c b/drivers/rtc/systohc.c index b4a68ffcd06bb8..0c177647ea6c71 100644 --- a/drivers/rtc/systohc.c +++ b/drivers/rtc/systohc.c @@ -10,6 +10,7 @@ /** * rtc_set_ntp_time - Save NTP synchronized time to the RTC * @now: Current time of day + * @target_nsec: pointer for desired now->tv_nsec value * * Replacement for the NTP platform function update_persistent_clock64 * that stores time for later retrieval by rtc_hctosys. @@ -18,30 +19,52 @@ * possible at all, and various other -errno for specific temporary failure * cases. * + * -EPROTO is returned if now.tv_nsec is not close enough to *target_nsec. + ( * If temporary failure is indicated the caller should try again 'soon' */ -int rtc_set_ntp_time(struct timespec64 now) +int rtc_set_ntp_time(struct timespec64 now, unsigned long *target_nsec) { struct rtc_device *rtc; struct rtc_time tm; + struct timespec64 to_set; int err = -ENODEV; - - if (now.tv_nsec < (NSEC_PER_SEC >> 1)) - rtc_time64_to_tm(now.tv_sec, &tm); - else - rtc_time64_to_tm(now.tv_sec + 1, &tm); + bool ok; rtc = rtc_class_open(CONFIG_RTC_SYSTOHC_DEVICE); - if (rtc) { - /* rtc_hctosys exclusively uses UTC, so we call set_time here, - * not set_mmss. */ - if (rtc->ops && - (rtc->ops->set_time || - rtc->ops->set_mmss64 || - rtc->ops->set_mmss)) - err = rtc_set_time(rtc, &tm); - rtc_class_close(rtc); + if (!rtc) + goto out_err; + + if (!rtc->ops || (!rtc->ops->set_time && !rtc->ops->set_mmss64 && + !rtc->ops->set_mmss)) + goto out_close; + + /* Compute the value of tv_nsec we require the caller to supply in + * now.tv_nsec. This is the value such that (now + + * set_offset_nsec).tv_nsec == 0. + */ + set_normalized_timespec64(&to_set, 0, -rtc->set_offset_nsec); + *target_nsec = to_set.tv_nsec; + + /* The ntp code must call this with the correct value in tv_nsec, if + * it does not we update target_nsec and return EPROTO to make the ntp + * code try again later. + */ + ok = rtc_tv_nsec_ok(rtc->set_offset_nsec, &to_set, &now); + if (!ok) { + err = -EPROTO; + goto out_close; } + rtc_time64_to_tm(to_set.tv_sec, &tm); + + /* rtc_hctosys exclusively uses UTC, so we call set_time here, not + * set_mmss. + */ + err = rtc_set_time(rtc, &tm); + +out_close: + rtc_class_close(rtc); +out_err: return err; } diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 0a0f0d14a5fba5..eb767f0bfc13fa 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -137,6 +137,14 @@ struct rtc_device { /* Some hardware can't support UIE mode */ int uie_unsupported; + /* Number of nsec it takes to set the RTC clock. This influences when + * the set ops are called. An offset: + * - of 0.5 s will call RTC set for wall clock time 10.0 s at 9.5 s + * - of 1.5 s will call RTC set for wall clock time 10.0 s at 8.5 s + * - of -0.5 s will call RTC set for wall clock time 10.0 s at 10.5 s + */ + long set_offset_nsec; + bool registered; struct nvmem_config *nvmem_config; @@ -174,7 +182,7 @@ extern void devm_rtc_device_unregister(struct device *dev, extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm); extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm); -extern int rtc_set_ntp_time(struct timespec64 now); +extern int rtc_set_ntp_time(struct timespec64 now, unsigned long *target_nsec); int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm); extern int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alrm); @@ -223,6 +231,39 @@ static inline bool is_leap_year(unsigned int year) return (!(year % 4) && (year % 100)) || !(year % 400); } +/* Determine if we can call to driver to set the time. Drivers can only be + * called to set a second aligned time value, and the field set_offset_nsec + * specifies how far away from the second aligned time to call the driver. + * + * This also computes 'to_set' which is the time we are trying to set, and has + * a zero in tv_nsecs, such that: + * to_set - set_delay_nsec == now +/- FUZZ + * + */ +static inline bool rtc_tv_nsec_ok(s64 set_offset_nsec, + struct timespec64 *to_set, + const struct timespec64 *now) +{ + /* Allowed error in tv_nsec, arbitarily set to 5 jiffies in ns. */ + const unsigned long TIME_SET_NSEC_FUZZ = TICK_NSEC * 5; + struct timespec64 delay = {.tv_sec = 0, + .tv_nsec = set_offset_nsec}; + + *to_set = timespec64_add(*now, delay); + + if (to_set->tv_nsec < TIME_SET_NSEC_FUZZ) { + to_set->tv_nsec = 0; + return true; + } + + if (to_set->tv_nsec > NSEC_PER_SEC - TIME_SET_NSEC_FUZZ) { + to_set->tv_sec++; + to_set->tv_nsec = 0; + return true; + } + return false; +} + #define rtc_register_device(device) \ __rtc_register_device(THIS_MODULE, device) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index edf19cc5314043..c209fc1d455668 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -492,11 +492,70 @@ int second_overflow(time64_t secs) return leap; } -#ifdef CONFIG_GENERIC_CMOS_UPDATE -int __weak update_persistent_clock(struct timespec now) +static void sync_hw_clock(struct work_struct *work); +static DECLARE_DELAYED_WORK(sync_work, sync_hw_clock); + +static void sched_sync_hw_clock(struct timespec64 now, + unsigned long target_nsec, bool fail) + +{ + struct timespec64 next; + + getnstimeofday64(&next); + if (!fail) + next.tv_sec = 659; + else { + /* + * Try again as soon as possible. Delaying long periods + * decreases the accuracy of the work queue timer. Due to this + * the algorithm is very likely to require a short-sleep retry + * after the above long sleep to synchronize ts_nsec. + */ + next.tv_sec = 0; + } + + /* Compute the needed delay that will get to tv_nsec == target_nsec */ + next.tv_nsec = target_nsec - next.tv_nsec; + if (next.tv_nsec <= 0) + next.tv_nsec += NSEC_PER_SEC; + if (next.tv_nsec >= NSEC_PER_SEC) { + next.tv_sec++; + next.tv_nsec -= NSEC_PER_SEC; + } + + queue_delayed_work(system_power_efficient_wq, &sync_work, + timespec64_to_jiffies(&next)); +} + +#if defined(CONFIG_RTC_SYSTOHC) +static void sync_rtc_clock(void) +{ + unsigned long target_nsec; + struct timespec64 adjust, now; + int rc; + + getnstimeofday64(&now); + + now = adjust; + if (persistent_clock_is_local) + adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); + + /* + * The current RTC in use will provide the target_nsec it wants to be + * called at, and does rtc_tv_nsec_ok internally. + */ + rc = rtc_set_ntp_time(adjust, &target_nsec); + + sched_sync_hw_clock(now, target_nsec, rc && rc != -ENODEV); +} +#else +static void sync_rtc_clock(void) { - return -ENODEV; } +#endif + +#if defined(CONFIG_GENERIC_CMOS_UPDATE) +int __weak update_persistent_clock(struct timespec now) { return -ENODEV; } int __weak update_persistent_clock64(struct timespec64 now64) { @@ -505,78 +564,71 @@ int __weak update_persistent_clock64(struct timespec64 now64) now = timespec64_to_timespec(now64); return update_persistent_clock(now); } -#endif - -#if defined(CONFIG_GENERIC_CMOS_UPDATE) || defined(CONFIG_RTC_SYSTOHC) -static void sync_cmos_clock(struct work_struct *work); - -static DECLARE_DELAYED_WORK(sync_cmos_work, sync_cmos_clock); -static void sync_cmos_clock(struct work_struct *work) +static bool sync_cmos_clock(void) { + static bool no_cmos; struct timespec64 now; - struct timespec64 next; - int fail = 1; + struct timespec64 adjust; + int rc = -EPROTO; + long target_nsec = NSEC_PER_SEC / 2; + + if (no_cmos) + return false; /* - * If we have an externally synchronized Linux clock, then update - * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be - * called as close as possible to 500 ms before the new second starts. - * This code is run on a timer. If the clock is set, that timer - * may not expire at the correct time. Thus, we adjust... - * We want the clock to be within a couple of ticks from the target. + * Historically update_persistent_clock64() has followed x86 + * semantics, which match the MC146818A/etc RTC. This RTC will store + * 'adjust' and then in .5s it will advance once second. + * + * Architectures are strongly encouraged to use rtclib and not + * implement this legacy API. */ - if (!ntp_synced()) { - /* - * Not synced, exit, do not restart a timer (if one is - * running, let it run out). - */ - return; - } - getnstimeofday64(&now); - if (abs(now.tv_nsec - (NSEC_PER_SEC / 2)) <= tick_nsec * 5) { - struct timespec64 adjust = now; - - fail = -ENODEV; + if (rtc_tv_nsec_ok(-1 * target_nsec, &adjust, &now)) { if (persistent_clock_is_local) adjust.tv_sec -= (sys_tz.tz_minuteswest * 60); -#ifdef CONFIG_GENERIC_CMOS_UPDATE - fail = update_persistent_clock64(adjust); -#endif + rc = update_persistent_clock64(adjust); + /* + * The machine does not support update_persistent_clock64 even + * though it defines it. + */ + if (rc == -ENODEV) { + no_cmos = true; + return false; + } + } -#ifdef CONFIG_RTC_SYSTOHC - if (fail == -ENODEV) - fail = rtc_set_ntp_time(adjust); + sched_sync_hw_clock(now, target_nsec, rc); + return true; +} +#else +static bool sync_cmos_clock(void) +{ + return false; +} #endif - } - next.tv_nsec = (NSEC_PER_SEC / 2) - now.tv_nsec - (TICK_NSEC / 2); - if (next.tv_nsec <= 0) - next.tv_nsec += NSEC_PER_SEC; +static void sync_hw_clock(struct work_struct *work) +{ + if (!ntp_synced()) + return; - if (!fail || fail == -ENODEV) - next.tv_sec = 659; - else - next.tv_sec = 0; + if (sync_cmos_clock()) + return; - if (next.tv_nsec >= NSEC_PER_SEC) { - next.tv_sec++; - next.tv_nsec -= NSEC_PER_SEC; - } - queue_delayed_work(system_power_efficient_wq, - &sync_cmos_work, timespec64_to_jiffies(&next)); + sync_rtc_clock(); } void ntp_notify_cmos_timer(void) { - queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0); -} - -#else -void ntp_notify_cmos_timer(void) { } -#endif + if (!ntp_synced()) + return; + if (IS_ENABLED(CONFIG_GENERIC_CMOS_UPDATE) || + IS_ENABLED(CONFIG_RTC_SYSTOHC)) + queue_delayed_work(system_power_efficient_wq, &sync_work, 0); +} /* * Propagate a new txc->status value into the NTP state: