From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937490AbdAKLQs (ORCPT ); Wed, 11 Jan 2017 06:16:48 -0500 Received: from terminus.zytor.com ([198.137.202.10]:45064 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762421AbdAKLQr (ORCPT ); Wed, 11 Jan 2017 06:16:47 -0500 Date: Wed, 11 Jan 2017 03:15:57 -0800 From: tip-bot for Prarit Bhargava Message-ID: Cc: bp@suse.de, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, eranian@google.com, kan.liang@intel.com, prarit@redhat.com, torvalds@linux-foundation.org, vincent.weaver@maine.edu, tglx@linutronix.de, alexander.shishkin@linux.intel.com, jolsa@redhat.com, acme@redhat.com, harish.chegondi@intel.com Reply-To: eranian@google.com, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, bp@suse.de, harish.chegondi@intel.com, alexander.shishkin@linux.intel.com, acme@redhat.com, jolsa@redhat.com, tglx@linutronix.de, torvalds@linux-foundation.org, vincent.weaver@maine.edu, prarit@redhat.com, kan.liang@intel.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: 6d6daa20945f3f598e56e18d1f926c08754f5801 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: 6d6daa20945f3f598e56e18d1f926c08754f5801 Gitweb: http://git.kernel.org/tip/6d6daa20945f3f598e56e18d1f926c08754f5801 Author: Prarit Bhargava AuthorDate: Thu, 5 Jan 2017 10:09:25 -0500 Committer: Thomas Gleixner CommitDate: Wed, 11 Jan 2017 12:13:21 +0100 perf/x86/intel/uncore: Fix hardcoded socket 0 assumption in the Haswell init code hswep_uncore_cpu_init() uses a hardcoded physical package id 0 for the boot cpu. This works as long as the boot CPU is actually on the physical package 0, which is normaly the case after power on / reboot. But it fails with a NULL pointer dereference when a kdump kernel is started on a secondary socket which has a different physical package id because the locigal package translation for physical package 0 does not exist. Use the logical package id of the boot cpu instead of hard coded 0. [ tglx: Rewrote changelog once more ] Fixes: cf6d445f6897 ("perf/x86/uncore: Track packages, not per CPU data") 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 Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1483628965-2890-1-git-send-email-prarit@redhat.com Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- 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;