sim-card
/
qemu
Archived
10
0
Fork 0

kvm: support TSC deadline MSR with subsection

KVM add emulation of lapic tsc deadline timer for guest.
This patch is co-operation work at qemu side.

Use subsections to save/restore the field (mtosatti).

Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Liu, Jinsong 2011-10-05 16:52:32 -03:00 committed by Marcelo Tosatti
parent 38d2c27ea6
commit aa82ba549a
3 changed files with 37 additions and 0 deletions

View File

@ -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 {
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;

View File

@ -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)
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)
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)
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)
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;

View File

@ -310,6 +310,24 @@ static const VMStateDescription vmstate_fpop_ip_dp = {
} }
}; };
static bool tscdeadline_needed(void *opaque)
{
CPUState *env = opaque;
return env->tsc_deadline != 0;
}
static const VMStateDescription vmstate_msr_tscdeadline = {
.name = "cpu/msr_tscdeadline",
.version_id = 1,
.minimum_version_id = 1,
.minimum_version_id_old = 1,
.fields = (VMStateField []) {
VMSTATE_UINT64(tsc_deadline, CPUState),
VMSTATE_END_OF_LIST()
}
};
static const VMStateDescription vmstate_cpu = { static const VMStateDescription vmstate_cpu = {
.name = "cpu", .name = "cpu",
.version_id = CPU_SAVE_VERSION, .version_id = CPU_SAVE_VERSION,
@ -420,6 +438,9 @@ static const VMStateDescription vmstate_cpu = {
} , { } , {
.vmsd = &vmstate_fpop_ip_dp, .vmsd = &vmstate_fpop_ip_dp,
.needed = fpop_ip_dp_needed, .needed = fpop_ip_dp_needed,
}, {
.vmsd = &vmstate_msr_tscdeadline,
.needed = tscdeadline_needed,
} , { } , {
/* empty */ /* empty */
} }