| Message ID | 20170330062003.9119-8-haozhong.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 30.03.17 at 08:20, <haozhong.zhang@intel.com> wrote: > @@ -1565,6 +1566,28 @@ 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); Please drop "in platform". > + break; > + } > + if ( broadcast ) > + { > + ret = x86_mcerr("XEN_MC_INJECT_CPU_BROADCAST cannot be used " > + "with XEN_MC_INJECT_TYPE_LMCE", Please shorten this by dropping the symbolic prefixes. Perhaps simply "Broadcast cannot be used with LMCE"? > + -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); "... for LMCE" With that Reviewed-by: Jan Beulich <jbeulich@suse.com> Jan
diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index c1a59bf..0de19ae 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1521,11 +1521,12 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) { const cpumask_t *cpumap; cpumask_var_t cmv; + bool broadcast = op->u.mc_inject_v2.flags & XEN_MC_INJECT_CPU_BROADCAST; if (nr_mce_banks == 0) return x86_mcerr("do_mca #MC", -ENODEV); - if ( op->u.mc_inject_v2.flags & XEN_MC_INJECT_CPU_BROADCAST ) + if ( broadcast ) cpumap = &cpu_online_map; else { @@ -1565,6 +1566,28 @@ 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; + } + if ( broadcast ) + { + ret = x86_mcerr("XEN_MC_INJECT_CPU_BROADCAST cannot be used " + "with XEN_MC_INJECT_TYPE_LMCE", + -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 v3: * Add a check to avoid XEN_MC_INJECT_CPU_BROADCAST being used with XEN_MC_INJECT_TYPE_LMCE. --- xen/arch/x86/cpu/mcheck/mce.c | 25 ++++++++++++++++++++++++- xen/include/public/arch-x86/xen-mca.h | 1 + 2 files changed, 25 insertions(+), 1 deletion(-)