KVM: x86: Include host suspended time in steal time
Subsystems (4)
v5 cover KVM: x86: Include host suspended time in steal time
This series makes it so that the time that the host is suspended is included in guests' steal time.
When the host resumes from a suspend, the guest thinks any task that was running during the suspend ran for a long time, even though the effective run time was much shorter, which can end up having negative effects with scheduling.
To mitigate this issue, we include the time that the host was suspended in steal time, which lets the guest can subtract the duration from the tasks' runtime.
In addition, we make the guest TSC behavior consistent whether the host TSC went backwards or not.
v5:
- Fix grammar mistakes in commit message.
v4: https://lore.kernel.org/kvm/[email protected]/T/
- Advance guest TSC on suspends where host TSC goes backwards.
- Block vCPUs from running until resume notifier.
- Move suspend duration accounting out of machine-independent kvm to x86.
- Merge code and documentation patches.
- Reworded documentation.
v3: https://lore.kernel.org/kvm/[email protected]/T/
- Use PM notifier instead of syscore ops (kvm_suspend()/kvm_resume()), because the latter doesn't get called on shallow suspend.
- Don't call function under UACCESS.
- Whitespace.
v2: https://lore.kernel.org/lkml/[email protected]/
- Accumulate suspend time at machine-independent kvm layer and track per-VCPU instead of per-VM.
- Document changes.
v1: https://lore.kernel.org/kvm/[email protected]/
Suleiman Souhlal (2):
KVM: x86: Advance guest TSC after deep suspend.
KVM: x86: Include host suspended time in steal time
Documentation/virt/kvm/x86/msr.rst | 10 +++- arch/x86/include/asm/kvm_host.h | 7 +++ arch/x86/kvm/x86.c | 84 +++++++++++++++++++++++++++++- 3 files changed, 98 insertions(+), 3 deletions(-)
Signature · 1 line
2.49.0.395.g12beb8f557-goog
PATCH v5 1/2 KVM: x86: Advance guest TSC after deep suspend.
Advance guest TSC to current time after suspend when the host TSCs went backwards.
This makes the behavior consistent between suspends where host TSC resets and suspends where it doesn't, such as suspend-to-idle, where in the former case if the host TSC resets, the guests' would previously be "frozen" due to KVM's backwards TSC prevention, while in the latter case they would advance.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -1399,6 +1399,7 @@ struct kvm_arch {u64 cur_tsc_offset;u64 cur_tsc_generation;int nr_vcpus_matched_tsc; +bool host_was_suspended;u32 default_tsc_khz;bool user_set_tsc;
arch/x86/kvm/x86.c +32 -1
@@ -4971,7 +4971,37 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)/* Apply any externally detected TSC adjustments (due to suspend) */ if (unlikely (vcpu->arch.tsc_offset_adjustment)) { -adjust_tsc_offset_host (vcpu, vcpu->arch.tsc_offset_adjustment); +unsigned long flags; +struct kvm *kvm; +bool advance; +u64 kernel_ns, l1_tsc, offset, tsc_now; + + kvm = vcpu->kvm; + advance =kvm_get_time_and_clockread (&kernel_ns, + &tsc_now); +raw_spin_lock_irqsave (&kvm->arch.tsc_write_lock, flags); +/* +* Advance the guest's TSC to current time instead of only +* preventing it from going backwards, while making sure +* all the vCPUs use the same offset. +*/ +if (kvm->arch.host_was_suspended && advance) { + l1_tsc =nsec_to_cycles (vcpu, + vcpu->kvm->arch.kvmclock_offset + + kernel_ns); + offset =kvm_compute_l1_tsc_offset (vcpu, + l1_tsc); + kvm->arch.cur_tsc_offset = offset; +kvm_vcpu_write_tsc_offset (vcpu, offset); + }else if (advance) +kvm_vcpu_write_tsc_offset (vcpu, + vcpu->kvm->arch.cur_tsc_offset); +else +adjust_tsc_offset_host (vcpu, + vcpu->arch.tsc_offset_adjustment); + kvm->arch.host_was_suspended =0 ; +raw_spin_unlock_irqrestore (&kvm->arch.tsc_write_lock, + flags); vcpu->arch.tsc_offset_adjustment =0 ;kvm_make_request (KVM_REQ_CLOCK_UPDATE , vcpu); }
@@ -12640,6 +12670,7 @@ int kvm_arch_enable_virtualization_cpu(void)kvm_make_request (KVM_REQ_MASTERCLOCK_UPDATE , vcpu); } + kvm->arch.host_was_suspended =1 ;/* * We have to disable TSC offset matching.. if you were * booting a VM while issuing an S4 host suspend....
Signature · 1 line
2.49.0.395.g12beb8f557-goog
Re: [PATCH v5 1/2] KVM: x86: Advance guest TSC after deep suspend.
Quoted 11 lines · Suleiman Souhlal
Advance guest TSC to current time after suspend when the host TSCs went backwards.
This makes the behavior consistent between suspends where host TSC resets and suspends where it doesn't, such as suspend-to-idle, where in the former case if the host TSC resets, the guests' would previously be "frozen" due to KVM's backwards TSC prevention, while in the latter case they would advance.
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Suleiman Souhlal <[email protected]>
Tested with comparing date before and after suspend-to-RAM[1]:
echo deep >/sys/power/mem_sleep
echo $(date '+%s' -d '+3 minutes') >/sys/class/rtc/rtc0/wakealarm echo mem >/sys/power/state
Without the patch, the guest's date is slower (~3 mins) than the host's after resuming.
[1]: https://www.kernel.org/doc/Documentation/power/states.txt
Some non-functional comments inline below.
arch/x86/kvm/x86.c void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · line 4979
Quoted 11 lines
arch/x86/kvm/x86.c +6
-1@@ -4971,7 +4971,37 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)/* Apply any externally detected TSC adjustments (due to suspend) */ if (unlikely (vcpu->arch.tsc_offset_adjustment)) { -adjust_tsc_offset_host (vcpu, vcpu->arch.tsc_offset_adjustment); +unsigned long flags; +struct kvm *kvm; +bool advance; +u64 kernel_ns, l1_tsc, offset, tsc_now; + + kvm = vcpu->kvm;
It will be more clear (at least to me) if moving the statement to its declaration:
struct kvm *kvm = vcpu->kvm;
Other than that, the following code should better utilitize the local variable, e.g. s/vcpu->kvm/kvm/g.
arch/x86/kvm/x86.c void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · line 4990
Quoted 11 lines
arch/x86/kvm/x86.c +11
-0+ advance =kvm_get_time_and_clockread (&kernel_ns, + &tsc_now); +raw_spin_lock_irqsave (&kvm->arch.tsc_write_lock, flags); +/* +* Advance the guest's TSC to current time instead of only +* preventing it from going backwards, while making sure +* all the vCPUs use the same offset. +*/ +if (kvm->arch.host_was_suspended && advance) { + l1_tsc = nsec_to_cycles(vcpu, + vcpu->kvm->arch.kvmclock_offset +
^^^^^^^^^
kvmarch/x86/kvm/x86.c void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · line 4998
Quoted 8 lines
arch/x86/kvm/x86.c +8
-0+ kernel_ns); + offset =kvm_compute_l1_tsc_offset (vcpu, + l1_tsc); + kvm->arch.cur_tsc_offset = offset; +kvm_vcpu_write_tsc_offset (vcpu, offset); + }else if (advance) +kvm_vcpu_write_tsc_offset (vcpu, + vcpu->kvm->arch.cur_tsc_offset);
^^^^^^^^^ kvm
arch/x86/kvm/x86.c void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · line 5001
Quoted 3 lines
arch/x86/kvm/x86.c +3
-0+else +adjust_tsc_offset_host (vcpu, + vcpu->arch.tsc_offset_adjustment);
Need braces in else if and else cases [2].
[2]: https://www.kernel.org/doc/html/latest/process/coding-style.html#placing-braces-and-spaces
arch/x86/kvm/x86.c int kvm_arch_enable_virtualization_cpu(void) · line 12673
Quoted 5 lines
arch/x86/kvm/x86.c +1
-0@@ -12640,6 +12670,7 @@ int kvm_arch_enable_virtualization_cpu(void)kvm_make_request (KVM_REQ_MASTERCLOCK_UPDATE , vcpu); } + kvm->arch.host_was_suspended =1 ;
Given that it is a bool, how about use true?
Sean Christopherson
maintainerRe: [PATCH v5 1/2] KVM: x86: Advance guest TSC after deep suspend.
Quoted 42 lines · Tzung-Bi Shih
Quoted 11 lines · Suleiman Souhlal
Advance guest TSC to current time after suspend when the host TSCs went backwards.
This makes the behavior consistent between suspends where host TSC resets and suspends where it doesn't, such as suspend-to-idle, where in the former case if the host TSC resets, the guests' would previously be "frozen" due to KVM's backwards TSC prevention, while in the latter case they would advance.
Suggested-by Sean Christopherson <[email protected]>Signed-off-by Suleiman Souhlal <[email protected]>Tested with comparing
datebefore and after suspend-to-RAM[1]:
echo deep >/sys/power/mem_sleep
echo $(date '+%s' -d '+3 minutes') >/sys/class/rtc/rtc0/wakealarm echo mem >/sys/power/stateWithout the patch, the guest's
dateis slower (~3 mins) than the host's after resuming.Tested-by Tzung-Bi Shih <[email protected]>[1]: https://www.kernel.org/doc/Documentation/power/states.txt
Some non-functional comments inline below.
arch/x86/kvm/x86.c void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · line 4979
Quoted 11 lines
arch/x86/kvm/x86.c +6
-1@@ -4971,7 +4971,37 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)/* Apply any externally detected TSC adjustments (due to suspend) */ if (unlikely (vcpu->arch.tsc_offset_adjustment)) { -adjust_tsc_offset_host (vcpu, vcpu->arch.tsc_offset_adjustment); +unsigned long flags; +struct kvm *kvm; +bool advance; +u64 kernel_ns, l1_tsc, offset, tsc_now; + + kvm = vcpu->kvm;It will be more clear (at least to me) if moving the statement to its declaration:
struct kvm *kvm =vcpu->kvm;
Quoted 5 lines
Other than that, the following code should better utilitize the local variable, e.g. s/vcpu->kvm/kvm/g.
arch/x86/kvm/x86.c void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · line 4981
Quoted 2 lines
arch/x86/kvm/x86.c +2
-0+ advance =kvm_get_time_and_clockread (&kernel_ns, + &tsc_now);
In addition to Tzung-Bi's feedback...
Please don't wrap at weird points, and align when you do wrap. The 80 char limit isn't a super hard limit, and many of these wraps are well below that anyways.
advance = kvm_get_time_and_clockread(&kernel_ns, &tsc_now);
raw_spin_lock_irqsave(&kvm->arch.tsc_write_lock, flags);
/*
* Advance the guest's TSC to current time instead of only
* preventing it from going backwards, while making sure
* all the vCPUs use the same offset.
*/
if (kvm->arch.host_was_suspended && advance) {
l1_tsc = nsec_to_cycles(vcpu,
vcpu->kvm->arch.kvmclock_offset + kernel_ns);
offset = kvm_compute_l1_tsc_offset(vcpu, l1_tsc);
kvm->arch.cur_tsc_offset = offset;
kvm_vcpu_write_tsc_offset(vcpu, offset);
} else if (advance) {
kvm_vcpu_write_tsc_offset(vcpu, vcpu->kvm->arch.cur_tsc_offset);
} else {
adjust_tsc_offset_host(vcpu, vcpu->arch.tsc_offset_adjustment);
}
kvm->arch.host_was_suspended = 0;
raw_spin_unlock_irqrestore(&kvm->arch.tsc_write_lock, flags);As for the correctness of this code with respect to masterclock and TSC synchronization, I'm definitely going to have to stare even more, and probably bring in at least Paolo for a consult, because KVM's TSC code is all kinds of brittle and complex.
PATCH v5 2/2 KVM: x86: Include host suspended time in steal time
In reply to Suleiman SouhlalWhen the host resumes from a suspend, the guest thinks any task that was running during the suspend ran for a long time, even though the effective run time was much shorter, which can end up having negative effects with scheduling.
To mitigate this issue, the time that the host was suspended is included in steal time, which lets the guest subtract the duration from the tasks' runtime.
In order to implement this behavior, once the suspend notifier fires, vCPUs trying to run will block until the resume notifier finishes. This is because the freezing of userspace tasks happens between these two points. It means that vCPUs could otherwise run and get their suspend steal time misaccounted, particularly if a vCPU would run after resume before the resume notifier fires.
Incidentally, doing this also addresses a potential race with the suspend notifier setting PVCLOCK_GUEST_STOPPED, which could then get cleared before the suspend actually happened.
One potential caveat is that in the case of a suspend happening during a VM migration, the suspend time might not be accounted for. A workaround would be for the VMM to ensure that the guest is entered with KVM_RUN after resuming from suspend.
--- Documentation/virt/kvm/x86/msr.rst | 10 ++++-- arch/x86/include/asm/kvm_host.h | 6 ++++ arch/x86/kvm/x86.c | 51 ++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-)
Documentation/virt/kvm/x86/msr.rst +8 -2
@@ -294,8 +294,14 @@ data: steal: the amount of time in which this vCPU did not run, in - nanoseconds. Time during which the vcpu is idle, will not be - reported as steal time. + nanoseconds. This includes the time during which the host is + suspended. Time during which the vcpu is idle, might not be + reported as steal time. The case where the host suspends + during a VM migration might not be accounted if VCPUs aren't + entered post-resume, because KVM does not currently support + suspend/resuming the associated metadata. A workaround would + be for the VMM to ensure that the guest is entered with + KVM_RUN after resuming from suspend. preempted: indicate the vCPU who owns this struct is running or
arch/x86/include/asm/kvm_host.h +6 -0
@@ -124,6 +124,7 @@#define KVM_REQ_HV_TLB_FLUSH \ KVM_ARCH_REQ_FLAGS(32, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_UPDATE_PROTECTED_GUEST_STATE KVM_ARCH_REQ(34) +#define KVM_REQ_WAIT_FOR_RESUME KVM_ARCH_REQ(35)#define CR0_RESERVED_BITS \ (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
@@ -917,8 +918,13 @@ struct kvm_vcpu_arch {struct {u8 preempted; +bool host_suspended;u64 msr_val;u64 last_steal; +u64 last_suspend; +u64 suspend_ns; +u64 last_suspend_ns; +wait_queue_head_t resume_waitq;struct gfn_to_hva_cache cache; } st;
arch/x86/kvm/x86.c +51 -0
93 lines not on this page · raw message
Signature · 1 line
2.49.0.395.g12beb8f557-goog
Quoted 8 lines · Suleiman Souhlal
When the host resumes from a suspend, the guest thinks any task that was running during the suspend ran for a long time, even though the effective run time was much shorter, which can end up having negative effects with scheduling.
[...]
Signed-off-by Suleiman Souhlal <[email protected]>
Saw the corresponding host suspended time has been compensated in update_rq_clock_task():
With 1 minor comment:
arch/x86/include/asm/kvm_host.h struct kvm_vcpu_arch { · line 921
Quoted 5 lines
arch/x86/include/asm/kvm_host.h +1
-0@@ -917,8 +918,13 @@ struct kvm_vcpu_arch {struct {u8 preempted; +bool host_suspended;
Use it in bool manner.
arch/x86/kvm/x86.c long kvm_arch_vm_compat_ioctl(struct file *filp, unsigned int ioctl, · line 6938
Quoted 4 lines
arch/x86/kvm/x86.c +4
-0+static void wait_for_resume (struct kvm_vcpu *vcpu) +{ +wait_event_interruptible (vcpu->arch.st.resume_waitq, + vcpu->arch.st.host_suspended ==0 );
E.g.: !vcpu->arch.st.host_suspended.
Quoted 5 lines
arch/x86/kvm/x86.c +1
-0@@ -6939,6 +6954,19 @@ static int kvm_arch_suspend_notifier(struct kvm *kvm)mutex_lock (&kvm->lock);kvm_for_each_vcpu (i, vcpu, kvm) { + vcpu->arch.st.last_suspend =ktime_get_boottime_ns ();
arch/x86/kvm/x86.c static int kvm_arch_suspend_notifier(struct kvm *kvm) · line 6967
Quoted 10 lines
arch/x86/kvm/x86.c +10
-0+/* +* Tasks get thawed before the resume notifier has been called +* so we need to block vCPUs until the resume notifier has run. +* Otherwise, suspend steal time might get applied too late, +* and get accounted to the wrong guest task. +* This also ensures that the guest paused bit set below +* doesn't get checked and cleared before the host actually +* suspends. +*/ + vcpu->arch.st.host_suspended =1 ;
E.g.: true.
arch/x86/kvm/x86.c static int kvm_arch_suspend_notifier(struct kvm *kvm) · line 6992
Quoted 8 lines
arch/x86/kvm/x86.c +8
-0+static int kvm_arch_resume_notifier (struct kvm *kvm) +{ +struct kvm_vcpu *vcpu; +unsigned long i; + +mutex_lock (&kvm->lock); +kvm_for_each_vcpu (i, vcpu, kvm) { + vcpu->arch.st.host_suspended =0 ;
E.g.: false.
Sean Christopherson
maintainerQuoted 19 lines · Suleiman Souhlal
When the host resumes from a suspend, the guest thinks any task that was running during the suspend ran for a long time, even though the effective run time was much shorter, which can end up having negative effects with scheduling.
To mitigate this issue, the time that the host was suspended is included in steal time, which lets the guest subtract the duration from the tasks' runtime.
In order to implement this behavior, once the suspend notifier fires, vCPUs trying to run will block until the resume notifier finishes. This is because the freezing of userspace tasks happens between these two points. It means that vCPUs could otherwise run and get their suspend steal time misaccounted, particularly if a vCPU would run after resume before the resume notifier fires.
Incidentally, doing this also addresses a potential race with the suspend notifier settingPVCLOCK_GUEST_STOPPED, which could then get cleared before the suspend actually happened.
Quoted 4 lines
One potential caveat is that in the case of a suspend happening during a VM migration, the suspend time might not be accounted for. A workaround would be for the VMM to ensure that the guest is entered with
KVM_RUNafter resuming from suspend.
Please rewrite this to state what changes are being made in impreative mood, as commands. Describing the _effects_ of a change makes it extremely difficult to understand whether the behavior is pre-patch or post-patch.
E.g. for this
vCPUs trying to run will block until the resume notifier finishes
I had to look at the code to understand what this was saying, which largely defeats the purpose of the changelog.
Quoted 15 lines
Signed-off-by Suleiman Souhlal <[email protected]>--- Documentation/virt/kvm/x86/msr.rst | 10 ++++-- arch/x86/include/asm/kvm_host.h | 6 ++++ arch/x86/kvm/x86.c | 51 ++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-)Documentation/virt/kvm/x86/msr.rst +0
-0@@ -294,8 +294,14 @@ data: steal: the amount of time in which this vCPU did not run, in
Documentation/virt/kvm/x86/msr.rst data: · line 304
Quoted 10 lines
Documentation/virt/kvm/x86/msr.rst +8
-2- nanoseconds. Time during which the vcpu is idle, will not be - reported as steal time. + nanoseconds. This includes the time during which the host is + suspended. Time during which the vcpu is idle, might not be + reported as steal time. The case where the host suspends + during a VM migration might not be accounted if VCPUs aren't + entered post-resume, because KVM does not currently support + suspend/resuming the associated metadata. A workaround would + be for the VMM to ensure that the guest is entered with + KVM_RUN after resuming from suspend.
Coming back to this with fresh eyes, I kinda feel like this needs an opt-in somewhere. E.g. a KVM capability, or maybe a guest-side steal-time feature? Or maybe we can squeak by with a module param based on your use case?
IIRC, there is a guest-side fix that is needed to not go completely off the rails for large steal-time values. I.e. enabling this blindly could negatively effect existings guests.
The forced wait behavior introduced in v4 also gives me pause, but that should really just be about getting the code right, i.e. shouldn't go sideways as long as the host kernel is bug free.
Ugh, actually, yeah, that part needs a guard. At the very least, it needs to be conditional on steal-time being enabled. KVM most definitely should not block vCPUs that aren't using steal-time, as that's a complete waste and will only make the effects of suspend worse for the guest. At that point, having the guest opt-in to the behavior is a pretty minor change, and it gives users a way to opt-out if this is causing pain.
Quoted 33 lines
Documentation/virt/kvm/x86/msr.rst +0
-0preempted: indicate the vCPU who owns this struct is running orarch/x86/include/asm/kvm_host.h +6
-0@@ -124,6 +124,7 @@#define KVM_REQ_HV_TLB_FLUSH \ KVM_ARCH_REQ_FLAGS(32, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_UPDATE_PROTECTED_GUEST_STATE KVM_ARCH_REQ(34) +#define KVM_REQ_WAIT_FOR_RESUME KVM_ARCH_REQ(35)#define CR0_RESERVED_BITS \ (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \@@ -917,8 +918,13 @@ struct kvm_vcpu_arch {struct {u8 preempted; +bool host_suspended;u64 msr_val;u64 last_steal; +u64 last_suspend; +u64 suspend_ns; +u64 last_suspend_ns; +wait_queue_head_t resume_waitq;struct gfn_to_hva_cache cache; } st;arch/x86/kvm/x86.c +0
-0
arch/x86/kvm/x86.c static void record_steal_time(struct kvm_vcpu *vcpu) · line 3721
Quoted 5 lines
arch/x86/kvm/x86.c +2
-0@@ -3717,6 +3717,8 @@ static void record_steal_time(struct kvm_vcpu *vcpu) steal += current->sched_info.run_delay - vcpu->arch.st.last_steal; vcpu->arch.st.last_steal = current->sched_info.run_delay; + steal += vcpu->arch.st.suspend_ns - vcpu->arch.st.last_suspend_ns; + vcpu->arch.st.last_suspend_ns = vcpu->arch.st.suspend_ns;
Isn't this just:
steal += vcpu->arch.st.suspend_ns; vcpu->arch.st.suspend_ns = 0;
or am I missing something? I suspect you implemented the code this way to avoid writing vcpu->arch.st.suspend_ns in this context, because you discovered that record_steal_time() can run concurrently with kvm_arch_suspend_notifier(), i.e. because vcpu->arch.st.suspend_ns was getting corrupted.
The above doesn't fully solve the problem, it just makes the badness less bad and/or much less likely to be hit. E.g. if vcpu->arch.st.suspend_ns is advanced between the first and second loads, KVM would fail to account the delta between the two loads.
Unless I'm missing something, the obvious/easy thing is to make arch.st.suspend_ns and atomic64_t, e.g.
if (unlikely(atomic64_read(&vcpu->arch.st.suspend_ns))) steal += atomic64_xchg(&vcpu->arch.st.suspend_ns, 0);
and then on the resume side:
atomic64_add(suspend_ns, &vcpu->arch.st.suspend_ns); kvm_make_request(KVM_REQ_STEAL_UPDATE, vcpu);
Quoted 8 lines
arch/x86/kvm/x86.c +1
-0unsafe_put_user (steal, &st->steal, out); version +=1 ;@@ -6930,6 +6932,19 @@ long kvm_arch_vm_compat_ioctl(struct file *filp, unsigned int ioctl, }#endif +static void wait_for_resume (struct kvm_vcpu *vcpu)
arch/x86/kvm/x86.c long kvm_arch_vm_compat_ioctl(struct file *filp, unsigned int ioctl, · line 6945
Quoted 10 lines
arch/x86/kvm/x86.c +10
-0+{ +wait_event_interruptible (vcpu->arch.st.resume_waitq, + vcpu->arch.st.host_suspended ==0 ); + +/* +* This might happen if we blocked here before the freezing of tasks +* and we get woken up by the freezer. +*/ +if (vcpu->arch.st.host_suspended) +kvm_make_request (KVM_REQ_WAIT_FOR_RESUME , vcpu);
I most definitely don't want to add custom waiting behavior for this. As this code shows, ensuring a wakeup doesn't race with blocking isn't the easiest thing in the world.
Off the top of my head, I can't think of any reason why we can't simply send the vCPU into kvm_vcpu_block(), by treating the vCPU as completely non-runnable while it is suspended.
Quoted 8 lines
arch/x86/kvm/x86.c +1
-0#ifdef CONFIG_HAVE_KVM_PM_NOTIFIER static int kvm_arch_suspend_notifier (struct kvm *kvm) {@@ -6939,6 +6954,19 @@ static int kvm_arch_suspend_notifier(struct kvm *kvm)mutex_lock (&kvm->lock);kvm_for_each_vcpu (i, vcpu, kvm) { + vcpu->arch.st.last_suspend =ktime_get_boottime_ns ();
arch/x86/kvm/x86.c static int kvm_arch_suspend_notifier(struct kvm *kvm) · line 6967
Quoted 10 lines
arch/x86/kvm/x86.c +10
-0+/* +* Tasks get thawed before the resume notifier has been called +* so we need to block vCPUs until the resume notifier has run. +* Otherwise, suspend steal time might get applied too late, +* and get accounted to the wrong guest task. +* This also ensures that the guest paused bit set below +* doesn't get checked and cleared before the host actually +* suspends. +*/ + vcpu->arch.st.host_suspended =1 ;
We can definitely avoid this flag, e.g. by zeroing last_suspend in the resume notified, and using that to detect "host suspended".
Quoted 6 lines
arch/x86/kvm/x86.c +2
-0+kvm_make_request (KVM_REQ_WAIT_FOR_RESUME , vcpu); +if (!vcpu->arch.pv_time.active)continue ;
arch/x86/kvm/x86.c static int kvm_arch_suspend_notifier(struct kvm *kvm) · line 6990
Quoted 9 lines
arch/x86/kvm/x86.c +6
-0@@ -6954,12 +6982,32 @@ static int kvm_arch_suspend_notifier(struct kvm *kvm)return ret ?NOTIFY_BAD :NOTIFY_DONE ; } +static int kvm_arch_resume_notifier (struct kvm *kvm) +{ +struct kvm_vcpu *vcpu; +unsigned long i; + +mutex_lock (&kvm->lock);
No need for this, it provides zero protection and can (very, very theoretically) trigger deadlock. The lock has already been dropped from the suspend notifier.
arch/x86/kvm/x86.c static int kvm_arch_suspend_notifier(struct kvm *kvm) · line 6995
Quoted 5 lines
arch/x86/kvm/x86.c +5
-0+kvm_for_each_vcpu (i, vcpu, kvm) { + vcpu->arch.st.host_suspended =0 ; + vcpu->arch.st.suspend_ns +=ktime_get_boottime_ns () - + vcpu->arch.st.last_suspend; +wake_up_interruptible (&vcpu->arch.st.resume_waitq);
This needs a
kvm_make_request(KVM_REQ_STEAL_UPDATE, vcpu);
to ensure the suspend_ns time is accounted. kvm_arch_vcpu_load() probably guarantees KVM_REQ_STEAL_UPDATE is set, but KVM shouldn't rely on that.
Completely untested, and I didn't add any new ABI, but something like this?
--- Documentation/virt/kvm/x86/msr.rst | 10 ++++-- arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/x86.c | 56 +++++++++++++++++++++++++++++- 3 files changed, 65 insertions(+), 3 deletions(-)
Documentation/virt/kvm/x86/msr.rst +8 -2
@@ -294,8 +294,14 @@ data: steal: the amount of time in which this vCPU did not run, in - nanoseconds. Time during which the vcpu is idle, will not be - reported as steal time. + nanoseconds. This includes the time during which the host is + suspended. Time during which the vcpu is idle, might not be + reported as steal time. The case where the host suspends + during a VM migration might not be accounted if VCPUs aren't + entered post-resume, because KVM does not currently support + suspend/resuming the associated metadata. A workaround would + be for the VMM to ensure that the guest is entered with + KVM_RUN after resuming from suspend. preempted: indicate the vCPU who owns this struct is running or
arch/x86/include/asm/kvm_host.h +2 -0
@@ -931,6 +931,8 @@ struct kvm_vcpu_arch {u8 preempted;u64 msr_val;u64 last_steal; +atomic64_t suspend_ns; +u64 suspend_ts;struct gfn_to_hva_cache cache; } st;
arch/x86/kvm/x86.c +55 -1
88 lines not on this page · raw message
base-commit: 17cfb61855eafd72fd6a22d713a39be0d74660e1
Quoted 3 lines · Suleiman Souhlal
This series makes it so that the time that the host is suspended is included in guests' steal time.
Friendly ping.
-- Suleiman
Quoted 49 lines
When the host resumes from a suspend, the guest thinks any task that was running during the suspend ran for a long time, even though the effective run time was much shorter, which can end up having negative effects with scheduling.
To mitigate this issue, we include the time that the host was suspended in steal time, which lets the guest can subtract the duration from the tasks' runtime.
In addition, we make the guest TSC behavior consistent whether the host TSC went backwards or not.
v5:
- Fix grammar mistakes in commit message.v4: https://lore.kernel.org/kvm/[email protected]/T/
- Advance guest TSC on suspends where host TSC goes backwards.
- Block vCPUs from running until resume notifier.
- Move suspend duration accounting out of machine-independent kvm to x86.
- Merge code and documentation patches.
- Reworded documentation.v3: https://lore.kernel.org/kvm/[email protected]/T/
- Use PM notifier instead of syscore ops (kvm_suspend()/kvm_resume()), because the latter doesn't get called on shallow suspend.
- Don't call function under UACCESS.
- Whitespace.v2: https://lore.kernel.org/lkml/[email protected]/
- Accumulate suspend time at machine-independent kvm layer and track per-VCPU instead of per-VM.
- Document changes.v1: https://lore.kernel.org/kvm/[email protected]/
Suleiman Souhlal (2):
KVM: x86: Advance guest TSC after deep suspend.
KVM: x86: Include host suspended time in steal timeDocumentation/virt/kvm/x86/msr.rst | 10 +++- arch/x86/include/asm/kvm_host.h | 7 +++ arch/x86/kvm/x86.c | 84 +++++++++++++++++++++++++++++- 3 files changed, 98 insertions(+), 3 deletions(-)--
2.49.0.395.g12beb8f557-goog