Commit 45c3af97 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: Trace changes to active TSC offset regardless if vCPU in guest-mode 



For some reason, kvm_x86_ops->write_l1_tsc_offset() skipped trace
of change to active TSC offset in case vCPU is in guest-mode.
This patch changes write_l1_tsc_offset() behavior to trace any change
to active TSC offset to aid debugging.  The VMX code is changed to
look more similar to SVM, which is in my opinion nicer.

Based on a patch by Liran Alon.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fd65d314

arch/x86/kvm/svm.c

+5 −4
Original line number Diff line number Diff line
@@ -1456,9 +1456,10 @@ static u64 svm_write_l1_tsc_offset(struct kvm_vcpu *vcpu, u64 offset) 
		g_tsc_offset = svm->vmcb->control.tsc_offset -

			       svm->nested.hsave->control.tsc_offset;

		svm->nested.hsave->control.tsc_offset = offset;

	} else

	}



	trace_kvm_write_tsc_offset(vcpu->vcpu_id,

					   svm->vmcb->control.tsc_offset,

				   svm->vmcb->control.tsc_offset - g_tsc_offset,

				   offset);



	svm->vmcb->control.tsc_offset = offset + g_tsc_offset;

arch/x86/kvm/vmx.c

+17 −17
Original line number Diff line number Diff line
@@ -3466,24 +3466,24 @@ static u64 vmx_read_l1_tsc_offset(struct kvm_vcpu *vcpu) 


static u64 vmx_write_l1_tsc_offset(struct kvm_vcpu *vcpu, u64 offset)

{

	u64 active_offset = offset;

	if (is_guest_mode(vcpu)) {

	struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

	u64 g_tsc_offset = 0;



	/*

	 * We're here if L1 chose not to trap WRMSR to TSC. According

	 * to the spec, this should set L1's TSC; The offset that L1

	 * set for L2 remains unchanged, and still needs to be added

	 * to the newly set TSC to get L2's TSC.

	 */

		struct vmcs12 *vmcs12 = get_vmcs12(vcpu);

		if (nested_cpu_has(vmcs12, CPU_BASED_USE_TSC_OFFSETING))

			active_offset += vmcs12->tsc_offset;

	} else {

		trace_kvm_write_tsc_offset(vcpu->vcpu_id,

					   vmcs_read64(TSC_OFFSET), offset);

	}

	if (is_guest_mode(vcpu) &&

	    (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETING))

		g_tsc_offset = vmcs12->tsc_offset;



	vmcs_write64(TSC_OFFSET, active_offset);

	return active_offset;

	trace_kvm_write_tsc_offset(vcpu->vcpu_id,

				   vcpu->arch.tsc_offset - g_tsc_offset,

				   offset);

	vmcs_write64(TSC_OFFSET, offset + g_tsc_offset);

	return offset + g_tsc_offset;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE