lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf, x86: Avoid kfree() in CPU_STARTING

Browse Source 
On -rt kfree() can schedule, but CPU_STARTING is before the CPU is
fully up and running. These are contradictory, so avoid it. Instead
push the kfree() to CPU_ONLINE where we're free to schedule.

Reported-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-kwd4j6ayld5thrscvaxgjquv@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2011-07-22 13:41:54 +02:00
committed by Ingo Molnar
parent bdc2209fd2
commit 7fdba1ca10
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/cpu/perf_event.c
View File

@@ -129,6 +129,8 @@ struct cpu_hw_events {
* AMD specific bits * AMD specific bits
*/ */
struct amd_nb *amd_nb; struct amd_nb *amd_nb;
void *kfree_on_online;
}; };
#define __EVENT_CONSTRAINT(c, n, m, w) {\ #define __EVENT_CONSTRAINT(c, n, m, w) {\
@@ -1466,10 +1468,12 @@ static int __cpuinit
x86_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) x86_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
{ {
unsigned int cpu = (long)hcpu; unsigned int cpu = (long)hcpu;
struct cpu_hw_events *cpuc = &per_cpu(cpu_hw_events, cpu);
int ret = NOTIFY_OK; int ret = NOTIFY_OK;
switch (action & ~CPU_TASKS_FROZEN) { switch (action & ~CPU_TASKS_FROZEN) {
case CPU_UP_PREPARE: case CPU_UP_PREPARE:
cpuc->kfree_on_online = NULL;
if (x86_pmu.cpu_prepare) if (x86_pmu.cpu_prepare)
ret = x86_pmu.cpu_prepare(cpu); ret = x86_pmu.cpu_prepare(cpu);
break; break;
@@ -1479,6 +1483,10 @@ x86_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
x86_pmu.cpu_starting(cpu); x86_pmu.cpu_starting(cpu);
break; break;
case CPU_ONLINE:
kfree(cpuc->kfree_on_online);
break;
case CPU_DYING: case CPU_DYING:
if (x86_pmu.cpu_dying) if (x86_pmu.cpu_dying)
x86_pmu.cpu_dying(cpu); x86_pmu.cpu_dying(cpu);

2
arch/x86/kernel/cpu/perf_event_amd.c
View File

@@ -350,7 +350,7 @@ static void amd_pmu_cpu_starting(int cpu)
continue; continue;
if (nb->nb_id == nb_id) { if (nb->nb_id == nb_id) {
kfree(cpuc->amd_nb); cpuc->kfree_on_online = cpuc->amd_nb;
cpuc->amd_nb = nb; cpuc->amd_nb = nb;
break; break;
} }

2
arch/x86/kernel/cpu/perf_event_intel.c
View File

@@ -1362,7 +1362,7 @@ static void intel_pmu_cpu_starting(int cpu)
pc = per_cpu(cpu_hw_events, i).shared_regs; pc = per_cpu(cpu_hw_events, i).shared_regs;
if (pc && pc->core_id == core_id) { if (pc && pc->core_id == core_id) {
kfree(cpuc->shared_regs); cpuc->kfree_on_online = cpuc->shared_regs;
cpuc->shared_regs = pc; cpuc->shared_regs = pc;
break; break;
} }