]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
time/sched_clock: Mark sched_clock_read_begin/retry() as notrace
authorQuanyang Wang <quanyang.wang@windriver.com>
Tue, 29 Sep 2020 08:20:27 +0000 (16:20 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Nov 2020 10:51:58 +0000 (11:51 +0100)
commit167ebb193db90c6271dd79fc77d2d04fee19bf47
tree6339798e8f1357693c3c9d033b15be10b5f4864d
parent3ac4fb8895e5061374b4fd9026d59e8cca53741e
time/sched_clock: Mark sched_clock_read_begin/retry() as notrace

commit 4cd2bb12981165f865d2b8ed92b446b52310ef74 upstream.

Since sched_clock_read_begin() and sched_clock_read_retry() are called
by notrace function sched_clock(), they shouldn't be traceable either,
or else ftrace_graph_caller will run into a dead loop on the path
as below (arm for instance):

  ftrace_graph_caller()
    prepare_ftrace_return()
      function_graph_enter()
        ftrace_push_return_trace()
          trace_clock_local()
            sched_clock()
              sched_clock_read_begin/retry()

Fixes: 1b86abc1c645 ("sched_clock: Expose struct clock_read_data")
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200929082027.16787-1-quanyang.wang@windriver.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/time/sched_clock.c