]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
sparc64: Fix pcr_ops initialization and usage bugs.
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Aug 2014 22:38:46 +0000 (15:38 -0700)
committerJiri Slaby <jslaby@suse.cz>
Fri, 31 Oct 2014 14:05:04 +0000 (15:05 +0100)
commitdd55fec8c50bbc799ddef0e0adb8a980c074e28d
treea9b16a0bfd4340063961254dc4996b9b47b1ed71
parentadb54d2a80797cbcc639217ec3eb2315faecb687
sparc64: Fix pcr_ops initialization and usage bugs.

[ Upstream commit 8bccf5b313180faefce38e0d1140f76e0f327d28 ]

Christopher reports that perf_event_print_debug() can crash in uniprocessor
builds.  The crash is due to pcr_ops being NULL.

This happens because pcr_arch_init() is only invoked by smp_cpus_done() which
only executes in SMP builds.

init_hw_perf_events() is closely intertwined with pcr_ops being setup properly,
therefore:

1) Call pcr_arch_init() early on from init_hw_perf_events(), instead of
   from smp_cpus_done().

2) Do not hook up a PMU type if pcr_ops is NULL after pcr_arch_init().

3) Move init_hw_perf_events to a later initcall so that it we will be
   sure to invoke pcr_arch_init() after all cpus are brought up.

Finally, guard the one naked sequence of pcr_ops dereferences in
__global_pmu_self() with an appropriate NULL check.

Reported-by: Christopher Alexander Tobias Schulze <cat.schulze@alice-dsl.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/perf_event.c
arch/sparc/kernel/process_64.c
arch/sparc/kernel/smp_64.c