The patch titled
KVM: Add time stamp counter msr and accessors
has been added to the -mm tree. Its filename is
kvm-add-time-stamp-counter-msr-and-accessors.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: KVM: Add time stamp counter msr and accessors
From: Uri Lublin <uril@xxxxxxxxxxxx>
Add a couple of accessors for the time stamp counter, and expose the tsc msr.
Signed-off-by: Uri Lublin <uril@xxxxxxxxxxxx>
Signed-off-by: Avi Kivity <avi@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/kvm/kvm_main.c | 40 ++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff -puN drivers/kvm/kvm_main.c~kvm-add-time-stamp-counter-msr-and-accessors drivers/kvm/kvm_main.c
--- a/drivers/kvm/kvm_main.c~kvm-add-time-stamp-counter-msr-and-accessors
+++ a/drivers/kvm/kvm_main.c
@@ -118,6 +118,7 @@ static const u32 vmx_msr_index[] = {
#define TSS_REDIRECTION_SIZE (256 / 8)
#define RMODE_TSS_SIZE (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1)
+#define MSR_IA32_TIME_STAMP_COUNTER 0x010
#define MSR_IA32_FEATURE_CONTROL 0x03a
#define MSR_IA32_VMX_BASIC_MSR 0x480
#define MSR_IA32_VMX_PINBASED_CTLS_MSR 0x481
@@ -713,6 +714,31 @@ static void inject_gp(struct kvm_vcpu *v
INTR_INFO_VALID_MASK);
}
+/*
+ * reads and returns guest's timestamp counter "register"
+ * guest_tsc = host_tsc + tsc_offset -- 21.3
+ */
+static u64 guest_read_tsc(void)
+{
+ u64 host_tsc, tsc_offset;
+
+ rdtscll(host_tsc);
+ tsc_offset = vmcs_read64(TSC_OFFSET);
+ return host_tsc + tsc_offset;
+}
+
+/*
+ * writes 'guest_tsc' into guest's timestamp counter "register"
+ * guest_tsc = host_tsc + tsc_offset ==> tsc_offset = guest_tsc - host_tsc
+ */
+static void guest_write_tsc(u64 guest_tsc)
+{
+ u64 host_tsc;
+
+ rdtscll(host_tsc);
+ vmcs_write64(TSC_OFFSET, guest_tsc - host_tsc);
+}
+
static void update_exception_bitmap(struct kvm_vcpu *vcpu)
{
if (vcpu->rmode.active)
@@ -1174,7 +1200,6 @@ static int kvm_vcpu_setup(struct kvm_vcp
struct descriptor_table dt;
int i;
int ret;
- u64 tsc;
int nr_good_msrs;
@@ -1244,8 +1269,7 @@ static int kvm_vcpu_setup(struct kvm_vcp
vmcs_write64(IO_BITMAP_A, 0);
vmcs_write64(IO_BITMAP_B, 0);
- rdtscll(tsc);
- vmcs_write64(TSC_OFFSET, -tsc);
+ guest_write_tsc(0);
vmcs_write64(VMCS_LINK_POINTER, -1ull); /* 22.3.1.5 */
@@ -2294,6 +2318,9 @@ static int handle_rdmsr(struct kvm_vcpu
data = vmcs_readl(GUEST_GS_BASE);
break;
#endif
+ case MSR_IA32_TIME_STAMP_COUNTER:
+ data = guest_read_tsc();
+ break;
case MSR_IA32_SYSENTER_CS:
data = vmcs_read32(GUEST_SYSENTER_CS);
break;
@@ -2371,8 +2398,6 @@ static void set_efer(struct kvm_vcpu *vc
#endif
-#define MSR_IA32_TIME_STAMP_COUNTER 0x10
-
static int handle_wrmsr(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
{
u32 ecx = vcpu->regs[VCPU_REGS_RCX];
@@ -2416,10 +2441,7 @@ static int handle_wrmsr(struct kvm_vcpu
break;
#endif
case MSR_IA32_TIME_STAMP_COUNTER: {
- u64 tsc;
-
- rdtscll(tsc);
- vmcs_write64(TSC_OFFSET, data - tsc);
+ guest_write_tsc(data);
break;
}
case MSR_IA32_UCODE_REV:
_
Patches currently in -mm which might be from uril@xxxxxxxxxxxx are
kvm-expose-interrupt-bitmap.patch
kvm-add-time-stamp-counter-msr-and-accessors.patch
kvm-expose-msrs-to-userspace.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
