kvm userspace: Add MCE simulation to kvm
PATCH 2/2 kvm userspace: Add MCE simulation to kvm
- MCE features is initialized when VCPU is initialized according to CPUID.
- A monitor command "mce" is added to inject a MCE.
Signed-off-by Huang Ying <[email protected]>
--- libkvm/libkvm-x86.c | 10 ++++++++++ libkvm/libkvm.h | 2 ++ qemu/monitor.c | 26 ++++++++++++++++++++++++++ qemu/qemu-kvm-x86.c | 22 +++++++++++++++++++++- qemu/qemu-kvm.c | 26 ++++++++++++++++++++++++++ qemu/qemu-kvm.h | 4 ++++ qemu/target-i386/cpu.h | 3 +++ 7 files changed, 92 insertions(+), 1 deletion(-)
qemu/monitor.c +26 -0
@@ -1556,6 +1556,31 @@ static void do_info_status(Monitor *mon) } +#if defined(TARGET_I386 ) || defined(TARGET_X86_64 ) +static void do_inject_mce (Monitor *mon, +int cpu_index,int bank, +unsigned status_hi,unsigned status_lo, +unsigned mcg_status_hi,unsigned mcg_status_lo, +unsigned addr_hi,unsigned addr_lo, +unsigned misc_hi,unsigned misc_lo) +{ +CPUState *env; +struct kvm_x86_mce mce = { + .bank = bank, + .status = ((uint64_t )status_hi <<32 ) | status_lo, + .mcg_status = ((uint64_t )mcg_status_hi <<32 ) | mcg_status_lo, + .addr = ((uint64_t )addr_hi <<32 ) | addr_lo, + .misc = ((uint64_t )misc_hi <<32 ) | misc_lo, + }; + +for (env = first_cpu; env !=NULL ; env = env->next_cpu) +if (env->cpu_index == cpu_index && env->mcg_cap) { +kvm_inject_x86_mce (env, &mce); +break ; + } +} +#endif +static void do_balloon (Monitor *mon,int value) {ram_addr_t target = value;
@@ -1757,6 +1782,7 @@ static const mon_cmd_t mon_cmds[] = { "[tap,user,socket,vde] options", "add host VLAN client" }, { "host_net_remove", "is", net_host_device_remove, "vlan_id name", "remove host VLAN client" }, + { "mce", "iillll", do_inject_mce, "cpu bank status mcgstatus addr misc", "inject a MCE on the given CPU"}, #endif { "balloon", "i", do_balloon, "target", "request VM to change it's memory allocation (in MB)" },
libkvm/libkvm-x86.c +10 -0
@@ -379,6 +379,16 @@ int kvm_set_msrs(kvm_context_t kvm, intreturn r; } +int kvm_setup_mce (kvm_context_t kvm,int vcpu,uint64_t *mcg_cap) +{ +return ioctl (kvm->vcpu_fd[vcpu],KVM_X86_SETUP_MCE , mcg_cap); +} + +int kvm_set_mce (kvm_context_t kvm,int vcpu,struct kvm_x86_mce *m) +{ +return ioctl (kvm->vcpu_fd[vcpu],KVM_X86_SET_MCE , m); +} +static void print_seg (FILE *file,const char *name,struct kvm_segment *seg) { fprintf(stderr,
libkvm/libkvm.h +2 -0
@@ -27,6 +27,8 @@ typedef struct kvm_context *kvm_context_struct kvm_msr_list *kvm_get_msr_list (kvm_context_t );int kvm_get_msrs (kvm_context_t ,int vcpu,struct kvm_msr_entry *msrs,int n);int kvm_set_msrs (kvm_context_t ,int vcpu,struct kvm_msr_entry *msrs,int n); +int kvm_setup_mce (kvm_context_t ,int vcpu,uint64_t *mcg_cap); +int kvm_set_mce (kvm_context_t ,int vcpu,struct kvm_x86_mce *mce);#endif /*!
qemu/qemu-kvm-x86.c +21 -1
@@ -457,6 +457,15 @@ void kvm_arch_save_regs(CPUState *env) } } +void kvm_arch_inject_x86_mce (CPUState *env,struct kvm_x86_mce *mce) +{ +int rc; + + rc =kvm_set_mce (kvm_context, env->cpu_index, mce); +if (rc ==-1 ) +perror ("kvm_set_mce FAILED" ); +} +static void do_cpuid_ent (struct kvm_cpuid_entry2 *e,uint32_t function,uint32_t count,CPUState *env) {
@@ -510,7 +519,7 @@ int kvm_arch_qemu_init_env(CPUState *censtruct kvm_cpuid_entry2 *pv_ent;uint32_t signature[3 ];#endif -int cpuid_nent =0 ; +int cpuid_nent =0 , family;CPUState copy;uint32_t i, j, limit;
@@ -566,6 +575,17 @@ int kvm_arch_qemu_init_env(CPUState *cendo_cpuid_ent (&cpuid_ent[cpuid_nent++], i,0 , ©);kvm_setup_cpuid2 (kvm_context, cenv->cpu_index, cpuid_nent, cpuid_ent); + +#define MCG_CAP_DEF 0x904 + +if (((cenv->cpuid_version >>8 )&0xF ) >=6 && + (cenv->cpuid_features&(CPUID_MCE |CPUID_MCA )) == (CPUID_MCE |CPUID_MCA )) { +uint64_t mcg_cap =MCG_CAP_DEF ; +if (kvm_setup_mce (kvm_context, cenv->cpu_index, &mcg_cap)) +perror ("kvm_setup_mce FAILED" ); + cenv->mcg_cap = mcg_cap; + } +return 0 ; }
qemu/qemu-kvm.h +4 -0
@@ -74,6 +74,8 @@ int kvm_arch_try_push_interrupts(void *ovoid kvm_arch_push_nmi (void *opaque);void kvm_arch_update_regs_for_sipi (CPUState *env);void kvm_arch_cpu_reset (CPUState *env); +struct kvm_x86_mce ; +void kvm_arch_inject_x86_mce (CPUState *env,struct kvm_x86_mce *mce);struct kvm_guest_debug ;struct kvm_debug_exit_arch ;
@@ -233,4 +235,6 @@ static inline void cpu_synchronize_state } } +void kvm_inject_x86_mce (CPUState *env,struct kvm_x86_mce *mce); +#endif
qemu/qemu-kvm.c +26 -0
@@ -198,6 +198,32 @@ void kvm_save_registers(CPUState *env)on_vcpu (env, kvm_do_save_registers, env); } +#if defined(TARGET_I386 ) || defined(TARGET_X86_64 ) +struct kvm_x86_mce_data +{ +CPUState *env; +struct kvm_x86_mce *mce; +}; + +static void kvm_do_inject_x86_mce (void *_data) +{ +struct kvm_x86_mce_data *data = _data; + +kvm_arch_inject_x86_mce (data->env, data->mce); +} + +void kvm_inject_x86_mce (CPUState *env,struct kvm_x86_mce *mce) +{ +struct kvm_x86_mce_data data; + +if (kvm_enabled ()) { + data.env = env; + data.mce = mce; +on_vcpu (env, kvm_do_inject_x86_mce, &data); + } +} +#endif +int kvm_cpu_exec (CPUState *env) {int r;
qemu/target-i386/cpu.h +3 -0
@@ -661,6 +661,9 @@ typedef struct CPUX86State {uint64_t mask; } mtrr_var[8 ]; +/* MCE capability */ +uint64_t mcg_cap; +#ifdef USE_KQEMU int kqemu_enabled;int last_io_time;