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: [RESEND,2/5] x86/MCE: Handle MCA controls in a per_cpu way From: Borislav Petkov Message-Id: <20190408175142.GK15689@zn.tnic> Date: Mon, 8 Apr 2019 19:51:42 +0200 To: "Ghannam, Yazen" Cc: "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "tony.luck@intel.com" , "x86@kernel.org" List-ID: T24gTW9uLCBBcHIgMDgsIDIwMTkgYXQgMDI6MTI6MTZQTSArMDAwMCwgR2hhbm5hbSwgWWF6ZW4g d3JvdGU6Cj4gRnJvbTogWWF6ZW4gR2hhbm5hbSA8eWF6ZW4uZ2hhbm5hbUBhbWQuY29tPgo+IAo+ IEN1cnJlbnQgQU1EIHN5c3RlbXMgaGF2ZSB1bmlxdWUgTUNBIGJhbmtzIHBlciBsb2dpY2FsIENQ VSBldmVuIHRob3VnaAo+IHRoZSB0eXBlIG9mIHRoZSBiYW5rcyBtYXkgYWxsIGFsaWduIHRvIHRo ZSBzYW1lIGJhbmsgbnVtYmVyLiBFYWNoIENQVQo+IHdpbGwgaGF2ZSBjb250cm9sIG9mIGEgc2V0 IG9mIE1DQSBiYW5rcyBpbiB0aGUgaGFyZHdhcmUgYW5kIHRoZXNlIGFyZQo+IG5vdCBzaGFyZWQg d2l0aCBvdGhlciBDUFVzLgo+IAo+IEZvciBleGFtcGxlLCBiYW5rIDAgbWF5IGJlIHRoZSBMb2Fk LVN0b3JlIFVuaXQgb24gZXZlcnkgbG9naWNhbCBDUFUsIGJ1dAo+IGVhY2ggYmFuayAwIGlzIGEg dW5pcXVlIHN0cnVjdHVyZSBpbiB0aGUgaGFyZHdhcmUuIEluIG90aGVyIHdvcmRzLCB0aGVyZQo+ IGlzbid0IGEgKnNpbmdsZSogTG9hZC1TdG9yZSBVbml0IGF0IE1DQSBiYW5rIDAgdGhhdCBhbGwg bG9naWNhbCBDUFVzCj4gc2hhcmUuCj4gCj4gVGhpcyBpZGVhIGV4dGVuZHMgZXZlbiB0byBub24t Y29yZSBNQ0EgYmFua3MuIEZvciBleGFtcGxlLCBDUFUwIGFuZCBDUFU0Cj4gbWF5IHNlZSBhIFVu aWZpZWQgTWVtb3J5IENvbnRyb2xsZXIgYXQgYmFuayAxNSwgYnV0IGVhY2ggQ1BVIGlzIGFjdHVh bGx5Cj4gc2VlaW5nIGEgdW5pcXVlIGhhcmR3YXJlIHN0cnVjdHVyZSB0aGF0IGlzIG5vdCBzaGFy ZWQgd2l0aCBvdGhlciBDUFVzLgo+IAo+IEJlY2F1c2UgdGhlIE1DQSBiYW5rcyBhcmUgYWxsIHVu aXF1ZSBoYXJkd2FyZSBzdHJ1Y3R1cmVzLCBpdCB3b3VsZCBiZQo+IGdvb2QgdG8gY29udHJvbCB0 aGVtIGluIGEgbW9yZSBncmFudWxhciB3YXkuIEZvciBleGFtcGxlLCBpZiB0aGVyZSBpcyBhCj4g a25vd24gaXNzdWUgd2l0aCB0aGUgRmxvYXRpbmcgUG9pbnQgVW5pdCBvbiBDUFU1IGFuZCBhIHVz ZXIgd2lzaGVzIHRvCj4gZGlzYWJsZSBhbiBlcnJvciB0eXBlIG9uIHRoZSBGbG9hdGluZyBQb2lu dCBVbml0LCB0aGVuIGl0IHdvdWxkIGJlIGdvb2QKPiB0byBkbyB0aGlzIG9ubHkgZm9yIENQVTUg cmF0aGVyIHRoYW4gYWxsIENQVXMuCj4gCj4gQWxzbywgZnV0dXJlIEFNRCBzeXN0ZW1zIG1heSBo YXZlIGhldGVyb2dlbmVvdXMgTUNBIGJhbmtzLiBNZWFuaW5nIHRoZQo+IGJhbmsgbnVtYmVycyBt YXkgbm90IG5lY2Vzc2FyaWx5IHJlcHJlc2VudCB0aGUgc2FtZSB0eXBlcyBiZXR3ZWVuIENQVXMu Cj4gRm9yIGV4YW1wbGUsIGJhbmsgMjAgdmlzaWJsZSB0byBDUFUwIG1heSBiZSBhIFVuaWZpZWQg TWVtb3J5IENvbnRyb2xsZXIKPiBhbmQgYmFuayAyMCB2aXNpYmxlIHRvIENQVTQgbWF5IGJlIGEg Q29oZXJlbnQgU2xhdmUuIFNvIGdyYW51bGFyIGNvbnRyb2wKPiB3aWxsIGJlIGV2ZW4gbW9yZSBu ZWNlc3Nhcnkgc2hvdWxkIHRoZSB1c2VyIHdpc2ggdG8gY29udHJvbCBzcGVjaWZpYyBNQ0EKPiBi YW5rcy4KPiAKPiBTcGxpdCB0aGUgZGV2aWNlIGF0dHJpYnV0ZXMgZnJvbSBzdHJ1Y3QgbWNlX2Jh bmsgbGVhdmluZyBvbmx5IHRoZSBNQ0EKPiBiYW5rIGNvbnRyb2wgZmllbGRzLgo+IAo+IE1ha2Ug c3RydWN0IG1jZV9iYW5rc1tdIHBlcl9jcHUgaW4gb3JkZXIgdG8gaGF2ZSBtb3JlIGdyYW51bGFy IGNvbnRyb2wKPiBvdmVyIGluZGl2aWR1YWwgTUNBIGJhbmtzIGluIHRoZSBoYXJkd2FyZS4KPiAK PiBBbGxvY2F0ZSB0aGUgZGV2aWNlIGF0dHJpYnV0ZXMgc3RhdGljYWxseSBiYXNlZCBvbiB0aGUg bWF4aW11bSBudW1iZXIgb2YKPiBNQ0EgYmFua3Mgc3VwcG9ydGVkLiBUaGUgc3lzZnMgaW50ZXJm YWNlIHdpbGwgdXNlIGFzIG1hbnkgYXMgbmVlZGVkIHBlcgo+IENQVS4gQ3VycmVudGx5LCB0aGlz IGlzIHNldCB0byBtY2FfY2ZnLmJhbmtzLCBidXQgd2lsbCBiZSBjaGFuZ2VkIHRvIGEKPiBwZXJf Y3B1IGJhbmsgY291bnQgaW4gYSBmdXR1cmUgcGF0Y2guCj4gCj4gQWxsb2NhdGUgdGhlIE1DQSBj b250cm9sIGJpdHMgZHluYW1pY2FsbHkuIFVzZSB0aGUgbWF4aW11bSBudW1iZXIgb2YgTUNBCj4g YmFua3Mgc3VwcG9ydGVkIGZvciBub3cuIFRoaXMgd2lsbCBiZSBjaGFuZ2VkIHRvIGEgcGVyX2Nw dSBiYW5rIGNvdW50IGluCj4gYSBmdXR1cmUgcGF0Y2guCj4gCj4gUmVkbyB0aGUgc3lzZnMgc3Rv cmUvc2hvdyBmdW5jdGlvbnMgdG8gaGFuZGxlIHRoZSBwZXJfY3B1IG1jZV9iYW5rc1tdLgo+IAo+ IFNpZ25lZC1vZmYtYnk6IFlhemVuIEdoYW5uYW0gPHlhemVuLmdoYW5uYW1AYW1kLmNvbT4KPiAt LS0KPiAgYXJjaC94ODYva2VybmVsL2NwdS9tY2UvY29yZS5jIHwgNzcgKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwg MjYgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNl L2NvcmUuYyBiL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNlL2NvcmUuYwo+IGluZGV4IDhkMGQxZTg0 MjVkYi4uMTQ1ODNjNWM2ZTEyIDEwMDY0NAo+IC0tLSBhL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNl L2NvcmUuYwo+ICsrKyBiL2FyY2gveDg2L2tlcm5lbC9jcHUvbWNlL2NvcmUuYwo+IEBAIC02NCwx NiArNjQsMjEgQEAgc3RhdGljIERFRklORV9NVVRFWChtY2Vfc3lzZnNfbXV0ZXgpOwo+ICAKPiAg REVGSU5FX1BFUl9DUFUodW5zaWduZWQsIG1jZV9leGNlcHRpb25fY291bnQpOwo+ICAKPiArc3Ry dWN0IG1jZV9iYW5rIHsKPiArCXU2NAljdGw7CS8qIHN1YmV2ZW50cyB0byBlbmFibGUgKi8KPiAr CWJvb2wJaW5pdDsJLyogaW5pdGlhbGlzZSBiYW5rPyAqLwoKS2VlcCB0aGF0IHZlcnRpY2FsIGFs aWdubWVudCBhcyBvZiB0aGF0IG9mIHRoZSBtZW1iZXJzIGlmIG1jZV9iYW5rX2RldgpiZWxvdy4K Cj4gK307Cj4gK3N0YXRpYyBERUZJTkVfUEVSX0NQVV9SRUFEX01PU1RMWShzdHJ1Y3QgbWNlX2Jh bmsqLCBtY2VfYmFua3MpOwoKU3BhY2UgYmV0d2VlbiBtY2VfYmFuayBhbmQgKi4KCj4gKwo+ICAj ZGVmaW5lIEFUVFJfTEVOICAgICAgICAgICAgICAgMTYKPiAgLyogT25lIG9iamVjdCBmb3IgZWFj aCBNQ0UgYmFuaywgc2hhcmVkIGJ5IGFsbCBDUFVzICovCj4gLXN0cnVjdCBtY2VfYmFuayB7Cj4g LQl1NjQJCQljdGw7CQkJLyogc3ViZXZlbnRzIHRvIGVuYWJsZSAqLwo+IC0JYm9vbAkJCWluaXQ7 CQkJLyogaW5pdGlhbGlzZSBiYW5rPyAqLwo+ICtzdHJ1Y3QgbWNlX2JhbmtfZGV2IHsKPiAgCXN0 cnVjdCBkZXZpY2VfYXR0cmlidXRlCWF0dHI7CQkJLyogZGV2aWNlIGF0dHJpYnV0ZSAqLwo+ICAJ Y2hhcgkJCWF0dHJuYW1lW0FUVFJfTEVOXTsJLyogYXR0cmlidXRlIG5hbWUgKi8KPiArCXU4CQkJ YmFuazsJCQkvKiBiYW5rIG51bWJlciAqLwo+ICB9Owo+ICtzdGF0aWMgc3RydWN0IG1jZV9iYW5r X2RldiBtY2VfYmFua19kZXZzW01BWF9OUl9CQU5LU107CgpXaGF0IGJvdGhlcnMgbWUgaGVyZSBp cyB0aGUgY29ubmVjdGlvbiBiZXR3ZWVuIHRoZSBtY2VfYmFuayBhbmQgdGhlCm1jZV9iYW5rX2Rl djogaXQgaXMgc2ltcGx5IG5vdCB0aGVyZS4KCldoeSBpc24ndCB0aGVyZSBhCgoJc3RydWN0IG1j ZV9iYW5rX2RldiAqZGV2OwoKaW4gc3RydWN0IG1jZV9iYW5rPwoKQmVjYXVzZSAtIGFuZCBjb3Jy ZWN0IG1lIGlmIEknbSB3cm9uZyBoZXJlIC0gYnV0IEkgdGhpbmsgaWYgd2UgZG8KcGVyLUNQVSBi YW5rcywgdGhlbiB3ZSBuZWVkIHRvIHNlbGVjdGl2ZWx5IHBvaW50IGZyb20gZWFjaCBtY2VfYmFu ayB0bwppdHMgY29ycmVzcG9uZGluZyBtY2VfYmFua19kZXYgZGVzY3JpcHRvciBzbyB0aGF0IHlv dSBoYXZlIHRoZSBwcm9wZXIKbmFtZXMuCgpGb3IgZXhhbXBsZSwgaWYgYmFuazMgb24gQ1BVNSBp cyBub3QgcHJlc2VudC9kaXNhYmxlZC9OL0Evd2hhdGV2ZXIsIHRoZW4KeW91IG5lZWQgdG8gbm90 IGluaXRpYWxpemUgdGhlIHRoYXQgc3lzZnMgZmlsZSB0aGVyZSBhbmQgaGF2ZToKCi9zeXMvZGV2 aWNlcy9zeXN0ZW0vbWFjaGluZWNoZWNrL21hY2hpbmVjaGVjazUvCuKUnOKUgOKUgCBiYW5rMAri lJzilIDilIAgYmFuazEK4pSc4pSA4pSAIGJhbmsxMArilJzilIDilIAgYmFuazExCuKUnOKUgOKU gCBiYW5rMTIK4pSc4pSA4pSAIGJhbmsxMwrilJzilIDilIAgYmFuazE0CuKUnOKUgOKUgCBiYW5r MTUK4pSc4pSA4pSAIGJhbmsxNgrilJzilIDilIAgYmFuazE3CuKUnOKUgOKUgCBiYW5rMTgK4pSc 4pSA4pSAIGJhbmsxOQrilJzilIDilIAgYmFuazIK4pSc4pSA4pSAIGJhbmsyMArilJzilIDilIAg YmFuazIxCuKUnOKUgOKUgCBiYW5rMjIKCQk8LS0tIGJhbmsgMyBpcyBub3QgdGhlcmUgYmVjYXVz ZSB1bnN1cHBvcnRlZC4K4pSc4pSA4pSAIGJhbms0CuKUnOKUgOKUgCBiYW5rNQrilJzilIDilIAg YmFuazYK4pSc4pSA4pSAIGJhbms3CuKUnOKUgOKUgCBiYW5rOArilJzilIDilIAgYmFuazkKCgpX aGljaCBtZWFucyB0aGF0IG1jZV9kZXZpY2VfY3JlYXRlKCkgc2hvdWxkIGxlYXJuIHRvIGJlIGFi bGUgdG8gY3JlYXRlCm5vbi1jb250aWd1b3VzIHBlci1DUFUgYmFuayBzeXNmcyBmaWxlcyBzbyB0 aGF0IHlvdSdsbCBoYXZlIHRvIGl0ZXJhdGUKb3ZlciB0aGUgcGVyLUNQVSBzdHJ1Y3QgbWNlX2Jh bmtzIGFycmF5IGFuZCB1c2Ugb25seSB0aG9zZSBtY2VfYmFua19kZXYKKiBwb2ludGVycyB3aGlj aCByZXByZXNlbnQgcHJlc2VudCBiYW5rcyBvbiB0aGlzIENQVSBvbmx5LgoKWWVzLCBubywgYW0g SSB3YXkgb2ZmPwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45A62C10F14 for ; Mon, 8 Apr 2019 17:51:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D04C217F4 for ; Mon, 8 Apr 2019 17:51:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alien8.de header.i=@alien8.de header.b="GZLdhslm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726373AbfDHRvw (ORCPT ); Mon, 8 Apr 2019 13:51:52 -0400 Received: from mail.skyhub.de ([5.9.137.197]:44610 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729307AbfDHRvv (ORCPT ); Mon, 8 Apr 2019 13:51:51 -0400 Received: from zn.tnic (p200300EC2F07270000CFE9C28C8FA671.dip0.t-ipconnect.de [IPv6:2003:ec:2f07:2700:cf:e9c2:8c8f:a671]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 8105E1EC082D; Mon, 8 Apr 2019 19:51:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1554745909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GBTty3sKkWiOiGKI1Pwh07W4vTuREULqwVTX/qLAFNs=; b=GZLdhslmG/EwfVXWSByznKpmj79wjB4Ge/p2lMEBm2OaGQUpGOMgYF5xMuo4RKWD85Cp4B 6Fh5fI4ux7m4IvGqm0DwUhBvEaV0hV72h3ArLqwUJUkDE+zovhQPaHAq9t6ika/RdLyu1i FCAcYoaBeTr73OBnFPR7KoXIVCNAiAE= Date: Mon, 8 Apr 2019 19:51:42 +0200 From: Borislav Petkov To: "Ghannam, Yazen" Cc: "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "tony.luck@intel.com" , "x86@kernel.org" Subject: Re: [PATCH RESEND 2/5] x86/MCE: Handle MCA controls in a per_cpu way Message-ID: <20190408175142.GK15689@zn.tnic> References: <20190408141205.12376-1-Yazen.Ghannam@amd.com> <20190408141205.12376-3-Yazen.Ghannam@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190408141205.12376-3-Yazen.Ghannam@amd.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org Message-ID: <20190408175142.Z9wlkL7rHHmegDq27yT5cQn4RaP5FehUymPbaCSwDfs@z> On Mon, Apr 08, 2019 at 02:12:16PM +0000, Ghannam, Yazen wrote: > From: Yazen Ghannam > > Current AMD systems have unique MCA banks per logical CPU even though > the type of the banks may all align to the same bank number. Each CPU > will have control of a set of MCA banks in the hardware and these are > not shared with other CPUs. > > For example, bank 0 may be the Load-Store Unit on every logical CPU, but > each bank 0 is a unique structure in the hardware. In other words, there > isn't a *single* Load-Store Unit at MCA bank 0 that all logical CPUs > share. > > This idea extends even to non-core MCA banks. For example, CPU0 and CPU4 > may see a Unified Memory Controller at bank 15, but each CPU is actually > seeing a unique hardware structure that is not shared with other CPUs. > > Because the MCA banks are all unique hardware structures, it would be > good to control them in a more granular way. For example, if there is a > known issue with the Floating Point Unit on CPU5 and a user wishes to > disable an error type on the Floating Point Unit, then it would be good > to do this only for CPU5 rather than all CPUs. > > Also, future AMD systems may have heterogeneous MCA banks. Meaning the > bank numbers may not necessarily represent the same types between CPUs. > For example, bank 20 visible to CPU0 may be a Unified Memory Controller > and bank 20 visible to CPU4 may be a Coherent Slave. So granular control > will be even more necessary should the user wish to control specific MCA > banks. > > Split the device attributes from struct mce_bank leaving only the MCA > bank control fields. > > Make struct mce_banks[] per_cpu in order to have more granular control > over individual MCA banks in the hardware. > > Allocate the device attributes statically based on the maximum number of > MCA banks supported. The sysfs interface will use as many as needed per > CPU. Currently, this is set to mca_cfg.banks, but will be changed to a > per_cpu bank count in a future patch. > > Allocate the MCA control bits dynamically. Use the maximum number of MCA > banks supported for now. This will be changed to a per_cpu bank count in > a future patch. > > Redo the sysfs store/show functions to handle the per_cpu mce_banks[]. > > Signed-off-by: Yazen Ghannam > --- > arch/x86/kernel/cpu/mce/core.c | 77 ++++++++++++++++++++++------------ > 1 file changed, 51 insertions(+), 26 deletions(-) > > diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c > index 8d0d1e8425db..14583c5c6e12 100644 > --- a/arch/x86/kernel/cpu/mce/core.c > +++ b/arch/x86/kernel/cpu/mce/core.c > @@ -64,16 +64,21 @@ static DEFINE_MUTEX(mce_sysfs_mutex); > > DEFINE_PER_CPU(unsigned, mce_exception_count); > > +struct mce_bank { > + u64 ctl; /* subevents to enable */ > + bool init; /* initialise bank? */ Keep that vertical alignment as of that of the members if mce_bank_dev below. > +}; > +static DEFINE_PER_CPU_READ_MOSTLY(struct mce_bank*, mce_banks); Space between mce_bank and *. > + > #define ATTR_LEN 16 > /* One object for each MCE bank, shared by all CPUs */ > -struct mce_bank { > - u64 ctl; /* subevents to enable */ > - bool init; /* initialise bank? */ > +struct mce_bank_dev { > struct device_attribute attr; /* device attribute */ > char attrname[ATTR_LEN]; /* attribute name */ > + u8 bank; /* bank number */ > }; > +static struct mce_bank_dev mce_bank_devs[MAX_NR_BANKS]; What bothers me here is the connection between the mce_bank and the mce_bank_dev: it is simply not there. Why isn't there a struct mce_bank_dev *dev; in struct mce_bank? Because - and correct me if I'm wrong here - but I think if we do per-CPU banks, then we need to selectively point from each mce_bank to its corresponding mce_bank_dev descriptor so that you have the proper names. For example, if bank3 on CPU5 is not present/disabled/N/A/whatever, then you need to not initialize the that sysfs file there and have: /sys/devices/system/machinecheck/machinecheck5/ ├── bank0 ├── bank1 ├── bank10 ├── bank11 ├── bank12 ├── bank13 ├── bank14 ├── bank15 ├── bank16 ├── bank17 ├── bank18 ├── bank19 ├── bank2 ├── bank20 ├── bank21 ├── bank22 <--- bank 3 is not there because unsupported. ├── bank4 ├── bank5 ├── bank6 ├── bank7 ├── bank8 ├── bank9 Which means that mce_device_create() should learn to be able to create non-contiguous per-CPU bank sysfs files so that you'll have to iterate over the per-CPU struct mce_banks array and use only those mce_bank_dev * pointers which represent present banks on this CPU only. Yes, no, am I way off? -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.