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: [3/3] x86/MCE/AMD: Get address from already initialized block From: Boris Petkov Message-Id: <20180517104124.GA25595@pd.tnic> Date: Thu, 17 May 2018 12:41:24 +0200 To: Johannes Hirte Cc: "Ghannam, Yazen" , "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "tony.luck@intel.com" , "x86@kernel.org" List-ID: T24gVGh1LCBNYXkgMTcsIDIwMTggYXQgMDg6NDk6MzFBTSArMDIwMCwgSm9oYW5uZXMgSGlydGUg d3JvdGU6Cj4gTWF5YmUgSSdtIG1pc3Npbmcgc29tZXRoaW5nLCBidXQgdGhvc2UgUkRNU1IgSVBT cyBkb24ndCBoYXBwZW4gb24KPiBwcmUtU01DQSBzeXN0ZW1zLCByaWdodD8gU28gdGhlIGNhY2hp bmcgc2hvdWxkIGJlIGF2b2lkZWQgaGVyZSwgY2F1c2UKPiB0aGUgd2hvbGUgbG9va3VwIGxvb2tz IG1vcmUgZXhwZW5zaXZlIHRvIG1lIHRoYW4gdGhlIHNpbXBsZSBzd2l0Y2gtYmxvY2sKPiBpbiBn ZXRfYmxvY2tfYWRkcmVzcy4KClllYWgsIGFuZCB3ZSBzaG91bGQgc2ltcGx5IGNhY2hlIGFsbCB0 aG9zZSBNU1IgdmFsdWVzIGFzIEkgc3VnZ2VzdGVkIHRoZW4uCgpUaGUgcGF0Y2ggYXQgdGhlIGVu ZCBzaG91bGQgZml4IHlvdXIgaXNzdWUuCgpZYXplbiwgc28gSSdtIHdvcmtpbmcgb24gdGhlIGFz c3VtcHRpb24gdGhhdCBhbGwgYWRkcmVzc2VzIGFyZSB0aGUgc2FtZQpvbiBldmVyeSBjb3JlIC0g SSBkdW1wZWQgdGhlbSBhbmQgaXQgbG9va3MgbGlrZSB0aGlzOgoKICAgIDEyOCBiYW5rOiAwMCwg YmxvY2s6IDAgOiAweGMwMDAyMDAzCiAgICAxMjggYmFuazogMDAsIGJsb2NrOiAxIDogMHgwCiAg ICAxMjggYmFuazogMDEsIGJsb2NrOiAwIDogMHhjMDAwMjAxMwogICAgMTI4IGJhbms6IDAxLCBi bG9jazogMSA6IDB4MAogICAgMTI4IGJhbms6IDAyLCBibG9jazogMCA6IDB4YzAwMDIwMjMKICAg IDEyOCBiYW5rOiAwMiwgYmxvY2s6IDEgOiAweDAKICAgIDEyOCBiYW5rOiAwMywgYmxvY2s6IDAg OiAweGMwMDAyMDMzCiAgICAxMjggYmFuazogMDMsIGJsb2NrOiAxIDogMHgwCiAgICAxMjggYmFu azogMDQsIGJsb2NrOiAwIDogMHgwCiAgICAxMjggYmFuazogMDUsIGJsb2NrOiAwIDogMHhjMDAw MjA1MwogICAgMTI4IGJhbms6IDA1LCBibG9jazogMSA6IDB4MAogICAgMTI4IGJhbms6IDA2LCBi bG9jazogMCA6IDB4YzAwMDIwNjMKICAgIDEyOCBiYW5rOiAwNiwgYmxvY2s6IDEgOiAweDAKICAg IDEyOCBiYW5rOiAwNywgYmxvY2s6IDAgOiAweGMwMDAyMDczCiAgICAxMjggYmFuazogMDcsIGJs b2NrOiAxIDogMHgwCiAgICAxMjggYmFuazogMDgsIGJsb2NrOiAwIDogMHhjMDAwMjA4MwogICAg MTI4IGJhbms6IDA4LCBibG9jazogMSA6IDB4MAogICAgMTI4IGJhbms6IDA5LCBibG9jazogMCA6 IDB4YzAwMDIwOTMKICAgIDEyOCBiYW5rOiAwOSwgYmxvY2s6IDEgOiAweDAKICAgIDEyOCBiYW5r OiAxMCwgYmxvY2s6IDAgOiAweGMwMDAyMGEzCiAgICAxMjggYmFuazogMTAsIGJsb2NrOiAxIDog MHgwCiAgICAxMjggYmFuazogMTEsIGJsb2NrOiAwIDogMHhjMDAwMjBiMwogICAgMTI4IGJhbms6 IDExLCBibG9jazogMSA6IDB4MAogICAgMTI4IGJhbms6IDEyLCBibG9jazogMCA6IDB4YzAwMDIw YzMKICAgIDEyOCBiYW5rOiAxMiwgYmxvY2s6IDEgOiAweDAKICAgIDEyOCBiYW5rOiAxMywgYmxv Y2s6IDAgOiAweGMwMDAyMGQzCiAgICAxMjggYmFuazogMTMsIGJsb2NrOiAxIDogMHgwCiAgICAx MjggYmFuazogMTQsIGJsb2NrOiAwIDogMHhjMDAwMjBlMwogICAgMTI4IGJhbms6IDE0LCBibG9j azogMSA6IDB4MAogICAgMTI4IGJhbms6IDE1LCBibG9jazogMCA6IDB4YzAwMDIwZjMKICAgIDEy OCBiYW5rOiAxNSwgYmxvY2s6IDEgOiAweDAKICAgIDEyOCBiYW5rOiAxNiwgYmxvY2s6IDAgOiAw eGMwMDAyMTAzCiAgICAxMjggYmFuazogMTYsIGJsb2NrOiAxIDogMHgwCiAgICAxMjggYmFuazog MTcsIGJsb2NrOiAwIDogMHhjMDAwMjExMwogICAgMTI4IGJhbms6IDE3LCBibG9jazogMSA6IDB4 MAogICAgMTI4IGJhbms6IDE4LCBibG9jazogMCA6IDB4YzAwMDIxMjMKICAgIDEyOCBiYW5rOiAx OCwgYmxvY2s6IDEgOiAweDAKICAgIDEyOCBiYW5rOiAxOSwgYmxvY2s6IDAgOiAweGMwMDAyMTMz CiAgICAxMjggYmFuazogMTksIGJsb2NrOiAxIDogMHgwCiAgICAxMjggYmFuazogMjAsIGJsb2Nr OiAwIDogMHhjMDAwMjE0MwogICAgMTI4IGJhbms6IDIwLCBibG9jazogMSA6IDB4MAogICAgMTI4 IGJhbms6IDIxLCBibG9jazogMCA6IDB4YzAwMDIxNTMKICAgIDEyOCBiYW5rOiAyMSwgYmxvY2s6 IDEgOiAweDAKICAgIDEyOCBiYW5rOiAyMiwgYmxvY2s6IDAgOiAweGMwMDAyMTYzCiAgICAxMjgg YmFuazogMjIsIGJsb2NrOiAxIDogMHgwCgpzbyB5b3UgaGF2ZSAxMjggdGltZXMgdGhlIHNhbWUg YWRkcmVzcyBvbiBhIDEyOCBjb3JlIFplbiBib3guCgpJZiB0aGF0IGlzIGNvcnJlY3QsIHRoZW4g d2UgY2FuIHVzZSB0aGlzIG5pY2Ugc2ltcGxpZmljYXRpb24gYW5kIGNhY2hlCnRoZW0gZ2xvYmFs bHkgYW5kIG5vdCBwZXItQ1BVLiBTZWVtcyB0byB3b3JrIGhlcmUuIFNjcmVhbSBpZiBzb21ldGhp bmcncwphbWlzcy4KClRoeC4KLS0tCkZyb20gZDg2MTRlOTA0ZDhmNjNiODlkMmQyMDRkNmZhMjQ3 YzRjNDE2YTFiNiBNb24gU2VwIDE3IDAwOjAwOjAwIDIwMDEKRnJvbTogQm9yaXNsYXYgUGV0a292 IDxicEBzdXNlZGU+CkRhdGU6IFRodSwgMTcgTWF5IDIwMTggMTA6NDY6MjYgKzAyMDAKU3ViamVj dDogW1BBVENIXSBhcnJheSBjYWNoaW5nCgpOb3QtU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0 a292IDxicEBzdXNlLmRlPgotLS0KIGFyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZV9hbWQu YyB8IDI5ICsrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBp bnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJu ZWwvY3B1L21jaGVjay9tY2VfYW1kLmMgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2Vf YW1kLmMKaW5kZXggZjc2NjZlZWY0YTg3Li5jOGUwMzg4MDA1OTEgMTAwNjQ0Ci0tLSBhL2FyY2gv eDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZV9hbWQuYworKysgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1 L21jaGVjay9tY2VfYW1kLmMKQEAgLTk0LDYgKzk0LDExIEBAIHN0YXRpYyBzdHJ1Y3Qgc21jYV9i YW5rX25hbWUgc21jYV9uYW1lc1tdID0gewogCVtTTUNBX1NNVV0JPSB7ICJzbXUiLAkJIlN5c3Rl bSBNYW5hZ2VtZW50IFVuaXQiIH0sCiB9OwogCitzdGF0aWMgdTMyIHNtY2FfYmFua19hZGRyc1tN QVhfTlJfQkFOS1NdW05SX0JMT0NLU10gX19yb19hZnRlcl9pbml0ID0KK3sKKwlbMCAuLi4gTUFY X05SX0JBTktTIC0gMV0gPSB7IFswIC4uLiBOUl9CTE9DS1MgLSAxXSA9IC0xIH0KK307CisKIGNv bnN0IGNoYXIgKnNtY2FfZ2V0X25hbWUoZW51bSBzbWNhX2JhbmtfdHlwZXMgdCkKIHsKIAlpZiAo dCA+PSBOX1NNQ0FfQkFOS19UWVBFUykKQEAgLTQ0MywyMCArNDQ4LDI2IEBAIHN0YXRpYyB1MzIg c21jYV9nZXRfYmxvY2tfYWRkcmVzcyh1bnNpZ25lZCBpbnQgY3B1LCB1bnNpZ25lZCBpbnQgYmFu aywKIAlpZiAoIWJsb2NrKQogCQlyZXR1cm4gTVNSX0FNRDY0X1NNQ0FfTUN4X01JU0MoYmFuayk7 CiAKKwkvKiBDaGVjayBvdXIgY2FjaGUgZmlyc3Q6ICovCisJaWYgKHNtY2FfYmFua19hZGRyc1ti YW5rXVtibG9ja10gIT0gLTEpCisJCXJldHVybiBzbWNhX2JhbmtfYWRkcnNbYmFua11bYmxvY2td OworCiAJLyoKIAkgKiBGb3IgU01DQSBlbmFibGVkIHByb2Nlc3NvcnMsIEJMS1BUUiBmaWVsZCBv ZiB0aGUgZmlyc3QgTUlTQyByZWdpc3RlcgogCSAqIChNQ3hfTUlTQzApIGluZGljYXRlcyBwcmVz ZW5jZSBvZiBhZGRpdGlvbmFsIE1JU0MgcmVncyBzZXQgKE1JU0MxLTQpLgogCSAqLwogCWlmIChy ZG1zcl9zYWZlX29uX2NwdShjcHUsIE1TUl9BTUQ2NF9TTUNBX01DeF9DT05GSUcoYmFuayksICZs b3csICZoaWdoKSkKLQkJcmV0dXJuIGFkZHI7CisJCWdvdG8gb3V0OwogCiAJaWYgKCEobG93ICYg TUNJX0NPTkZJR19NQ0FYKSkKLQkJcmV0dXJuIGFkZHI7CisJCWdvdG8gb3V0OwogCiAJaWYgKCFy ZG1zcl9zYWZlX29uX2NwdShjcHUsIE1TUl9BTUQ2NF9TTUNBX01DeF9NSVNDKGJhbmspLCAmbG93 LCAmaGlnaCkgJiYKIAkgICAgKGxvdyAmIE1BU0tfQkxLUFRSX0xPKSkKLQkJcmV0dXJuIE1TUl9B TUQ2NF9TTUNBX01DeF9NSVNDeShiYW5rLCBibG9jayAtIDEpOworCQlhZGRyID0gTVNSX0FNRDY0 X1NNQ0FfTUN4X01JU0N5KGJhbmssIGJsb2NrIC0gMSk7CiAKK291dDoKKwlzbWNhX2JhbmtfYWRk cnNbYmFua11bYmxvY2tdID0gYWRkcjsKIAlyZXR1cm4gYWRkcjsKIH0KIApAQCAtNDY4LDE4ICs0 NzksNiBAQCBzdGF0aWMgdTMyIGdldF9ibG9ja19hZGRyZXNzKHVuc2lnbmVkIGludCBjcHUsIHUz MiBjdXJyZW50X2FkZHIsIHUzMiBsb3csIHUzMiBoaQogCWlmICgoYmFuayA+PSBtY2FfY2ZnLmJh bmtzKSB8fCAoYmxvY2sgPj0gTlJfQkxPQ0tTKSkKIAkJcmV0dXJuIGFkZHI7CiAKLQkvKiBHZXQg YWRkcmVzcyBmcm9tIGFscmVhZHkgaW5pdGlhbGl6ZWQgYmxvY2suICovCi0JaWYgKHBlcl9jcHUo dGhyZXNob2xkX2JhbmtzLCBjcHUpKSB7Ci0JCXN0cnVjdCB0aHJlc2hvbGRfYmFuayAqYmFua3Ag PSBwZXJfY3B1KHRocmVzaG9sZF9iYW5rcywgY3B1KVtiYW5rXTsKLQotCQlpZiAoYmFua3AgJiYg YmFua3AtPmJsb2NrcykgewotCQkJc3RydWN0IHRocmVzaG9sZF9ibG9jayAqYmxvY2twID0gJmJh bmtwLT5ibG9ja3NbYmxvY2tdOwotCi0JCQlpZiAoYmxvY2twKQotCQkJCXJldHVybiBibG9ja3At PmFkZHJlc3M7Ci0JCX0KLQl9Ci0KIAlpZiAobWNlX2ZsYWdzLnNtY2EpCiAJCXJldHVybiBzbWNh X2dldF9ibG9ja19hZGRyZXNzKGNwdSwgYmFuaywgYmxvY2spOwogCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751530AbeEQKls (ORCPT ); Thu, 17 May 2018 06:41:48 -0400 Received: from mx2.suse.de ([195.135.220.15]:49872 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750938AbeEQKlq (ORCPT ); Thu, 17 May 2018 06:41:46 -0400 Date: Thu, 17 May 2018 12:41:24 +0200 From: Borislav Petkov To: Johannes Hirte Cc: "Ghannam, Yazen" , "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "tony.luck@intel.com" , "x86@kernel.org" Subject: Re: [PATCH 3/3] x86/MCE/AMD: Get address from already initialized block Message-ID: <20180517104124.GA25595@pd.tnic> References: <20180201184813.82253-1-Yazen.Ghannam@amd.com> <20180201184813.82253-3-Yazen.Ghannam@amd.com> <20180414004230.GA2033@probook> <20180416115624.GA1543@probook> <20180515093953.GA1746@probook> <20180516224641.GA31929@pd.tnic> <20180517064930.GA26421@probook> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180517064930.GA26421@probook> User-Agent: Mutt/1.9.3 (2018-01-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 17, 2018 at 08:49:31AM +0200, Johannes Hirte wrote: > Maybe I'm missing something, but those RDMSR IPSs don't happen on > pre-SMCA systems, right? So the caching should be avoided here, cause > the whole lookup looks more expensive to me than the simple switch-block > in get_block_address. Yeah, and we should simply cache all those MSR values as I suggested then. The patch at the end should fix your issue. Yazen, so I'm working on the assumption that all addresses are the same on every core - I dumped them and it looks like this: 128 bank: 00, block: 0 : 0xc0002003 128 bank: 00, block: 1 : 0x0 128 bank: 01, block: 0 : 0xc0002013 128 bank: 01, block: 1 : 0x0 128 bank: 02, block: 0 : 0xc0002023 128 bank: 02, block: 1 : 0x0 128 bank: 03, block: 0 : 0xc0002033 128 bank: 03, block: 1 : 0x0 128 bank: 04, block: 0 : 0x0 128 bank: 05, block: 0 : 0xc0002053 128 bank: 05, block: 1 : 0x0 128 bank: 06, block: 0 : 0xc0002063 128 bank: 06, block: 1 : 0x0 128 bank: 07, block: 0 : 0xc0002073 128 bank: 07, block: 1 : 0x0 128 bank: 08, block: 0 : 0xc0002083 128 bank: 08, block: 1 : 0x0 128 bank: 09, block: 0 : 0xc0002093 128 bank: 09, block: 1 : 0x0 128 bank: 10, block: 0 : 0xc00020a3 128 bank: 10, block: 1 : 0x0 128 bank: 11, block: 0 : 0xc00020b3 128 bank: 11, block: 1 : 0x0 128 bank: 12, block: 0 : 0xc00020c3 128 bank: 12, block: 1 : 0x0 128 bank: 13, block: 0 : 0xc00020d3 128 bank: 13, block: 1 : 0x0 128 bank: 14, block: 0 : 0xc00020e3 128 bank: 14, block: 1 : 0x0 128 bank: 15, block: 0 : 0xc00020f3 128 bank: 15, block: 1 : 0x0 128 bank: 16, block: 0 : 0xc0002103 128 bank: 16, block: 1 : 0x0 128 bank: 17, block: 0 : 0xc0002113 128 bank: 17, block: 1 : 0x0 128 bank: 18, block: 0 : 0xc0002123 128 bank: 18, block: 1 : 0x0 128 bank: 19, block: 0 : 0xc0002133 128 bank: 19, block: 1 : 0x0 128 bank: 20, block: 0 : 0xc0002143 128 bank: 20, block: 1 : 0x0 128 bank: 21, block: 0 : 0xc0002153 128 bank: 21, block: 1 : 0x0 128 bank: 22, block: 0 : 0xc0002163 128 bank: 22, block: 1 : 0x0 so you have 128 times the same address on a 128 core Zen box. If that is correct, then we can use this nice simplification and cache them globally and not per-CPU. Seems to work here. Scream if something's amiss. Thx. --- >>From d8614e904d8f63b89d2d204d6fa247c4c416a1b6 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Thu, 17 May 2018 10:46:26 +0200 Subject: [PATCH] array caching Not-Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/mcheck/mce_amd.c | 29 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index f7666eef4a87..c8e038800591 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -94,6 +94,11 @@ static struct smca_bank_name smca_names[] = { [SMCA_SMU] = { "smu", "System Management Unit" }, }; +static u32 smca_bank_addrs[MAX_NR_BANKS][NR_BLOCKS] __ro_after_init = +{ + [0 ... MAX_NR_BANKS - 1] = { [0 ... NR_BLOCKS - 1] = -1 } +}; + const char *smca_get_name(enum smca_bank_types t) { if (t >= N_SMCA_BANK_TYPES) @@ -443,20 +448,26 @@ static u32 smca_get_block_address(unsigned int cpu, unsigned int bank, if (!block) return MSR_AMD64_SMCA_MCx_MISC(bank); + /* Check our cache first: */ + if (smca_bank_addrs[bank][block] != -1) + return smca_bank_addrs[bank][block]; + /* * For SMCA enabled processors, BLKPTR field of the first MISC register * (MCx_MISC0) indicates presence of additional MISC regs set (MISC1-4). */ if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_CONFIG(bank), &low, &high)) - return addr; + goto out; if (!(low & MCI_CONFIG_MCAX)) - return addr; + goto out; if (!rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_MISC(bank), &low, &high) && (low & MASK_BLKPTR_LO)) - return MSR_AMD64_SMCA_MCx_MISCy(bank, block - 1); + addr = MSR_AMD64_SMCA_MCx_MISCy(bank, block - 1); +out: + smca_bank_addrs[bank][block] = addr; return addr; } @@ -468,18 +479,6 @@ static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 hi if ((bank >= mca_cfg.banks) || (block >= NR_BLOCKS)) return addr; - /* Get address from already initialized block. */ - if (per_cpu(threshold_banks, cpu)) { - struct threshold_bank *bankp = per_cpu(threshold_banks, cpu)[bank]; - - if (bankp && bankp->blocks) { - struct threshold_block *blockp = &bankp->blocks[block]; - - if (blockp) - return blockp->address; - } - } - if (mce_flags.smca) return smca_get_block_address(cpu, bank, block); -- 2.17.0.391.g1f1cddd558b5 SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg) --