diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2013-09-13 07:14:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-19 10:57:42 -0500 |
| commit | 06db0b21712f878b808480ef31097637013bbf0f (patch) | |
| tree | 572c8d97ef964d3e0023626e246fc6ee775b4aa2 /kernel | |
| parent | d5b5f391d434c5cc8bcb1ab2d759738797b85f52 (diff) | |
perf: Remove fragile swevent hlist optimization
Currently we only allocate a single cpu hashtable for per-cpu
swevents; do away with this optimization for it is fragile in the face
of things like perf_pmu_migrate_context().
The easiest thing is to make sure all CPUs are consistent wrt state.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20130913111447.GN31370@twins.programming.kicks-ass.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index d724e7757cd1..72348dc192c1 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
| @@ -5680,11 +5680,6 @@ static void swevent_hlist_put(struct perf_event *event) | |||
| 5680 | { | 5680 | { |
| 5681 | int cpu; | 5681 | int cpu; |
| 5682 | 5682 | ||
| 5683 | if (event->cpu != -1) { | ||
| 5684 | swevent_hlist_put_cpu(event, event->cpu); | ||
| 5685 | return; | ||
| 5686 | } | ||
| 5687 | |||
| 5688 | for_each_possible_cpu(cpu) | 5683 | for_each_possible_cpu(cpu) |
| 5689 | swevent_hlist_put_cpu(event, cpu); | 5684 | swevent_hlist_put_cpu(event, cpu); |
| 5690 | } | 5685 | } |
| @@ -5718,9 +5713,6 @@ static int swevent_hlist_get(struct perf_event *event) | |||
| 5718 | int err; | 5713 | int err; |
| 5719 | int cpu, failed_cpu; | 5714 | int cpu, failed_cpu; |
| 5720 | 5715 | ||
| 5721 | if (event->cpu != -1) | ||
| 5722 | return swevent_hlist_get_cpu(event, event->cpu); | ||
| 5723 | |||
| 5724 | get_online_cpus(); | 5716 | get_online_cpus(); |
| 5725 | for_each_possible_cpu(cpu) { | 5717 | for_each_possible_cpu(cpu) { |
| 5726 | err = swevent_hlist_get_cpu(event, cpu); | 5718 | err = swevent_hlist_get_cpu(event, cpu); |
