[PATCH v10 00/21] KVM: x86: Cleaning up the KVM clock mess, part 1

Sean Christopherson posted 21 patches 1 month ago
arch/x86/include/asm/kvm_host.h |   6 +-
arch/x86/kvm/cpuid.c            |   1 +
arch/x86/kvm/msrs.c             |   3 +-
arch/x86/kvm/svm/svm.c          |   3 +-
arch/x86/kvm/vmx/vmx.c          |  10 +
arch/x86/kvm/x86.c              | 480 +++++++++++++++-----------------
arch/x86/kvm/x86.h              |   3 +-
7 files changed, 240 insertions(+), 266 deletions(-)
[PATCH v10 00/21] KVM: x86: Cleaning up the KVM clock mess, part 1
Posted by Sean Christopherson 1 month ago
Part 1 of David's series to clean up the host-side mess of kvmclock.  The cut
point in this version is still quite arbitrary, but what's left for "part 2" 
fits nicely into 2-3 buckets:

  1: Masterclock overhaul
  2. New uAPI and tests

v10:
 - Drop the stale reference to using div_u64() for the now-removed CPUID leaf.
   [Sashiko]
 - Don't bother with a enabling the pvclock_gtod notifier on 32-bit, and go
   straight to ktime_mono_to_any(). [Sashiko]

v9:
 - https://lore.kernel.org/all/20260810225500.869288-1-seanjc@google.com
 - Pull in "Compute kvmclock base without pvclock_gtod_data" before "Avoid NTP
   frequency skew for KVM clock on 32-bit host" to avoid having to provide what
   is effectively an open-coded version of ktime_mono_to_any() to avoid data
   races. [Sashiko].
 - Pull in use of kernel timekeeping snapshots, split in three patches purely
   to aid review and bisection.
 - Check and clear KVM_REQ_MASTERCLOCK_UPDATE in kvm_arch_vcpu_postcreate().
   [me, Sashiko]
 - Add the missing return value in "Move "no master clock" fallback from...".
   [Sashiko]

v8:
 - Obviously cut partway through the full series.
 - Update commit references for 633d7652f80f ("KVM: x86/xen: Do not corrupt
   KVM clock in kvm_xen_shared_info_init()").
 - Chunk the "Restructure ..." patches into individual logical changes
   ("Restructure kvm_guest_time_update() for TSC upscaling" in particular was
   quite gnarly).
 - Ensure the TSC+freq pair during guest time updates happens on a single
   CPU. [Sashiko]
 - Keep __get_kvmclock() as a masterclock-specific helper to avoid deep
   indentation and gotos.
 - Do waaaaay too much spelunking to try piece together the history of some
   of the many warts.
 - Ensure preemption is disabled in get_kvmclock() when getting the TSC freq.

v7: https://lore.kernel.org/all/20260728144954.355376-1-dwmw2@infradead.org

David Woodhouse (14):
  KVM: x86: Improve accuracy of KVM clock when TSC scaling is in force
  KVM: x86: Explicitly disable TSC scaling without CONSTANT_TSC
  KVM: x86: Activate master clock immediately on vCPU creation
  KVM: x86: Compute kvmclock base without pvclock_gtod_data
  KVM: x86: Avoid NTP frequency skew for KVM clock on 32-bit host
  KVM: x86: Wrap all of __get_kvmclock_master_clock() with
    CONFIG_X86_64=y
  KVM: x86: Fall back to non-master-clock if clockread fails in
    get_kvmclock()
  KVM: x86: Fix KVM clock precision in get_kvmclock() with TSC scaling
  KVM: x86: Use get_kvmclock() in kvm_get_wall_clock_epoch()
  KVM: x86: Fix compute_guest_tsc() to handle negative time deltas
  KVM: x86: Upscale TSC to "now", not master clock when updating PV
    clocks
  KVM: x86: Simplify and comment kvm_get_time_scale()
  KVM: x86: Remove implicit rdtsc() from kvm_compute_l1_tsc_offset()
  KVM: x86: Use kernel timekeeping snapshots for getting kvmclock time
    since boot

Sean Christopherson (7):
  KVM: x86: Update "last guest TSC" snapshot prior to enabling
    IRQs/preemption
  KVM: x86: Drop unnecessary CPU pinning when computing/getting kvmclock
  KVM: x86: Move "no master clock" fallback from __get_kvmclock() to
    get_kvmclock()
  KVM: x86: Disable preemption, not IRQs, when getting TSC+freq pair
  KVM: x86: Make master clock logic in guest PV clock updates 64-bit
    only
  KVM: x86: Use kernel timekeeping snapshot for monotonic clock
  KVM: x86: Use kernel timekeeping snapshot to get walltime+TSC

 arch/x86/include/asm/kvm_host.h |   6 +-
 arch/x86/kvm/cpuid.c            |   1 +
 arch/x86/kvm/msrs.c             |   3 +-
 arch/x86/kvm/svm/svm.c          |   3 +-
 arch/x86/kvm/vmx/vmx.c          |  10 +
 arch/x86/kvm/x86.c              | 480 +++++++++++++++-----------------
 arch/x86/kvm/x86.h              |   3 +-
 7 files changed, 240 insertions(+), 266 deletions(-)


base-commit: 76671054f9a1ff6abb976583cd8da37650acdc97
-- 
2.55.0.887.g758fc8c411-goog
Re: [PATCH v10 00/21] KVM: x86: Cleaning up the KVM clock mess, part 1
Posted by Sean Christopherson 6 days, 13 hours ago
On Wed, 26 Aug 2026 14:32:40 -0700, Sean Christopherson wrote:
> Part 1 of David's series to clean up the host-side mess of kvmclock.  The cut
> point in this version is still quite arbitrary, but what's left for "part 2"
> fits nicely into 2-3 buckets:
> 
>   1: Masterclock overhaul
>   2. New uAPI and tests
> 
> [...]

Applied to kvm-x86 clocks, thanks!

[01/21] KVM: x86: Update "last guest TSC" snapshot prior to enabling IRQs/preemption
        https://github.com/kvm-x86/linux/commit/ba78382f34c1
[02/21] KVM: x86: Improve accuracy of KVM clock when TSC scaling is in force
        https://github.com/kvm-x86/linux/commit/d4f54ed48e00
[03/21] KVM: x86: Explicitly disable TSC scaling without CONSTANT_TSC
        https://github.com/kvm-x86/linux/commit/dd0a8675f4ba
[04/21] KVM: x86: Activate master clock immediately on vCPU creation
        https://github.com/kvm-x86/linux/commit/7254e09bb5e9
[05/21] KVM: x86: Compute kvmclock base without pvclock_gtod_data
        https://github.com/kvm-x86/linux/commit/7ffdb9d111c3
[06/21] KVM: x86: Avoid NTP frequency skew for KVM clock on 32-bit host
        https://github.com/kvm-x86/linux/commit/4c710e8182f4
[07/21] KVM: x86: Drop unnecessary CPU pinning when computing/getting kvmclock
        https://github.com/kvm-x86/linux/commit/796b73bba577
[08/21] KVM: x86: Move "no master clock" fallback from __get_kvmclock() to get_kvmclock()
        https://github.com/kvm-x86/linux/commit/1a926fb39304
[09/21] KVM: x86: Wrap all of __get_kvmclock_master_clock() with CONFIG_X86_64=y
        https://github.com/kvm-x86/linux/commit/8e7e24b88e26
[10/21] KVM: x86: Fall back to non-master-clock if clockread fails in get_kvmclock()
        https://github.com/kvm-x86/linux/commit/25f75fb43fd5
[11/21] KVM: x86: Fix KVM clock precision in get_kvmclock() with TSC scaling
        https://github.com/kvm-x86/linux/commit/abdef42276d8
[12/21] KVM: x86: Use get_kvmclock() in kvm_get_wall_clock_epoch()
        https://github.com/kvm-x86/linux/commit/c56419275caa
[13/21] KVM: x86: Fix compute_guest_tsc() to handle negative time deltas
        https://github.com/kvm-x86/linux/commit/d9173f59df3a
[14/21] KVM: x86: Disable preemption, not IRQs, when getting TSC+freq pair
        https://github.com/kvm-x86/linux/commit/917a53a4b461
[15/21] KVM: x86: Make master clock logic in guest PV clock updates 64-bit only
        https://github.com/kvm-x86/linux/commit/f21b04302404
[16/21] KVM: x86: Upscale TSC to "now", not master clock when updating PV clocks
        https://github.com/kvm-x86/linux/commit/92fac63cc739
[17/21] KVM: x86: Simplify and comment kvm_get_time_scale()
        https://github.com/kvm-x86/linux/commit/2918af628d0d
[18/21] KVM: x86: Remove implicit rdtsc() from kvm_compute_l1_tsc_offset()
        https://github.com/kvm-x86/linux/commit/d4bbf2a8eb82
[19/21] KVM: x86: Use kernel timekeeping snapshots for getting kvmclock time since boot
        https://github.com/kvm-x86/linux/commit/ef7d809987c9
[20/21] KVM: x86: Use kernel timekeeping snapshot for monotonic clock
        https://github.com/kvm-x86/linux/commit/0a0ab23b05f0
[21/21] KVM: x86: Use kernel timekeeping snapshot to get walltime+TSC
        https://github.com/kvm-x86/linux/commit/d7841275e1fb

--
https://github.com/kvm-x86/linux/tree/next