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: [4.16,29/68] x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type From: Greg Kroah-Hartman Message-Id: <20180417155750.522518451@linuxfoundation.org> Date: Tue, 17 Apr 2018 17:57:42 +0200 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yazen Ghannam , Borislav Petkov , Borislav Petkov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Tony Luck , linux-edac , Ingo Molnar List-ID: NC4xNi1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBZYXplbiBHaGFu bmFtIDx5YXplbi5naGFubmFtQGFtZC5jb20+Cgpjb21taXQgNjg2MjdhNjk3YzE5NTkzNzY3MmNl MDc2ODMwOTRjNzJiMTE3NDc4NiB1cHN0cmVhbS4KCkN1cnJlbnRseSwgYmFuayA0IGlzIHJlc2Vy dmVkIG9uIEZhbTE3aCwgc28gd2UgY2hvc2Ugbm90IHRvIGluaXRpYWxpemUKYmFuayA0IGluIHRo ZSBzbWNhX2JhbmtzIGFycmF5LiBUaGlzIG1lYW5zIHRoYXQgd2hlbiB3ZSBjaGVjayBpZiBhIGJh bmsKaXMgaW5pdGlhbGl6ZWQsIGxpa2UgZHVyaW5nIGJvb3Qgb3IgcmVzdW1lLCB3ZSB3aWxsIHNl ZSB0aGF0IGJhbmsgNCBpcwpub3QgaW5pdGlhbGl6ZWQgYW5kIHRyeSB0byBpbml0aWFsaXplIGl0 LgoKVGhpcyB3aWxsIGNhdXNlIGEgY2FsbCB0cmFjZSwgd2hlbiByZXN1bWluZyBmcm9tIHN1c3Bl bmQsIGR1ZSB0bwpyZG1zcl8qb25fY3B1KCkgY2FsbHMgaW4gdGhlIGluaXQgcGF0aC4gVGhlIHJk bXNyXypvbl9jcHUoKSBjYWxscyBpc3N1ZQphbiBJUEkgYnV0IHdlJ3JlIHJ1bm5pbmcgd2l0aCBp bnRlcnJ1cHRzIGRpc2FibGVkLiBUaGlzIHRyaWdnZXJzOgoKICBXQVJOSU5HOiBDUFU6IDAgUElE OiAxMTUyMyBhdCBrZXJuZWwvc21wLmM6MjkxIHNtcF9jYWxsX2Z1bmN0aW9uX3NpbmdsZSsweGRj LzB4ZTAKICAuLi4KClJlc2VydmVkIGJhbmtzIHdpbGwgYmUgcmVhZC1hcy16ZXJvLCBzbyB0aGVp ciBNQ0FfSVBJRCByZWdpc3RlciB3aWxsIGJlCnplcm8uIFNvLCBsaWtlIHRoZSBzbWNhX2Jhbmtz IGFycmF5LCB0aGUgdGhyZXNob2xkX2JhbmtzIGFycmF5IHdpbGwgbm90CmhhdmUgYW4gZW50cnkg Zm9yIGEgcmVzZXJ2ZWQgYmFuayBzaW5jZSBhbGwgaXRzIE1DQV9NSVNDKiByZWdpc3RlcnMgd2ls bApiZSB6ZXJvLgoKRW51bWVyYXRlIGEgIlJlc2VydmVkIiBiYW5rIHR5cGUgdGhhdCBtYXRjaGVz IG9uIGEgSFdJRF9NQ0FUWVBFIG9mIDAsMC4KClVzZSB0aGUgIlJlc2VydmVkIiB0eXBlIHdoZW4g Y2hlY2tpbmcgaWYgYSBiYW5rIGlzIHJlc2VydmVkLiBJdCdzCnBvc3NpYmxlIHRoYXQgb3RoZXIg YmFuayBudW1iZXJzIG1heSBiZSByZXNlcnZlZCBvbiBmdXR1cmUgc3lzdGVtcy4KCkRvbid0IHRy eSB0byBmaW5kIHRoZSBibG9jayBhZGRyZXNzIG9uIHJlc2VydmVkIGJhbmtzLgoKU2lnbmVkLW9m Zi1ieTogWWF6ZW4gR2hhbm5hbSA8eWF6ZW4uZ2hhbm5hbUBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5 OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9y Zz4gIyA0LjE0LngKQ2M6IEJvcmlzbGF2IFBldGtvdiA8YnBAYWxpZW44LmRlPgpDYzogTGludXMg VG9ydmFsZHMgPHRvcnZhbGRzQGxpbnV4LWZvdW5kYXRpb24ub3JnPgpDYzogUGV0ZXIgWmlqbHN0 cmEgPHBldGVyekBpbmZyYWRlYWQub3JnPgpDYzogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0 cm9uaXguZGU+CkNjOiBUb255IEx1Y2sgPHRvbnkubHVja0BpbnRlbC5jb20+CkNjOiBsaW51eC1l ZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KTGluazogaHR0cDovL2xrbWwua2VybmVs Lm9yZy9yLzIwMTgwMjIxMTAxOTAwLjEwMzI2LTctYnBAYWxpZW44LmRlClNpZ25lZC1vZmYtYnk6 IEluZ28gTW9sbmFyIDxtaW5nb0BrZXJuZWwub3JnPgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2Fo LUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGFyY2gveDg2L2luY2x1 ZGUvYXNtL21jZS5oICAgICAgICAgICB8ICAgIDEgKwogYXJjaC94ODYva2VybmVsL2NwdS9tY2hl Y2svbWNlX2FtZC5jIHwgICAgNyArKysrKysrCiBkcml2ZXJzL2VkYWMvbWNlX2FtZC5jICAgICAg ICAgICAgICAgfCAgIDExICsrKysrKystLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlv bnMoKyksIDQgZGVsZXRpb25zKC0pCgoKCi0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0 OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1lZGFjIiBpbgp0aGUgYm9keSBvZiBh IG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZv IGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwKCi0tLSBhL2Fy Y2gveDg2L2luY2x1ZGUvYXNtL21jZS5oCisrKyBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL21jZS5o CkBAIC0zNDYsNiArMzQ2LDcgQEAgZW51bSBzbWNhX2JhbmtfdHlwZXMgewogCVNNQ0FfSUYsCS8q IEluc3RydWN0aW9uIEZldGNoICovCiAJU01DQV9MMl9DQUNIRSwJLyogTDIgQ2FjaGUgKi8KIAlT TUNBX0RFLAkvKiBEZWNvZGVyIFVuaXQgKi8KKwlTTUNBX1JFU0VSVkVELAkvKiBSZXNlcnZlZCAq LwogCVNNQ0FfRVgsCS8qIEV4ZWN1dGlvbiBVbml0ICovCiAJU01DQV9GUCwJLyogRmxvYXRpbmcg UG9pbnQgKi8KIAlTTUNBX0wzX0NBQ0hFLAkvKiBMMyBDYWNoZSAqLwotLS0gYS9hcmNoL3g4Ni9r ZXJuZWwvY3B1L21jaGVjay9tY2VfYW1kLmMKKysrIGIvYXJjaC94ODYva2VybmVsL2NwdS9tY2hl Y2svbWNlX2FtZC5jCkBAIC04Miw2ICs4Miw3IEBAIHN0YXRpYyBzdHJ1Y3Qgc21jYV9iYW5rX25h bWUgc21jYV9uYW1lc1sKIAlbU01DQV9JRl0JPSB7ICJpbnNuX2ZldGNoIiwJIkluc3RydWN0aW9u IEZldGNoIFVuaXQiIH0sCiAJW1NNQ0FfTDJfQ0FDSEVdCT0geyAibDJfY2FjaGUiLAkJIkwyIENh Y2hlIiB9LAogCVtTTUNBX0RFXQk9IHsgImRlY29kZV91bml0IiwJIkRlY29kZSBVbml0IiB9LAor CVtTTUNBX1JFU0VSVkVEXQk9IHsgInJlc2VydmVkIiwJCSJSZXNlcnZlZCIgfSwKIAlbU01DQV9F WF0JPSB7ICJleGVjdXRpb25fdW5pdCIsCSJFeGVjdXRpb24gVW5pdCIgfSwKIAlbU01DQV9GUF0J PSB7ICJmbG9hdGluZ19wb2ludCIsCSJGbG9hdGluZyBQb2ludCBVbml0IiB9LAogCVtTTUNBX0wz X0NBQ0hFXQk9IHsgImwzX2NhY2hlIiwJCSJMMyBDYWNoZSIgfSwKQEAgLTEyNyw2ICsxMjgsOSBA QCBzdGF0aWMgZW51bSBzbWNhX2JhbmtfdHlwZXMgc21jYV9nZXRfYmFuCiBzdGF0aWMgc3RydWN0 IHNtY2FfaHdpZCBzbWNhX2h3aWRfbWNhdHlwZXNbXSA9IHsKIAkvKiB7IGJhbmtfdHlwZSwgaHdp ZF9tY2F0eXBlLCB4ZWNfYml0bWFwIH0gKi8KIAorCS8qIFJlc2VydmVkIHR5cGUgKi8KKwl7IFNN Q0FfUkVTRVJWRUQsIEhXSURfTUNBVFlQRSgweDAwLCAweDApLCAweDAgfSwKKwogCS8qIFpOIENv cmUgKEhXSUQ9MHhCMCkgTUNBIHR5cGVzICovCiAJeyBTTUNBX0xTLAkgSFdJRF9NQ0FUWVBFKDB4 QjAsIDB4MCksIDB4MUZGRkVGIH0sCiAJeyBTTUNBX0lGLAkgSFdJRF9NQ0FUWVBFKDB4QjAsIDB4 MSksIDB4M0ZGRiB9LApAQCAtNDMzLDYgKzQzNyw5IEBAIHN0YXRpYyB1MzIgZ2V0X2Jsb2NrX2Fk ZHJlc3ModW5zaWduZWQgaW4KIAl1MzIgYWRkciA9IDAsIG9mZnNldCA9IDA7CiAKIAlpZiAobWNl X2ZsYWdzLnNtY2EpIHsKKwkJaWYgKHNtY2FfZ2V0X2JhbmtfdHlwZShiYW5rKSA9PSBTTUNBX1JF U0VSVkVEKQorCQkJcmV0dXJuIGFkZHI7CisKIAkJaWYgKCFibG9jaykgewogCQkJYWRkciA9IE1T Ul9BTUQ2NF9TTUNBX01DeF9NSVNDKGJhbmspOwogCQl9IGVsc2UgewotLS0gYS9kcml2ZXJzL2Vk YWMvbWNlX2FtZC5jCisrKyBiL2RyaXZlcnMvZWRhYy9tY2VfYW1kLmMKQEAgLTg1NCwyMSArODU0 LDI0IEBAIHN0YXRpYyB2b2lkIGRlY29kZV9tYzZfbWNlKHN0cnVjdCBtY2UgKm0KIHN0YXRpYyB2 b2lkIGRlY29kZV9zbWNhX2Vycm9yKHN0cnVjdCBtY2UgKm0pCiB7CiAJc3RydWN0IHNtY2FfaHdp ZCAqaHdpZDsKLQl1bnNpZ25lZCBpbnQgYmFua190eXBlOworCWVudW0gc21jYV9iYW5rX3R5cGVz IGJhbmtfdHlwZTsKIAljb25zdCBjaGFyICppcF9uYW1lOwogCXU4IHhlYyA9IFhFQyhtLT5zdGF0 dXMsIHhlY19tYXNrKTsKIAogCWlmIChtLT5iYW5rID49IEFSUkFZX1NJWkUoc21jYV9iYW5rcykp CiAJCXJldHVybjsKIAotCWlmICh4ODZfZmFtaWx5KG0tPmNwdWlkKSA+PSAweDE3ICYmIG0tPmJh bmsgPT0gNCkKLQkJcHJfZW1lcmcoSFdfRVJSICJCYW5rIDQgaXMgcmVzZXJ2ZWQgb24gRmFtMTdo LlxuIik7Ci0KIAlod2lkID0gc21jYV9iYW5rc1ttLT5iYW5rXS5od2lkOwogCWlmICghaHdpZCkK IAkJcmV0dXJuOwogCiAJYmFua190eXBlID0gaHdpZC0+YmFua190eXBlOworCisJaWYgKGJhbmtf dHlwZSA9PSBTTUNBX1JFU0VSVkVEKSB7CisJCXByX2VtZXJnKEhXX0VSUiAiQmFuayAlZCBpcyBy ZXNlcnZlZC5cbiIsIG0tPmJhbmspOworCQlyZXR1cm47CisJfQorCiAJaXBfbmFtZSA9IHNtY2Ff Z2V0X2xvbmdfbmFtZShiYW5rX3R5cGUpOwogCiAJcHJfZW1lcmcoSFdfRVJSICIlcyBFeHRlbmRl ZCBFcnJvciBDb2RlOiAlZFxuIiwgaXBfbmFtZSwgeGVjKTsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+7UKF5cYjAF2+vYfKg13QUk5WdMjbLfAm+J9VIpUVuY4kLvm53x1zes827WvbMgyr/lE6y ARC-Seal: i=1; a=rsa-sha256; t=1523980959; cv=none; d=google.com; s=arc-20160816; b=ypfPDwdBIuXwnKjfRU57TLb7z1e6O7X8H7QcZEuj+yaAdSlpaaf0s5AOv1F8mOlJJT PyLELsCxCoWbJzqQr+GyEQvsICxBaJNT/QyreQ2czRTi73XKV8DIHszcKC362iIvXdjD N/3QEbtweJT6quqbRA5PafgXmKRxbtesA1xpaCSFUBFIu/3nesuZVYFstdBE41jBZA/c uP6Sjltgdf/YfCBCzsQrwYTai1SuPl/hrNixQQHhtwALpPnSz6T+a1oSAhbX0KXBEs0k 1h8JRKcsGJTHmfM5ksI6wa/l4+n2HotmwYf3Ab+sFSNub48a2/J46CpnGK9Nfa05yufc wcsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=rf5ArrMrgNa4kgMR+DtqxTqQOX1pD4mxwrxoMnjd6rA=; b=Tr2TfjAXCb8UJQOfB8ZLnhFTrMx1G/je45HqsM/19qEz8M61/6iae5LQtH9hRglENb AnkNDM1VxDF3lQX9Hojk1ndIeNMQ6ob9AbrdQSnyhCBXuzAMIcvuKM76SaKrAFFi96xU 8sFSfiYXQ9GgBIw5jNp/mzWppOGuXc0RvfdoovFIaFKWqcTIxGTfT2ZoSTDTAOBJPMS6 /vYINuXf5dyI72UtoxcHgeGA1zjCbyjChL8juay8mT/Jq7eaQNAbXmvTKQeM64DX/IW8 YyiK0DEcdhgs/ECYweKwn+RdnHg/W7TNeOBeeNJNQTOwWLHt1HKdPbtqZiA7qqO4K+Au 29vA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 46.44.180.42 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 46.44.180.42 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yazen Ghannam , Borislav Petkov , Borislav Petkov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Tony Luck , linux-edac , Ingo Molnar Subject: [PATCH 4.16 29/68] x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type Date: Tue, 17 Apr 2018 17:57:42 +0200 Message-Id: <20180417155750.522518451@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417155749.341779147@linuxfoundation.org> References: <20180417155749.341779147@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1598009858597408342?= X-GMAIL-MSGID: =?utf-8?q?1598009858597408342?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yazen Ghannam commit 68627a697c195937672ce07683094c72b1174786 upstream. Currently, bank 4 is reserved on Fam17h, so we chose not to initialize bank 4 in the smca_banks array. This means that when we check if a bank is initialized, like during boot or resume, we will see that bank 4 is not initialized and try to initialize it. This will cause a call trace, when resuming from suspend, due to rdmsr_*on_cpu() calls in the init path. The rdmsr_*on_cpu() calls issue an IPI but we're running with interrupts disabled. This triggers: WARNING: CPU: 0 PID: 11523 at kernel/smp.c:291 smp_call_function_single+0xdc/0xe0 ... Reserved banks will be read-as-zero, so their MCA_IPID register will be zero. So, like the smca_banks array, the threshold_banks array will not have an entry for a reserved bank since all its MCA_MISC* registers will be zero. Enumerate a "Reserved" bank type that matches on a HWID_MCATYPE of 0,0. Use the "Reserved" type when checking if a bank is reserved. It's possible that other bank numbers may be reserved on future systems. Don't try to find the block address on reserved banks. Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Cc: # 4.14.x Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Tony Luck Cc: linux-edac Link: http://lkml.kernel.org/r/20180221101900.10326-7-bp@alien8.de Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/include/asm/mce.h | 1 + arch/x86/kernel/cpu/mcheck/mce_amd.c | 7 +++++++ drivers/edac/mce_amd.c | 11 +++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -346,6 +346,7 @@ enum smca_bank_types { SMCA_IF, /* Instruction Fetch */ SMCA_L2_CACHE, /* L2 Cache */ SMCA_DE, /* Decoder Unit */ + SMCA_RESERVED, /* Reserved */ SMCA_EX, /* Execution Unit */ SMCA_FP, /* Floating Point */ SMCA_L3_CACHE, /* L3 Cache */ --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -82,6 +82,7 @@ static struct smca_bank_name smca_names[ [SMCA_IF] = { "insn_fetch", "Instruction Fetch Unit" }, [SMCA_L2_CACHE] = { "l2_cache", "L2 Cache" }, [SMCA_DE] = { "decode_unit", "Decode Unit" }, + [SMCA_RESERVED] = { "reserved", "Reserved" }, [SMCA_EX] = { "execution_unit", "Execution Unit" }, [SMCA_FP] = { "floating_point", "Floating Point Unit" }, [SMCA_L3_CACHE] = { "l3_cache", "L3 Cache" }, @@ -127,6 +128,9 @@ static enum smca_bank_types smca_get_ban static struct smca_hwid smca_hwid_mcatypes[] = { /* { bank_type, hwid_mcatype, xec_bitmap } */ + /* Reserved type */ + { SMCA_RESERVED, HWID_MCATYPE(0x00, 0x0), 0x0 }, + /* ZN Core (HWID=0xB0) MCA types */ { SMCA_LS, HWID_MCATYPE(0xB0, 0x0), 0x1FFFEF }, { SMCA_IF, HWID_MCATYPE(0xB0, 0x1), 0x3FFF }, @@ -433,6 +437,9 @@ static u32 get_block_address(unsigned in u32 addr = 0, offset = 0; if (mce_flags.smca) { + if (smca_get_bank_type(bank) == SMCA_RESERVED) + return addr; + if (!block) { addr = MSR_AMD64_SMCA_MCx_MISC(bank); } else { --- a/drivers/edac/mce_amd.c +++ b/drivers/edac/mce_amd.c @@ -854,21 +854,24 @@ static void decode_mc6_mce(struct mce *m static void decode_smca_error(struct mce *m) { struct smca_hwid *hwid; - unsigned int bank_type; + enum smca_bank_types bank_type; const char *ip_name; u8 xec = XEC(m->status, xec_mask); if (m->bank >= ARRAY_SIZE(smca_banks)) return; - if (x86_family(m->cpuid) >= 0x17 && m->bank == 4) - pr_emerg(HW_ERR "Bank 4 is reserved on Fam17h.\n"); - hwid = smca_banks[m->bank].hwid; if (!hwid) return; bank_type = hwid->bank_type; + + if (bank_type == SMCA_RESERVED) { + pr_emerg(HW_ERR "Bank %d is reserved.\n", m->bank); + return; + } + ip_name = smca_get_long_name(bank_type); pr_emerg(HW_ERR "%s Extended Error Code: %d\n", ip_name, xec);