From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751466AbdFZOFR (ORCPT ); Mon, 26 Jun 2017 10:05:17 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55671 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750799AbdFZOFJ (ORCPT ); Mon, 26 Jun 2017 10:05:09 -0400 Date: Mon, 26 Jun 2017 07:03:54 -0700 From: tip-bot for Yazen Ghannam Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, yazen.ghannam@amd.com, bp@suse.de, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: bp@suse.de, mingo@kernel.org, yazen.ghannam@amd.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <1498074402-98633-1-git-send-email-Yazen.Ghannam@amd.com> References: <1498074402-98633-1-git-send-email-Yazen.Ghannam@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/mce: Always save severity in machine_check_poll() Git-Commit-ID: e2de64ec52659870b4fdef5bf08f265ce5fe1ccc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: e2de64ec52659870b4fdef5bf08f265ce5fe1ccc Gitweb: http://git.kernel.org/tip/e2de64ec52659870b4fdef5bf08f265ce5fe1ccc Author: Yazen Ghannam AuthorDate: Mon, 26 Jun 2017 14:35:31 +0200 Committer: Thomas Gleixner CommitDate: Mon, 26 Jun 2017 15:58:56 +0200 x86/mce: Always save severity in machine_check_poll() The MCE severity gives a hint as to how to handle the error. The notifier blocks can then use the severity to decide on an action. It's not necessary for machine_check_poll() to filter errors for the notifier chain, since each block will check its own set of conditions before handling an error. Also, there isn't any urgency for machine_check_poll() to make decisions based on severity like in do_machine_check(). If we can assume that a severity is set then we can use it in more notifier blocks. For example, the CEC block could check for a "KEEP" severity rather than checking bits in the status. This isn't possible now since the severity is not set except for "DEFFRRED/UCNA" errors with a valid address. Save the severity since we have it, and let the notifier blocks decide if they want to do anything. Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Link: http://lkml.kernel.org/r/1498074402-98633-1-git-send-email-Yazen.Ghannam@amd.com --- arch/x86/kernel/cpu/mcheck/mce.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index b58b778..6dde049 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -673,7 +673,6 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) { bool error_seen = false; struct mce m; - int severity; int i; this_cpu_inc(mce_poll_count); @@ -710,11 +709,7 @@ bool machine_check_poll(enum mcp_flags flags, mce_banks_t *b) mce_read_aux(&m, i); - severity = mce_severity(&m, mca_cfg.tolerant, NULL, false); - - if (severity == MCE_DEFERRED_SEVERITY && mce_is_memory_error(&m)) - if (m.status & MCI_STATUS_ADDRV) - m.severity = severity; + m.severity = mce_severity(&m, mca_cfg.tolerant, NULL, false); /* * Don't get the IP here because it's unlikely to