public inbox for linux-kernel@vger.kernel.org
 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>
Subject: [PATCH 3/4] hv_util: use do_adjtimex() to update system time
Date: Mon,  2 Jan 2017 20:41:13 +0100	[thread overview]
Message-ID: <20170102194114.657-4-vkuznets@redhat.com> (raw)
In-Reply-To: <20170102194114.657-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().

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 drivers/hv/hv_util.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
index 94719eb..4c0fbb0 100644
--- a/drivers/hv/hv_util.c
+++ b/drivers/hv/hv_util.c
@@ -182,9 +182,10 @@ 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};
 
 	wrk = container_of(work, struct adj_time_work, work);
 
@@ -205,7 +206,25 @@ 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;
+
+	/* Try adjusting time by using phase adjustment if possible */
+	if (abs(delta) > MAXPHASE) {
+		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;
+	do_adjtimex(&txc);
 }
 
 /*
-- 
2.9.3

  parent reply	other threads:[~2017-01-02 19:42 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-02 19:41 [PATCH 0/4] hv_util: adjust system time smoothly Vitaly Kuznetsov
2017-01-02 19:41 ` [PATCH 1/4] timekeeping: export do_adjtimex() to modules Vitaly Kuznetsov
2017-01-02 19:41 ` [PATCH 2/4] hv_util: switch to using timespec64 Vitaly Kuznetsov
2017-01-02 19:41 ` Vitaly Kuznetsov [this message]
2017-01-02 23:24   ` [PATCH 3/4] hv_util: use do_adjtimex() to update system time Alex Ng (LIS)
2017-01-03 12:32     ` Vitaly Kuznetsov
2017-01-03 19:48       ` Alex Ng (LIS)
2017-01-09 17:19         ` Stephen Hemminger
2017-01-09 17:40           ` Vitaly Kuznetsov
2017-01-09 17:58             ` Stephen Hemminger
2017-01-09 18:14               ` Vitaly Kuznetsov
2017-01-09 18:31                 ` Stephen Hemminger
2017-01-02 19:41 ` [PATCH 4/4] hv_util: improve time adjustment accuracy by disabling interrupts Vitaly Kuznetsov
2017-01-02 19:50   ` Stephen Hemminger
2017-01-03 12:28     ` 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=20170102194114.657-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=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