From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4473EC04A6B for ; Mon, 6 May 2019 14:49:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0EAC6216F4 for ; Mon, 6 May 2019 14:49:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154169; bh=/bA49ZbnmE/CpHWtCL8vSGJJdaufceFH3QoHWjIVC40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mYNtzy8Q4OhZHjN6dvfpd2R8gAxdJlyiBeoWvKXOzAT3Tg7u/uxGwC5vZ6GkEr+My 8BXFhAJ5Vdk3ZQ0f8fizW7JUkro7Nnpal5FpgeNzALwmo5X9GrfQ8aGG8NNZV6hgcd N3LqvbGjL0et3zXwFAqGjckHTzJ+aWrCSB4p1OLc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727824AbfEFOt1 (ORCPT ); Mon, 6 May 2019 10:49:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:50972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729187AbfEFOtZ (ORCPT ); Mon, 6 May 2019 10:49:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 935612053B; Mon, 6 May 2019 14:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154165; bh=/bA49ZbnmE/CpHWtCL8vSGJJdaufceFH3QoHWjIVC40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XqxTW7IIQU2ZYv3Stin9+b3HuUDsQW0s7FQZhNKKQ9bZt7qTL5YoQAF7Y1qPLy77t BfEXluGCmGwRFgjCbLEGFMh+APe2gmgwLGMxWuO+6erPCqGAgcVemjcbWHBo8DJpqM SflWp/o0emsEqh6zX8ejKu5fCt0Q6ydy4jJ/MocI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tony Luck , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Pu Wen , Thomas Gleixner , x86-ml Subject: [PATCH 4.9 61/62] x86/mce: Improve error message when kernel cannot recover, p2 Date: Mon, 6 May 2019 16:33:32 +0200 Message-Id: <20190506143056.720671871@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143051.102535767@linuxfoundation.org> References: <20190506143051.102535767@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tony Luck commit 41f035a86b5b72a4f947c38e94239d20d595352a upstream. In c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover") a case was added for a machine check caused by a DATA access to poison memory from the kernel. A case should have been added also for an uncorrectable error during an instruction fetch in the kernel. Add that extra case so the error message now reads: mce: [Hardware Error]: Machine check: Instruction fetch error in kernel Fixes: c7d606f560e4 ("x86/mce: Improve error message when kernel cannot recover") Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Pu Wen Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20190225205940.15226-1-tony.luck@intel.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mcheck/mce-severity.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -148,6 +148,11 @@ static struct severity { SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_DATA), KERNEL ), + MCESEV( + PANIC, "Instruction fetch error in kernel", + SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR|MCACOD_INSTR), + KERNEL + ), #endif MCESEV( PANIC, "Action required: unknown MCACOD",