Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cc5064d authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: SVM: Ensure timestamp counter monotonicity 



When a vcpu is migrated from one cpu to another, its timestamp counter
may lose its monotonic property if the host has unsynced timestamp counters.
This can confuse the guest, sometimes to the point of refusing to boot.

As the rdtsc instruction is rather fast on AMD processors (7-10 cycles),
we can simply record the last host tsc when we drop the cpu, and adjust
the vcpu tsc offset when we detect that we've migrated to a different cpu.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent d28c6cfb

drivers/kvm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ struct kvm_vcpu { 
	struct mutex mutex;

	int   cpu;

	int   launched;

	u64 host_tsc;

	struct kvm_run *run;

	int interrupt_window_open;

	unsigned long irq_summary; /* bit vector: 1 per word in irq_pending */

drivers/kvm/svm.c

+17 −4
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ static void init_vmcb(struct vmcb *vmcb) 
{

	struct vmcb_control_area *control = &vmcb->control;

	struct vmcb_save_area *save = &vmcb->save;

	u64 tsc;



	control->intercept_cr_read = 	INTERCEPT_CR0_MASK |

					INTERCEPT_CR3_MASK |
@@ -517,8 +516,7 @@ static void init_vmcb(struct vmcb *vmcb) 


	control->iopm_base_pa = iopm_base;

	control->msrpm_base_pa = msrpm_base;

	rdtscll(tsc);

	control->tsc_offset = -tsc;

	control->tsc_offset = 0;

	control->int_ctl = V_INTR_MASKING_MASK;



	init_seg(&save->es);
@@ -606,11 +604,26 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu) 


static void svm_vcpu_load(struct kvm_vcpu *vcpu)

{

	get_cpu();

	int cpu;



	cpu = get_cpu();

	if (unlikely(cpu != vcpu->cpu)) {

		u64 tsc_this, delta;



		/*

		 * Make sure that the guest sees a monotonically

		 * increasing TSC.

		 */

		rdtscll(tsc_this);

		delta = vcpu->host_tsc - tsc_this;

		vcpu->svm->vmcb->control.tsc_offset += delta;

		vcpu->cpu = cpu;

	}

}



static void svm_vcpu_put(struct kvm_vcpu *vcpu)

{

	rdtscll(vcpu->host_tsc);

	put_cpu();

}