From patchwork Fri Jul 7 03:53:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9829535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 24F98602CA for ; Fri, 7 Jul 2017 03:56:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D8CF25F3E for ; Fri, 7 Jul 2017 03:56:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 026C8283DA; Fri, 7 Jul 2017 03:56:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A1CD325F3E for ; Fri, 7 Jul 2017 03:56:38 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTKL2-0002E0-He; Fri, 07 Jul 2017 03:53:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTKL0-0002Ci-LH for xen-devel@lists.xen.org; Fri, 07 Jul 2017 03:53:50 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 17/5C-01995-DC50F595; Fri, 07 Jul 2017 03:53:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsVywNykQvcMa3y kQf8aS4slHxezODB6HN39mymAMYo1My8pvyKBNWPCuSvMBXOFKw7fe8fawPiKt4uRi0NIYDqj xNYXUxm7GDk5JAR4JY4sm8EKYftLLHr8mRmiqJdR4tHmL0wgCTYBfYkVjw+CFYkISEtc+3wZr JlZoFpi4vQ5YLawQLDEh51dYPUsAqoSty9MBarn4OAVsJVoPscBMV9eYlfbRbAxnAJ2Eu0Xtz KD2EJAJQ9WrWWZwMi7gJFhFaN6cWpRWWqRrpFeUlFmekZJbmJmjq6hgbFebmpxcWJ6ak5iUrF ecn7uJkZgMNQzMDDuYDzV7HyIUZKDSUmU98zNuEghvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErxr WeIjhQSLUtNTK9Iyc4BhCZOW4OBREuHdB9LKW1yQmFucmQ6ROsWoy/Fqwv9vTEIsefl5qVLiv KtAZgiAFGWU5sGNgMXIJUZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvNtApvBk5pXAbXoFdA QT0BGKjTEgR5QkIqSkGhizc5nmZxhGTJOy2zaDQUx5yUzer7P5b64+dn/Cp0tKkV0OC30zrn5 Vv33tmMO8d32NDO5u9qtPMq9w7DWNLeM/saup++x5nTjdep59n9be2X7r6pTnOv7HDC5/ifvQ 4dURdCTVqtR27vlfrEfnttz8LKzc9cjc/fTmeL+pZ+eqPr7YlGadwcWsxFKckWioxVxUnAgAC qzIDowCAAA= X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1499399618!104177186!5 X-Originating-IP: [192.55.52.120] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55218 invoked from network); 7 Jul 2017 03:53:48 -0000 Received: from mga04.intel.com (HELO mga04.intel.com) (192.55.52.120) by server-14.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Jul 2017 03:53:48 -0000 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jul 2017 20:53:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,320,1496127600"; d="scan'208";a="123632544" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.142]) by fmsmga005.fm.intel.com with ESMTP; 06 Jul 2017 20:53:47 -0700 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Fri, 7 Jul 2017 11:53:12 +0800 Message-Id: <20170707035314.15659-6-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170707035314.15659-1-haozhong.zhang@intel.com> References: <20170707035314.15659-1-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v7 5/7] xen/mce: add support of vLMCE injection to XEN_MC_inject_v2 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Haozhong Zhang Reviewed-by: Jan Beulich --- Cc: Jan Beulich Cc: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.c | 24 +++++++++++++++++++++++- xen/include/public/arch-x86/xen-mca.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index ee04fb54ff..30525dd78b 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1485,11 +1485,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 { @@ -1529,6 +1530,27 @@ 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", -EINVAL); + break; + } + if ( broadcast ) + { + ret = x86_mcerr("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 for LMCE", + -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 7db990723b..dc35267249 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