From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4/o7feX27fmDe7yCN7X9xI9i/ZwIzxWnxFqJt5yQoAaVfHbCfA06ctfakCCefG1c71tqU9G ARC-Seal: i=1; a=rsa-sha256; t=1523981223; cv=none; d=google.com; s=arc-20160816; b=mgvWYCtn2MlgjLQEm2rp8WKIBvSCsjQzlDLoh2enQJBTxEpYuxtMy2l4NEbKAxdUxS 0nc60UdUvNwCgUdg1tz4jo3QKJKdDGmRDZEnXFabvMkbnt/dB1c99+qQvpPKX46DnBNM T3BFJEdZMEjJJX1qPbS6clDOA/VERzxgjkpHojXYyyRvC3LE4l6LEOM57FPA+Qsm5EFo 599NFHtaawWyzTGw7o8neTO8Cn30rn2WiOLnDhXD4MwORuRSPcpNPvVM2ldb5f0AYMlD 91MgDwWAeGujcUXmJIIhsd53cCpSmkx/huPqBLAb79sOC+D1tlJ80tJ8dT1x9mGqxN8G brXg== 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=P/hhgyyE0o9H2jGggCnH3uTSiYGr5kP+2zQm08Dgig4=; b=g0ZswjGKoH02ci62+H2iH2Aqyzod0uC9hEE88Nx5DAY9qljtsBaVehYHcuC6+cUDJs V282k6HNrtAEg22KR+0miFN8zyCrTX+H4aVDVzIXPqotB3ShRPnJPuW2/eVt5oP75dx3 Y92NpQStcqi05Tz1cKv6EZZaUIc8wUNcGB1z4xGIzznH8jttlF/DNXr6ESmRc22VDrvP lt+TFLPDWfam6W0vhLcGYupl5oU+EsvObv8lYSfreb+HvOclJAJvRZvT+xwTWs4mxMdi AV2azTGUK7HaIuduJRb3lFoT18utZOFU5viP1kCmiZA1NnobbG8JkUqY1ge8lZ195Bjg bZ3w== 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.14 37/49] x86/mce/AMD: Pass the bank number to smca_get_bank_type() Date: Tue, 17 Apr 2018 17:59:16 +0200 Message-Id: <20180417155716.787234362@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417155715.032245882@linuxfoundation.org> References: <20180417155715.032245882@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?1598009856327420253?= X-GMAIL-MSGID: =?utf-8?q?1598010135526808329?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yazen Ghannam commit e5d6a126d4c473499f354254a15ca0c2d8c84ca3 upstream. Pass the bank number to smca_get_bank_type() since that's all we need. Also, we should compare the bank number to MAX_NR_BANKS (size of the smca_banks array) not the number of bank types. Bank types are reused for multiple banks, so the number of types can be different from the number of banks in a system and thus we could return an invalid bank type. Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Cc: # 4.14.x Cc: # 4.14.x: 11cf887728a3 x86/MCE/AMD: Define a function to get SMCA bank type Cc: # 4.14.x: c6708d50f166 x86/MCE: Report only DRAM ECC as memory errors on AMD systems 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-6-bp@alien8.de Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -110,14 +110,14 @@ const char *smca_get_long_name(enum smca } EXPORT_SYMBOL_GPL(smca_get_long_name); -static enum smca_bank_types smca_get_bank_type(struct mce *m) +static enum smca_bank_types smca_get_bank_type(unsigned int bank) { struct smca_bank *b; - if (m->bank >= N_SMCA_BANK_TYPES) + if (bank >= MAX_NR_BANKS) return N_SMCA_BANK_TYPES; - b = &smca_banks[m->bank]; + b = &smca_banks[bank]; if (!b->hwid) return N_SMCA_BANK_TYPES; @@ -758,7 +758,7 @@ bool amd_mce_is_memory_error(struct mce u8 xec = (m->status >> 16) & 0x1f; if (mce_flags.smca) - return smca_get_bank_type(m) == SMCA_UMC && xec == 0x0; + return smca_get_bank_type(m->bank) == SMCA_UMC && xec == 0x0; return m->bank == 4 && xec == 0x8; } @@ -1061,7 +1061,7 @@ static struct kobj_type threshold_ktype static const char *get_name(unsigned int bank, struct threshold_block *b) { - unsigned int bank_type; + enum smca_bank_types bank_type; if (!mce_flags.smca) { if (b && bank == 4) @@ -1070,11 +1070,10 @@ static const char *get_name(unsigned int return th_names[bank]; } - if (!smca_banks[bank].hwid) + bank_type = smca_get_bank_type(bank); + if (bank_type >= N_SMCA_BANK_TYPES) return NULL; - bank_type = smca_banks[bank].hwid->bank_type; - if (b && bank_type == SMCA_UMC) { if (b->block < ARRAY_SIZE(smca_umc_block_names)) return smca_umc_block_names[b->block]; 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.14,37/49] x86/mce/AMD: Pass the bank number to smca_get_bank_type() From: Greg Kroah-Hartman Message-Id: <20180417155716.787234362@linuxfoundation.org> Date: Tue, 17 Apr 2018 17:59:16 +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: NC4xNC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBZYXplbiBHaGFu bmFtIDx5YXplbi5naGFubmFtQGFtZC5jb20+Cgpjb21taXQgZTVkNmExMjZkNGM0NzM0OTlmMzU0 MjU0YTE1Y2EwYzJkOGM4NGNhMyB1cHN0cmVhbS4KClBhc3MgdGhlIGJhbmsgbnVtYmVyIHRvIHNt Y2FfZ2V0X2JhbmtfdHlwZSgpIHNpbmNlIHRoYXQncyBhbGwgd2UgbmVlZC4KCkFsc28sIHdlIHNo b3VsZCBjb21wYXJlIHRoZSBiYW5rIG51bWJlciB0byBNQVhfTlJfQkFOS1MgKHNpemUgb2YgdGhl CnNtY2FfYmFua3MgYXJyYXkpIG5vdCB0aGUgbnVtYmVyIG9mIGJhbmsgdHlwZXMuIEJhbmsgdHlw ZXMgYXJlIHJldXNlZApmb3IgbXVsdGlwbGUgYmFua3MsIHNvIHRoZSBudW1iZXIgb2YgdHlwZXMg Y2FuIGJlIGRpZmZlcmVudCBmcm9tIHRoZQpudW1iZXIgb2YgYmFua3MgaW4gYSBzeXN0ZW0gYW5k IHRodXMgd2UgY291bGQgcmV0dXJuIGFuIGludmFsaWQgYmFuawp0eXBlLgoKU2lnbmVkLW9mZi1i eTogWWF6ZW4gR2hhbm5hbSA8eWF6ZW4uZ2hhbm5hbUBhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBC b3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+CkNjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4g IyA0LjE0LngKQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiAjIDQuMTQueDogMTFjZjg4Nzcy OGEzIHg4Ni9NQ0UvQU1EOiBEZWZpbmUgYSBmdW5jdGlvbiB0byBnZXQgU01DQSBiYW5rIHR5cGUK Q2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPiAjIDQuMTQueDogYzY3MDhkNTBmMTY2IHg4Ni9N Q0U6IFJlcG9ydCBvbmx5IERSQU0gRUNDIGFzIG1lbW9yeSBlcnJvcnMgb24gQU1EIHN5c3RlbXMK Q2M6IEJvcmlzbGF2IFBldGtvdiA8YnBAYWxpZW44LmRlPgpDYzogTGludXMgVG9ydmFsZHMgPHRv cnZhbGRzQGxpbnV4LWZvdW5kYXRpb24ub3JnPgpDYzogUGV0ZXIgWmlqbHN0cmEgPHBldGVyekBp bmZyYWRlYWQub3JnPgpDYzogVGhvbWFzIEdsZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNj OiBUb255IEx1Y2sgPHRvbnkubHVja0BpbnRlbC5jb20+CkNjOiBsaW51eC1lZGFjIDxsaW51eC1l ZGFjQHZnZXIua2VybmVsLm9yZz4KTGluazogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgw MjIxMTAxOTAwLjEwMzI2LTYtYnBAYWxpZW44LmRlClNpZ25lZC1vZmYtYnk6IEluZ28gTW9sbmFy IDxtaW5nb0BrZXJuZWwub3JnPgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdy ZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGFyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNr L21jZV9hbWQuYyB8ICAgMTUgKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNl cnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKCgotLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMg bGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4KdGhlIGJvZHkg b2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8g aW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCgotLS0g YS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2VfYW1kLmMKKysrIGIvYXJjaC94ODYva2Vy bmVsL2NwdS9tY2hlY2svbWNlX2FtZC5jCkBAIC0xMTAsMTQgKzExMCwxNCBAQCBjb25zdCBjaGFy ICpzbWNhX2dldF9sb25nX25hbWUoZW51bSBzbWNhCiB9CiBFWFBPUlRfU1lNQk9MX0dQTChzbWNh X2dldF9sb25nX25hbWUpOwogCi1zdGF0aWMgZW51bSBzbWNhX2JhbmtfdHlwZXMgc21jYV9nZXRf YmFua190eXBlKHN0cnVjdCBtY2UgKm0pCitzdGF0aWMgZW51bSBzbWNhX2JhbmtfdHlwZXMgc21j YV9nZXRfYmFua190eXBlKHVuc2lnbmVkIGludCBiYW5rKQogewogCXN0cnVjdCBzbWNhX2Jhbmsg KmI7CiAKLQlpZiAobS0+YmFuayA+PSBOX1NNQ0FfQkFOS19UWVBFUykKKwlpZiAoYmFuayA+PSBN QVhfTlJfQkFOS1MpCiAJCXJldHVybiBOX1NNQ0FfQkFOS19UWVBFUzsKIAotCWIgPSAmc21jYV9i YW5rc1ttLT5iYW5rXTsKKwliID0gJnNtY2FfYmFua3NbYmFua107CiAJaWYgKCFiLT5od2lkKQog CQlyZXR1cm4gTl9TTUNBX0JBTktfVFlQRVM7CiAKQEAgLTc1OCw3ICs3NTgsNyBAQCBib29sIGFt ZF9tY2VfaXNfbWVtb3J5X2Vycm9yKHN0cnVjdCBtY2UKIAl1OCB4ZWMgPSAobS0+c3RhdHVzID4+ IDE2KSAmIDB4MWY7CiAKIAlpZiAobWNlX2ZsYWdzLnNtY2EpCi0JCXJldHVybiBzbWNhX2dldF9i YW5rX3R5cGUobSkgPT0gU01DQV9VTUMgJiYgeGVjID09IDB4MDsKKwkJcmV0dXJuIHNtY2FfZ2V0 X2JhbmtfdHlwZShtLT5iYW5rKSA9PSBTTUNBX1VNQyAmJiB4ZWMgPT0gMHgwOwogCiAJcmV0dXJu IG0tPmJhbmsgPT0gNCAmJiB4ZWMgPT0gMHg4OwogfQpAQCAtMTA2MSw3ICsxMDYxLDcgQEAgc3Rh dGljIHN0cnVjdCBrb2JqX3R5cGUgdGhyZXNob2xkX2t0eXBlCiAKIHN0YXRpYyBjb25zdCBjaGFy ICpnZXRfbmFtZSh1bnNpZ25lZCBpbnQgYmFuaywgc3RydWN0IHRocmVzaG9sZF9ibG9jayAqYikK IHsKLQl1bnNpZ25lZCBpbnQgYmFua190eXBlOworCWVudW0gc21jYV9iYW5rX3R5cGVzIGJhbmtf dHlwZTsKIAogCWlmICghbWNlX2ZsYWdzLnNtY2EpIHsKIAkJaWYgKGIgJiYgYmFuayA9PSA0KQpA QCAtMTA3MCwxMSArMTA3MCwxMCBAQCBzdGF0aWMgY29uc3QgY2hhciAqZ2V0X25hbWUodW5zaWdu ZWQgaW50CiAJCXJldHVybiB0aF9uYW1lc1tiYW5rXTsKIAl9CiAKLQlpZiAoIXNtY2FfYmFua3Nb YmFua10uaHdpZCkKKwliYW5rX3R5cGUgPSBzbWNhX2dldF9iYW5rX3R5cGUoYmFuayk7CisJaWYg KGJhbmtfdHlwZSA+PSBOX1NNQ0FfQkFOS19UWVBFUykKIAkJcmV0dXJuIE5VTEw7CiAKLQliYW5r X3R5cGUgPSBzbWNhX2JhbmtzW2JhbmtdLmh3aWQtPmJhbmtfdHlwZTsKLQogCWlmIChiICYmIGJh bmtfdHlwZSA9PSBTTUNBX1VNQykgewogCQlpZiAoYi0+YmxvY2sgPCBBUlJBWV9TSVpFKHNtY2Ff dW1jX2Jsb2NrX25hbWVzKSkKIAkJCXJldHVybiBzbWNhX3VtY19ibG9ja19uYW1lc1tiLT5ibG9j a107Cg==