Message ID | 20170317064614.23539-11-haozhong.zhang@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
>>> On 17.03.17 at 07:46, <haozhong.zhang@intel.com> wrote: > --- a/xen/arch/x86/cpu/mcheck/mce.c > +++ b/xen/arch/x86/cpu/mcheck/mce.c > @@ -1546,6 +1546,21 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) > } > break; > > + case XEN_MC_INJECT_TYPE_LMCE: > + if ( !lmce_support ) > + { > + ret = x86_mcerr("No LMCE support in platform", -EINVAL); > + break; > + } > + /* Ensure at most one CPU is specified. */ > + if ( nr_cpu_ids > cpumask_next(cpumask_first(cpumap), cpumap) ) > + { > + ret = x86_mcerr("More than one CPU specified", -EINVAL); > + break; > + } > + on_selected_cpus(cpumap, x86_mc_mceinject, NULL, 1); > + break; Please reject XEN_MC_INJECT_CPU_BROADCAST being used together with this new type. Jan
diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 20ab678..e7c681b 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1546,6 +1546,21 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) } break; + case XEN_MC_INJECT_TYPE_LMCE: + if ( !lmce_support ) + { + ret = x86_mcerr("No LMCE support in platform", -EINVAL); + break; + } + /* Ensure at most one CPU is specified. */ + if ( nr_cpu_ids > cpumask_next(cpumask_first(cpumap), cpumap) ) + { + ret = x86_mcerr("More than one CPU specified", -EINVAL); + break; + } + on_selected_cpus(cpumap, x86_mc_mceinject, NULL, 1); + break; + default: ret = x86_mcerr("Wrong mca type\n", -EINVAL); break; diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index 7db9907..dc35267 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -414,6 +414,7 @@ struct xen_mc_mceinject { #define XEN_MC_INJECT_TYPE_MASK 0x7 #define XEN_MC_INJECT_TYPE_MCE 0x0 #define XEN_MC_INJECT_TYPE_CMCI 0x1 +#define XEN_MC_INJECT_TYPE_LMCE 0x2 #define XEN_MC_INJECT_CPU_BROADCAST 0x8
Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com> --- Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> Changes in v2: * Remove the unnecessary local variable "cpu_nr". --- xen/arch/x86/cpu/mcheck/mce.c | 15 +++++++++++++++ xen/include/public/arch-x86/xen-mca.h | 1 + 2 files changed, 16 insertions(+)