From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965492Ab3E2JmJ (ORCPT ); Wed, 29 May 2013 05:42:09 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:12101 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965239Ab3E2JmH (ORCPT ); Wed, 29 May 2013 05:42:07 -0400 X-IronPort-AV: E=Sophos;i="4.87,763,1363132800"; d="scan'208";a="26600172" Message-ID: <51A5CD6C.8020908@citrix.com> Date: Wed, 29 May 2013 10:42:04 +0100 From: David Vrabel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20120428 Iceowl/1.0b1 Icedove/3.0.11 MIME-Version: 1.0 To: John Stultz CC: , Konrad Rzeszutek Wilk , , Marcelo Tosatti Subject: Re: [PATCH 2/2] x86/xen: sync the wallclock when the system time changes References: <1369765368-10823-1-git-send-email-david.vrabel@citrix.com> <1369765368-10823-3-git-send-email-david.vrabel@citrix.com> <51A4FD47.2030301@linaro.org> In-Reply-To: <51A4FD47.2030301@linaro.org> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.80.2.76] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 28/05/13 19:53, John Stultz wrote: > On 05/28/2013 11:22 AM, David Vrabel wrote: >> From: David Vrabel >> >> Currently the Xen wallclock is only updated every 11 minutes if NTP is >> synchronized to its clock source. If a guest is started before NTP is >> synchronized it may see an incorrect wallclock time. >> >> Use the pvclock_gtod notifier chain to receive a notification when the >> system time has changed and update the wallclock to match. >> >> This chain is called on every timer tick and we want to avoid an extra >> (expensive) hypercall on every tick. Because dom0 has historically >> never provided a very accurate wallclock and guests do not expect one, >> we can do this simply. The wallclock is only updated if the >> difference between now and the last update is more than 0.5 s. [...] >> index 4656165..81027b5 100644 >> --- a/arch/x86/xen/time.c >> +++ b/arch/x86/xen/time.c [...] >> + struct xen_platform_op op; >> + int ret; >> + >> + /* >> + * Set the Xen wallclock from Linux system time. >> + * >> + * dom0 hasn't historically maintained a very accurate >> + * wallclock so guests don't expect it. We can therefore >> + * reduce the number of expensive hypercalls by only updating >> + * the wallclock every 0.5 s. >> + */ >> + >> + now.tv_sec = tk->xtime_sec; >> + now.tv_nsec = tk->xtime_nsec >> tk->shift; > > You probably want current_kernel_time() here. Ah. I was looking for something like this but since the notifier chain is called with various locks held stuff kept deadlocking. It looks like I can use __current_kernel_time() though. >> + >> + if (timespec_compare(&now, &last) > 0 >> + && timespec_compare(&now, &next) < 0) >> + return 0; >> + >> op.cmd = XENPF_settime; >> - op.u.settime.secs = now->tv_sec; >> - op.u.settime.nsecs = now->tv_nsec; >> + op.u.settime.secs = now.tv_sec; >> + op.u.settime.nsecs = now.tv_nsec; >> op.u.settime.system_time = xen_clocksource_read(); >> ret = HYPERVISOR_dom0_op(&op); >> if (ret) >> - return ret; >> + return 0; >> - /* Set the hardware RTC. */ >> - return mach_set_rtc_mmss(now); >> + last = now; >> + next = timespec_add(now, ns_to_timespec(NSEC_PER_SEC / 2)); >> > > Am I missing the xen_set_wallclock hook here? Your previous patch wanted > to call the dom0 op and then set the hardware RTC. As Jan says, this is deliberate. We now update the hardware CMOS RTC in the same way as bare metal and then use this notifier to only maintain the Xen wallclock for guests. > And this notifier get called every timer tick? This seems out there... This notifier was added to support similar functionality for KVM and I'm just reusing what's there. See e0b306fef (time: export time information for KVM pvclock) [1] and 16e8d74d2 (KVM: x86: notifier for clocksource changes) [2]. Perhaps Marcelo can comment on why it was necessary for this to be called on every timer tick. David [1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=e0b306fef90556233797d2e1747bd6a3ae35ea93 [2] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=16e8d74d2da9920f874b10a3d979fb25c01f518f