On Fri, 2009-04-17 at 22:49 +0800, Marcelo Tosatti wrote:
> Hi Huang,
>
> On Fri, Apr 17, 2009 at 03:38:45PM +0800, Huang Ying wrote:
> > - MCE features are initialized when VCPU is initialized according to CPUID.
> > - A monitor command "mce" is added to inject a MCE.
> >
> >
> > ChangeLog:
> >
> > v2:
> >
> > - Use new kernel MCE capability exportion interface.
> >
> >
> > Signed-off-by: Huang Ying <ying.huang@xxxxxxxxx>
> >
> > ---
> > libkvm/libkvm-x86.c | 33 +++++++++++++++++++++++++++++++++
> > libkvm/libkvm.h | 4 ++++
> > qemu/monitor.c | 26 ++++++++++++++++++++++++++
> > qemu/qemu-kvm-x86.c | 33 +++++++++++++++++++++++++++++++++
> > qemu/qemu-kvm.c | 26 ++++++++++++++++++++++++++
> > qemu/qemu-kvm.h | 4 ++++
> > qemu/target-i386/cpu.h | 3 +++
> > 7 files changed, 129 insertions(+)
> >
> > --- a/qemu/monitor.c
> > +++ b/qemu/monitor.c
> > @@ -1557,6 +1557,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
>
> This will break compilation on hosts with older kernel headers. To ease
> the merge with QEMU, do_inject_mce should call qemu_inject_x86_mce,
> which does nothing for the case where KVM is disabled, or call KVM
> specific function otherwise (knowledge about struct kvm_x86_mce should
> be contained within KVM code).
Yes. I will fix this.
> > +
> > static void do_balloon(Monitor *mon, int value)
> > {
> > ram_addr_t target = value;
> > @@ -1758,6 +1783,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)" },
> > --- a/libkvm/libkvm-x86.c
> > +++ b/libkvm/libkvm-x86.c
> > @@ -379,6 +379,39 @@ int kvm_set_msrs(kvm_context_t kvm, int
> > return r;
> > }
> >
> >
> > +int kvm_get_mce_cap_supported(kvm_context_t kvm, uint64_t *mce_cap,
> > + int *max_banks)
> > +{
> > + int r;
> > +
> > + r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_MCE);
> > + if (r > 0) {
> > + *max_banks = r;
> > + return ioctl(kvm->fd, KVM_X86_GET_MCE_CAP_SUPPORTED, mce_cap);
> > + }
> > + return -ENOSYS;
> > +}
> > +
> > +int kvm_setup_mce(kvm_context_t kvm, int vcpu, uint64_t *mcg_cap)
> > +{
> > + int r;
> > +
> > + r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_MCE);
> > + if (r > 0)
> > + return ioctl(kvm->vcpu_fd[vcpu], KVM_X86_SETUP_MCE, mcg_cap);
> > + return -ENOSYS;
> > +}
> > +
> > +int kvm_set_mce(kvm_context_t kvm, int vcpu, struct kvm_x86_mce *m)
> > +{
> > + int r;
> > +
> > + r = ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_MCE);
> > + if (r > 0)
> > + return ioctl(kvm->vcpu_fd[vcpu], KVM_X86_SET_MCE, m);
> > + return -ENOSYS;
> > +}
>
> Have to #ifdef KVM_CAP_MCE where appropriate, otherwise compilation
> on hosts with older kernel headers fail.
Yes. I will fix this.
Best Regards,
Huang Ying
Attachment:
signature.asc
Description: This is a digitally signed message part
