From: sashiko-bot@kernel.org
To: "Sean Christopherson" <seanjc@google.com>
Cc: kvm@vger.kernel.org
Subject: Re: [PATCH v10 14/21] KVM: x86: Disable preemption, not IRQs, when getting TSC+freq pair
Date: Wed, 26 Aug 2026 21:45:44 +0000 [thread overview]
Message-ID: <20260826214544.CEF0D1F000E9@smtp.kernel.org> (raw)
In-Reply-To: <20260826213303.914988-15-seanjc@google.com>
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] Replacing `local_irq_save()` with `preempt_disable()` allows interrupts to occur between reading `host_tsc` and `kernel_ns`, causing the guest clock to abruptly jump forward.
--
commit 905bf0112d20298ccaf2fcc14bf1871e4d77ff84
Author: Sean Christopherson <seanjc@google.com>
Subject: KVM: x86: Disable preemption, not IRQs, when getting TSC+freq pair
This commit replaces local_irq_save() with preempt_disable() when reading
the TSC and frequency pair to update guest time. The commit message notes
that disabling IRQs is overkill for task migration protection.
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
[ ... ]
> @@ -1824,11 +1823,14 @@ int kvm_guest_time_update(struct kvm_vcpu *v)
> }
> } while (read_seqcount_retry(&ka->pvclock_sc, seq));
>
> - /* Keep irq disabled to prevent changes to the clock */
> - local_irq_save(flags);
> + /*
> + * Ensure reading the TSC+frequency pair is done on the same CPU. When
> + * NOT using the master clock, the TSC frequency may vary between CPUs.
> + */
> + preempt_disable();
> tgt_tsc_hz = (u64)get_cpu_tsc_khz() * HZ_PER_KHZ;
> if (unlikely(tgt_tsc_hz == 0)) {
> - local_irq_restore(flags);
> + preempt_enable();
> kvm_make_request(KVM_REQ_CLOCK_UPDATE, v);
> return 1;
> }
[Severity: High]
Does this replacement of local_irq_save() with preempt_disable() expose the
fallback clock path to an interrupt latency race?
Because preempt_disable() does not disable hardware IRQs, it appears an
interrupt can now fire between reading host_tsc and kernel_ns:
kvm_guest_time_update() {
...
if (!use_master_clock) {
host_tsc = rdtsc();
<-- hardware interrupt fires here
kernel_ns = get_kvmclock_base_ns();
}
...
}
If an interrupt occurs between these two reads, kernel_ns will be captured
after the interrupt completes. Would this artificially inflate the kernel_ns
value relative to the exact moment host_tsc was captured?
It looks like this could cause the elapsed interrupt time to be double-counted
(once in kernel_ns and again when the guest calculates elapsed time since
host_tsc), causing the guest clock to abruptly jump forward by milliseconds.
While later patches in this series update the use_master_clock path to use
the atomic ktime_get_snapshot_id(), it seems this !use_master_clock fallback
path remains exposed to this race.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20260826213303.914988-1-seanjc@google.com?part=14
next prev parent reply other threads:[~2026-08-26 21:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-26 21:32 [PATCH v10 00/21] KVM: x86: Cleaning up the KVM clock mess, part 1 Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 01/21] KVM: x86: Update "last guest TSC" snapshot prior to enabling IRQs/preemption Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 02/21] KVM: x86: Improve accuracy of KVM clock when TSC scaling is in force Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 03/21] KVM: x86: Explicitly disable TSC scaling without CONSTANT_TSC Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 04/21] KVM: x86: Activate master clock immediately on vCPU creation Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 05/21] KVM: x86: Compute kvmclock base without pvclock_gtod_data Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 06/21] KVM: x86: Avoid NTP frequency skew for KVM clock on 32-bit host Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 07/21] KVM: x86: Drop unnecessary CPU pinning when computing/getting kvmclock Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 08/21] KVM: x86: Move "no master clock" fallback from __get_kvmclock() to get_kvmclock() Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 09/21] KVM: x86: Wrap all of __get_kvmclock_master_clock() with CONFIG_X86_64=y Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 10/21] KVM: x86: Fall back to non-master-clock if clockread fails in get_kvmclock() Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 11/21] KVM: x86: Fix KVM clock precision in get_kvmclock() with TSC scaling Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 12/21] KVM: x86: Use get_kvmclock() in kvm_get_wall_clock_epoch() Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 13/21] KVM: x86: Fix compute_guest_tsc() to handle negative time deltas Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 14/21] KVM: x86: Disable preemption, not IRQs, when getting TSC+freq pair Sean Christopherson
2026-08-26 21:45 ` sashiko-bot [this message]
2026-08-26 21:32 ` [PATCH v10 15/21] KVM: x86: Make master clock logic in guest PV clock updates 64-bit only Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 16/21] KVM: x86: Upscale TSC to "now", not master clock when updating PV clocks Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 17/21] KVM: x86: Simplify and comment kvm_get_time_scale() Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 18/21] KVM: x86: Remove implicit rdtsc() from kvm_compute_l1_tsc_offset() Sean Christopherson
2026-08-26 21:32 ` [PATCH v10 19/21] KVM: x86: Use kernel timekeeping snapshots for getting kvmclock time since boot Sean Christopherson
2026-08-26 21:33 ` [PATCH v10 20/21] KVM: x86: Use kernel timekeeping snapshot for monotonic clock Sean Christopherson
2026-08-26 21:33 ` [PATCH v10 21/21] KVM: x86: Use kernel timekeeping snapshot to get walltime+TSC Sean Christopherson
2026-08-26 21:49 ` sashiko-bot
2026-08-28 22:46 ` David Woodhouse
2026-09-01 19:33 ` Sean Christopherson
2026-09-01 19:17 ` Sean Christopherson
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=20260826214544.CEF0D1F000E9@smtp.kernel.org \
--to=sashiko-bot@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=sashiko-reviews@lists.linux.dev \
--cc=seanjc@google.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.