From: "tip-bot2 for Gabriele Paoloni" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Gabriele Paoloni <gabriele.paoloni@intel.com>,
Borislav Petkov <bp@suse.de>, Tony Luck <tony.luck@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: ras/core] x86/mce: Panic for LMCE only if mca_cfg.tolerant < 3
Date: Tue, 01 Dec 2020 18:05:54 -0000 [thread overview]
Message-ID: <160684595431.3364.7177958752136781622.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201127161819.3106432-4-gabriele.paoloni@intel.com>
The following commit has been merged into the ras/core branch of tip:
Commit-ID: 3a866b16fd2360a9c4ebf71cfbf7ebfe968c1409
Gitweb: https://git.kernel.org/tip/3a866b16fd2360a9c4ebf71cfbf7ebfe968c1409
Author: Gabriele Paoloni <gabriele.paoloni@intel.com>
AuthorDate: Fri, 27 Nov 2020 16:18:17
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Tue, 01 Dec 2020 18:49:29 +01:00
x86/mce: Panic for LMCE only if mca_cfg.tolerant < 3
Right now for LMCE, if no_way_out is set, mce_panic() is called
regardless of mca_cfg.tolerant. This is not correct as, if
mca_cfg.tolerant = 3, the code should never panic.
Add that check.
[ bp: use local ptr 'cfg'. ]
Signed-off-by: Gabriele Paoloni <gabriele.paoloni@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20201127161819.3106432-4-gabriele.paoloni@intel.com
---
arch/x86/kernel/cpu/mce/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index ebaa52a..99da2e0 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -1368,7 +1368,7 @@ noinstr void do_machine_check(struct pt_regs *regs)
* to see it will clear it.
*/
if (lmce) {
- if (no_way_out)
+ if (no_way_out && cfg->tolerant < 3)
mce_panic("Fatal local machine check", &m, msg);
} else {
order = mce_start(&no_way_out);
next prev parent reply other threads:[~2020-12-01 18:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 16:18 [PATCH v2 0/5] x86/MCE: some minor fixes Gabriele Paoloni
2020-11-27 16:18 ` [PATCH v2 1/5] x86/mce: do not overwrite no_way_out if mce_end() fails Gabriele Paoloni
2020-11-27 16:43 ` [tip: x86/urgent] x86/mce: Do " tip-bot2 for Gabriele Paoloni
2020-11-27 16:18 ` [PATCH v2 2/5] x86/mce: move the mce_panic() call and 'kill_it' assignments to the right places Gabriele Paoloni
2020-12-01 18:05 ` [tip: ras/core] x86/mce: Move " tip-bot2 for Gabriele Paoloni
2020-11-27 16:18 ` [PATCH v2 3/5] x86/mce: for LMCE panic only if mca_cfg.tolerant < 3 Gabriele Paoloni
2020-12-01 18:05 ` tip-bot2 for Gabriele Paoloni [this message]
2020-11-27 16:18 ` [PATCH v2 4/5] x86/mce: remove redundant call to irq_work_queue() Gabriele Paoloni
2020-12-01 18:05 ` [tip: ras/core] x86/mce: Remove " tip-bot2 for Gabriele Paoloni
2020-11-27 16:18 ` [PATCH v2 5/5] x86/mce: rename kill_it as kill_current_task Gabriele Paoloni
2020-12-01 18:05 ` [tip: ras/core] x86/mce: Rename kill_it to kill_current_task tip-bot2 for Gabriele Paoloni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160684595431.3364.7177958752136781622.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=gabriele.paoloni@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).