提交 bfc2455d 编写于 作者: L Liu, Jinsong 提交者: Marcelo Tosatti

kvm: support TSC deadline MSR

KVM add emulation of lapic tsc deadline timer for guest.
This patch is co-operation work at qemu side.
Signed-off-by: NLiu, Jinsong <jinsong.liu@intel.com>
Signed-off-by: NMarcelo Tosatti <mtosatti@redhat.com>
上级 d11cf8cc
...@@ -283,6 +283,7 @@ ...@@ -283,6 +283,7 @@
#define MSR_IA32_APICBASE_BSP (1<<8) #define MSR_IA32_APICBASE_BSP (1<<8)
#define MSR_IA32_APICBASE_ENABLE (1<<11) #define MSR_IA32_APICBASE_ENABLE (1<<11)
#define MSR_IA32_APICBASE_BASE (0xfffff<<12) #define MSR_IA32_APICBASE_BASE (0xfffff<<12)
#define MSR_IA32_TSCDEADLINE 0x6e0
#define MSR_MTRRcap 0xfe #define MSR_MTRRcap 0xfe
#define MSR_MTRRcap_VCNT 8 #define MSR_MTRRcap_VCNT 8
...@@ -687,6 +688,7 @@ typedef struct CPUX86State { ...@@ -687,6 +688,7 @@ typedef struct CPUX86State {
uint64_t async_pf_en_msr; uint64_t async_pf_en_msr;
uint64_t tsc; uint64_t tsc;
uint64_t tsc_deadline;
uint64_t mcg_status; uint64_t mcg_status;
...@@ -947,7 +949,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); ...@@ -947,7 +949,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
#define cpu_list_id x86_cpu_list #define cpu_list_id x86_cpu_list
#define cpudef_setup x86_cpudef_setup #define cpudef_setup x86_cpudef_setup
#define CPU_SAVE_VERSION 12 #define CPU_SAVE_VERSION 13
/* MMU modes definitions */ /* MMU modes definitions */
#define MMU_MODE0_SUFFIX _kernel #define MMU_MODE0_SUFFIX _kernel
......
...@@ -59,6 +59,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = { ...@@ -59,6 +59,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
static bool has_msr_star; static bool has_msr_star;
static bool has_msr_hsave_pa; static bool has_msr_hsave_pa;
static bool has_msr_tsc_deadline;
static bool has_msr_async_pf_en; static bool has_msr_async_pf_en;
static int lm_capable_kernel; static int lm_capable_kernel;
...@@ -568,6 +569,10 @@ static int kvm_get_supported_msrs(KVMState *s) ...@@ -568,6 +569,10 @@ static int kvm_get_supported_msrs(KVMState *s)
has_msr_hsave_pa = true; has_msr_hsave_pa = true;
continue; continue;
} }
if (kvm_msr_list->indices[i] == MSR_IA32_TSCDEADLINE) {
has_msr_tsc_deadline = true;
continue;
}
} }
} }
...@@ -881,6 +886,9 @@ static int kvm_put_msrs(CPUState *env, int level) ...@@ -881,6 +886,9 @@ static int kvm_put_msrs(CPUState *env, int level)
if (has_msr_hsave_pa) { if (has_msr_hsave_pa) {
kvm_msr_entry_set(&msrs[n++], MSR_VM_HSAVE_PA, env->vm_hsave); kvm_msr_entry_set(&msrs[n++], MSR_VM_HSAVE_PA, env->vm_hsave);
} }
if (has_msr_tsc_deadline) {
kvm_msr_entry_set(&msrs[n++], MSR_IA32_TSCDEADLINE, env->tsc_deadline);
}
#ifdef TARGET_X86_64 #ifdef TARGET_X86_64
if (lm_capable_kernel) { if (lm_capable_kernel) {
kvm_msr_entry_set(&msrs[n++], MSR_CSTAR, env->cstar); kvm_msr_entry_set(&msrs[n++], MSR_CSTAR, env->cstar);
...@@ -1127,6 +1135,9 @@ static int kvm_get_msrs(CPUState *env) ...@@ -1127,6 +1135,9 @@ static int kvm_get_msrs(CPUState *env)
if (has_msr_hsave_pa) { if (has_msr_hsave_pa) {
msrs[n++].index = MSR_VM_HSAVE_PA; msrs[n++].index = MSR_VM_HSAVE_PA;
} }
if (has_msr_tsc_deadline) {
msrs[n++].index = MSR_IA32_TSCDEADLINE;
}
if (!env->tsc_valid) { if (!env->tsc_valid) {
msrs[n++].index = MSR_IA32_TSC; msrs[n++].index = MSR_IA32_TSC;
...@@ -1195,6 +1206,9 @@ static int kvm_get_msrs(CPUState *env) ...@@ -1195,6 +1206,9 @@ static int kvm_get_msrs(CPUState *env)
case MSR_IA32_TSC: case MSR_IA32_TSC:
env->tsc = msrs[i].data; env->tsc = msrs[i].data;
break; break;
case MSR_IA32_TSCDEADLINE:
env->tsc_deadline = msrs[i].data;
break;
case MSR_VM_HSAVE_PA: case MSR_VM_HSAVE_PA:
env->vm_hsave = msrs[i].data; env->vm_hsave = msrs[i].data;
break; break;
......
...@@ -410,6 +410,7 @@ static const VMStateDescription vmstate_cpu = { ...@@ -410,6 +410,7 @@ static const VMStateDescription vmstate_cpu = {
VMSTATE_UINT64_V(xcr0, CPUState, 12), VMSTATE_UINT64_V(xcr0, CPUState, 12),
VMSTATE_UINT64_V(xstate_bv, CPUState, 12), VMSTATE_UINT64_V(xstate_bv, CPUState, 12),
VMSTATE_YMMH_REGS_VARS(ymmh_regs, CPUState, CPU_NB_REGS, 12), VMSTATE_YMMH_REGS_VARS(ymmh_regs, CPUState, CPU_NB_REGS, 12),
VMSTATE_UINT64_V(tsc_deadline, CPUState, 13),
VMSTATE_END_OF_LIST() VMSTATE_END_OF_LIST()
/* The above list is not sorted /wrt version numbers, watch out! */ /* The above list is not sorted /wrt version numbers, watch out! */
}, },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册