Commit 886b470c authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

KVM: x86: pass host_tsc to read_l1_tsc 



Allow the caller to pass host tsc value to kvm_x86_ops->read_l1_tsc().

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 51c19b4f

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ struct kvm_x86_ops { 
	void (*write_tsc_offset)(struct kvm_vcpu *vcpu, u64 offset);



	u64 (*compute_tsc_offset)(struct kvm_vcpu *vcpu, u64 target_tsc);

	u64 (*read_l1_tsc)(struct kvm_vcpu *vcpu);

	u64 (*read_l1_tsc)(struct kvm_vcpu *vcpu, u64 host_tsc);



	void (*get_exit_info)(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2);

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ static void start_apic_timer(struct kvm_lapic *apic) 
		local_irq_save(flags);



		now = apic->lapic_timer.timer.base->get_time();

		guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu);

		guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu, native_read_tsc());

		if (likely(tscdeadline > guest_tsc)) {

			ns = (tscdeadline - guest_tsc) * 1000000ULL;

			do_div(ns, this_tsc_khz);

arch/x86/kvm/svm.c

+2 −2
Original line number Diff line number Diff line
@@ -3005,11 +3005,11 @@ static int cr8_write_interception(struct vcpu_svm *svm) 
	return 0;

}



u64 svm_read_l1_tsc(struct kvm_vcpu *vcpu)

u64 svm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)

{

	struct vmcb *vmcb = get_host_vmcb(to_svm(vcpu));

	return vmcb->control.tsc_offset +

		svm_scale_tsc(vcpu, native_read_tsc());

		svm_scale_tsc(vcpu, host_tsc);

}



static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)

arch/x86/kvm/vmx.c

+2 −3
Original line number Diff line number Diff line
@@ -1839,11 +1839,10 @@ static u64 guest_read_tsc(void) 
 * Like guest_read_tsc, but always returns L1's notion of the timestamp

 * counter, even if a nested guest (L2) is currently running.

 */

u64 vmx_read_l1_tsc(struct kvm_vcpu *vcpu)

u64 vmx_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)

{

	u64 host_tsc, tsc_offset;

	u64 tsc_offset;



	rdtscll(host_tsc);

	tsc_offset = is_guest_mode(vcpu) ?

		to_vmx(vcpu)->nested.vmcs01_tsc_offset :

		vmcs_read64(TSC_OFFSET);

arch/x86/kvm/x86.c

+3 −2
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) 


	/* Keep irq disabled to prevent changes to the clock */

	local_irq_save(flags);

	tsc_timestamp = kvm_x86_ops->read_l1_tsc(v);

	tsc_timestamp = kvm_x86_ops->read_l1_tsc(v, native_read_tsc());

	kernel_ns = get_kernel_ns();

	this_tsc_khz = __get_cpu_var(cpu_tsc_khz);

	if (unlikely(this_tsc_khz == 0)) {
@@ -5338,7 +5338,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) 
	if (hw_breakpoint_active())

		hw_breakpoint_restore();



	vcpu->arch.last_guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu);

	vcpu->arch.last_guest_tsc = kvm_x86_ops->read_l1_tsc(vcpu,

							   native_read_tsc());



	vcpu->mode = OUTSIDE_GUEST_MODE;

	smp_wmb();