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.9-stable tree From: Greg Kroah-Hartman Message-Id: <1511092295119247@kroah.com> Date: Sun, 19 Nov 2017 12:51:35 +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 Zm9yIFVDIGVycm9ycyBpbiBrZXJuZWwgY29udGV4dAoKdG8gdGhlIDQuOS1zdGFibGUgdHJlZSB3 aGljaCBjYW4gYmUgZm91bmQgYXQ6CiAgICBodHRwOi8vd3d3Lmtlcm5lbC5vcmcvZ2l0Lz9wPWxp bnV4L2tlcm5lbC9naXQvc3RhYmxlL3N0YWJsZS1xdWV1ZS5naXQ7YT1zdW1tYXJ5CgpUaGUgZmls ZW5hbWUgb2YgdGhlIHBhdGNoIGlzOgogICAgIHg4Ni1tY2UtYW1kLWFsd2F5cy1naXZlLXBhbmlj LXNldmVyaXR5LWZvci11Yy1lcnJvcnMtaW4ta2VybmVsLWNvbnRleHQucGF0Y2gKYW5kIGl0IGNh biBiZSBmb3VuZCBpbiB0aGUgcXVldWUtNC45IHN1YmRpcmVjdG9yeS4KCklmIHlvdSwgb3IgYW55 b25lIGVsc2UsIGZlZWxzIGl0IHNob3VsZCBub3QgYmUgYWRkZWQgdG8gdGhlIHN0YWJsZSB0cmVl LApwbGVhc2UgbGV0IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiBrbm93IGFib3V0IGl0LgoKCkZy b20gZDY1ZGZjODFiYjM4OTRmZGI2OGNiYzc0YmJmNWZiNDhkMjM1NDA3MSBNb24gU2VwIDE3IDAw OjAwOjAwIDIwMDEKRnJvbTogWWF6ZW4gR2hhbm5hbSA8eWF6ZW4uZ2hhbm5hbUBhbWQuY29tPgpE YXRlOiBNb24sIDYgTm92IDIwMTcgMTg6NDY6MzIgKzAxMDAKU3ViamVjdDogeDg2L01DRS9BTUQ6 IEFsd2F5cyBnaXZlIHBhbmljIHNldmVyaXR5IGZvciBVQyBlcnJvcnMgaW4ga2VybmVsIGNvbnRl eHQKCkZyb206IFlhemVuIEdoYW5uYW0gPHlhemVuLmdoYW5uYW1AYW1kLmNvbT4KCmNvbW1pdCBk NjVkZmM4MWJiMzg5NGZkYjY4Y2JjNzRiYmY1ZmI0OGQyMzU0MDcxIHVwc3RyZWFtLgoKVGhlIEFN RCBzZXZlcml0eSBncmFkaW5nIGZ1bmN0aW9uIHdhcyBpbnRyb2R1Y2VkIGluIGtlcm5lbCA0LjEu IFRoZQpjdXJyZW50IGxvZ2ljIGNhbiBwb3NzaWJseSBnaXZlIE1DRV9BUl9TRVZFUklUWSBmb3Ig dW5jb3JyZWN0YWJsZQplcnJvcnMgaW4ga2VybmVsIGNvbnRleHQuIFRoZSBzeXN0ZW0gbWF5IHRo ZW4gZ2V0IHN0dWNrIGluIGEgbG9vcCBhcwptZW1vcnlfZmFpbHVyZSgpIHdpbGwgdHJ5IHRvIGhh bmRsZSB0aGUgYmFkIGtlcm5lbCBtZW1vcnkgYW5kIGZpbmQgaXQKYnVzeS4KClJldHVybiBNQ0Vf UEFOSUNfU0VWRVJJVFkgZm9yIGFsbCBVQyBlcnJvcnMgSU5fS0VSTkVMIGNvbnRleHQgb24gQU1E CnN5c3RlbXMuCgpBZnRlcjoKCiAgYjJmOWQ2NzhlMjhjICgieDg2L21jZTogQ2hlY2sgZm9yIGZh dWx0cyB0YWdnZWQgaW4gRVhUQUJMRV9DTEFTU19GQVVMVCBleGNlcHRpb24gdGFibGUgZW50cmll cyIpCgp3YXMgYWNjZXB0ZWQgaW4gdjQuNiwgdGhpcyBpc3N1ZSB3YXMgbWFza2VkIGJlY2F1c2Ug b2YgdGhlIHRhaWwtZW5kIGF0dGVtcHQKYXQga2VybmVsIG1vZGUgcmVjb3ZlcnkgaW4gdGhlICNN QyBoYW5kbGVyLgoKSG93ZXZlciwgdW5jb3JyZWN0YWJsZSBlcnJvcnMgSU5fS0VSTkVMIGNvbnRl eHQgc2hvdWxkIGFsd2F5cyBiZSBjb25zaWRlcmVkCnVucmVjb3ZlcmFibGUgYW5kIGNhdXNlIGEg cGFuaWMuCgpTaWduZWQtb2ZmLWJ5OiBZYXplbiBHaGFubmFtIDx5YXplbi5naGFubmFtQGFtZC5j b20+ClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KQ2M6IExpbnVz IFRvcnZhbGRzIDx0b3J2YWxkc0BsaW51eC1mb3VuZGF0aW9uLm9yZz4KQ2M6IFBldGVyIFppamxz dHJhIDxwZXRlcnpAaW5mcmFkZWFkLm9yZz4KQ2M6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51 dHJvbml4LmRlPgpDYzogVG9ueSBMdWNrIDx0b255Lmx1Y2tAaW50ZWwuY29tPgpDYzogbGludXgt ZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+CkZpeGVzOiBiZjgwYmJkN2RjZjUgKHg4 Ni9tY2U6IEFkZCBhbiBBTUQgc2V2ZXJpdGllcy1ncmFkaW5nIGZ1bmN0aW9uKQpMaW5rOiBodHRw Oi8vbGttbC5rZXJuZWwub3JnL3IvMjAxNzExMDYxNzQ2MzMuMTM1NzYtMS1icEBhbGllbjguZGUK U2lnbmVkLW9mZi1ieTogSW5nbyBNb2xuYXIgPG1pbmdvQGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYt Ynk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+Ci0tLQog YXJjaC94ODYva2VybmVsL2NwdS9tY2hlY2svbWNlLXNldmVyaXR5LmMgfCAgICA3ICsrKy0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgoKClBhdGNo ZXMgY3VycmVudGx5IGluIHN0YWJsZS1xdWV1ZSB3aGljaCBtaWdodCBiZSBmcm9tIHlhemVuLmdo YW5uYW1AYW1kLmNvbSBhcmUKCnF1ZXVlLTQuOS94ODYtbWNlLWFtZC1hbHdheXMtZ2l2ZS1wYW5p Yy1zZXZlcml0eS1mb3ItdWMtZXJyb3JzLWluLWtlcm5lbC1jb250ZXh0LnBhdGNoCi0tClRvIHVu c3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51 eC1lZGFjIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVs Lm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9y ZG9tby1pbmZvLmh0bWwKCi0tLSBhL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZS1zZXZl cml0eS5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZS1zZXZlcml0eS5jCkBA IC0yNDUsNiArMjQ1LDkgQEAgc3RhdGljIGludCBtY2Vfc2V2ZXJpdHlfYW1kKHN0cnVjdCBtY2Ug KgogCiAJaWYgKG0tPnN0YXR1cyAmIE1DSV9TVEFUVVNfVUMpIHsKIAorCQlpZiAoY3R4ID09IElO X0tFUk5FTCkKKwkJCXJldHVybiBNQ0VfUEFOSUNfU0VWRVJJVFk7CisKIAkJLyoKIAkJICogT24g b2xkZXIgc3lzdGVtcyB3aGVyZSBvdmVyZmxvd19yZWNvdiBmbGFnIGlzIG5vdCBwcmVzZW50LCB3 ZQogCQkgKiBzaG91bGQgc2ltcGx5IHBhbmljIGlmIGFuIGVycm9yIG92ZXJmbG93IG9jY3Vycy4g SWYKQEAgLTI1NSwxMCArMjU4LDYgQEAgc3RhdGljIGludCBtY2Vfc2V2ZXJpdHlfYW1kKHN0cnVj dCBtY2UgKgogCQkJaWYgKG1jZV9mbGFncy5zbWNhKQogCQkJCXJldHVybiBtY2Vfc2V2ZXJpdHlf YW1kX3NtY2EobSwgY3R4KTsKIAotCQkJLyogc29mdHdhcmUgY2FuIHRyeSB0byBjb250YWluICov Ci0JCQlpZiAoIShtLT5tY2dzdGF0dXMgJiBNQ0dfU1RBVFVTX1JJUFYpICYmIChjdHggPT0gSU5f S0VSTkVMKSkKLQkJCQlyZXR1cm4gTUNFX1BBTklDX1NFVkVSSVRZOwotCiAJCQkvKiBraWxsIGN1 cnJlbnQgcHJvY2VzcyAqLwogCQkJcmV0dXJuIE1DRV9BUl9TRVZFUklUWTsKIAkJfSBlbHNlIHsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43900 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751070AbdKSLvm (ORCPT ); Sun, 19 Nov 2017 06:51:42 -0500 Subject: Patch "x86/MCE/AMD: Always give panic severity for UC errors in kernel context" has been added to the 4.9-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:51:35 +0100 Message-ID: <1511092295119247@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.9-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.9 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.9/x86-mce-amd-always-give-panic-severity-for-uc-errors-in-kernel-context.patch