]> git.baikalelectronics.ru Git - kernel.git/commit
watchdog: Mark watchdog touch functions as notrace
authorVincent Whitchurch <vincent.whitchurch@axis.com>
Tue, 21 Aug 2018 15:25:07 +0000 (17:25 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 30 Aug 2018 10:56:40 +0000 (12:56 +0200)
commit87b54852d429d1c20905d97e46f8e6d2695f9ee8
tree617f11702e19fd0cc2f07eef3a922716476ec6b9
parent0ff97265403d59a684be8666710156706ccfd8fa
watchdog: Mark watchdog touch functions as notrace

Some architectures need to use stop_machine() to patch functions for
ftrace, and the assumption is that the stopped CPUs do not make function
calls to traceable functions when they are in the stopped state.

Commit 84cdde5cd58a ("stop_machine: Touch_nmi_watchdog() after
MULTI_STOP_PREPARE") added calls to the watchdog touch functions from
the stopped CPUs and those functions lack notrace annotations.  This
leads to crashes when enabling/disabling ftrace on ARM kernels built
with the Thumb-2 instruction set.

Fix it by adding the necessary notrace annotations.

Fixes: 84cdde5cd58a ("stop_machine: Touch_nmi_watchdog() after MULTI_STOP_PREPARE")
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: oleg@redhat.com
Cc: tj@kernel.org
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20180821152507.18313-1-vincent.whitchurch@axis.com
kernel/watchdog.c
kernel/watchdog_hld.c
kernel/workqueue.c