From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754613AbbCEISN (ORCPT ); Thu, 5 Mar 2015 03:18:13 -0500 Received: from cantor2.suse.de ([195.135.220.15]:47489 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752590AbbCEIRz (ORCPT ); Thu, 5 Mar 2015 03:17:55 -0500 Date: Thu, 5 Mar 2015 09:16:40 +0100 From: Borislav Petkov To: Sudeep Holla Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Andre Przywara , x86@kernel.org Subject: Re: [PATCH v3] x86: move cacheinfo sysfs to generic cacheinfo infrastructure Message-ID: <20150305081640.GA3817@pd.tnic> References: <1424715265-21407-1-git-send-email-sudeep.holla@arm.com> <1425470416-20691-1-git-send-email-sudeep.holla@arm.com> <20150304122720.GD3663@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20150304122720.GD3663@pd.tnic> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 04, 2015 at 01:27:20PM +0100, Borislav Petkov wrote: > Applied, thanks guys. Ok, we forgot to add the same check in the cpu_has_topoext case in __cache_amd_cpumap_setup() and my F15h exploded this morning: --- diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 54e43d58e714..8008bc2dd2d0 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c @@ -820,9 +820,13 @@ static int __cache_amd_cpumap_setup(unsigned int cpu, int index, for_each_online_cpu(i) { this_cpu_ci = get_cpu_cacheinfo(i); + if (!this_cpu_ci->info_list) + continue; + apicid = cpu_data(i).apicid; if ((apicid < first) || (apicid > last)) continue; + this_leaf = this_cpu_ci->info_list + index; for_each_online_cpu(sibling) { --- I've folded the above into your patch. -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --