Skip to content

KVM: x86: pvclock fixes and cleanups

Sean Christopherson kvm lkml 2 versions – Applied

Status from this message: Applied to kvm-x86 pvclock, to start getting coverage in -next. I put this in

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest11 patches 8 repliesApplied
  2. v110 patches 19 repliesSuperseded

Changes in v2 from the cover letter

- Collect reviews. [Paul, Vitaly]
- Account for the compat offset in xen_get_guest_pvclock().
- Try both the compat and non-compat clocks in kvm_xen_start_timer().
- Fix a horrendous uninitialized variable bug. [Paul]
- Move the kvm_xen_start_timer() change earlier so that it wouldn't be transiently broken due to "version" always being '0'.
- Shuffle patches so that the "set PVCLOCK_GUEST_STOPPED only for kvmclock" is fully isolated from "Don't bleed PVCLOCK_GUEST_STOPPED". [Paul]

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/11KVM: x86: Don't take kvm->lock when iterating over vCPUs in suspend notifierarch/x86/kvm/x86.c+0 -20 replies
2/11KVM: x86: Eliminate "handling" of impossible errors during SUSPENDarch/x86/kvm/x86.c+7 -130 replies
3/11KVM: x86: Drop local pvclock_flags variable in kvm_guest_time_update()arch/x86/kvm/x86.c+2 -50 replies
4/11KVM: x86: Process "guest stopped request" once per guest time updatearch/x86/kvm/x86.c+12 -51 reply
5/11KVM: x86/xen: Use guest's copy of pvclock when starting timerarch/x86/kvm/xen.c+60 -51 reply
6/11KVM: x86: Don't bleed PVCLOCK_GUEST_STOPPED across PV clocksarch/x86/kvm/x86.c+8 -51 reply
7/11KVM: x86: Set PVCLOCK_GUEST_STOPPED only for kvmclock, not for Xen PV clockarch/x86/kvm/x86.c+10 -91 reply
8/11KVM: x86: Pass reference pvclock as a param to kvm_setup_guest_pvclock()arch/x86/kvm/x86.c+7 -73 replies
9/11KVM: x86: Remove per-vCPU "cache" of its reference pvclockarch/x86/include/asm/kvm_host.h arch/x86/kvm/x86.c arch/x86/kvm/xen.c+21 -170 replies
10/11KVM: x86: Setup Hyper-V TSC page before Xen PV clocks (during clock update)arch/x86/kvm/x86.c+2 -10 replies
11/11KVM: x86: Override TSC_STABLE flag for Xen PV clocks in kvm_guest_time_update()arch/x86/kvm/x86.c+15 -200 replies

Reviews trailers per patch

All 11 patches have a Reviewed-by or Acked-by.

PatchPaul DurrantVitaly Kuznetsov
1/11R-b
2/11R-b
3/11R-b
4/11R-b
5/11R-b
6/11R-b
7/11R-b
8/11R-b R-b
9/11R-b
10/11R-b R-b
11/11R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/11] KVM: x86: pvclock fixes and cleanups

Fix a lockdep splat in KVM's suspend notifier by simply removing a spurious kvm->lock acquisition related to kvmclock, and then try to wrangle KVM's pvclock handling into something approaching sanity (I made the mistake of looking at how KVM handled PVCLOCK_GUEST_STOPPED).

The Xen changes are slightly better tested this time around, though given how many bugs there were in v1, that isn't saying a whole lot.

Case in point, I had to shuffle the scariest patch (at first glance), "KVM: x86/xen: Use guest's copy of pvclock when starting timer", to land earlier in the series, because the existing usage of the cache pvclock's "version" field in kvm_xen_start_timer() relies on the pvclock update to persist _a_ version number to the cache. Eww. :-(

v2:
- Collect reviews. [Paul, Vitaly]
- Account for the compat offset in xen_get_guest_pvclock().
- Try both the compat and non-compat clocks in kvm_xen_start_timer().
- Fix a horrendous uninitialized variable bug. [Paul]
- Move the kvm_xen_start_timer() change earlier so that it wouldn't be transiently broken due to "version" always being '0'.
- Shuffle patches so that the "set PVCLOCK_GUEST_STOPPED only for kvmclock" is fully isolated from "Don't bleed PVCLOCK_GUEST_STOPPED". [Paul]

v1: https://lore.kernel.org/all/[email protected]

Sean Christopherson (11):
KVM: x86: Don't take kvm->lock when iterating over vCPUs in suspend
notifier
KVM: x86: Eliminate "handling" of impossible errors during SUSPEND
KVM: x86: Drop local pvclock_flags variable in kvm_guest_time_update()
KVM: x86: Process "guest stopped request" once per guest time update
KVM: x86/xen: Use guest's copy of pvclock when starting timer
KVM: x86: Don't bleed PVCLOCK_GUEST_STOPPED across PV clocks
KVM: x86: Set PVCLOCK_GUEST_STOPPED only for kvmclock, not for Xen PV
clock
KVM: x86: Pass reference pvclock as a param to
kvm_setup_guest_pvclock()
KVM: x86: Remove per-vCPU "cache" of its reference pvclock
KVM: x86: Setup Hyper-V TSC page before Xen PV clocks (during clock
update)
KVM: x86: Override TSC_STABLE flag for Xen PV clocks in
kvm_guest_time_update()

 arch/x86/include/asm/kvm_host.h |   3 +-
 arch/x86/kvm/x86.c              | 115 ++++++++++++++++----------------
 arch/x86/kvm/xen.c              |  69 +++++++++++++++++--
 3 files changed, 121 insertions(+), 66 deletions(-)

base-commit: eb723766b1030a23c38adf2348b7c3d1409d11f0

Signature · 1 line
2.48.1.362.g079036d154-goog