KVM: x86: Minor steal time cleanups
Sean Christopherson
maintainercover KVM: x86: Minor steal time cleanups
Cleanups and a minor optimization to kvm_steal_time_set_preempted() that were made possible by the switch to using a cache gfn->pfn translation.
Sean Christopherson (2):
KVM: x86: Remove obsolete disabling of page faults in
kvm_arch_vcpu_put()
KVM: x86: Take KVM's SRCU lock only if steal time update is needed
arch/x86/kvm/x86.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
Sean Christopherson
maintainerPATCH 1/2 KVM: x86: Remove obsolete disabling of page faults in kvm_arch_vcpu_put()
Remove the disabling of page faults across kvm_steal_time_set_preempted() as KVM now accesses the steal time struct (shared with the guest) via a cached mapping (see commit b043138246a4, "x86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed".) The cache lookup is flagged as atomic, thus it would be a bug if KVM tried to resolve a new pfn, i.e. we want the splat that would be reached via might_fault().
--- arch/x86/kvm/x86.c | 10 ---------- 1 file changed, 10 deletions(-)
arch/x86/kvm/x86.c +0 -10
@@ -4031,15 +4031,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)if (vcpu->preempted && !vcpu->arch.guest_state_protected) vcpu->arch.preempted_in_kernel = !kvm_x86_ops.get_cpl (vcpu); -/* -* Disable page faults because we're in atomic context here. -* kvm_write_guest_offset_cached() would call might_fault() -* that relies on pagefault_disable() to tell if there's a -* bug. NOTE: the write to guest memory may not go through if -* during postcopy live migration or if there's heavy guest -* paging. -*/ -pagefault_disable ();/* * kvm_memslots() will be called by * kvm_write_guest_offset_cached() so take the srcu lock.
@@ -4047,7 +4038,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) idx =srcu_read_lock (&vcpu->kvm->srcu);kvm_steal_time_set_preempted (vcpu);srcu_read_unlock (&vcpu->kvm->srcu, idx); -pagefault_enable (); kvm_x86_ops.vcpu_put (vcpu); vcpu->arch.last_host_tsc =rdtsc ();/*
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
Sean Christopherson
maintainerPATCH 2/2 KVM: x86: Take KVM's SRCU lock only if steal time update is needed
In reply to Sean ChristophersonEnter a SRCU critical section for a memslots lookup during steal time update if and only if a steal time update is actually needed. Taking the lock can be avoided if steal time is disabled by the guest, or if KVM knows it has already flagged the vCPU as being preempted.
Reword the comment to be more precise as to exactly why memslots will be queried.
--- arch/x86/kvm/x86.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
arch/x86/kvm/x86.c +11 -9
@@ -4005,6 +4005,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) {struct kvm_host_map map;struct kvm_steal_time *st; +int idx;if (!(vcpu->arch.st.msr_val &KVM_MSR_ENABLED ))return ;
@@ -4012,9 +4013,15 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu)if (vcpu->arch.st.preempted)return ; +/* +* Take the srcu lock as memslots will be accessed to check the gfn +* cache generation against the memslots generation. +*/ + idx =srcu_read_lock (&vcpu->kvm->srcu); +if (kvm_map_gfn (vcpu, vcpu->arch.st.msr_val >>PAGE_SHIFT , &map, &vcpu->arch.st.cache, true)) -return ; + goto out; st = map.hva +offset_in_page (vcpu->arch.st.msr_val &KVM_STEAL_VALID_BITS );
@@ -4022,22 +4029,17 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) st->preempted = vcpu->arch.st.preempted =KVM_VCPU_PREEMPTED ;kvm_unmap_gfn (vcpu, &map, &vcpu->arch.st.cache, true, true); + +out: +srcu_read_unlock (&vcpu->kvm->srcu, idx); }void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu) { -int idx; -if (vcpu->preempted && !vcpu->arch.guest_state_protected) vcpu->arch.preempted_in_kernel = !kvm_x86_ops.get_cpl (vcpu); -/* -* kvm_memslots() will be called by -* kvm_write_guest_offset_cached() so take the srcu lock. -*/ - idx =srcu_read_lock (&vcpu->kvm->srcu);kvm_steal_time_set_preempted (vcpu); -srcu_read_unlock (&vcpu->kvm->srcu, idx); kvm_x86_ops.vcpu_put (vcpu); vcpu->arch.last_host_tsc =rdtsc ();/*
Signature · 1 line
2.30.0.280.ga3ce27912f-goog
Quoted 11 lines · Sean Christopherson
Cleanups and a minor optimization to
kvm_steal_time_set_preempted()that were made possible by the switch to using a cachegfn->pfntranslation.Sean Christopherson (2):
KVM: x86: Remove obsolete disabling of page faults inkvm_arch_vcpu_put()KVM: x86: Take KVM's SRCU lock only if steal time update is needed
arch/x86/kvm/x86.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-)
Queued, thanks.
Paolo