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.15,22/53] x86/mce/AMD: Get address from already initialized block From: Greg Kroah-Hartman Message-Id: <20180417155724.189120729@linuxfoundation.org> Date: Tue, 17 Apr 2018 17:58:47 +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: NC4xNS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg 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 YXJjaC94ODYva2VybmVsL2NwdS9tY2hlY2svbWNlX2FtZC5jCkBAIC00MTYsNiArNDE2LDIxIEBA IHN0YXRpYyB1MzIgZ2V0X2Jsb2NrX2FkZHJlc3ModW5zaWduZWQgaW4KIHsKIAl1MzIgYWRkciA9 IDAsIG9mZnNldCA9IDA7CiAKKwlpZiAoKGJhbmsgPj0gbWNhX2NmZy5iYW5rcykgfHwgKGJsb2Nr ID49IE5SX0JMT0NLUykpCisJCXJldHVybiBhZGRyOworCisJLyogR2V0IGFkZHJlc3MgZnJvbSBh bHJlYWR5IGluaXRpYWxpemVkIGJsb2NrLiAqLworCWlmIChwZXJfY3B1KHRocmVzaG9sZF9iYW5r cywgY3B1KSkgeworCQlzdHJ1Y3QgdGhyZXNob2xkX2JhbmsgKmJhbmtwID0gcGVyX2NwdSh0aHJl c2hvbGRfYmFua3MsIGNwdSlbYmFua107CisKKwkJaWYgKGJhbmtwICYmIGJhbmtwLT5ibG9ja3Mp IHsKKwkJCXN0cnVjdCB0aHJlc2hvbGRfYmxvY2sgKmJsb2NrcCA9ICZiYW5rcC0+YmxvY2tzW2Js b2NrXTsKKworCQkJaWYgKGJsb2NrcCkKKwkJCQlyZXR1cm4gYmxvY2twLT5hZGRyZXNzOworCQl9 CisJfQorCiAJaWYgKG1jZV9mbGFncy5zbWNhKSB7CiAJCWlmICghYmxvY2spIHsKIAkJCWFkZHIg PSBNU1JfQU1ENjRfU01DQV9NQ3hfTUlTQyhiYW5rKTsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+VkhcGcxwiRWc6vQnG5wfMYylrKIvRHjYZ5PZfq0ENhV5bkKiQTFmEp2+zC6ml5Jl/ObnR ARC-Seal: i=1; a=rsa-sha256; t=1523981030; cv=none; d=google.com; s=arc-20160816; b=CPyttTrFrXDdbDe/zwJEUG4gD37gF5lpBTZ+OuZ12Cu4PfsfDxl4rQh3vB2SQTtzuh FVLsVhY5PCxTYi08tgOs5GAmMSlcyEAlpX3qaIPfNqalbb0TgbvJ4op0b2TUQPT2l+Z0 87Wf546/4mEz5wEde5ocJIq+NjaUnFF9jA4ouC+OH6PdQQFb0X88/Spzg5VA3UpKfw30 8jWlt+8lfWu2WrXPxnKWv356OaEHJRv+nf1kdoQtKY9HhOraw/aZ+TUI/dMCIcIgSMM0 6wDAZ/GbAvNU9D6xxzQev+dtJ5FdN+tI80TYb8AQF5d8z9NNoCQJoHbA5+xY5PSPgyGL GCuQ== 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=qTWl/1G4yVcY9HcS2ZfG9QjP3D5exJloaNfzO8irfJ0=; b=c8fNQ5aP6BI2UIIPgnjfzRXSoKqO7laxj16WiRbbWawH42qf/hkIhoLv/JlEez7xUV NvqtuT/SDOZ8UulDeAQ4/K8Eab5EZp0AK6De6R9SYX1vataImUqkYyfLHt9TaZW180on IauD7v7Eio+EjO/N6hpk4QFmtAZHzoiKfcjyPJs+UZ1AH9AaVAk7IKanBTFn5JLYr12Z 1COtLjlEM+HEJMGKcUV5S7ga4KNgZeyIRFY+0aepxJauvS0W6k562Etg6Vr2201Fz3AJ rqTcyNP8SfM6isk1tEoQRkjhEI/whpa/ns9wTY7VP1+c5nN2FSd3wR2v2OB/viQEmMCI ASoQ== 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.15 22/53] x86/mce/AMD: Get address from already initialized block Date: Tue, 17 Apr 2018 17:58:47 +0200 Message-Id: <20180417155724.189120729@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417155723.091120060@linuxfoundation.org> References: <20180417155723.091120060@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?1598009933453164349?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-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 @@ -416,6 +416,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 (!block) { addr = MSR_AMD64_SMCA_MCx_MISC(bank);