From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760374Ab0EEPHy (ORCPT ); Wed, 5 May 2010 11:07:54 -0400 Received: from mail-bw0-f225.google.com ([209.85.218.225]:52082 "EHLO mail-bw0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760353Ab0EEPHw (ORCPT ); Wed, 5 May 2010 11:07:52 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=mABFqnnziwRjgjAg8yCfiwmXOnz96XMvvrD6F74PStxN/HoKyG1ex1Yyrje9lCDzBh 8CO47hUatKefyHayPYmNxymA/DwuSGt8AtzQvT5tCDB0LSLMd0mm8kD+Wfi3GqFA7A7B VVF0HPcptFZnUqN5iknzFzcRdkubexj5cm53A= Date: Wed, 5 May 2010 19:07:40 +0400 From: Cyrill Gorcunov To: Ingo Molnar Cc: LKML , Peter Zijlstra , Steven Rostedt , Frederic Weisbecker Subject: [PATCH -tip] x86,perf: P4 PMU -- protect sensible procedures from preemption Message-ID: <20100505150740.GB5686@lenovo> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Steven reported | | I'm getting: | | Pid: 3477, comm: perf Not tainted 2.6.34-rc6 #2727 | Call Trace: | [] debug_smp_processor_id+0xd5/0xf0 | [] p4_hw_config+0x2b/0x15c | [] ? trace_hardirqs_on_caller+0x12b/0x14f | [] hw_perf_event_init+0x468/0x7be | [] ? debug_mutex_init+0x31/0x3c | [] T.850+0x273/0x42e | [] sys_perf_event_open+0x23e/0x3f1 | [] ? sysret_check+0x2e/0x69 | [] system_call_fastpath+0x16/0x1b | | When running perf record in latest tip/perf/core | Due to the fact that p4 counters are shared between HT threads we synthetically divide the whole set of counters into two non-intersected subsets. And while we're borrowing counters from these subsets we should not be preempted. So use get_cpu/put_cpu pair. Reported-by: Steven Rostedt Tested-by: Steven Rostedt CC: Steven Rostedt CC: Peter Zijlstra CC: Ingo Molnar CC: Frederic Weisbecker Signed-off-by: Cyrill Gorcunov --- arch/x86/kernel/cpu/perf_event_p4.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c ===================================================================== --- linux-2.6.git.orig/arch/x86/kernel/cpu/perf_event_p4.c +++ linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c @@ -421,7 +421,7 @@ static u64 p4_pmu_event_map(int hw_event static int p4_hw_config(struct perf_event *event) { - int cpu = raw_smp_processor_id(); + int cpu = get_cpu(); u32 escr, cccr; /* @@ -440,7 +440,7 @@ static int p4_hw_config(struct perf_even event->hw.config = p4_set_ht_bit(event->hw.config); if (event->attr.type != PERF_TYPE_RAW) - return 0; + goto out; /* * We don't control raw events so it's up to the caller @@ -455,6 +455,8 @@ static int p4_hw_config(struct perf_even (p4_config_pack_escr(P4_ESCR_MASK_HT) | p4_config_pack_cccr(P4_CCCR_MASK_HT)); +out: + put_cpu(); return 0; } @@ -741,7 +743,7 @@ static int p4_pmu_schedule_events(struct { unsigned long used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)]; unsigned long escr_mask[BITS_TO_LONGS(ARCH_P4_TOTAL_ESCR)]; - int cpu = raw_smp_processor_id(); + int cpu = get_cpu(); struct hw_perf_event *hwc; struct p4_event_bind *bind; unsigned int i, thread, num; @@ -777,6 +779,7 @@ reserve: } done: + put_cpu(); return num ? -ENOSPC : 0; }