Ingo Molnar 34adc80622 perf_counter: Fix context removal deadlock ...

Disable the PMU globally before removing a counter from a
context. This fixes the following lockup:

[22081.741922] ------------[ cut here ]------------
[22081.746668] WARNING: at arch/x86/kernel/cpu/perf_counter.c:803 intel_pmu_handle_irq+0x9b/0x24e()
[22081.755624] Hardware name: X8DTN
[22081.758903] perfcounters: irq loop stuck!
[22081.762985] Modules linked in:
[22081.766136] Pid: 11082, comm: perf Not tainted 2.6.30-rc6-tip #226
[22081.772432] Call Trace:
[22081.774940]  <NMI>  [<ffffffff81019aed>] ? intel_pmu_handle_irq+0x9b/0x24e
[22081.781993]  [<ffffffff81019aed>] ? intel_pmu_handle_irq+0x9b/0x24e
[22081.788368]  [<ffffffff8104505c>] ? warn_slowpath_common+0x77/0xa3
[22081.794649]  [<ffffffff810450d3>] ? warn_slowpath_fmt+0x40/0x45
[22081.800696]  [<ffffffff81019aed>] ? intel_pmu_handle_irq+0x9b/0x24e
[22081.807080]  [<ffffffff814d1a72>] ? perf_counter_nmi_handler+0x3f/0x4a
[22081.813751]  [<ffffffff814d2d09>] ? notifier_call_chain+0x58/0x86
[22081.819951]  [<ffffffff8105b250>] ? notify_die+0x2d/0x32
[22081.825392]  [<ffffffff814d1414>] ? do_nmi+0x8e/0x242
[22081.830538]  [<ffffffff814d0f0a>] ? nmi+0x1a/0x20
[22081.835342]  [<ffffffff8117e102>] ? selinux_file_free_security+0x0/0x1a
[22081.842105]  [<ffffffff81018793>] ? x86_pmu_disable_counter+0x15/0x41
[22081.848673]  <<EOE>>  [<ffffffff81018f3d>] ? x86_pmu_disable+0x86/0x103
[22081.855512]  [<ffffffff8108fedd>] ? __perf_counter_remove_from_context+0x0/0xfe
[22081.862926]  [<ffffffff8108fcbc>] ? counter_sched_out+0x30/0xce
[22081.868909]  [<ffffffff8108ff36>] ? __perf_counter_remove_from_context+0x59/0xfe
[22081.876382]  [<ffffffff8106808a>] ? smp_call_function_single+0x6c/0xe6
[22081.882955]  [<ffffffff81091b96>] ? perf_release+0x86/0x14c
[22081.888600]  [<ffffffff810c4c84>] ? __fput+0xe7/0x195
[22081.893718]  [<ffffffff810c213e>] ? filp_close+0x5b/0x62
[22081.899107]  [<ffffffff81046a70>] ? put_files_struct+0x64/0xc2
[22081.905031]  [<ffffffff8104841a>] ? do_exit+0x1e2/0x6ef
[22081.910360]  [<ffffffff814d0a60>] ? _spin_lock_irqsave+0x9/0xe
[22081.916292]  [<ffffffff8104898e>] ? do_group_exit+0x67/0x93
[22081.921953]  [<ffffffff810489cc>] ? sys_exit_group+0x12/0x16
[22081.927759]  [<ffffffff8100baab>] ? system_call_fastpath+0x16/0x1b
[22081.934076] ---[ end trace 3a3936ce3e1b4505 ]---

And could potentially also fix the lockup reported by Marcelo Tosatti.

Also, print more debug info in case of a detected lockup.

[ Impact: fix lockup ]

Reported-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-05-20 20:12:54 +02:00

..

irq

Revert "genirq: assert that irq handlers are indeed running in hardirq context"

2009-05-01 15:16:04 +02:00

power

PM/Hibernate: Fix waiting for image device to appear on resume

2009-04-24 15:31:30 -07:00

time

clockevents: prevent endless loop in tick_handle_periodic()

2009-05-02 10:22:27 +02:00

trace

tracing: fix ref count in splice pages

2009-04-29 08:02:44 +02:00

.gitignore

…

acct.c

[CVE-2009-0029] System call wrappers part 04

2009-01-14 14:15:19 +01:00

async.c

async: remove the temporary (2.6.29) "async is off by default" code

2009-03-28 13:05:30 -07:00

audit_tree.c

No need for crossing to mountpoint in audit_tag_tree()

2009-04-20 23:01:15 -04:00

audit.c

Audit: remove spaces from audit_log_d_path

2009-04-05 13:49:04 -04:00

audit.h

fixing audit rule ordering mess, part 1

2009-01-04 15:14:41 -05:00

auditfilter.c

inotify: use GFP_NOFS in kernel_event() to work around a lockdep false-positive

2009-05-06 16:36:09 -07:00

auditsc.c

Audit: remove spaces from audit_log_d_path

2009-04-05 13:49:04 -04:00

backtracetest.c

…

bounds.c

…

capability.c

[CVE-2009-0029] System call wrappers part 04

2009-01-14 14:15:19 +01:00

cgroup_debug.c

debug cgroup: remove unneeded cgroup_lock

2009-04-02 19:04:54 -07:00

cgroup_freezer.c

freezer_cg: disable writing freezer.state of root cgroup

2008-11-12 17:17:16 -08:00

cgroup.c

Convert obvious places to deactivate_locked_super()

2009-05-09 10:49:40 -04:00

compat.c

signals: implement sys_rt_tgsigqueueinfo

2009-04-30 19:24:24 +02:00

configs.c

kernel/configs.c: remove useless comments

2008-10-20 08:52:34 -07:00

cpu.c

cpumask: use set_cpu_active in init/main.c

2009-03-30 22:05:12 +10:30

cpuset.c

cpusets: prevent PF_THREAD_BOUND tasks from attaching to non-root cpusets

2009-04-02 19:04:57 -07:00

cred-internals.h

CRED: Inaugurate COW credentials

2008-11-14 10:39:23 +11:00

cred.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

2009-01-09 13:59:25 -08:00

delayacct.c

schedstat: consolidate per-task cpu runtime stats

2008-12-18 13:54:01 +01:00

dma-coherent.c

dma-coherent: Restore dma_alloc_from_coherent() large alloc fall back policy.

2009-01-21 18:51:53 +09:00

dma.c

kernel/dma.c: remove a CVS keyword

2008-10-16 11:21:30 -07:00

exec_domain.c

Get rid of indirect include of fs_struct.h

2009-03-31 23:00:27 -04:00

exit.c

perf_counter: fix counter freeing logic

2009-05-20 00:22:24 +02:00

extable.c

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

fork.c

Merge branch 'linus' into perfcounters/core

2009-04-29 14:47:05 +02:00

freezer.c

freezer_cg: use thaw_process() in unfreeze_cgroup()

2008-10-30 11:38:45 -07:00

futex_compat.c

CRED: Use RCU to access another task's creds and to release a task's own creds

2008-11-14 10:39:19 +11:00

futex.c

futex: comment requeue key reference semantics

2009-04-02 23:39:53 +02:00

hrtimer.c

hrtimer: fix rq->lock inversion (again)

2009-03-31 14:52:52 +02:00

hung_task.c

softlockup: ensure the task has been switched out once

2009-02-11 11:04:16 +01:00

itimer.c

timers: split process wide cpu clocks/timers

2009-02-05 13:04:33 +01:00

kallsyms.c

Ksplice: Add functions for walking kallsyms symbols

2009-03-31 13:05:32 +10:30

Kconfig.freezer

container freezer: implement freezer cgroup subsystem

2008-10-20 08:52:34 -07:00

Kconfig.hz

sched: fix SCHED_HRTICK dependency

2008-07-28 14:37:38 +02:00

Kconfig.preempt

rcu: provide RCU options on non-preempt architectures too

2008-12-25 09:31:28 +01:00

kexec.c

kexec: vmcoreinfo_data[] can become static

2009-04-02 19:05:04 -07:00

kfifo.c

…

kgdb.c

sysrq, intel_fb: fix sysrq g collision

2009-05-15 07:56:24 -05:00

kmod.c

module: create a request_module_nowait()

2009-03-31 13:05:35 +10:30

kprobes.c

kprobes: fix to use text_mutex around arm/disarm kprobe

2009-05-08 16:23:48 -07:00

ksysfs.c

kernel/ksysfs.c:fix dependence on CONFIG_NET

2009-01-06 10:44:31 -08:00

kthread.c

kthread: move sched-realeted initialization from kthreadd context

2009-04-09 09:50:37 +09:30

latencytop.c

sched, latencytop: incorporate review feedback from Andrew Morton

2009-02-11 10:18:04 +01:00

lockdep_internals.h

lockdep: get_user_chars() redo

2009-02-14 23:28:22 +01:00

lockdep_proc.c

lockstat: warn about disabled lock debugging

2009-02-14 23:28:28 +01:00

lockdep_states.h

lockdep: move state bit definitions around

2009-02-14 23:27:59 +01:00

lockdep.c

lockdep: more robust lockdep_map init sequence

2009-04-17 18:00:00 +02:00

Makefile

Merge commit 'v2.6.30-rc1' into perfcounters/core

2009-04-08 10:35:30 +02:00

marker.c

markers/tracpoints: fix non-modular build

2008-11-16 09:52:03 +01:00

module.c

async: Fix module loading async-work regression

2009-04-11 12:44:49 -07:00

mutex-debug.c

mutex: implement adaptive spinning

2009-01-14 18:09:02 +01:00

mutex-debug.h

mutex: implement adaptive spinning

2009-01-14 18:09:02 +01:00

mutex.c

Merge branch 'core/locking' into perfcounters/core

2009-05-06 08:47:26 +02:00

mutex.h

mutex: implement adaptive spinning

2009-01-14 18:09:02 +01:00

notifier.c

Merge commit 'v2.6.28-rc6' into core/debug

2008-11-26 08:22:50 +01:00

ns_cgroup.c

cgroups: relax ns_can_attach checks to allow attaching to grandchild cgroups

2009-04-02 19:04:53 -07:00

nsproxy.c

User namespaces: set of cleanups (v2)

2008-11-24 18:57:41 -05:00

panic.c

Eliminate thousands of warnings with gcc 3.2 build

2009-05-06 16:36:09 -07:00

params.c

param: fix charp parameters set via sysfs

2009-03-31 13:05:30 +10:30

perf_counter.c

perf_counter: Fix context removal deadlock

2009-05-20 20:12:54 +02:00

pid_namespace.c

signals: zap_pid_ns_process() should use force_sig()

2009-04-02 19:04:58 -07:00

pid.c

pids: refactor vnr/nr_ns helpers to make them safe

2009-04-02 19:05:02 -07:00

pm_qos_params.c

pm_qos_requirement might sleep

2008-09-02 19:21:40 -07:00

posix-cpu-timers.c

kernel/posix-cpu-timers.c: fix sparse warning

2009-04-30 08:08:31 +02:00

posix-timers.c

[CVE-2009-0029] System call wrappers part 05

2009-01-14 14:15:20 +01:00

printk.c

Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 10:23:25 -07:00

profile.c

profiling: fix broken profiling regression

2009-02-10 00:50:37 +01:00

ptrace.c

ptrace: ptrace_attach: fix the usage of ->cred_exec_mutex

2009-04-27 20:30:51 +10:00

rcuclassic.c

kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies

2009-04-03 12:23:02 +02:00

rcupdate.c

RCU: Don't try and predeclare inline funcs as it upsets some versions of gcc

2009-04-15 13:55:14 -07:00

rcupreempt_trace.c

"Tree RCU": scalable classic RCU implementation

2008-12-18 21:56:04 +01:00

rcupreempt.c

kmemtrace, rcu: fix rcupreempt.c data structure dependencies

2009-04-03 12:23:04 +02:00

rcutorture.c

cpumask: convert rcutorture.c

2009-03-30 22:05:16 +10:30

rcutree_trace.c

rcu: Make hierarchical RCU less IPI-happy

2009-04-14 11:31:50 +02:00

rcutree.c

rcu: Make hierarchical RCU less IPI-happy

2009-04-14 11:31:50 +02:00

rcutree.h

kmemtrace, rcu: fix rcu_tree_trace.c data structure dependencies

2009-04-03 12:23:03 +02:00

relay.c

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

res_counter.c

memcg: memory cgroup resource counters for hierarchy

2009-01-08 08:31:05 -08:00

resource.c

Remove 'recurse into child resources' logic from 'reserve_region_with_split()'

2009-04-18 21:44:24 -07:00

rtmutex_common.h

…

rtmutex-debug.c

…

rtmutex-debug.h

…

rtmutex-tester.c

sysdev: Pass the attribute to the low level sysdev show/store function

2008-07-21 21:55:02 -07:00

rtmutex.c

locking, rtmutex.c: Documentation cleanup

2009-04-29 23:20:17 +02:00

rtmutex.h

…

rwsem.c

…

sched_clock.c

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-02 00:49:02 +02:00

sched_cpupri.c

sched_rt: don't allocate cpumask in fastpath

2009-04-01 13:24:51 +02:00

sched_cpupri.h

cpumask: remove cpumask_t from core

2009-03-30 22:05:17 +10:30

sched_debug.c

sched: remove unused fields from struct rq

2009-03-24 23:16:51 +01:00

sched_fair.c

Merge branch 'sched/urgent'; commit 'v2.6.29-rc5' into sched/core

2009-02-15 21:15:16 +01:00

sched_features.h

Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-03-30 17:17:35 -07:00

sched_idletask.c

sched: add CONFIG_SMP consistency

2008-10-22 10:01:52 +02:00

sched_rt.c

Merge commit 'v2.6.30-rc1' into sched/urgent

2009-04-08 17:26:00 +02:00

sched_stats.h

sched: remove unused fields from struct rq

2009-03-24 23:16:51 +01:00

sched.c

Merge commit 'v2.6.30-rc6' into perfcounters/core

2009-05-18 07:37:49 +02:00

seccomp.c

x86-64: seccomp: fix 32/64 syscall hole

2009-03-02 15:41:30 -08:00

semaphore.c

semaphore: __down_common: use signal_pending_state()

2008-08-05 14:33:47 -07:00

signal.c

signals: implement sys_rt_tgsigqueueinfo

2009-04-30 19:24:24 +02:00

slow-work.c

Delete slow-work timers properly

2009-04-24 07:47:59 -07:00

smp.c

generic-ipi: eliminate WARN_ON()s during oops/panic

2009-03-13 10:47:34 +01:00

softirq.c

kernel/softirq.c: fix sparse warning

2009-04-17 01:57:54 +02:00

softlockup.c

softlockup: decouple hung tasks check from softlockup detection

2009-01-16 14:06:04 +01:00

spinlock.c

Allow rwlocks to re-enable interrupts

2009-04-02 19:05:11 -07:00

srcu.c

…

stacktrace.c

stacktrace: provide save_stack_trace_tsk() weak alias

2008-12-25 11:44:43 +01:00

stop_machine.c

cpumask: remove cpumask_t from core

2009-03-30 22:05:17 +10:30

sys_ni.c

Merge commit 'v2.6.29-rc2' into perfcounters/core

2009-01-21 16:37:27 +01:00

sys.c

Merge branch 'linus' into perfcounters/core

2009-04-29 14:47:05 +02:00

sysctl_check.c

net: add ARP notify option for devices

2009-02-01 01:04:33 -08:00

sysctl.c

Merge commit 'v2.6.30-rc6' into perfcounters/core

2009-05-18 07:37:49 +02:00

taskstats.c

cpumask: convert rest of files in kernel/

2009-01-01 10:12:28 +10:30

test_kprobes.c

kprobes: add tests for register_kprobes

2009-01-06 15:59:20 -08:00

time.c

[CVE-2009-0029] System call wrappers part 01

2009-01-14 14:15:18 +01:00

timeconst.pl

…

timer.c

Merge branch 'linus' into perfcounters/core

2009-04-29 14:47:05 +02:00

tracepoint.c

tracepoints: dont update zero-sized tracepoint sections

2009-03-18 19:55:00 +01:00

tsacct.c

Fix fixpoint divide exception in acct_update_integrals

2009-03-09 08:13:35 -07:00

uid16.c

[CVE-2009-0029] System call wrappers part 19

2009-01-14 14:15:26 +01:00

up.c

smp_call_function_single(): be slightly less stupid, fix #2

2009-01-12 16:04:37 +01:00

user_namespace.c

Fix recursive lock in free_uid()/free_user_ns()

2009-02-27 16:26:21 -08:00

user.c

Merge branch 'master' into next

2009-03-24 10:52:46 +11:00

utsname_sysctl.c

proc_sysctl: use CONFIG_PROC_SYSCTL around ipc and utsname proc_handlers

2009-04-02 19:05:01 -07:00

utsname.c

removed unused #include <linux/version.h>'s

2008-08-23 12:14:12 -07:00

wait.c

wait: prevent exclusive waiter starvation

2009-02-05 12:56:48 -08:00

workqueue.c

work_on_cpu(): rewrite it to create a kernel thread on demand

2009-04-09 09:50:37 +09:30