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: Handle broadcasted MCE gracefully with kexec" has been added to the 4.9-stable tree From: Greg Kroah-Hartman Message-Id: <1521389162195237@kroah.com> Date: Sun, 18 Mar 2018 17:06:02 +0100 To: xlpang@redhat.com, alexander.levin@microsoft.com, bp@alien8.de, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org, n-horiguchi@ah.jp.nec.com, tglx@linutronix.de, tony.luck@intel.com Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org List-ID: VGhpcyBpcyBhIG5vdGUgdG8gbGV0IHlvdSBrbm93IHRoYXQgSSd2ZSBqdXN0IGFkZGVkIHRoZSBw YXRjaCB0aXRsZWQKCiAgICB4ODYvbWNlOiBIYW5kbGUgYnJvYWRjYXN0ZWQgTUNFIGdyYWNlZnVs bHkgd2l0aCBrZXhlYwoKdG8gdGhlIDQuOS1zdGFibGUgdHJlZSB3aGljaCBjYW4gYmUgZm91bmQg YXQ6CiAgICBodHRwOi8vd3d3Lmtlcm5lbC5vcmcvZ2l0Lz9wPWxpbnV4L2tlcm5lbC9naXQvc3Rh YmxlL3N0YWJsZS1xdWV1ZS5naXQ7YT1zdW1tYXJ5CgpUaGUgZmlsZW5hbWUgb2YgdGhlIHBhdGNo IGlzOgogICAgIHg4Ni1tY2UtaGFuZGxlLWJyb2FkY2FzdGVkLW1jZS1ncmFjZWZ1bGx5LXdpdGgt a2V4ZWMucGF0Y2gKYW5kIGl0IGNhbiBiZSBmb3VuZCBpbiB0aGUgcXVldWUtNC45IHN1YmRpcmVj dG9yeS4KCklmIHlvdSwgb3IgYW55b25lIGVsc2UsIGZlZWxzIGl0IHNob3VsZCBub3QgYmUgYWRk ZWQgdG8gdGhlIHN0YWJsZSB0cmVlLApwbGVhc2UgbGV0IDxzdGFibGVAdmdlci5rZXJuZWwub3Jn PiBrbm93IGFib3V0IGl0LgoKCkZyb20gZm9vQGJheiBTdW4gTWFyIDE4IDE2OjU1OjMzIENFVCAy MDE4CkZyb206IFh1bmxlaSBQYW5nIDx4bHBhbmdAcmVkaGF0LmNvbT4KRGF0ZTogTW9uLCAxMyBN YXIgMjAxNyAxMDo1MDoxOSArMDEwMApTdWJqZWN0OiB4ODYvbWNlOiBIYW5kbGUgYnJvYWRjYXN0 ZWQgTUNFIGdyYWNlZnVsbHkgd2l0aCBrZXhlYwoKRnJvbTogWHVubGVpIFBhbmcgPHhscGFuZ0By ZWRoYXQuY29tPgoKClsgVXBzdHJlYW0gY29tbWl0IDViYzMyOTUwM2U4MTkxYzkxYzRjNDA4MzZm MDYyZWY3NzFkOGJhODMgXQoKV2hlbiB3ZSBhcmUgYWJvdXQgdG8ga2V4ZWMgYSBjcmFzaCBrZXJu ZWwgYW5kIHJpZ2h0IHRoZW4gYW5kIHRoZXJlIGEKYnJvYWRjYXN0ZWQgTUNFIGZpcmVzIHdoaWxl IHdlJ3JlIHN0aWxsIGluIHRoZSBmaXJzdCBrZXJuZWwgYW5kIHdoaWxlCnRoZSBvdGhlciBDUFVz IHJlbWFpbiBpbiBhIGhvbGRpbmcgcGF0dGVybiwgdGhlICNNQyBoYW5kbGVyIG9mIHRoZQpmaXJz dCBrZXJuZWwgd2lsbCB0aW1lb3V0IGFuZCB0aGVuIHBhbmljIGR1ZSB0byBuZXZlciBjb21wbGV0 aW5nIE1DRQpzeW5jaHJvbml6YXRpb24uCgpIYW5kbGUgdGhpcyBpbiBhIHNpbWlsYXIgd2F5IGFz IHRvIHdoZW4gdGhlIENQVXMgYXJlIG9mZmxpbmVkIHdoZW4gdGhhdApicm9hZGNhc3RlZCBNQ0Ug aGFwcGVucy4KClsgQm9yaXM6IHJld3JvdGUgY29tbWl0IG1lc3NhZ2UgYW5kIGNvbW1lbnRzLiBd CgpTdWdnZXN0ZWQtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAYWxpZW44LmRlPgpTaWduZWQtb2Zm LWJ5OiBYdW5sZWkgUGFuZyA8eGxwYW5nQHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IEJvcmlz bGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KQWNrZWQtYnk6IFRvbnkgTHVjayA8dG9ueS5sdWNrQGlu dGVsLmNvbT4KQ2M6IE5hb3lhIEhvcmlndWNoaSA8bi1ob3JpZ3VjaGlAYWguanAubmVjLmNvbT4K Q2M6IGtleGVjQGxpc3RzLmluZnJhZGVhZC5vcmcKQ2M6IGxpbnV4LWVkYWMgPGxpbnV4LWVkYWNA dmdlci5rZXJuZWwub3JnPgpMaW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMTQ4Nzg1NzAx Mi05MDU5LTEtZ2l0LXNlbmQtZW1haWwteGxwYW5nQHJlZGhhdC5jb20KTGluazogaHR0cDovL2xr bWwua2VybmVsLm9yZy9yLzIwMTcwMzEzMDk1MDE5LjE5MzUxLTEtYnBAYWxpZW44LmRlClNpZ25l ZC1vZmYtYnk6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPgpTaWduZWQtb2Zm LWJ5OiBTYXNoYSBMZXZpbiA8YWxleGFuZGVyLmxldmluQG1pY3Jvc29mdC5jb20+ClNpZ25lZC1v ZmYtYnk6IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+Ci0t LQogYXJjaC94ODYvaW5jbHVkZS9hc20vcmVib290LmggICAgfCAgICAxICsKIGFyY2gveDg2L2tl cm5lbC9jcHUvbWNoZWNrL21jZS5jIHwgICAxOCArKysrKysrKysrKysrKysrLS0KIGFyY2gveDg2 L2tlcm5lbC9yZWJvb3QuYyAgICAgICAgIHwgICAgNSArKystLQogMyBmaWxlcyBjaGFuZ2VkLCAy MCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKCgpQYXRjaGVzIGN1cnJlbnRseSBpbiBz dGFibGUtcXVldWUgd2hpY2ggbWlnaHQgYmUgZnJvbSB4bHBhbmdAcmVkaGF0LmNvbSBhcmUKCnF1 ZXVlLTQuOS9ydG11dGV4LWZpeC1waS1jaGFpbi1vcmRlci1pbnRlZ3JpdHkucGF0Y2gKcXVldWUt NC45L3g4Ni1tY2UtaGFuZGxlLWJyb2FkY2FzdGVkLW1jZS1ncmFjZWZ1bGx5LXdpdGgta2V4ZWMu cGF0Y2gKLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVu c3Vic2NyaWJlIGxpbnV4LWVkYWMiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRv bW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtl cm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAoKLS0tIGEvYXJjaC94ODYvaW5jbHVkZS9hc20v cmVib290LmgKKysrIGIvYXJjaC94ODYvaW5jbHVkZS9hc20vcmVib290LmgKQEAgLTE1LDYgKzE1 LDcgQEAgc3RydWN0IG1hY2hpbmVfb3BzIHsKIH07CiAKIGV4dGVybiBzdHJ1Y3QgbWFjaGluZV9v cHMgbWFjaGluZV9vcHM7CitleHRlcm4gaW50IGNyYXNoaW5nX2NwdTsKIAogdm9pZCBuYXRpdmVf bWFjaGluZV9jcmFzaF9zaHV0ZG93bihzdHJ1Y3QgcHRfcmVncyAqcmVncyk7CiB2b2lkIG5hdGl2 ZV9tYWNoaW5lX3NodXRkb3duKHZvaWQpOwotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVj ay9tY2UuYworKysgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2UuYwpAQCAtNDgsNiAr NDgsNyBAQAogI2luY2x1ZGUgPGFzbS90bGJmbHVzaC5oPgogI2luY2x1ZGUgPGFzbS9tY2UuaD4K ICNpbmNsdWRlIDxhc20vbXNyLmg+CisjaW5jbHVkZSA8YXNtL3JlYm9vdC5oPgogCiAjaW5jbHVk ZSAibWNlLWludGVybmFsLmgiCiAKQEAgLTEwODEsOSArMTA4MiwyMiBAQCB2b2lkIGRvX21hY2hp bmVfY2hlY2soc3RydWN0IHB0X3JlZ3MgKnJlCiAJICogb24gSW50ZWwuCiAJICovCiAJaW50IGxt Y2UgPSAxOworCWludCBjcHUgPSBzbXBfcHJvY2Vzc29yX2lkKCk7CiAKLQkvKiBJZiB0aGlzIENQ VSBpcyBvZmZsaW5lLCBqdXN0IGJhaWwgb3V0LiAqLwotCWlmIChjcHVfaXNfb2ZmbGluZShzbXBf cHJvY2Vzc29yX2lkKCkpKSB7CisJLyoKKwkgKiBDYXNlcyB3aGVyZSB3ZSBhdm9pZCByZW5kZXp2 b3VzIGhhbmRsZXIgdGltZW91dDoKKwkgKiAxKSBJZiB0aGlzIENQVSBpcyBvZmZsaW5lLgorCSAq CisJICogMikgSWYgY3Jhc2hpbmdfY3B1IHdhcyBzZXQsIGUuZy4gd2UncmUgZW50ZXJpbmcga2R1 bXAgYW5kIHdlIG5lZWQgdG8KKwkgKiAgc2tpcCB0aG9zZSBDUFVzIHdoaWNoIHJlbWFpbiBsb29w aW5nIGluIHRoZSAxc3Qga2VybmVsIC0gc2VlCisJICogIGNyYXNoX25taV9jYWxsYmFjaygpLgor CSAqCisJICogTm90ZTogdGhlcmUgc3RpbGwgaXMgYSBzbWFsbCB3aW5kb3cgYmV0d2VlbiBrZXhl Yy1pbmcgYW5kIHRoZSBuZXcsCisJICoga2R1bXAga2VybmVsIGVzdGFibGlzaGluZyBhIG5ldyAj TUMgaGFuZGxlciB3aGVyZSBhIGJyb2FkY2FzdGVkIE1DRQorCSAqIG1pZ2h0IG5vdCBnZXQgaGFu ZGxlZCBwcm9wZXJseS4KKwkgKi8KKwlpZiAoY3B1X2lzX29mZmxpbmUoY3B1KSB8fAorCSAgICAo Y3Jhc2hpbmdfY3B1ICE9IC0xICYmIGNyYXNoaW5nX2NwdSAhPSBjcHUpKSB7CiAJCXU2NCBtY2dz dGF0dXM7CiAKIAkJbWNnc3RhdHVzID0gbWNlX3JkbXNybChNU1JfSUEzMl9NQ0dfU1RBVFVTKTsK LS0tIGEvYXJjaC94ODYva2VybmVsL3JlYm9vdC5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9yZWJv b3QuYwpAQCAtNzY5LDEwICs3NjksMTEgQEAgdm9pZCBtYWNoaW5lX2NyYXNoX3NodXRkb3duKHN0 cnVjdCBwdF9yZQogI2VuZGlmCiAKIAorLyogVGhpcyBpcyB0aGUgQ1BVIHBlcmZvcm1pbmcgdGhl IGVtZXJnZW5jeSBzaHV0ZG93biB3b3JrLiAqLworaW50IGNyYXNoaW5nX2NwdSA9IC0xOworCiAj aWYgZGVmaW5lZChDT05GSUdfU01QKQogCi0vKiBUaGlzIGtlZXBzIGEgdHJhY2sgb2Ygd2hpY2gg b25lIGlzIGNyYXNoaW5nIGNwdS4gKi8KLXN0YXRpYyBpbnQgY3Jhc2hpbmdfY3B1Owogc3RhdGlj IG5taV9zaG9vdGRvd25fY2Igc2hvb3Rkb3duX2NhbGxiYWNrOwogCiBzdGF0aWMgYXRvbWljX3Qg d2FpdGluZ19mb3JfY3Jhc2hfaXBpOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45248 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754599AbeCRQHr (ORCPT ); Sun, 18 Mar 2018 12:07:47 -0400 Subject: Patch "x86/mce: Handle broadcasted MCE gracefully with kexec" has been added to the 4.9-stable tree To: xlpang@redhat.com, alexander.levin@microsoft.com, bp@alien8.de, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org, n-horiguchi@ah.jp.nec.com, tglx@linutronix.de, tony.luck@intel.com Cc: , From: Date: Sun, 18 Mar 2018 17:06:02 +0100 Message-ID: <1521389162195237@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: Handle broadcasted MCE gracefully with kexec 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-handle-broadcasted-mce-gracefully-with-kexec.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 foo@baz Sun Mar 18 16:55:33 CET 2018 From: Xunlei Pang Date: Mon, 13 Mar 2017 10:50:19 +0100 Subject: x86/mce: Handle broadcasted MCE gracefully with kexec From: Xunlei Pang [ Upstream commit 5bc329503e8191c91c4c40836f062ef771d8ba83 ] When we are about to kexec a crash kernel and right then and there a broadcasted MCE fires while we're still in the first kernel and while the other CPUs remain in a holding pattern, the #MC handler of the first kernel will timeout and then panic due to never completing MCE synchronization. Handle this in a similar way as to when the CPUs are offlined when that broadcasted MCE happens. [ Boris: rewrote commit message and comments. ] Suggested-by: Borislav Petkov Signed-off-by: Xunlei Pang Signed-off-by: Borislav Petkov Acked-by: Tony Luck Cc: Naoya Horiguchi Cc: kexec@lists.infradead.org Cc: linux-edac Link: http://lkml.kernel.org/r/1487857012-9059-1-git-send-email-xlpang@redhat.com Link: http://lkml.kernel.org/r/20170313095019.19351-1-bp@alien8.de Signed-off-by: Thomas Gleixner Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/reboot.h | 1 + arch/x86/kernel/cpu/mcheck/mce.c | 18 ++++++++++++++++-- arch/x86/kernel/reboot.c | 5 +++-- 3 files changed, 20 insertions(+), 4 deletions(-) --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -15,6 +15,7 @@ struct machine_ops { }; extern struct machine_ops machine_ops; +extern int crashing_cpu; void native_machine_crash_shutdown(struct pt_regs *regs); void native_machine_shutdown(void); --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "mce-internal.h" @@ -1081,9 +1082,22 @@ void do_machine_check(struct pt_regs *re * on Intel. */ int lmce = 1; + int cpu = smp_processor_id(); - /* If this CPU is offline, just bail out. */ - if (cpu_is_offline(smp_processor_id())) { + /* + * Cases where we avoid rendezvous handler timeout: + * 1) If this CPU is offline. + * + * 2) If crashing_cpu was set, e.g. we're entering kdump and we need to + * skip those CPUs which remain looping in the 1st kernel - see + * crash_nmi_callback(). + * + * Note: there still is a small window between kexec-ing and the new, + * kdump kernel establishing a new #MC handler where a broadcasted MCE + * might not get handled properly. + */ + if (cpu_is_offline(cpu) || + (crashing_cpu != -1 && crashing_cpu != cpu)) { u64 mcgstatus; mcgstatus = mce_rdmsrl(MSR_IA32_MCG_STATUS); --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -769,10 +769,11 @@ void machine_crash_shutdown(struct pt_re #endif +/* This is the CPU performing the emergency shutdown work. */ +int crashing_cpu = -1; + #if defined(CONFIG_SMP) -/* This keeps a track of which one is crashing cpu. */ -static int crashing_cpu; static nmi_shootdown_cb shootdown_callback; static atomic_t waiting_for_crash_ipi; Patches currently in stable-queue which might be from xlpang@redhat.com are queue-4.9/rtmutex-fix-pi-chain-order-integrity.patch queue-4.9/x86-mce-handle-broadcasted-mce-gracefully-with-kexec.patch