Received: by 10.192.165.156 with SMTP id m28csp1306564imm; Fri, 13 Apr 2018 17:53:29 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+W1OeaZqu39OLjdY/gz2NEXa+5u5/JNi7OVfISt6WOxSu+IvGd3Yj6dkFADek+0smcxV5Z X-Received: by 10.99.147.80 with SMTP id w16mr5666408pgm.181.1523667209823; Fri, 13 Apr 2018 17:53:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523667209; cv=none; d=google.com; s=arc-20160816; b=PLoiJJaKM3jT/94IYRNRjs4mkX7lDAHXAynQv+Owe7dJglt5gZSQczYiOHMdtMDyyD bZ0maFHkpKyQiHAaltfF61aE4km2IakCcDULffrVNEiwkU57J6rtRA9crVczZCbFJowf g+82IEJrEE4BUavoaI+3PpzeUBLnTWTw45dYgcIZD6CGr/vecBqECxTlVVJbB+tzmA1Z 8ysTVtwC1hj6oGjb3Y0iXmBDPjNjmrF/LCLXovT7tM2pBaKZ3Rd2UR7HBowtF/aEt0iO 6hzxg7LJvYfz1tA+v2nQE/w7gLZETR0W1B/adzzDylbLJCcjo1QEAbrDFop9H+US5/K+ 6IKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:arc-authentication-results; bh=w0+5kA/GAvGWxqEz0EufBXjrnynCb6oOW4Zs2eee4QU=; b=ZglBx7ltCnbNMRkiqtFsitx5NF3bjcJSEWW6a2hqRT47zuQGJeq3fx03FEaRaKbEo7 bo3PPwxx8NuuqORkDsWIt8u0MjK21ZW6+bvaArpgXtAJYAnnEStEUtVhvwqs6rK3s4k7 peelHeAgk5ncW8hR20ZwTygRZ/raxiCd4cczqfeTUKdcrHxMwhqJyVfzFhlDqIGvQ564 WCh8T5NjwUuzNkLiyB40E+bGihwZgoMTnjk/RnZq+jjnIwQrbvFjv5JBPpUHYknitQc6 WqLWLxTFbM1UnpBZqfO9FXzr7EyGuMp+pyvo7k7SzT/Ut+bIeTEndz3BX8JSYprXQR9j MwJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r4si4921453pgt.7.2018.04.13.17.53.15; Fri, 13 Apr 2018 17:53:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751421AbeDNAwL (ORCPT + 99 others); Fri, 13 Apr 2018 20:52:11 -0400 Received: from freki.datenkhaos.de ([81.7.17.101]:48570 "EHLO freki.datenkhaos.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980AbeDNAwJ (ORCPT ); Fri, 13 Apr 2018 20:52:09 -0400 X-Greylist: delayed 569 seconds by postgrey-1.27 at vger.kernel.org; Fri, 13 Apr 2018 20:52:08 EDT Received: from probook (x590d8900.dyn.telefonica.de [89.13.137.0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by freki.datenkhaos.de (Postfix) with ESMTPSA id DA9AC8472FD; Sat, 14 Apr 2018 02:42:37 +0200 (CEST) Date: Sat, 14 Apr 2018 02:42:31 +0200 From: Johannes Hirte To: Yazen Ghannam Cc: linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, bp@suse.de, tony.luck@intel.com, x86@kernel.org Subject: Re: [PATCH 3/3] x86/MCE/AMD: Get address from already initialized block Message-ID: <20180414004230.GA2033@probook> References: <20180201184813.82253-1-Yazen.Ghannam@amd.com> <20180201184813.82253-3-Yazen.Ghannam@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180201184813.82253-3-Yazen.Ghannam@amd.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2018 Feb 01, Yazen Ghannam wrote: > From: Yazen Ghannam > > 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. > > We can avoid some *on_cpu() calls in the init path that will cause a > call trace when resuming from suspend. > > Cc: # 4.14.x > Signed-off-by: Yazen Ghannam > --- > arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c > index bf53b4549a17..8c4f8f30c779 100644 > --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c > +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c > @@ -436,6 +436,21 @@ static u32 get_block_address(unsigned int cpu, u32 current_addr, u32 low, u32 hi > { > 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; > -- > 2.14.1 I have a KASAN: slab-out-of-bounds, and git bisect points me to this change: Apr 13 00:40:32 probook kernel: ================================================================== Apr 13 00:40:32 probook kernel: BUG: KASAN: slab-out-of-bounds in get_block_address.isra.3+0x1e9/0x520 Apr 13 00:40:32 probook kernel: Read of size 4 at addr ffff8803f165ddf4 by task swapper/0/1 Apr 13 00:40:32 probook kernel: Apr 13 00:40:32 probook kernel: CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.16.0-10757-g4ca8ba4ccff9 #532 Apr 13 00:40:32 probook kernel: Hardware name: HP HP ProBook 645 G2/80FE, BIOS N77 Ver. 01.12 12/19/2017 Apr 13 00:40:32 probook kernel: Call Trace: Apr 13 00:40:32 probook kernel: dump_stack+0x5b/0x8b Apr 13 00:40:32 probook kernel: ? get_block_address.isra.3+0x1e9/0x520 Apr 13 00:40:32 probook kernel: print_address_description+0x65/0x270 Apr 13 00:40:32 probook kernel: ? get_block_address.isra.3+0x1e9/0x520 Apr 13 00:40:32 probook kernel: kasan_report+0x232/0x350 Apr 13 00:40:32 probook kernel: get_block_address.isra.3+0x1e9/0x520 Apr 13 00:40:32 probook kernel: ? kobject_init_and_add+0xde/0x130 Apr 13 00:40:32 probook kernel: ? get_name+0x390/0x390 Apr 13 00:40:32 probook kernel: ? kasan_unpoison_shadow+0x30/0x40 Apr 13 00:40:32 probook kernel: ? kasan_kmalloc+0xa0/0xd0 Apr 13 00:40:32 probook kernel: allocate_threshold_blocks+0x12c/0xc60 Apr 13 00:40:32 probook kernel: ? kobject_add_internal+0x800/0x800 Apr 13 00:40:32 probook kernel: ? get_block_address.isra.3+0x520/0x520 Apr 13 00:40:32 probook kernel: ? kasan_kmalloc+0xa0/0xd0 Apr 13 00:40:32 probook kernel: mce_threshold_create_device+0x35b/0x990 Apr 13 00:40:32 probook kernel: ? init_special_inode+0x1d0/0x230 Apr 13 00:40:32 probook kernel: threshold_init_device+0x98/0xa7 Apr 13 00:40:32 probook kernel: ? mcheck_vendor_init_severity+0x43/0x43 Apr 13 00:40:32 probook kernel: do_one_initcall+0x76/0x30c Apr 13 00:40:32 probook kernel: ? trace_event_raw_event_initcall_finish+0x190/0x190 Apr 13 00:40:32 probook kernel: ? kasan_unpoison_shadow+0xb/0x40 Apr 13 00:40:32 probook kernel: ? kasan_unpoison_shadow+0x30/0x40 Apr 13 00:40:32 probook kernel: kernel_init_freeable+0x3d6/0x471 Apr 13 00:40:32 probook kernel: ? rest_init+0xf0/0xf0 Apr 13 00:40:32 probook kernel: kernel_init+0xa/0x120 Apr 13 00:40:32 probook kernel: ? rest_init+0xf0/0xf0 Apr 13 00:40:32 probook kernel: ret_from_fork+0x22/0x40 Apr 13 00:40:32 probook kernel: Apr 13 00:40:32 probook kernel: Allocated by task 1: Apr 13 00:40:32 probook kernel: kasan_kmalloc+0xa0/0xd0 Apr 13 00:40:32 probook kernel: kmem_cache_alloc_trace+0xf3/0x1f0 Apr 13 00:40:32 probook kernel: allocate_threshold_blocks+0x1bc/0xc60 Apr 13 00:40:32 probook kernel: mce_threshold_create_device+0x35b/0x990 Apr 13 00:40:32 probook kernel: threshold_init_device+0x98/0xa7 Apr 13 00:40:32 probook kernel: do_one_initcall+0x76/0x30c Apr 13 00:40:32 probook kernel: kernel_init_freeable+0x3d6/0x471 Apr 13 00:40:32 probook kernel: kernel_init+0xa/0x120 Apr 13 00:40:32 probook kernel: ret_from_fork+0x22/0x40 Apr 13 00:40:32 probook kernel: Apr 13 00:40:32 probook kernel: Freed by task 0: Apr 13 00:40:32 probook kernel: (stack is not available) Apr 13 00:40:32 probook kernel: Apr 13 00:40:32 probook kernel: The buggy address belongs to the object at ffff8803f165dd80 which belongs to the cache kmalloc-128 of size 128 Apr 13 00:40:32 probook kernel: The buggy address is located 116 bytes inside of 128-byte region [ffff8803f165dd80, ffff8803f165de00) Apr 13 00:40:32 probook kernel: The buggy address belongs to the page: Apr 13 00:40:32 probook kernel: page:ffffea000fc59740 count:1 mapcount:0 mapping:0000000000000000 index:0x0 Apr 13 00:40:32 probook kernel: flags: 0x2000000000000100(slab) Apr 13 00:40:32 probook kernel: raw: 2000000000000100 0000000000000000 0000000000000000 0000000180150015 Apr 13 00:40:32 probook kernel: raw: dead000000000100 dead000000000200 ffff8803f3403340 0000000000000000 Apr 13 00:40:32 probook kernel: page dumped because: kasan: bad access detected Apr 13 00:40:32 probook kernel: Apr 13 00:40:32 probook kernel: Memory state around the buggy address: Apr 13 00:40:32 probook kernel: ffff8803f165dc80: fc fc fc fc fc fc fc fc 00 00 00 00 00 00 00 00 Apr 13 00:40:32 probook kernel: ffff8803f165dd00: 00 00 00 00 00 00 00 fc fc fc fc fc fc fc fc fc Apr 13 00:40:32 probook kernel: >ffff8803f165dd80: 00 00 00 00 00 00 00 00 00 00 00 00 00 fc fc fc Apr 13 00:40:32 probook kernel: ^ Apr 13 00:40:32 probook kernel: ffff8803f165de00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc Apr 13 00:40:32 probook kernel: ffff8803f165de80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc Apr 13 00:40:32 probook kernel: ================================================================== -- Regards, Johannes