[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-94f4db3590893c600506105b88dab581c7f6f5c8@git.kernel.org>
Date: Mon, 22 Apr 2013 01:29:39 -0700
From: tip-bot for Jacob Shin <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, eranian@...gle.com, hpa@...or.com,
mingo@...nel.org, a.p.zijlstra@...llo.nl, acme@...stprotocols.net,
bp@...en8.de, jolsa@...hat.com, jacob.shin@....com,
tglx@...utronix.de, bp@...e.de
Subject: [tip:perf/core] perf/x86/amd: Fix AMD NB and L2I "uncore" support
Commit-ID: 94f4db3590893c600506105b88dab581c7f6f5c8
Gitweb: http://git.kernel.org/tip/94f4db3590893c600506105b88dab581c7f6f5c8
Author: Jacob Shin <jacob.shin@....com>
AuthorDate: Sun, 21 Apr 2013 13:06:27 -0500
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 22 Apr 2013 10:10:55 +0200
perf/x86/amd: Fix AMD NB and L2I "uncore" support
Borislav Petkov reported a lockdep splat warning about kzalloc()
done in an IPI (hardirq) handler.
This is a real bug, do not call kzalloc() in a smp_call_function_single()
handler because it can schedule and crash.
Reported-by: Borislav Petkov <bp@...e.de>
Signed-off-by: Jacob Shin <jacob.shin@....com>
Tested-by: Borislav Petkov <bp@...e.de>
Cc: Borislav Petkov <bp@...en8.de>
Cc: <eranian@...gle.com>
Cc: <a.p.zijlstra@...llo.nl>
Cc: <acme@...stprotocols.net>
Cc: <jolsa@...hat.com>
Link: http://lkml.kernel.org/r/20130421180627.GA21049@jshin-Toonie
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
index 6dc6227..c0c661a 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
@@ -498,7 +498,6 @@ static void __init init_cpu_already_online(void *dummy)
{
unsigned int cpu = smp_processor_id();
- amd_uncore_cpu_up_prepare(cpu);
amd_uncore_cpu_starting(cpu);
amd_uncore_cpu_online(cpu);
}
@@ -535,8 +534,10 @@ static int __init amd_uncore_init(void)
get_online_cpus();
/* init cpus already online before registering for hotplug notifier */
- for_each_online_cpu(cpu)
+ for_each_online_cpu(cpu) {
+ amd_uncore_cpu_up_prepare(cpu);
smp_call_function_single(cpu, init_cpu_already_online, NULL, 1);
+ }
register_cpu_notifier(&amd_uncore_cpu_notifier_block);
put_online_cpus();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists