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,39/49] x86/mce/AMD: Get address from already initialized block From: Greg Kroah-Hartman Message-Id: <20180417155716.895432903@linuxfoundation.org> Date: Tue, 17 Apr 2018 17:59:18 +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+Cgpjb21taXQgMjdiZDU5NTAyNzAyZmU1MWQ5ZWIw MDQ1MGE3NWI3MjdlYzZiZmNiNCB1cHN0cmVhbS4KClRoZSBibG9jayBhZGRyZXNzIGlzIHNhdmVk IGFmdGVyIHRoZSBibG9jayBpcyBpbml0aWFsaXplZCB3aGVuCnRocmVzaG9sZF9pbml0X2Rldmlj ZSgpIGlzIGNhbGxlZC4KClVzZSB0aGUgc2F2ZWQgYmxvY2sgYWRkcmVzcywgaWYgYXZhaWxhYmxl LCByYXRoZXIgdGhhbiB0cnlpbmcgdG8KcmVkaXNjb3ZlciBpdC4KClRoaXMgd2lsbCBhdm9pZCBh IGNhbGwgdHJhY2UsIHdoZW4gcmVzdW1pbmcgZnJvbSBzdXNwZW5kLCBkdWUgdG8gdGhlCnJkbXNy X3NhZmVfb25fY3B1KCkgY2FsbCBpbiBnZXRfYmxvY2tfYWRkcmVzcygpLiBUaGUgcmRtc3Jfc2Fm ZV9vbl9jcHUoKQpjYWxsIGlzc3VlcyBhbiBJUEkgYnV0IHdlJ3JlIHJ1bm5pbmcgd2l0aCBpbnRl cnJ1cHRzIGRpc2FibGVkLiBUaGlzCnRyaWdnZXJzOgoKICAgIFdBUk5JTkc6IENQVTogMCBQSUQ6 IDExNTIzIGF0IGtlcm5lbC9zbXAuYzoyOTEgc21wX2NhbGxfZnVuY3Rpb25fc2luZ2xlKzB4ZGMv MHhlMAoKU2lnbmVkLW9mZi1ieTogWWF6ZW4gR2hhbm5hbSA8eWF6ZW4uZ2hhbm5hbUBhbWQuY29t PgpTaWduZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+CkNjOiA8c3RhYmxl QHZnZXIua2VybmVsLm9yZz4gIyA0LjE0LngKQ2M6IEJvcmlzbGF2IFBldGtvdiA8YnBAYWxpZW44 LmRlPgpDYzogTGludXMgVG9ydmFsZHMgPHRvcnZhbGRzQGxpbnV4LWZvdW5kYXRpb24ub3JnPgpD YzogUGV0ZXIgWmlqbHN0cmEgPHBldGVyekBpbmZyYWRlYWQub3JnPgpDYzogVGhvbWFzIEdsZWl4 bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+CkNjOiBUb255IEx1Y2sgPHRvbnkubHVja0BpbnRlbC5j b20+CkNjOiBsaW51eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KTGluazogaHR0 cDovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgwMjIxMTAxOTAwLjEwMzI2LTgtYnBAYWxpZW44LmRl ClNpZ25lZC1vZmYtYnk6IEluZ28gTW9sbmFyIDxtaW5nb0BrZXJuZWwub3JnPgpTaWduZWQtb2Zm LWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0K IGFyY2gveDg2L2tlcm5lbC9jcHUvbWNoZWNrL21jZV9hbWQuYyB8ICAgMTUgKysrKysrKysrKysr KysrCiAxIGZpbGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKQoKCgotLQpUbyB1bnN1YnNjcmli ZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIg aW4KdGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9y ZSBtYWpvcmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5m by5odG1sCgotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L21jaGVjay9tY2VfYW1kLmMKKysrIGIv YXJjaC94ODYva2VybmVsL2NwdS9tY2hlY2svbWNlX2FtZC5jCkBAIC00MzQsNiArNDM0LDIxIEBA IHN0YXRpYyB1MzIgZ2V0X2Jsb2NrX2FkZHJlc3ModW5zaWduZWQgaW4KIHsKIAl1MzIgYWRkciA9 IDAsIG9mZnNldCA9IDA7CiAKKwlpZiAoKGJhbmsgPj0gbWNhX2NmZy5iYW5rcykgfHwgKGJsb2Nr ID49IE5SX0JMT0NLUykpCisJCXJldHVybiBhZGRyOworCisJLyogR2V0IGFkZHJlc3MgZnJvbSBh bHJlYWR5IGluaXRpYWxpemVkIGJsb2NrLiAqLworCWlmIChwZXJfY3B1KHRocmVzaG9sZF9iYW5r cywgY3B1KSkgeworCQlzdHJ1Y3QgdGhyZXNob2xkX2JhbmsgKmJhbmtwID0gcGVyX2NwdSh0aHJl c2hvbGRfYmFua3MsIGNwdSlbYmFua107CisKKwkJaWYgKGJhbmtwICYmIGJhbmtwLT5ibG9ja3Mp IHsKKwkJCXN0cnVjdCB0aHJlc2hvbGRfYmxvY2sgKmJsb2NrcCA9ICZiYW5rcC0+YmxvY2tzW2Js b2NrXTsKKworCQkJaWYgKGJsb2NrcCkKKwkJCQlyZXR1cm4gYmxvY2twLT5hZGRyZXNzOworCQl9 CisJfQorCiAJaWYgKG1jZV9mbGFncy5zbWNhKSB7CiAJCWlmIChzbWNhX2dldF9iYW5rX3R5cGUo YmFuaykgPT0gU01DQV9SRVNFUlZFRCkKIAkJCXJldHVybiBhZGRyOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4/8oouJR38oW+m0TLMGCvalC/Q0PCaat5nv/09Vi+KpxXKc744bTiHkuH+TH4J2pHPTPs4p ARC-Seal: i=1; a=rsa-sha256; t=1523981228; cv=none; d=google.com; s=arc-20160816; b=xXKcoeDN9pbz1xtPUSRwv4Nu6dSrKmUNtCWCL1OPRcVoLzNjIll4NlfMHtohXtZL+X WjL7SjoB1j8gaFs8FmgE8BY9QP+HCuJMJHfWwvXud0PSzhGdez9rCLQOPrai+ABW+Zv8 3QbbqecmXvwFiiWTLCQT2vWekpJXGn/lb0TpRRAnPOtzVsSciM09Upqb+QWoUvQnNLut SurL+mmgzVGbUJLLfFWCpabTgL6YB3kWdU33Oa4gXidcEqcoMTFmxCrrr6tfMZzceHEr UUEnNTPAR3R/+E4A6rqXBf/udAhFB3Mv82n3ioRV70CmMunj6CZQZttGW0uWfoeHMG4+ mCaA== 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=OtZWjni0tua+Fqgg5cNw/stv83UDTz5ZyGWP+m+GDDM=; b=BCxnR5wdqMVb2WQwIt7KM9megK6R7GU8OSbN+1VkzDhLcLWbSABcV2xDlVv6TVMtPK 7pY0OCxi+V5qdhcUYw9wdK83xv/uS15zrwoHl2wNyrbp2DWmgJYOvfSMwv/0DSSwXfll NyrHrpr1CPWWfviHDqoXKnl4nvUh7rqdNo114UhUkrtl1bGNvZ6p+e9+Bwo+u92Fl65z jRDKk3j3Vgi8J8QyE+7FTQ0KLNGF2XBtIqyBDx4NQE4Du53ROq6OLENQHQEcmqNDODRa iTwXecA+0moCQcl9CILiWwef0x+oSCBvxj6c4wip2g5W6VRuKKHdJDCO9ItOl5IdvOKV jtbw== 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 39/49] x86/mce/AMD: Get address from already initialized block Date: Tue, 17 Apr 2018 17:59:18 +0200 Message-Id: <20180417155716.895432903@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?1598009860124329571?= X-GMAIL-MSGID: =?utf-8?q?1598010140442309933?= 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 27bd59502702fe51d9eb00450a75b727ec6bfcb4 upstream. The block address is saved after the block is initialized when threshold_init_device() is called. Use the saved block address, if available, rather than trying to rediscover it. This will avoid a call trace, when resuming from suspend, due to the rdmsr_safe_on_cpu() call in get_block_address(). The rdmsr_safe_on_cpu() call issues 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 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-8-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, 15 insertions(+) --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -434,6 +434,21 @@ static u32 get_block_address(unsigned in { u32 addr = 0, offset = 0; + 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) { if (smca_get_bank_type(bank) == SMCA_RESERVED) return addr;