Skip to content

KVM: Fix tick-based accounting for x86 guests

Sean Christopherson kvm lkml stable 3 versions – Applied

Status from this message: The following commit has been merged into the x86/urgent branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest8 patches 1 replyApplied
  2. v39 patches 15 repliesSuperseded
  3. v1 RFC7 patches 2 repliesSuperseded

Changes in v4 from the cover letter

- Add R-b's (dropped one due to code change). [Christian]
- Drop instrumentation annotation shuffling since s390 may be gaining support. [Christian].
- Drop "irqs_off" from context_tracking_guest_exit(). [Frederic]
- Account guest time after enabling IRQs, even when using context tracking to precisely account time. [Frederic]

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/8context_tracking: Move guest exit context tracking to separate helpersinclude/linux/context_tracking.h+8 -10 replies
2/8context_tracking: Move guest exit vtime accounting to separate helpersinclude/linux/context_tracking.h+17 -70 replies
3/8KVM: x86: Defer vtime accounting 'til after IRQ handlingarch/x86/kvm/svm/svm.c arch/x86/kvm/vmx/vmx.c arch/x86/kvm/x86.c+15 -61 reply
4/8sched/vtime: Move vtime accounting external declarations above inlinesinclude/linux/vtime.h+47 -470 replies
5/8sched/vtime: Move guest enter/exit vtime accounting to vtime.hinclude/linux/context_tracking.h include/linux/vtime.h+41 -220 replies
6/8context_tracking: Consolidate guest enter/exit wrappersinclude/linux/context_tracking.h+24 -410 replies
7/8context_tracking: KVM: Move guest enter/exit wrappers to KVM's domaininclude/linux/context_tracking.h include/linux/kvm_host.h+45 -450 replies
8/8KVM: x86: Consolidate guest enter/exit logic to common helpersarch/x86/kvm/svm/svm.c arch/x86/kvm/vmx/vmx.c arch/x86/kvm/x86.h+49 -740 replies

Reviews trailers per patch

2 of 8 patches have a Reviewed-by or Acked-by.

PatchChristian Borntraeger
1/8
2/8R-b
3/8
4/8R-b
5/8
6/8
7/8
8/8

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

Read the v4 thread

Cover letter [PATCH v4 0/8] KVM: Fix tick-based accounting for x86 guests

Fix tick-based accounting for x86 guests, and do additional cleanups to further disentangle guest time accounting and to deduplicate code.

v4:
- Add R-b's (dropped one due to code change). [Christian]
- Drop instrumentation annotation shuffling since s390 may be gaining support. [Christian].
- Drop "irqs_off" from context_tracking_guest_exit(). [Frederic]
- Account guest time after enabling IRQs, even when using context tracking to precisely account time. [Frederic]

v3 (delta from Wanpeng's v2):
- https://lkml.kernel.org/r/[email protected]
- s/context_guest/context_tracking_guest, purely to match the existing functions. I have no strong opinion either way.
- Split only the "exit" functions.
- Partially open code vcpu_account_guest_exit() and __vtime_account_guest_exit() in x86 to avoid churn when segueing into my cleanups (see above).

older:
- https://lkml.kernel.org/r/[email protected]
- https://lkml.kernel.org/r/[email protected]

Sean Christopherson (5):
sched/vtime: Move vtime accounting external declarations above inlines sched/vtime: Move guest enter/exit vtime accounting to vtime.h
context_tracking: Consolidate guest enter/exit wrappers
context_tracking: KVM: Move guest enter/exit wrappers to KVM's domain
KVM: x86: Consolidate guest enter/exit logic to common helpers

Wanpeng Li (3):
context_tracking: Move guest exit context tracking to separate helpers
context_tracking: Move guest exit vtime accounting to separate helpers
KVM: x86: Defer vtime accounting 'til after IRQ handling

 arch/x86/kvm/svm/svm.c           |  39 +--------
 arch/x86/kvm/vmx/vmx.c           |  39 +--------
 arch/x86/kvm/x86.c               |   9 ++
 arch/x86/kvm/x86.h               |  45 ++++++++++
 include/linux/context_tracking.h |  92 ++++-----------------
 include/linux/kvm_host.h         |  45 ++++++++++
 include/linux/vtime.h            | 138 +++++++++++++++++++------------
 7 files changed, 205 insertions(+), 202 deletions(-)
Signature · 1 line
2.31.1.527.g47e6f16901-goog