Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm

* 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (131 commits)
  KVM: MMU: Use ptep_user for cmpxchg_gpte()
  KVM: Fix kvm mmu_notifier initialization order
  KVM: Add documentation for KVM_CAP_NR_VCPUS
  KVM: make guest mode entry to be rcu quiescent state
  KVM: x86 emulator: Make jmp far emulation into a separate function
  KVM: x86 emulator: Rename emulate_grpX() to em_grpX()
  KVM: x86 emulator: Remove unused arg from emulate_pop()
  KVM: x86 emulator: Remove unused arg from writeback()
  KVM: x86 emulator: Remove unused arg from read_descriptor()
  KVM: x86 emulator: Remove unused arg from seg_override()
  KVM: Validate userspace_addr of memslot when registered
  KVM: MMU: Clean up gpte reading with copy_from_user()
  KVM: PPC: booke: add sregs support
  KVM: PPC: booke: save/restore VRSAVE (a.k.a. USPRG0)
  KVM: PPC: use ticks, not usecs, for exit timing
  KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
  KVM: PPC: e500: emulate SVR
  KVM: VMX: Cache vmcs segment fields
  KVM: x86 emulator: consolidate segment accessors
  KVM: VMX: Avoid reading %rip unnecessarily when handling exceptions
  ...

3 files changed, 189 insertions, 60 deletions

diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 0f521356432..0049211959c 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -14,6 +14,8 @@
 #include <asm/desc_defs.h>
 
 struct x86_emulate_ctxt;
+enum x86_intercept;
+enum x86_intercept_stage;
 
 struct x86_exception {
         u8 vector;
@@ -24,6 +26,24 @@ struct x86_exception {
 };
 
 /*
+ * This struct is used to carry enough information from the instruction
+ * decoder to main KVM so that a decision can be made whether the
+ * instruction needs to be intercepted or not.
+ */
+struct x86_instruction_info {
+        u8  intercept;          /* which intercept                      */
+        u8  rep_prefix;         /* rep prefix?                          */
+        u8  modrm_mod;          /* mod part of modrm                    */
+        u8  modrm_reg;          /* index of register used               */
+        u8  modrm_rm;           /* rm part of modrm                     */
+        u64 src_val;            /* value of source operand              */
+        u8  src_bytes;          /* size of source operand               */
+        u8  dst_bytes;          /* size of destination operand          */
+        u8  ad_bytes;           /* size of src/dst address              */
+        u64 next_rip;           /* rip following the instruction        */
+};
+
+/*
  * x86_emulate_ops:
  *
  * These operations represent the instruction emulator's interface to memory.
@@ -62,6 +82,7 @@ struct x86_exception {
 #define X86EMUL_RETRY_INSTR     3 /* retry the instruction for some reason */
 #define X86EMUL_CMPXCHG_FAILED  4 /* cmpxchg did not see expected value */
 #define X86EMUL_IO_NEEDED       5 /* IO is needed to complete emulation */
+#define X86EMUL_INTERCEPTED     6 /* Intercepted by nested VMCB/VMCS */
 
 struct x86_emulate_ops {
         /*
@@ -71,8 +92,9 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*read_std)(unsigned long addr, void *val,
-                        unsigned int bytes, struct kvm_vcpu *vcpu,
+        int (*read_std)(struct x86_emulate_ctxt *ctxt,
+                        unsigned long addr, void *val,
+                        unsigned int bytes,
                         struct x86_exception *fault);
 
         /*
@@ -82,8 +104,8 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value write to memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
-        int (*write_std)(unsigned long addr, void *val,
-                         unsigned int bytes, struct kvm_vcpu *vcpu,
+        int (*write_std)(struct x86_emulate_ctxt *ctxt,
+                         unsigned long addr, void *val, unsigned int bytes,
                          struct x86_exception *fault);
         /*
          * fetch: Read bytes of standard (non-emulated/special) memory.
@@ -92,8 +114,8 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*fetch)(unsigned long addr, void *val,
-                     unsigned int bytes, struct kvm_vcpu *vcpu,
+        int (*fetch)(struct x86_emulate_ctxt *ctxt,
+                     unsigned long addr, void *val, unsigned int bytes,
                      struct x86_exception *fault);
 
         /*
@@ -102,11 +124,9 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*read_emulated)(unsigned long addr,
-                             void *val,
-                             unsigned int bytes,
-                             struct x86_exception *fault,
-                             struct kvm_vcpu *vcpu);
+        int (*read_emulated)(struct x86_emulate_ctxt *ctxt,
+                             unsigned long addr, void *val, unsigned int bytes,
+                             struct x86_exception *fault);
 
         /*
          * write_emulated: Write bytes to emulated/special memory area.
@@ -115,11 +135,10 @@ struct x86_emulate_ops {
          *                required).
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
-        int (*write_emulated)(unsigned long addr,
-                              const void *val,
+        int (*write_emulated)(struct x86_emulate_ctxt *ctxt,
+                              unsigned long addr, const void *val,
                               unsigned int bytes,
-                              struct x86_exception *fault,
-                              struct kvm_vcpu *vcpu);
+                              struct x86_exception *fault);
 
         /*
          * cmpxchg_emulated: Emulate an atomic (LOCKed) CMPXCHG operation on an
@@ -129,40 +148,54 @@ struct x86_emulate_ops {
          *  @new:   [IN ] Value to write to @addr.
          *  @bytes: [IN ] Number of bytes to access using CMPXCHG.
          */
-        int (*cmpxchg_emulated)(unsigned long addr,
+        int (*cmpxchg_emulated)(struct x86_emulate_ctxt *ctxt,
+                                unsigned long addr,
                                 const void *old,
                                 const void *new,
                                 unsigned int bytes,
-                                struct x86_exception *fault,
-                                struct kvm_vcpu *vcpu);
-
-        int (*pio_in_emulated)(int size, unsigned short port, void *val,
-                               unsigned int count, struct kvm_vcpu *vcpu);
-
-        int (*pio_out_emulated)(int size, unsigned short port, const void *val,
-                                unsigned int count, struct kvm_vcpu *vcpu);
-
-        bool (*get_cached_descriptor)(struct desc_struct *desc, u32 *base3,
-                                      int seg, struct kvm_vcpu *vcpu);
-        void (*set_cached_descriptor)(struct desc_struct *desc, u32 base3,
-                                      int seg, struct kvm_vcpu *vcpu);
-        u16 (*get_segment_selector)(int seg, struct kvm_vcpu *vcpu);
-        void (*set_segment_selector)(u16 sel, int seg, struct kvm_vcpu *vcpu);
-        unsigned long (*get_cached_segment_base)(int seg, struct kvm_vcpu *vcpu);
-        void (*get_gdt)(struct desc_ptr *dt, struct kvm_vcpu *vcpu);
-        void (*get_idt)(struct desc_ptr *dt, struct kvm_vcpu *vcpu);
-        ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);
-        int (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);
-        int (*cpl)(struct kvm_vcpu *vcpu);
-        int (*get_dr)(int dr, unsigned long *dest, struct kvm_vcpu *vcpu);
-        int (*set_dr)(int dr, unsigned long value, struct kvm_vcpu *vcpu);
-        int (*set_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);
-        int (*get_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
+                                struct x86_exception *fault);
+        void (*invlpg)(struct x86_emulate_ctxt *ctxt, ulong addr);
+
+        int (*pio_in_emulated)(struct x86_emulate_ctxt *ctxt,
+                               int size, unsigned short port, void *val,
+                               unsigned int count);
+
+        int (*pio_out_emulated)(struct x86_emulate_ctxt *ctxt,
+                                int size, unsigned short port, const void *val,
+                                unsigned int count);
+
+        bool (*get_segment)(struct x86_emulate_ctxt *ctxt, u16 *selector,
+                            struct desc_struct *desc, u32 *base3, int seg);
+        void (*set_segment)(struct x86_emulate_ctxt *ctxt, u16 selector,
+                            struct desc_struct *desc, u32 base3, int seg);
+        unsigned long (*get_cached_segment_base)(struct x86_emulate_ctxt *ctxt,
+                                                 int seg);
+        void (*get_gdt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        void (*get_idt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        void (*set_gdt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        void (*set_idt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        ulong (*get_cr)(struct x86_emulate_ctxt *ctxt, int cr);
+        int (*set_cr)(struct x86_emulate_ctxt *ctxt, int cr, ulong val);
+        int (*cpl)(struct x86_emulate_ctxt *ctxt);
+        int (*get_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong *dest);
+        int (*set_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong value);
+        int (*set_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 data);
+        int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);
+        void (*halt)(struct x86_emulate_ctxt *ctxt);
+        void (*wbinvd)(struct x86_emulate_ctxt *ctxt);
+        int (*fix_hypercall)(struct x86_emulate_ctxt *ctxt);
+        void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */
+        void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */
+        int (*intercept)(struct x86_emulate_ctxt *ctxt,
+                         struct x86_instruction_info *info,
+                         enum x86_intercept_stage stage);
 };
 
+typedef u32 __attribute__((vector_size(16))) sse128_t;
+
 /* Type, address-of, and value of an instruction's operand. */
 struct operand {
-        enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type;
+        enum { OP_REG, OP_MEM, OP_IMM, OP_XMM, OP_NONE } type;
         unsigned int bytes;
         union {
                 unsigned long orig_val;
@@ -174,11 +207,13 @@ struct operand {
                         ulong ea;
                         unsigned seg;
                 } mem;
+                unsigned xmm;
         } addr;
         union {
                 unsigned long val;
                 u64 val64;
                 char valptr[sizeof(unsigned long) + 2];
+                sse128_t vec_val;
         };
 };
 
@@ -197,6 +232,7 @@ struct read_cache {
 struct decode_cache {
         u8 twobyte;
         u8 b;
+        u8 intercept;
         u8 lock_prefix;
         u8 rep_prefix;
         u8 op_bytes;
@@ -209,6 +245,7 @@ struct decode_cache {
         u8 seg_override;
         unsigned int d;
         int (*execute)(struct x86_emulate_ctxt *ctxt);
+        int (*check_perm)(struct x86_emulate_ctxt *ctxt);
         unsigned long regs[NR_VCPU_REGS];
         unsigned long eip;
         /* modrm */
@@ -227,17 +264,15 @@ struct x86_emulate_ctxt {
         struct x86_emulate_ops *ops;
 
         /* Register state before/after emulation. */
-        struct kvm_vcpu *vcpu;
-
         unsigned long eflags;
         unsigned long eip; /* eip before instruction emulation */
         /* Emulated execution mode, represented by an X86EMUL_MODE value. */
         int mode;
-        u32 cs_base;
 
         /* interruptibility state, as a result of execution of STI or MOV SS */
         int interruptibility;
 
+        bool guest_mode; /* guest running a nested guest */
         bool perm_ok; /* do not check permissions if true */
         bool only_vendor_specific_insn;
 
@@ -249,8 +284,8 @@ struct x86_emulate_ctxt {
 };
 
 /* Repeat String Operation Prefix */
-#define REPE_PREFIX     1
-#define REPNE_PREFIX    2
+#define REPE_PREFIX     0xf3
+#define REPNE_PREFIX    0xf2
 
 /* Execution mode, passed to the emulator. */
 #define X86EMUL_MODE_REAL     0 /* Real mode.             */
@@ -259,6 +294,69 @@ struct x86_emulate_ctxt {
 #define X86EMUL_MODE_PROT32   4 /* 32-bit protected mode. */
 #define X86EMUL_MODE_PROT64   8 /* 64-bit (long) mode.    */
 
+/* any protected mode   */
+#define X86EMUL_MODE_PROT     (X86EMUL_MODE_PROT16|X86EMUL_MODE_PROT32| \
+                               X86EMUL_MODE_PROT64)
+
+enum x86_intercept_stage {
+        X86_ICTP_NONE = 0,   /* Allow zero-init to not match anything */
+        X86_ICPT_PRE_EXCEPT,
+        X86_ICPT_POST_EXCEPT,
+        X86_ICPT_POST_MEMACCESS,
+};
+
+enum x86_intercept {
+        x86_intercept_none,
+        x86_intercept_cr_read,
+        x86_intercept_cr_write,
+        x86_intercept_clts,
+        x86_intercept_lmsw,
+        x86_intercept_smsw,
+        x86_intercept_dr_read,
+        x86_intercept_dr_write,
+        x86_intercept_lidt,
+        x86_intercept_sidt,
+        x86_intercept_lgdt,
+        x86_intercept_sgdt,
+        x86_intercept_lldt,
+        x86_intercept_sldt,
+        x86_intercept_ltr,
+        x86_intercept_str,
+        x86_intercept_rdtsc,
+        x86_intercept_rdpmc,
+        x86_intercept_pushf,
+        x86_intercept_popf,
+        x86_intercept_cpuid,
+        x86_intercept_rsm,
+        x86_intercept_iret,
+        x86_intercept_intn,
+        x86_intercept_invd,
+        x86_intercept_pause,
+        x86_intercept_hlt,
+        x86_intercept_invlpg,
+        x86_intercept_invlpga,
+        x86_intercept_vmrun,
+        x86_intercept_vmload,
+        x86_intercept_vmsave,
+        x86_intercept_vmmcall,
+        x86_intercept_stgi,
+        x86_intercept_clgi,
+        x86_intercept_skinit,
+        x86_intercept_rdtscp,
+        x86_intercept_icebp,
+        x86_intercept_wbinvd,
+        x86_intercept_monitor,
+        x86_intercept_mwait,
+        x86_intercept_rdmsr,
+        x86_intercept_wrmsr,
+        x86_intercept_in,
+        x86_intercept_ins,
+        x86_intercept_out,
+        x86_intercept_outs,
+
+        nr_x86_intercepts
+};
+
 /* Host execution mode. */
 #if defined(CONFIG_X86_32)
 #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32
@@ -270,6 +368,7 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len);
 #define EMULATION_FAILED -1
 #define EMULATION_OK 0
 #define EMULATION_RESTART 1
+#define EMULATION_INTERCEPTED 2
 int x86_emulate_insn(struct x86_emulate_ctxt *ctxt);
 int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
                          u16 tss_selector, int reason,
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index c8af0991fdf..d2ac8e2ee89 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -30,14 +30,30 @@
 #define KVM_MEMORY_SLOTS 32
 /* memory slots that does not exposed to userspace */
 #define KVM_PRIVATE_MEM_SLOTS 4
+#define KVM_MMIO_SIZE 16
 
 #define KVM_PIO_PAGE_OFFSET 1
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 2
 
+#define CR0_RESERVED_BITS                                               \
+        (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
+                          | X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM \
+                          | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
+
 #define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT | X86_CR3_PCD) - 1)
 #define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT | X86_CR3_PCD))
 #define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS |    \
                                   0xFFFFFF0000000000ULL)
+#define CR4_RESERVED_BITS                                               \
+        (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
+                          | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE     \
+                          | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR  \
+                          | X86_CR4_OSXSAVE \
+                          | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))
+
+#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
+
+
 
 #define INVALID_PAGE (~(hpa_t)0)
 #define VALID_PAGE(x) ((x) != INVALID_PAGE)
@@ -118,6 +134,9 @@ enum kvm_reg {
 enum kvm_reg_ex {
         VCPU_EXREG_PDPTR = NR_VCPU_REGS,
         VCPU_EXREG_CR3,
+        VCPU_EXREG_RFLAGS,
+        VCPU_EXREG_CPL,
+        VCPU_EXREG_SEGMENTS,
 };
 
 enum {
@@ -256,7 +275,7 @@ struct kvm_mmu {
                          struct kvm_mmu_page *sp);
         void (*invlpg)(struct kvm_vcpu *vcpu, gva_t gva);
         void (*update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
-                        u64 *spte, const void *pte, unsigned long mmu_seq);
+                           u64 *spte, const void *pte);
         hpa_t root_hpa;
         int root_level;
         int shadow_root_level;
@@ -340,7 +359,6 @@ struct kvm_vcpu_arch {
         struct fpu guest_fpu;
         u64 xcr0;
 
-        gva_t mmio_fault_cr2;
         struct kvm_pio_request pio;
         void *pio_data;
 
@@ -367,18 +385,22 @@ struct kvm_vcpu_arch {
         /* emulate context */
 
         struct x86_emulate_ctxt emulate_ctxt;
+        bool emulate_regs_need_sync_to_vcpu;
+        bool emulate_regs_need_sync_from_vcpu;
 
         gpa_t time;
         struct pvclock_vcpu_time_info hv_clock;
         unsigned int hw_tsc_khz;
         unsigned int time_offset;
         struct page *time_page;
-        u64 last_host_tsc;
         u64 last_guest_tsc;
         u64 last_kernel_ns;
         u64 last_tsc_nsec;
         u64 last_tsc_write;
+        u32 virtual_tsc_khz;
         bool tsc_catchup;
+        u32  tsc_catchup_mult;
+        s8   tsc_catchup_shift;
 
         bool nmi_pending;
         bool nmi_injected;
@@ -448,9 +470,6 @@ struct kvm_arch {
         u64 last_tsc_nsec;
         u64 last_tsc_offset;
         u64 last_tsc_write;
-        u32 virtual_tsc_khz;
-        u32 virtual_tsc_mult;
-        s8 virtual_tsc_shift;
 
         struct kvm_xen_hvm_config xen_hvm_config;
 
@@ -502,6 +521,8 @@ struct kvm_vcpu_stat {
         u32 nmi_injections;
 };
 
+struct x86_instruction_info;
+
 struct kvm_x86_ops {
         int (*cpu_has_kvm_support)(void);          /* __init */
         int (*disabled_by_bios)(void);             /* __init */
@@ -586,9 +607,17 @@ struct kvm_x86_ops {
 
         bool (*has_wbinvd_exit)(void);
 
+        void (*set_tsc_khz)(struct kvm_vcpu *vcpu, u32 user_tsc_khz);
         void (*write_tsc_offset)(struct kvm_vcpu *vcpu, u64 offset);
 
+        u64 (*compute_tsc_offset)(struct kvm_vcpu *vcpu, u64 target_tsc);
+
         void (*get_exit_info)(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2);
+
+        int (*check_intercept)(struct kvm_vcpu *vcpu,
+                               struct x86_instruction_info *info,
+                               enum x86_intercept_stage stage);
+
         const struct trace_print_flags *exit_reasons_str;
 };
 
@@ -627,6 +656,13 @@ u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
 
 extern bool tdp_enabled;
 
+/* control of guest tsc rate supported? */
+extern bool kvm_has_tsc_control;
+/* minimum supported tsc_khz for guests */
+extern u32  kvm_min_guest_tsc_khz;
+/* maximum supported tsc_khz for guests */
+extern u32  kvm_max_guest_tsc_khz;
+
 enum emulation_result {
         EMULATE_DONE,       /* no further processing */
         EMULATE_DO_MMIO,      /* kvm_run filled with mmio request */
@@ -645,9 +681,6 @@ static inline int emulate_instruction(struct kvm_vcpu *vcpu,
         return x86_emulate_instruction(vcpu, 0, emulation_type, NULL, 0);
 }
 
-void realmode_lgdt(struct kvm_vcpu *vcpu, u16 size, unsigned long address);
-void realmode_lidt(struct kvm_vcpu *vcpu, u16 size, unsigned long address);
-
 void kvm_enable_efer_bits(u64);
 int kvm_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *data);
 int kvm_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);
@@ -657,8 +690,6 @@ struct x86_emulate_ctxt;
 int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port);
 void kvm_emulate_cpuid(struct kvm_vcpu *vcpu);
 int kvm_emulate_halt(struct kvm_vcpu *vcpu);
-int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address);
-int emulate_clts(struct kvm_vcpu *vcpu);
 int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu);
 
 void kvm_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg);
@@ -721,8 +752,6 @@ gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva,
 
 int kvm_emulate_hypercall(struct kvm_vcpu *vcpu);
 
-int kvm_fix_hypercall(struct kvm_vcpu *vcpu);
-
 int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,
                        void *insn, int insn_len);
 void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva);
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 3cce71413d0..485b4f1f079 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -118,6 +118,7 @@
    complete list. */
 
 #define MSR_AMD64_PATCH_LEVEL           0x0000008b
+#define MSR_AMD64_TSC_RATIO             0xc0000104
 #define MSR_AMD64_NB_CFG                0xc001001f
 #define MSR_AMD64_PATCH_LOADER          0xc0010020
 #define MSR_AMD64_OSVW_ID_LENGTH        0xc0010140