Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755769AbYKDTT7 (ORCPT ); Tue, 4 Nov 2008 14:19:59 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752985AbYKDTTu (ORCPT ); Tue, 4 Nov 2008 14:19:50 -0500 Received: from courier.cs.helsinki.fi ([128.214.9.1]:45877 "EHLO mail.cs.helsinki.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751651AbYKDTTt (ORCPT ); Tue, 4 Nov 2008 14:19:49 -0500 Date: Tue, 4 Nov 2008 21:19:48 +0200 (EET) From: Pekka J Enberg To: Robert Richter cc: Andi Kleen , Eric Dumazet , linux kernel , Andi Kleen , Ingo Molnar Subject: Re: linux-2.6.28-rc2 regression : oprofile doesnt work anymore ? In-Reply-To: <20081104181855.GK9785@erda.amd.com> Message-ID: References: <4909F690.9090208@cosmosbay.com> <84144f020810310721x1d1eccbeica5d10608d7b2e57@mail.gmail.com> <20081104181855.GK9785@erda.amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2586 Lines: 79 Hi Robert, On Tue, 4 Nov 2008, Robert Richter wrote: > your patchset breaks oprofile on Intel Core 2 cpus. I could bisect the > bug for c493756..5951290. Please take a look at this and send me a fix. Unfortunately I don't have my machine with me right now so I can't test this, but don't we want something like this? Andi? Pekka >From 37d362c0262006be6a5d6a72b5993834afa776d7 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Tue, 4 Nov 2008 21:17:47 +0200 Subject: [PATCH] oprofile: make perfmon nethalem only Commit b99170288421c79f0c2efa8b33e26e65f4bb7fb8 ("oprofile: Implement Intel architectural perfmon support") added perfmon support to newer Intel CPUs (Core1+). The problem there is that it requires a patched oprofile userland to work properly. Fix that up by making oprofile perfmon support nethalem only. Signed-off-by: Pekka Enberg --- arch/x86/oprofile/nmi_int.c | 7 +++++++ arch/x86/oprofile/op_model_ppro.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 022cd41..1f4448e 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -426,8 +426,15 @@ static int __init ppro_init(char **cpu_type) static int __init arch_perfmon_init(char **cpu_type) { + __u8 cpu_model = boot_cpu_data.x86_model; + if (!cpu_has_arch_perfmon) return 0; + + /* Nethalem only */ + if (cpu_model != 26) + return 0; + *cpu_type = "i386/arch_perfmon"; model = &op_arch_perfmon_spec; arch_perfmon_setup_counters(); diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index 0620d6d..1c91ba2 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c @@ -66,6 +66,7 @@ static void ppro_fill_in_addresses(struct op_msrs * const msrs) static void ppro_setup_ctrs(struct op_msrs const * const msrs) { + __u8 cpu_model = boot_cpu_data.x86_model; unsigned int low, high; int i; @@ -76,7 +77,8 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs) return; } - if (cpu_has_arch_perfmon) { + /* Nethalem only */ + if (cpu_has_arch_perfmon && cpu_model == 26) { union cpuid10_eax eax; eax.full = cpuid_eax(0xa); if (counter_width < eax.split.bit_width) -- 1.5.3.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/