From patchwork Thu Apr 6 12:33:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haozhong Zhang X-Patchwork-Id: 9667081 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 EEE76601EB for ; Thu, 6 Apr 2017 12:36:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBA2428535 for ; Thu, 6 Apr 2017 12:36:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D095328584; Thu, 6 Apr 2017 12:36:04 +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 9048328535 for ; Thu, 6 Apr 2017 12:36:04 +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 1cw6bw-0007iY-MJ; Thu, 06 Apr 2017 12:34:00 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cw6bw-0007i6-84 for xen-devel@lists.xen.org; Thu, 06 Apr 2017 12:34:00 +0000 Received: from [193.109.254.147] by server-8.bemta-6.messagelabs.com id B5/D1-03648-7B536E85; Thu, 06 Apr 2017 12:33:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsXS1tYhorvd9Fm EQe9eboslHxezODB6HN39mymAMYo1My8pvyKBNWPygxuMBVd4KqYf28jcwHiMq4uRi4NF4BaT xNX2m4wgjpDAdEaJ9vXTWboYOTkkBHgljiybwQphB0jMOfGUFaKol1Gi6WwPM0iCTUBfYsXjg 2BFIgLSEtc+X2YEsZkFqiWmrTzHBmILC8RInPywiwnEZhFQlej71w0W5xWwlXjb8YIJYoG8xI Wrp8AWcwrYSRzp/wtmCwHVrOz8xzKBkW8BI8MqRo3i1KKy1CJdY0O9pKLM9IyS3MTMHF1DAzO 93NTi4sT01JzEpGK95PzcTYzAUGEAgh2MTYsCDzFKcjApifIq+DyJEOJLyk+pzEgszogvKs1J LT7EKMPBoSTBW2fyLEJIsCg1PbUiLTMHGLQwaQkOHiUR3kaQNG9xQWJucWY6ROoUo6KUOO9Jk IQASCKjNA+uDRYplxhlpYR5GYEOEeIpSC3KzSxBlX/FKM7BqCTM6wMyhSczrwRu+iugxUxAi3 1uPQVZXJKIkJJqYEy4veTNlZ2at69fOyj6/v5f7WCW+c4lB1mnyL1oD9zkUXfbfo354w8Sky+ d3n3Xwud7BOuXbT9nF256+CX+peSLwtePzXgeBbgeEFK+can2nSbfgicRBvOaZu5fwXKgxSY7 Pj7SL6nCZt7+31u4TxodW5pmfEHOSVTxk1KZZ9yJaK7NHoZCb64rsRRnJBpqMRcVJwIAv6fsy I8CAAA= X-Env-Sender: haozhong.zhang@intel.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1491482036!43572272!1 X-Originating-IP: [134.134.136.20] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTM0LjEzNC4xMzYuMjAgPT4gMzU1MzU4\n X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29982 invoked from network); 6 Apr 2017 12:33:58 -0000 Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by server-2.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 6 Apr 2017 12:33:58 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491482038; x=1523018038; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=RHMqfV28KggODVVtQ/TVQRuc75xP4CDKYffMeE0FwHk=; b=CWrvPvExUxrSENGxGbwrjqc2vEETPIE4RZRCGOCpZKLblID+/EpqPNlB FeGbOo4S5mKqqNt+1nzeyyrXFqZrgw==; Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Apr 2017 05:33:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.37,159,1488873600"; d="scan'208"; a="1151979792" Received: from hz-desktop.sh.intel.com (HELO localhost) ([10.239.159.153]) by fmsmga002.fm.intel.com with ESMTP; 06 Apr 2017 05:33:55 -0700 From: Haozhong Zhang To: xen-devel@lists.xen.org Date: Thu, 6 Apr 2017 20:33:42 +0800 Message-Id: <20170406123343.23423-4-haozhong.zhang@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170406123343.23423-1-haozhong.zhang@intel.com> References: <20170406123343.23423-1-haozhong.zhang@intel.com> Cc: Andrew Cooper , Jan Beulich , Haozhong Zhang Subject: [Xen-devel] [PATCH v2 3/4] xen/mce: always re-initialize 'severity_cpu' in mcheck_cmn_handler() 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 mcheck_cmn_handler() does not always set 'severity_cpu' to override its value taken from previous rounds of MC handling, which will interfere the current round of MC handling. Always re-initialize it to clear the historical value. Signed-off-by: Haozhong Zhang --- xen/arch/x86/cpu/mcheck/mce.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index a2e9668..d1bc642 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -449,13 +449,25 @@ static int mce_urgent_action(const struct cpu_user_regs *regs, void mcheck_cmn_handler(const struct cpu_user_regs *regs) { static DEFINE_MCE_BARRIER(mce_trap_bar); - static atomic_t severity_cpu = ATOMIC_INIT(-1); + static DEFINE_MCE_BARRIER(mce_handler_init_bar); + static atomic_t severity_cpu; 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; + /* + * Re-initialize severity_cpu to clear historical information + * taken from previous rounds of MC handling. Besides this + * initialization, severity_cpu is not always set below to + * override the previous value, so the re-initialization is + * necessary. + */ + mce_barrier_enter(&mce_handler_init_bar); + atomic_set(&severity_cpu, -1); + mce_barrier_exit(&mce_handler_init_bar); + mce_spin_lock(&mce_logout_lock); if (clear_bank != NULL) {