From patchwork Mon Jun 26 09:16:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9808911 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 03F6A603F3 for ; Mon, 26 Jun 2017 09:19:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E0A128161 for ; Mon, 26 Jun 2017 09:19:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 023EF2847D; Mon, 26 Jun 2017 09:19: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 09B0528437 for ; Mon, 26 Jun 2017 09:19:37 +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 1dPQ8p-0002mj-JL; Mon, 26 Jun 2017 09:17:07 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPQ8o-0002ld-0A for xen-devel@lists.xen.org; Mon, 26 Jun 2017 09:17:06 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id D0/1C-03620-111D0595; Mon, 26 Jun 2017 09:17:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLLMWRWlGSWpSXmKPExsVywNwkVlfwYkC kwYxjTBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aUhu0sBR+FK363OTQwruPrYuTiEBKYxijx fe1Cti5GTg4JAV6JI8tmsELY/hJn/l1hArGFBHoZJR6/Fwex2QT0JVY8PghWIyIgLXHt82VGE JtZoFpi4vQ5YLawQKjEzilPwHpZBFQlJv6dBDafV8BOonPPEmaI+fISu9ougs3hBIq/+HuAHW KXrcSEXysYJzDyLmBkWMWoUZxaVJZapGtooZdUlJmeUZKbmJmja2hgppebWlycmJ6ak5hUrJe cn7uJERgMDECwg/HmxoBDjJIcTEqivI3+/pFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHjPnQ+I FBIsSk1PrUjLzAGGJUxagoNHSYT3wlmgNG9xQWJucWY6ROoUo6KUOO8skD4BkERGaR5cGywWL jHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmYtx1kCk9mXgnc9FdAi5mAFrPMA1tckoiQkmpgXB x0tLmbOWm9MPtrTevNNg8bDI9mxtcGf+j93fcyyPrItsaeGbcYKmcFeOTllbUJdr6fFrV7qxN nfF7jipL32fkntknPkp10xvXlimCV6Wa/GJiFWiuYFm/NvPTArCDz942IHW+D/5ns1unplVwx oa9kz6WJc93FZq9PFjrb2FKsVrJptdocJZbijERDLeai4kQATZW3mYACAAA= X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1498468609!75505562!9 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDMyNDY2NQ==\n X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2177 invoked from network); 26 Jun 2017 09:17:04 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-9.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 26 Jun 2017 09:17:04 -0000 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2017 02:17:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,395,1493708400"; d="scan'208";a="985230023" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.142]) by orsmga003.jf.intel.com with ESMTP; 26 Jun 2017 02:17:03 -0700 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Mon, 26 Jun 2017 17:16:23 +0800 Message-Id: <20170626091625.19655-10-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170626091625.19655-1-haozhong.zhang@intel.com> References: <20170626091625.19655-1-haozhong.zhang@intel.com> Cc: Haozhong Zhang , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v4 09/11] 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 Changes in v4: (Take Jan's R-b with following changes.) * Adjust error messages. --- 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 2428cc0762..19e8a70cd6 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