mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: devel@linuxdriverproject.org
Cc: linux-kernel@vger.kernel.org,
	"K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>,
	John Stultz <john.stultz@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Alex Ng <alexng@microsoft.com>,
	Stephen Hemminger <stephen@networkplumber.org>
Subject: [PATCH v2 3/4] hv_util: use do_adjtimex() to update system time
Date: Wed,  4 Jan 2017 18:24:38 +0100	[thread overview]
Message-ID: <20170104172439.19683-4-vkuznets@redhat.com> (raw)
In-Reply-To: <20170104172439.19683-1-vkuznets@redhat.com>

With TimeSync version 4 protocol support we started updating system time
continuously through the whole lifetime of Hyper-V guests. Every 5 seconds
there is a time sample from the host which triggers do_settimeofday[64]().
While the time from the host is very accurate such adjustments may cause
issues:
- Time is jumping forward and backward, some applications may misbehave.
- In case an NTP client is run in parallel things may go south, e.g. when
  an NTP client tries to adjust tick/frequency with ADJ_TICK/ADJ_FREQUENCY
  the Hyper-V module will not see this changes and time will oscillate and
  never converge.
- Systemd starts annoying you by printing "Time has been changed" every 5
  seconds to the system log.

Instead of calling do_settimeofday64() we can pretend being an NTP client
and use do_adjtimex(). Do do_settimeofday64() in case the difference is too
big or ICTIMESYNCFLAG_SYNC flag was set in the request.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
Changes since v1:
- do do_settimeofday64() when ICTIMESYNCFLAG_SYNC flag is present in the
  request (Alex Ng)
- add pr_debug() for the case when do_adjtimex() fails (Alex Ng)
---
 drivers/hv/hv_util.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
index 94719eb..7e97231 100644
--- a/drivers/hv/hv_util.c
+++ b/drivers/hv/hv_util.c
@@ -182,9 +182,11 @@ struct adj_time_work {
 static void hv_set_host_time(struct work_struct *work)
 {
 	struct adj_time_work	*wrk;
-	s64 host_tns;
+	s64 host_tns, our_tns, delta;
 	u64 newtime;
-	struct timespec64 host_ts;
+	struct timespec64 host_ts, our_ts;
+	struct timex txc = {0};
+	int ret;
 
 	wrk = container_of(work, struct adj_time_work, work);
 
@@ -205,7 +207,31 @@ static void hv_set_host_time(struct work_struct *work)
 	host_tns = (newtime - WLTIMEDELTA) * 100;
 	host_ts = ns_to_timespec64(host_tns);
 
-	do_settimeofday64(&host_ts);
+	getnstimeofday64(&our_ts);
+	our_tns = timespec64_to_ns(&our_ts);
+
+	/* Difference between our time and host time */
+	delta = host_tns - our_tns;
+
+	/*
+	 * Do raw do_settimeofday64() in case delta is too big or we were
+	 * ordered to sync our time by the host.
+	 */
+	if (abs(delta) > MAXPHASE || wrk->flags & ICTIMESYNCFLAG_SYNC) {
+		do_settimeofday64(&host_ts);
+		return;
+	}
+
+	txc.modes = ADJ_TICK | ADJ_FREQUENCY | ADJ_OFFSET | ADJ_NANO |
+		ADJ_STATUS;
+	txc.tick = TICK_USEC;
+	txc.freq = 0;
+	txc.status = STA_PLL;
+	txc.offset = delta;
+
+	ret = do_adjtimex(&txc);
+	if (ret)
+		pr_debug("Failed to adjust system time: %d\n", ret);
 }
 
 /*
-- 
2.9.3

  parent reply	other threads:[~2017-01-04 17:32 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-04 17:24 [PATCH v2 0/4] hv_util: adjust system time smoothly Vitaly Kuznetsov
2017-01-04 17:24 ` [PATCH v2 1/4] timekeeping: export do_adjtimex() to modules Vitaly Kuznetsov
2017-01-07  1:06   ` John Stultz
2017-01-09 13:03     ` Vitaly Kuznetsov
2017-01-04 17:24 ` [PATCH v2 2/4] hv_util: switch to using timespec64 Vitaly Kuznetsov
2017-01-07  1:04   ` John Stultz
2017-01-04 17:24 ` Vitaly Kuznetsov [this message]
2017-01-04 19:09   ` [PATCH v2 3/4] hv_util: use do_adjtimex() to update system time Stephen Hemminger
2017-01-05 12:37     ` Vitaly Kuznetsov
2017-01-07  0:56   ` John Stultz
2017-01-04 17:24 ` [PATCH v2 4/4] hv_util: improve time adjustment accuracy by disabling interrupts Vitaly Kuznetsov
2017-01-04 19:17   ` Stephen Hemminger
2017-01-05 12:35     ` Vitaly Kuznetsov
2017-01-05 17:39       ` Stephen Hemminger
2017-01-07  1:02   ` John Stultz
2017-01-09 13:05     ` Vitaly Kuznetsov
2017-01-09 21:27 ` [PATCH v2 0/4] hv_util: adjust system time smoothly Thomas Gleixner
2017-01-10 14:30   ` Vitaly Kuznetsov
2017-01-10 14:58     ` Thomas Gleixner
2017-01-13 13:05       ` [PATCH RFC] hv_utils: implement Hyper-V PTP source Vitaly Kuznetsov
2017-01-13 14:50         ` Richard Cochran
2017-01-13 15:38           ` Vitaly Kuznetsov
2017-01-13 15:21         ` Olaf Hering
2017-01-13 15:37           ` Vitaly Kuznetsov
2017-01-16 19:29         ` Thomas Gleixner
2017-01-17  9:53           ` Vitaly Kuznetsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170104172439.19683-4-vkuznets@redhat.com \
    --to=vkuznets@redhat.com \
    --cc=alexng@microsoft.com \
    --cc=devel@linuxdriverproject.org \
    --cc=haiyangz@microsoft.com \
    --cc=john.stultz@linaro.org \
    --cc=kys@microsoft.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®