From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755762AbdAIGpz (ORCPT ); Mon, 9 Jan 2017 01:45:55 -0500 Received: from terminus.zytor.com ([198.137.202.10]:46610 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750902AbdAIGpw (ORCPT ); Mon, 9 Jan 2017 01:45:52 -0500 Date: Sun, 8 Jan 2017 22:43:21 -0800 From: tip-bot for Prarit Bhargava Message-ID: Cc: peterz@infradead.org, bp@suse.de, jolsa@redhat.com, prarit@redhat.com, vincent.weaver@maine.edu, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, kan.liang@intel.com, eranian@google.com, alexander.shishkin@linux.intel.com, harish.chegondi@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, torvalds@linux-foundation.org Reply-To: kan.liang@intel.com, eranian@google.com, alexander.shishkin@linux.intel.com, harish.chegondi@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, bp@suse.de, jolsa@redhat.com, hpa@zytor.com, prarit@redhat.com, tglx@linutronix.de, vincent.weaver@maine.edu, acme@redhat.com In-Reply-To: <1483628965-2890-1-git-send-email-prarit@redhat.com> References: <1483628965-2890-1-git-send-email-prarit@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/intel/uncore: Fix hardcoded socket 0 assumption in the Haswell init code Git-Commit-ID: fa37361e291bfe528872b9aef5c8644a3fc7ff20 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fa37361e291bfe528872b9aef5c8644a3fc7ff20 Gitweb: http://git.kernel.org/tip/fa37361e291bfe528872b9aef5c8644a3fc7ff20 Author: Prarit Bhargava AuthorDate: Thu, 5 Jan 2017 10:09:25 -0500 Committer: Ingo Molnar CommitDate: Sat, 7 Jan 2017 08:54:38 +0100 perf/x86/intel/uncore: Fix hardcoded socket 0 assumption in the Haswell init code On multi-socket Intel v3 processor systems (aka Haswell), kdump can crash in hswep_uncore_cpu_init(): BUG: unable to handle kernel paging request at 00000000006563a1 IP: [] hswep_uncore_cpu_init+0x52/0xa0 The crash was introduced by the following commit: 9d85eb9119f4 ("x86/smpboot: Make logical package management more robust") ... which patch corrected the physical ID to logical ID mapping of the threads if the kdumped panic occurs on any socket other than socket 0. But hswep_uncore_cpu_init() is hard coded for physical socket 0 and if the system is kdump'ing on any other socket the logical package value will be incorrect - crashing the kdump kernel. The code should not use 0 as the physical ID, and should use the boot CPU's logical package ID in this calculation. Signed-off-by: Prarit Bhargava Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Borislav Petkov Cc: H. Peter Anvin Cc: Harish Chegondi Cc: Jiri Olsa Cc: Kan Liang Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1483628965-2890-1-git-send-email-prarit@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore_snbep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index e6832be..dae2fed 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -2686,7 +2686,7 @@ static struct intel_uncore_type *hswep_msr_uncores[] = { void hswep_uncore_cpu_init(void) { - int pkg = topology_phys_to_logical_pkg(0); + int pkg = boot_cpu_data.logical_proc_id; if (hswep_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores) hswep_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;