| Message ID | 20191010073055.183635-3-suleiman@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kvm: Use host timekeeping in guest. | expand |
Suleiman Souhlal <suleiman@google.com> writes: > When kvm-hostclock is selected, and the host supports it, update our > timekeeping parameters to be the same as the host. > This lets us have our time synchronized with the host's, > even in the presence of host NTP or suspend. > > Signed-off-by: Suleiman Souhlal <suleiman@google.com> > --- > arch/x86/Kconfig | 9 ++ > arch/x86/include/asm/kvmclock.h | 12 +++ > arch/x86/kernel/Makefile | 2 + > arch/x86/kernel/kvmclock.c | 5 +- > arch/x86/kernel/kvmhostclock.c | 130 ++++++++++++++++++++++++++++ > include/linux/timekeeper_internal.h | 8 ++ > kernel/time/timekeeping.c | 2 + > 7 files changed, 167 insertions(+), 1 deletion(-) > create mode 100644 arch/x86/kernel/kvmhostclock.c > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index d6e1faa28c58..c5b1257ea969 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -839,6 +839,15 @@ config PARAVIRT_TIME_ACCOUNTING > config PARAVIRT_CLOCK > bool > > +config KVM_HOSTCLOCK > + bool "kvmclock uses host timekeeping" > + depends on KVM_GUEST > + help > + Select this option to make the guest use the same timekeeping > + parameters as the host. This means that time will be almost > + exactly the same between the two. Only works if the host uses "tsc" > + clocksource. > + > config JAILHOUSE_GUEST > bool "Jailhouse non-root cell support" > depends on X86_64 && PCI > diff --git a/arch/x86/include/asm/kvmclock.h b/arch/x86/include/asm/kvmclock.h > index eceea9299097..de1a590ff97e 100644 > --- a/arch/x86/include/asm/kvmclock.h > +++ b/arch/x86/include/asm/kvmclock.h > @@ -2,6 +2,18 @@ > #ifndef _ASM_X86_KVM_CLOCK_H > #define _ASM_X86_KVM_CLOCK_H > > +#include <linux/timekeeper_internal.h> > + > extern struct clocksource kvm_clock; > > +unsigned long kvm_get_tsc_khz(void); > + > +#ifdef CONFIG_KVM_HOSTCLOCK > +void kvm_hostclock_init(void); > +#else > +static inline void kvm_hostclock_init(void) > +{ > +} > +#endif /* KVM_HOSTCLOCK */ > + > #endif /* _ASM_X86_KVM_CLOCK_H */ > diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile > index 3578ad248bc9..bc7be935fc5e 100644 > --- a/arch/x86/kernel/Makefile > +++ b/arch/x86/kernel/Makefile > @@ -17,6 +17,7 @@ CFLAGS_REMOVE_tsc.o = -pg > CFLAGS_REMOVE_paravirt-spinlocks.o = -pg > CFLAGS_REMOVE_pvclock.o = -pg > CFLAGS_REMOVE_kvmclock.o = -pg > +CFLAGS_REMOVE_kvmhostclock.o = -pg > CFLAGS_REMOVE_ftrace.o = -pg > CFLAGS_REMOVE_early_printk.o = -pg > CFLAGS_REMOVE_head64.o = -pg > @@ -112,6 +113,7 @@ obj-$(CONFIG_AMD_NB) += amd_nb.o > obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o > > obj-$(CONFIG_KVM_GUEST) += kvm.o kvmclock.o > +obj-$(CONFIG_KVM_HOSTCLOCK) += kvmhostclock.o > obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch.o > obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o > obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o > diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c > index 904494b924c1..4ab862de9777 100644 > --- a/arch/x86/kernel/kvmclock.c > +++ b/arch/x86/kernel/kvmclock.c > @@ -125,7 +125,7 @@ static inline void kvm_sched_clock_init(bool stable) > * poll of guests can be running and trouble each other. So we preset > * lpj here > */ > -static unsigned long kvm_get_tsc_khz(void) > +unsigned long kvm_get_tsc_khz(void) > { > setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ); > return pvclock_tsc_khz(this_cpu_pvti()); > @@ -366,5 +366,8 @@ void __init kvmclock_init(void) > kvm_clock.rating = 299; > > clocksource_register_hz(&kvm_clock, NSEC_PER_SEC); > + > + kvm_hostclock_init(); > + > pv_info.name = "KVM"; > } > diff --git a/arch/x86/kernel/kvmhostclock.c b/arch/x86/kernel/kvmhostclock.c > new file mode 100644 > index 000000000000..9971343c2bed > --- /dev/null > +++ b/arch/x86/kernel/kvmhostclock.c > @@ -0,0 +1,130 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * KVM clocksource that uses host timekeeping. > + * Copyright (c) 2019 Suleiman Souhlal, Google LLC > + */ > + > +#include <linux/clocksource.h> > +#include <linux/kvm_para.h> > +#include <asm/pvclock.h> > +#include <asm/msr.h> > +#include <asm/kvmclock.h> > +#include <linux/timekeeper_internal.h> > + > +struct pvclock_timekeeper pv_timekeeper; > + > +static bool pv_timekeeper_enabled; > +static bool pv_timekeeper_present; > +static int old_vclock_mode; > + > +static u64 > +kvm_hostclock_get_cycles(struct clocksource *cs) > +{ > + return rdtsc_ordered(); > +} > + > +static int > +kvm_hostclock_enable(struct clocksource *cs) > +{ > + pv_timekeeper_enabled = 1; > + > + old_vclock_mode = kvm_clock.archdata.vclock_mode; > + kvm_clock.archdata.vclock_mode = VCLOCK_TSC; > + return 0; > +} > + > +static void > +kvm_hostclock_disable(struct clocksource *cs) > +{ > + pv_timekeeper_enabled = 0; > + kvm_clock.archdata.vclock_mode = old_vclock_mode; > +} > + > +struct clocksource kvm_hostclock = { > + .name = "kvm-hostclock", > + .read = kvm_hostclock_get_cycles, > + .enable = kvm_hostclock_enable, > + .disable = kvm_hostclock_disable, > + .rating = 401, /* Higher than kvm-clock */ I would've offload the decision which clock is better to the host. If I understand corectly the new clock is not compatible with live migration, right? So how can the guest know if the host plans to migrate it or not? I'd suggest adding two separate CPUID bits: - kvm-hostclock present and enabled - kvm-hostclock is prefered over kvm-clock. > + .mask = CLOCKSOURCE_MASK(64), > + .flags = CLOCK_SOURCE_IS_CONTINUOUS, > +}; > + > +static void > +pvclock_copy_into_read_base(struct pvclock_timekeeper *pvtk, > + struct tk_read_base *tkr, struct pvclock_read_base *pvtkr) > +{ > + int shift_diff; > + > + tkr->mask = pvtkr->mask; > + tkr->cycle_last = pvtkr->cycle_last + pvtk->tsc_offset; > + tkr->mult = pvtkr->mult; > + shift_diff = tkr->shift - pvtkr->shift; > + tkr->shift = pvtkr->shift; > + tkr->xtime_nsec = pvtkr->xtime_nsec; > + tkr->base = pvtkr->base; > +} > + > +static u64 > +pvtk_read_begin(struct pvclock_timekeeper *pvtk) > +{ > + u64 gen; > + > + gen = pvtk->gen & ~1; > + /* Make sure that the gen count is read before the data. */ > + virt_rmb(); > + > + return gen; > +} > + > +static bool > +pvtk_read_retry(struct pvclock_timekeeper *pvtk, u64 gen) > +{ > + /* Make sure that the gen count is re-read after the data. */ > + virt_rmb(); > + return unlikely(gen != pvtk->gen); > +} > + > +void > +kvm_clock_copy_into_tk(struct timekeeper *tk) > +{ > + struct pvclock_timekeeper *pvtk; > + u64 gen; > + > + if (!pv_timekeeper_enabled) > + return; > + > + pvtk = &pv_timekeeper; > + do { > + gen = pvtk_read_begin(pvtk); > + if (!(pv_timekeeper.flags & PVCLOCK_TIMEKEEPER_ENABLED)) > + return; > + > + pvclock_copy_into_read_base(pvtk, &tk->tkr_mono, > + &pvtk->tkr_mono); > + pvclock_copy_into_read_base(pvtk, &tk->tkr_raw, &pvtk->tkr_raw); > + > + tk->xtime_sec = pvtk->xtime_sec; > + tk->ktime_sec = pvtk->ktime_sec; > + tk->wall_to_monotonic.tv_sec = pvtk->wall_to_monotonic_sec; > + tk->wall_to_monotonic.tv_nsec = pvtk->wall_to_monotonic_nsec; > + tk->offs_real = pvtk->offs_real; > + tk->offs_boot = pvtk->offs_boot; > + tk->offs_tai = pvtk->offs_tai; > + tk->raw_sec = pvtk->raw_sec; > + } while (pvtk_read_retry(pvtk, gen)); > +} > + > +void __init > +kvm_hostclock_init(void) > +{ > + unsigned long pa; > + > + pa = __pa(&pv_timekeeper); > + wrmsrl(MSR_KVM_TIMEKEEPER_EN, pa); Shouldn't you check for the presence of the MSR somehow? (CPUID bit probably) > + if (pv_timekeeper.flags & PVCLOCK_TIMEKEEPER_ENABLED) { > + pv_timekeeper_present = 1; > + > + clocksource_register_khz(&kvm_hostclock, kvm_get_tsc_khz()); > + } > +} > diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h > index 84ff2844df2a..43b036375cdc 100644 > --- a/include/linux/timekeeper_internal.h > +++ b/include/linux/timekeeper_internal.h > @@ -153,4 +153,12 @@ static inline void update_vsyscall_tz(void) > } > #endif > > +#ifdef CONFIG_KVM_HOSTCLOCK > +void kvm_clock_copy_into_tk(struct timekeeper *tk); > +#else > +static inline void kvm_clock_copy_into_tk(struct timekeeper *tk) > +{ > +} > +#endif > + > #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */ > diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c > index ca69290bee2a..09bcf13b2334 100644 > --- a/kernel/time/timekeeping.c > +++ b/kernel/time/timekeeping.c > @@ -2107,6 +2107,8 @@ static void timekeeping_advance(enum timekeeping_adv_mode mode) > clock_set |= accumulate_nsecs_to_secs(tk); > > write_seqcount_begin(&tk_core.seq); > + kvm_clock_copy_into_tk(tk); > + > /* > * Update the real timekeeper. > *
On 10/10/19 09:30, Suleiman Souhlal wrote: > +kvm_hostclock_enable(struct clocksource *cs) > +{ > + pv_timekeeper_enabled = 1; > + > + old_vclock_mode = kvm_clock.archdata.vclock_mode; > + kvm_clock.archdata.vclock_mode = VCLOCK_TSC; > + return 0; > +} > + > +static void > +kvm_hostclock_disable(struct clocksource *cs) > +{ > + pv_timekeeper_enabled = 0; > + kvm_clock.archdata.vclock_mode = old_vclock_mode; > +} > + Why do you poke at kvm_clock? Instead you should add .archdata = { .vclock_mode = VCLOCK_TSC }, to the kvm_hostclock declaration. Please also check that the invariant TSC CPUID bit CPUID[0x80000007].EDX[8] is set before enabling this feature. Paolo > + pvtk = &pv_timekeeper; > + do { > + gen = pvtk_read_begin(pvtk); > + if (!(pv_timekeeper.flags & PVCLOCK_TIMEKEEPER_ENABLED)) > + return; > + > + pvclock_copy_into_read_base(pvtk, &tk->tkr_mono, > + &pvtk->tkr_mono); > + pvclock_copy_into_read_base(pvtk, &tk->tkr_raw, &pvtk->tkr_raw); > + > + tk->xtime_sec = pvtk->xtime_sec; > + tk->ktime_sec = pvtk->ktime_sec; > + tk->wall_to_monotonic.tv_sec = pvtk->wall_to_monotonic_sec; > + tk->wall_to_monotonic.tv_nsec = pvtk->wall_to_monotonic_nsec; > + tk->offs_real = pvtk->offs_real; > + tk->offs_boot = pvtk->offs_boot; > + tk->offs_tai = pvtk->offs_tai; > + tk->raw_sec = pvtk->raw_sec; > + } while (pvtk_read_retry(pvtk, gen)); > +} > + Should you write an "enabled value" (basically the flags) into pvtk as well? > > +kvm_hostclock_init(void) > +{ > + unsigned long pa; > + > + pa = __pa(&pv_timekeeper); > + wrmsrl(MSR_KVM_TIMEKEEPER_EN, pa); As Vitaly said, a new CPUID bit must be defined in Documentation/virt/kvm/cpuid.txt, and used here. Also please make bit 0 an enable bit.
On Thu, Oct 10, 2019 at 7:55 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > > On 10/10/19 09:30, Suleiman Souhlal wrote: > > +kvm_hostclock_enable(struct clocksource *cs) > > +{ > > + pv_timekeeper_enabled = 1; > > + > > + old_vclock_mode = kvm_clock.archdata.vclock_mode; > > + kvm_clock.archdata.vclock_mode = VCLOCK_TSC; > > + return 0; > > +} > > + > > +static void > > +kvm_hostclock_disable(struct clocksource *cs) > > +{ > > + pv_timekeeper_enabled = 0; > > + kvm_clock.archdata.vclock_mode = old_vclock_mode; > > +} > > + > > Why do you poke at kvm_clock? Instead you should add > > .archdata = { .vclock_mode = VCLOCK_TSC }, > > to the kvm_hostclock declaration. Yeah, what I was doing does not make sense. > Please also check that the invariant TSC CPUID bit > CPUID[0x80000007].EDX[8] is set before enabling this feature. Will do. > > Paolo > > > + pvtk = &pv_timekeeper; > > + do { > > + gen = pvtk_read_begin(pvtk); > > + if (!(pv_timekeeper.flags & PVCLOCK_TIMEKEEPER_ENABLED)) > > + return; > > + > > + pvclock_copy_into_read_base(pvtk, &tk->tkr_mono, > > + &pvtk->tkr_mono); > > + pvclock_copy_into_read_base(pvtk, &tk->tkr_raw, &pvtk->tkr_raw); > > + > > + tk->xtime_sec = pvtk->xtime_sec; > > + tk->ktime_sec = pvtk->ktime_sec; > > + tk->wall_to_monotonic.tv_sec = pvtk->wall_to_monotonic_sec; > > + tk->wall_to_monotonic.tv_nsec = pvtk->wall_to_monotonic_nsec; > > + tk->offs_real = pvtk->offs_real; > > + tk->offs_boot = pvtk->offs_boot; > > + tk->offs_tai = pvtk->offs_tai; > > + tk->raw_sec = pvtk->raw_sec; > > + } while (pvtk_read_retry(pvtk, gen)); > > +} > > + > > Should you write an "enabled value" (basically the flags) into pvtk as well? I think we have that already (pvtk->flags). I'll change the if statement above to use pvtk instead of pv_timekeeper. > > +kvm_hostclock_init(void) > > +{ > > + unsigned long pa; > > + > > + pa = __pa(&pv_timekeeper); > > + wrmsrl(MSR_KVM_TIMEKEEPER_EN, pa); > > > As Vitaly said, a new CPUID bit must be defined in > Documentation/virt/kvm/cpuid.txt, and used here. Also please make bit 0 > an enable bit. I think I might not be able to move the enable bit to 0 because we need the generation count (pvclock_timekeeper.gen) to be the first word of the struct due to the way we copy the data to userspace, similarly to how kvm_setup_pvclock_page() does it. I also noticed the comment in kvm_copy_into_pvtk() references the wrong function, which I will fix in the next revision. Thanks for the feedback. -- Suleiman
On 15/10/19 10:39, Suleiman Souhlal wrote: > I think we have that already (pvtk->flags). > I'll change the if statement above to use pvtk instead of pv_timekeeper. Of course, thanks. >>> +kvm_hostclock_init(void) >>> +{ >>> + unsigned long pa; >>> + >>> + pa = __pa(&pv_timekeeper); >>> + wrmsrl(MSR_KVM_TIMEKEEPER_EN, pa); >> >> >> As Vitaly said, a new CPUID bit must be defined in >> Documentation/virt/kvm/cpuid.txt, and used here. Also please make bit 0 >> an enable bit. > > I think I might not be able to move the enable bit to 0 because we > need the generation count (pvclock_timekeeper.gen) to be the first > word of the struct due to the way we copy the data to userspace, > similarly to how kvm_setup_pvclock_page() does it. I mean bit 0 of the MSR. Thanks, Paolo
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d6e1faa28c58..c5b1257ea969 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -839,6 +839,15 @@ config PARAVIRT_TIME_ACCOUNTING config PARAVIRT_CLOCK bool +config KVM_HOSTCLOCK + bool "kvmclock uses host timekeeping" + depends on KVM_GUEST + help + Select this option to make the guest use the same timekeeping + parameters as the host. This means that time will be almost + exactly the same between the two. Only works if the host uses "tsc" + clocksource. + config JAILHOUSE_GUEST bool "Jailhouse non-root cell support" depends on X86_64 && PCI diff --git a/arch/x86/include/asm/kvmclock.h b/arch/x86/include/asm/kvmclock.h index eceea9299097..de1a590ff97e 100644 --- a/arch/x86/include/asm/kvmclock.h +++ b/arch/x86/include/asm/kvmclock.h @@ -2,6 +2,18 @@ #ifndef _ASM_X86_KVM_CLOCK_H #define _ASM_X86_KVM_CLOCK_H +#include <linux/timekeeper_internal.h> + extern struct clocksource kvm_clock; +unsigned long kvm_get_tsc_khz(void); + +#ifdef CONFIG_KVM_HOSTCLOCK +void kvm_hostclock_init(void); +#else +static inline void kvm_hostclock_init(void) +{ +} +#endif /* KVM_HOSTCLOCK */ + #endif /* _ASM_X86_KVM_CLOCK_H */ diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 3578ad248bc9..bc7be935fc5e 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -17,6 +17,7 @@ CFLAGS_REMOVE_tsc.o = -pg CFLAGS_REMOVE_paravirt-spinlocks.o = -pg CFLAGS_REMOVE_pvclock.o = -pg CFLAGS_REMOVE_kvmclock.o = -pg +CFLAGS_REMOVE_kvmhostclock.o = -pg CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_early_printk.o = -pg CFLAGS_REMOVE_head64.o = -pg @@ -112,6 +113,7 @@ obj-$(CONFIG_AMD_NB) += amd_nb.o obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o obj-$(CONFIG_KVM_GUEST) += kvm.o kvmclock.o +obj-$(CONFIG_KVM_HOSTCLOCK) += kvmhostclock.o obj-$(CONFIG_PARAVIRT) += paravirt.o paravirt_patch.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 904494b924c1..4ab862de9777 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -125,7 +125,7 @@ static inline void kvm_sched_clock_init(bool stable) * poll of guests can be running and trouble each other. So we preset * lpj here */ -static unsigned long kvm_get_tsc_khz(void) +unsigned long kvm_get_tsc_khz(void) { setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ); return pvclock_tsc_khz(this_cpu_pvti()); @@ -366,5 +366,8 @@ void __init kvmclock_init(void) kvm_clock.rating = 299; clocksource_register_hz(&kvm_clock, NSEC_PER_SEC); + + kvm_hostclock_init(); + pv_info.name = "KVM"; } diff --git a/arch/x86/kernel/kvmhostclock.c b/arch/x86/kernel/kvmhostclock.c new file mode 100644 index 000000000000..9971343c2bed --- /dev/null +++ b/arch/x86/kernel/kvmhostclock.c @@ -0,0 +1,130 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * KVM clocksource that uses host timekeeping. + * Copyright (c) 2019 Suleiman Souhlal, Google LLC + */ + +#include <linux/clocksource.h> +#include <linux/kvm_para.h> +#include <asm/pvclock.h> +#include <asm/msr.h> +#include <asm/kvmclock.h> +#include <linux/timekeeper_internal.h> + +struct pvclock_timekeeper pv_timekeeper; + +static bool pv_timekeeper_enabled; +static bool pv_timekeeper_present; +static int old_vclock_mode; + +static u64 +kvm_hostclock_get_cycles(struct clocksource *cs) +{ + return rdtsc_ordered(); +} + +static int +kvm_hostclock_enable(struct clocksource *cs) +{ + pv_timekeeper_enabled = 1; + + old_vclock_mode = kvm_clock.archdata.vclock_mode; + kvm_clock.archdata.vclock_mode = VCLOCK_TSC; + return 0; +} + +static void +kvm_hostclock_disable(struct clocksource *cs) +{ + pv_timekeeper_enabled = 0; + kvm_clock.archdata.vclock_mode = old_vclock_mode; +} + +struct clocksource kvm_hostclock = { + .name = "kvm-hostclock", + .read = kvm_hostclock_get_cycles, + .enable = kvm_hostclock_enable, + .disable = kvm_hostclock_disable, + .rating = 401, /* Higher than kvm-clock */ + .mask = CLOCKSOURCE_MASK(64), + .flags = CLOCK_SOURCE_IS_CONTINUOUS, +}; + +static void +pvclock_copy_into_read_base(struct pvclock_timekeeper *pvtk, + struct tk_read_base *tkr, struct pvclock_read_base *pvtkr) +{ + int shift_diff; + + tkr->mask = pvtkr->mask; + tkr->cycle_last = pvtkr->cycle_last + pvtk->tsc_offset; + tkr->mult = pvtkr->mult; + shift_diff = tkr->shift - pvtkr->shift; + tkr->shift = pvtkr->shift; + tkr->xtime_nsec = pvtkr->xtime_nsec; + tkr->base = pvtkr->base; +} + +static u64 +pvtk_read_begin(struct pvclock_timekeeper *pvtk) +{ + u64 gen; + + gen = pvtk->gen & ~1; + /* Make sure that the gen count is read before the data. */ + virt_rmb(); + + return gen; +} + +static bool +pvtk_read_retry(struct pvclock_timekeeper *pvtk, u64 gen) +{ + /* Make sure that the gen count is re-read after the data. */ + virt_rmb(); + return unlikely(gen != pvtk->gen); +} + +void +kvm_clock_copy_into_tk(struct timekeeper *tk) +{ + struct pvclock_timekeeper *pvtk; + u64 gen; + + if (!pv_timekeeper_enabled) + return; + + pvtk = &pv_timekeeper; + do { + gen = pvtk_read_begin(pvtk); + if (!(pv_timekeeper.flags & PVCLOCK_TIMEKEEPER_ENABLED)) + return; + + pvclock_copy_into_read_base(pvtk, &tk->tkr_mono, + &pvtk->tkr_mono); + pvclock_copy_into_read_base(pvtk, &tk->tkr_raw, &pvtk->tkr_raw); + + tk->xtime_sec = pvtk->xtime_sec; + tk->ktime_sec = pvtk->ktime_sec; + tk->wall_to_monotonic.tv_sec = pvtk->wall_to_monotonic_sec; + tk->wall_to_monotonic.tv_nsec = pvtk->wall_to_monotonic_nsec; + tk->offs_real = pvtk->offs_real; + tk->offs_boot = pvtk->offs_boot; + tk->offs_tai = pvtk->offs_tai; + tk->raw_sec = pvtk->raw_sec; + } while (pvtk_read_retry(pvtk, gen)); +} + +void __init +kvm_hostclock_init(void) +{ + unsigned long pa; + + pa = __pa(&pv_timekeeper); + wrmsrl(MSR_KVM_TIMEKEEPER_EN, pa); + if (pv_timekeeper.flags & PVCLOCK_TIMEKEEPER_ENABLED) { + pv_timekeeper_present = 1; + + clocksource_register_khz(&kvm_hostclock, kvm_get_tsc_khz()); + } +} diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h index 84ff2844df2a..43b036375cdc 100644 --- a/include/linux/timekeeper_internal.h +++ b/include/linux/timekeeper_internal.h @@ -153,4 +153,12 @@ static inline void update_vsyscall_tz(void) } #endif +#ifdef CONFIG_KVM_HOSTCLOCK +void kvm_clock_copy_into_tk(struct timekeeper *tk); +#else +static inline void kvm_clock_copy_into_tk(struct timekeeper *tk) +{ +} +#endif + #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */ diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index ca69290bee2a..09bcf13b2334 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -2107,6 +2107,8 @@ static void timekeeping_advance(enum timekeeping_adv_mode mode) clock_set |= accumulate_nsecs_to_secs(tk); write_seqcount_begin(&tk_core.seq); + kvm_clock_copy_into_tk(tk); + /* * Update the real timekeeper. *
When kvm-hostclock is selected, and the host supports it, update our timekeeping parameters to be the same as the host. This lets us have our time synchronized with the host's, even in the presence of host NTP or suspend. Signed-off-by: Suleiman Souhlal <suleiman@google.com> --- arch/x86/Kconfig | 9 ++ arch/x86/include/asm/kvmclock.h | 12 +++ arch/x86/kernel/Makefile | 2 + arch/x86/kernel/kvmclock.c | 5 +- arch/x86/kernel/kvmhostclock.c | 130 ++++++++++++++++++++++++++++ include/linux/timekeeper_internal.h | 8 ++ kernel/time/timekeeping.c | 2 + 7 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kernel/kvmhostclock.c