From patchwork Thu Apr 6 04:55:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9666029 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 C5E1E60365 for ; Thu, 6 Apr 2017 04:58:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEA4D27317 for ; Thu, 6 Apr 2017 04:58:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A69BA2858B; Thu, 6 Apr 2017 04:58:55 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 4CD402818E for ; Thu, 6 Apr 2017 04:58:55 +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 1cvzTH-0000mv-Mw; Thu, 06 Apr 2017 04:56:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cvzTG-0000mo-VM for xen-devel@lists.xen.org; Thu, 06 Apr 2017 04:56:35 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 3D/D4-19998-28AC5E85; Thu, 06 Apr 2017 04:56:34 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsXS1tYhodt46mm EwZoZphZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0brv/msBX8EKl6ufMHewHiOr4uRk4NFYD+T xMIJuiC2kMA0RolNhwJBbAkBXokjy2awdjFyANkBEvsOWHYxcgGV9DJK7Fv4hBWkhk1AX2LF4 4NgtoiAtMS1z5cZQWxmgWqJaSvPsYHYwgKhEp9Pv2SH2KUq8Xf/eTCbV8BGYuLeOywQu+QlLl w9xTKBkWcBI8MqRo3i1KKy1CJdI0u9pKLM9IyS3MTMHF1DA2O93NTi4sT01JzEpGK95PzcTYx Ar9czMDDuYGza63eIUZKDSUmUV8HnSYQQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCd6sk08jhASL UtNTK9Iyc4DhB5OW4OBREuG9A5LmLS5IzC3OTIdInWJUlBLnTQFJCIAkMkrz4NpgIX+JUVZKm JeRgYFBiKcgtSg3swRV/hWjOAejkjDvNpApPJl5JXDTXwEtZgJa/OTOQ5DFJYkIKakGxuxFGk n3f/M4ZtjJVJZc99zlu/PZhZrOxTblis7x/FoJZl1F7AGGpa9FNadrZHI2nXAUlBLkZphsNPe yz45TC9lWbXt9wmjJ20P7Jl+YyHyyNjEoZOnUKleD7ayPo/7FiJ1XcvBvvlXyZPfXhNIpH83b PmnfD/SMlt+l4DbNSXmWb20HryurEktxRqKhFnNRcSIArGDj/XQCAAA= X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1491454591!86900910!1 X-Originating-IP: [134.134.136.24] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjQgPT4gMzkwOTcx\n X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24952 invoked from network); 6 Apr 2017 04:56:33 -0000 Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by server-7.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Apr 2017 04:56:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491454593; x=1522990593; h=from:to:cc:subject:date:message-id; bh=8ZySfiVaSSaUz4yKMe+dVnOWkyo9xi36Qhj9OzQx5EM=; b=kyXIX/zo5om7zE2siKhtPP1Fwv8rScB4N8MGQDAGOCQbx6QpOtP1wiDf LvMPlKBxjkHeIipiJe77rd3rnnuLBw==; Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2017 21:56:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.37,282,1488873600"; d="scan'208"; a="1116051617" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.153]) by orsmga001.jf.intel.com with ESMTP; 05 Apr 2017 21:56:28 -0700 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Thu, 6 Apr 2017 12:55:36 +0800 Message-Id: <20170406045537.1573-1-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.10.1 Cc: Andrew Cooper , Jan Beulich , Haozhong Zhang Subject: [Xen-devel] [PATCH 1/2] xen/mce: fix static variables 'found_error' and 'mce_fatal_cpus' 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 1. Move them into mcheck_cmn_handler() which is their only user. 2. Always (re-)initialize them to clear historical information. Signed-off-by: Haozhong Zhang --- xen/arch/x86/cpu/mcheck/mce.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 11d0e23..7618120 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -177,6 +177,7 @@ void mce_need_clearbank_register(mce_need_clearbank_t cbfunc) static struct mce_softirq_barrier mce_inside_bar, mce_severity_bar; static struct mce_softirq_barrier mce_trap_bar; +static struct mce_softirq_barrier mce_handler_init_bar; /* * mce_logout_lock should only be used in the trap handler, @@ -187,8 +188,6 @@ static struct mce_softirq_barrier mce_trap_bar; static DEFINE_SPINLOCK(mce_logout_lock); static atomic_t severity_cpu = ATOMIC_INIT(-1); -static atomic_t found_error = ATOMIC_INIT(0); -static cpumask_t mce_fatal_cpus; const struct mca_error_handler *__read_mostly mce_dhandlers; const struct mca_error_handler *__read_mostly mce_uhandlers; @@ -453,12 +452,19 @@ static int mce_urgent_action(const struct cpu_user_regs *regs, /* Shared #MC handler. */ void mcheck_cmn_handler(const struct cpu_user_regs *regs) { + static atomic_t found_error; + static cpumask_t mce_fatal_cpus; struct mca_banks *bankmask = mca_allbanks; struct mca_banks *clear_bank = __get_cpu_var(mce_clear_banks); uint64_t gstatus; mctelem_cookie_t mctc = NULL; struct mca_summary bs; + mce_barrier_enter(&mce_handler_init_bar); + atomic_set(&found_error, 0); + cpumask_clear(&mce_fatal_cpus); + mce_barrier_exit(&mce_handler_init_bar); + mce_spin_lock(&mce_logout_lock); if (clear_bank != NULL) { @@ -1767,6 +1773,7 @@ void mce_handler_init(void) mce_barrier_init(&mce_inside_bar); mce_barrier_init(&mce_severity_bar); mce_barrier_init(&mce_trap_bar); + mce_barrier_init(&mce_handler_init_bar); spin_lock_init(&mce_logout_lock); open_softirq(MACHINE_CHECK_SOFTIRQ, mce_softirq); }