From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: Patch "x86/MCE/AMD: Always give panic severity for UC errors in kernel context" has been added to the 4.14-stable tree From: Greg Kroah-Hartman Message-Id: <151109266824930@kroah.com> Date: Sun, 19 Nov 2017 12:57:48 +0100 To: yazen.ghannam@amd.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, tony.luck@intel.com, torvalds@linux-foundation.org Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org List-ID: VGhpcyBpcyBhIG5vdGUgdG8gbGV0IHlvdSBrbm93IHRoYXQgSSd2ZSBqdXN0IGFkZGVkIHRoZSBw YXRjaCB0aXRsZWQKCiAgICB4ODYvTUNFL0FNRDogQWx3YXlzIGdpdmUgcGFuaWMgc2V2ZXJpdHkg Zm9yIFVDIGVycm9ycyBpbiBrZXJuZWwgY29udGV4dAoKdG8gdGhlIDQuMTQtc3RhYmxlIHRyZWUg d2hpY2ggY2FuIGJlIGZvdW5kIGF0OgogICAgaHR0cDovL3d3dy5rZXJuZWwub3JnL2dpdC8/cD1s aW51eC9rZXJuZWwvZ2l0L3N0YWJsZS9zdGFibGUtcXVldWUuZ2l0O2E9c3VtbWFyeQoKVGhlIGZp bGVuYW1lIG9mIHRoZSBwYXRjaCBpczoKICAgICB4ODYtbWNlLWFtZC1hbHdheXMtZ2l2ZS1wYW5p Yy1zZXZlcml0eS1mb3ItdWMtZXJyb3JzLWluLWtlcm5lbC1jb250ZXh0LnBhdGNoCmFuZCBpdCBj YW4gYmUgZm91bmQgaW4gdGhlIHF1ZXVlLTQuMTQgc3ViZGlyZWN0b3J5LgoKSWYgeW91LCBvciBh bnlvbmUgZWxzZSwgZmVlbHMgaXQgc2hvdWxkIG5vdCBiZSBhZGRlZCB0byB0aGUgc3RhYmxlIHRy ZWUsCnBsZWFzZSBsZXQgPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+IGtub3cgYWJvdXQgaXQuCgoK RnJvbSBkNjVkZmM4MWJiMzg5NGZkYjY4Y2JjNzRiYmY1ZmI0OGQyMzU0MDcxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBZYXplbiBHaGFubmFtIDx5YXplbi5naGFubmFtQGFtZC5jb20+ CkRhdGU6IE1vbiwgNiBOb3YgMjAxNyAxODo0NjozMiArMDEwMApTdWJqZWN0OiB4ODYvTUNFL0FN RDogQWx3YXlzIGdpdmUgcGFuaWMgc2V2ZXJpdHkgZm9yIFVDIGVycm9ycyBpbiBrZXJuZWwgY29u dGV4dAoKRnJvbTogWWF6ZW4gR2hhbm5hbSA8eWF6ZW4uZ2hhbm5hbUBhbWQuY29tPgoKY29tbWl0 IGQ2NWRmYzgxYmIzODk0ZmRiNjhjYmM3NGJiZjVmYjQ4ZDIzNTQwNzEgdXBzdHJlYW0uCgpUaGUg QU1EIHNldmVyaXR5IGdyYWRpbmcgZnVuY3Rpb24gd2FzIGludHJvZHVjZWQgaW4ga2VybmVsIDQu MS4gVGhlCmN1cnJlbnQgbG9naWMgY2FuIHBvc3NpYmx5IGdpdmUgTUNFX0FSX1NFVkVSSVRZIGZv ciB1bmNvcnJlY3RhYmxlCmVycm9ycyBpbiBrZXJuZWwgY29udGV4dC4gVGhlIHN5c3RlbSBtYXkg dGhlbiBnZXQgc3R1Y2sgaW4gYSBsb29wIGFzCm1lbW9yeV9mYWlsdXJlKCkgd2lsbCB0cnkgdG8g aGFuZGxlIHRoZSBiYWQga2VybmVsIG1lbW9yeSBhbmQgZmluZCBpdApidXN5LgoKUmV0dXJuIE1D RV9QQU5JQ19TRVZFUklUWSBmb3IgYWxsIFVDIGVycm9ycyBJTl9LRVJORUwgY29udGV4dCBvbiBB TUQKc3lzdGVtcy4KCkFmdGVyOgoKICBiMmY5ZDY3OGUyOGMgKCJ4ODYvbWNlOiBDaGVjayBmb3Ig ZmF1bHRzIHRhZ2dlZCBpbiBFWFRBQkxFX0NMQVNTX0ZBVUxUIGV4Y2VwdGlvbiB0YWJsZSBlbnRy aWVzIikKCndhcyBhY2NlcHRlZCBpbiB2NC42LCB0aGlzIGlzc3VlIHdhcyBtYXNrZWQgYmVjYXVz ZSBvZiB0aGUgdGFpbC1lbmQgYXR0ZW1wdAphdCBrZXJuZWwgbW9kZSByZWNvdmVyeSBpbiB0aGUg I01DIGhhbmRsZXIuCgpIb3dldmVyLCB1bmNvcnJlY3RhYmxlIGVycm9ycyBJTl9LRVJORUwgY29u dGV4dCBzaG91bGQgYWx3YXlzIGJlIGNvbnNpZGVyZWQKdW5yZWNvdmVyYWJsZSBhbmQgY2F1c2Ug YSBwYW5pYy4KClNpZ25lZC1vZmYtYnk6IFlhemVuIEdoYW5uYW0gPHlhemVuLmdoYW5uYW1AYW1k LmNvbT4KU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgpDYzogTGlu dXMgVG9ydmFsZHMgPHRvcnZhbGRzQGxpbnV4LWZvdW5kYXRpb24ub3JnPgpDYzogUGV0ZXIgWmlq bHN0cmEgPHBldGVyekBpbmZyYWRlYWQub3JnPgpDYzogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxp bnV0cm9uaXguZGU+CkNjOiBUb255IEx1Y2sgPHRvbnkubHVja0BpbnRlbC5jb20+CkNjOiBsaW51 eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KRml4ZXM6IGJmODBiYmQ3ZGNmNSAo eDg2L21jZTogQWRkIGFuIEFNRCBzZXZlcml0aWVzLWdyYWRpbmcgZnVuY3Rpb24pCkxpbms6IGh0 dHA6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE3MTEwNjE3NDYzMy4xMzU3Ni0xLWJwQGFsaWVuOC5k ZQpTaWduZWQtb2ZmLWJ5OiBJbmdvIE1vbG5hciA8bWluZ29Aa2VybmVsLm9yZz4KU2lnbmVkLW9m Zi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KLS0t CiBhcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2Utc2V2ZXJpdHkuYyB8ICAgIDcgKysrLS0t LQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCgoKUGF0 Y2hlcyBjdXJyZW50bHkgaW4gc3RhYmxlLXF1ZXVlIHdoaWNoIG1pZ2h0IGJlIGZyb20geWF6ZW4u Z2hhbm5hbUBhbWQuY29tIGFyZQoKcXVldWUtNC4xNC94ODYtbWNlLWFtZC1hbHdheXMtZ2l2ZS1w YW5pYy1zZXZlcml0eS1mb3ItdWMtZXJyb3JzLWluLWtlcm5lbC1jb250ZXh0LnBhdGNoCi0tClRv IHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBs aW51eC1lZGFjIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2Vy bmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21h am9yZG9tby1pbmZvLmh0bWwKCi0tLSBhL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZS1z ZXZlcml0eS5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZS1zZXZlcml0eS5j CkBAIC0yNDUsNiArMjQ1LDkgQEAgc3RhdGljIGludCBtY2Vfc2V2ZXJpdHlfYW1kKHN0cnVjdCBt Y2UgKgogCiAJaWYgKG0tPnN0YXR1cyAmIE1DSV9TVEFUVVNfVUMpIHsKIAorCQlpZiAoY3R4ID09 IElOX0tFUk5FTCkKKwkJCXJldHVybiBNQ0VfUEFOSUNfU0VWRVJJVFk7CisKIAkJLyoKIAkJICog T24gb2xkZXIgc3lzdGVtcyB3aGVyZSBvdmVyZmxvd19yZWNvdiBmbGFnIGlzIG5vdCBwcmVzZW50 LCB3ZQogCQkgKiBzaG91bGQgc2ltcGx5IHBhbmljIGlmIGFuIGVycm9yIG92ZXJmbG93IG9jY3Vy cy4gSWYKQEAgLTI1NSwxMCArMjU4LDYgQEAgc3RhdGljIGludCBtY2Vfc2V2ZXJpdHlfYW1kKHN0 cnVjdCBtY2UgKgogCQkJaWYgKG1jZV9mbGFncy5zbWNhKQogCQkJCXJldHVybiBtY2Vfc2V2ZXJp dHlfYW1kX3NtY2EobSwgY3R4KTsKIAotCQkJLyogc29mdHdhcmUgY2FuIHRyeSB0byBjb250YWlu ICovCi0JCQlpZiAoIShtLT5tY2dzdGF0dXMgJiBNQ0dfU1RBVFVTX1JJUFYpICYmIChjdHggPT0g SU5fS0VSTkVMKSkKLQkJCQlyZXR1cm4gTUNFX1BBTklDX1NFVkVSSVRZOwotCiAJCQkvKiBraWxs IGN1cnJlbnQgcHJvY2VzcyAqLwogCQkJcmV0dXJuIE1DRV9BUl9TRVZFUklUWTsKIAkJfSBlbHNl IHsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:44094 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750879AbdKSL5u (ORCPT ); Sun, 19 Nov 2017 06:57:50 -0500 Subject: Patch "x86/MCE/AMD: Always give panic severity for UC errors in kernel context" has been added to the 4.14-stable tree To: yazen.ghannam@amd.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, tony.luck@intel.com, torvalds@linux-foundation.org Cc: , From: Date: Sun, 19 Nov 2017 12:57:48 +0100 Message-ID: <151109266824930@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled x86/MCE/AMD: Always give panic severity for UC errors in kernel context to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-mce-amd-always-give-panic-severity-for-uc-errors-in-kernel-context.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d65dfc81bb3894fdb68cbc74bbf5fb48d2354071 Mon Sep 17 00:00:00 2001 From: Yazen Ghannam Date: Mon, 6 Nov 2017 18:46:32 +0100 Subject: x86/MCE/AMD: Always give panic severity for UC errors in kernel context From: Yazen Ghannam commit d65dfc81bb3894fdb68cbc74bbf5fb48d2354071 upstream. The AMD severity grading function was introduced in kernel 4.1. The current logic can possibly give MCE_AR_SEVERITY for uncorrectable errors in kernel context. The system may then get stuck in a loop as memory_failure() will try to handle the bad kernel memory and find it busy. Return MCE_PANIC_SEVERITY for all UC errors IN_KERNEL context on AMD systems. After: b2f9d678e28c ("x86/mce: Check for faults tagged in EXTABLE_CLASS_FAULT exception table entries") was accepted in v4.6, this issue was masked because of the tail-end attempt at kernel mode recovery in the #MC handler. However, uncorrectable errors IN_KERNEL context should always be considered unrecoverable and cause a panic. Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-edac Fixes: bf80bbd7dcf5 (x86/mce: Add an AMD severities-grading function) Link: http://lkml.kernel.org/r/20171106174633.13576-1-bp@alien8.de Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mcheck/mce-severity.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/arch/x86/kernel/cpu/mcheck/mce-severity.c +++ b/arch/x86/kernel/cpu/mcheck/mce-severity.c @@ -245,6 +245,9 @@ static int mce_severity_amd(struct mce * if (m->status & MCI_STATUS_UC) { + if (ctx == IN_KERNEL) + return MCE_PANIC_SEVERITY; + /* * On older systems where overflow_recov flag is not present, we * should simply panic if an error overflow occurs. If @@ -255,10 +258,6 @@ static int mce_severity_amd(struct mce * if (mce_flags.smca) return mce_severity_amd_smca(m, ctx); - /* software can try to contain */ - if (!(m->mcgstatus & MCG_STATUS_RIPV) && (ctx == IN_KERNEL)) - return MCE_PANIC_SEVERITY; - /* kill current process */ return MCE_AR_SEVERITY; } else { Patches currently in stable-queue which might be from yazen.ghannam@amd.com are queue-4.14/x86-mce-amd-always-give-panic-severity-for-uc-errors-in-kernel-context.patch