locking/lockdep: Correct calling tracepoints
authorLeo Yan <leo.yan@linaro.org>
Wed, 12 May 2021 12:09:37 +0000 (20:09 +0800)
committerPeter Zijlstra <peterz@infradead.org>
Tue, 18 May 2021 10:53:50 +0000 (12:53 +0200)
commit89e70d5c583c55088faa2201d397ee30a15704aa
treeba94f0e7778ed78aeabcd843665d63b8667cffa7
parentd07f6ca923ea0927a1024dfccafc5b53b61cfecc
locking/lockdep: Correct calling tracepoints

The commit eb1f00237aca ("lockdep,trace: Expose tracepoints") reverses
tracepoints for lock_contended() and lock_acquired(), thus the ftrace
log shows the wrong locking sequence that "acquired" event is prior to
"contended" event:

  <idle>-0       [001] d.s3 20803.501685: lock_acquire: 0000000008b91ab4 &sg_policy->update_lock
  <idle>-0       [001] d.s3 20803.501686: lock_acquired: 0000000008b91ab4 &sg_policy->update_lock
  <idle>-0       [001] d.s3 20803.501689: lock_contended: 0000000008b91ab4 &sg_policy->update_lock
  <idle>-0       [001] d.s3 20803.501690: lock_release: 0000000008b91ab4 &sg_policy->update_lock

This patch fixes calling tracepoints for lock_contended() and
lock_acquired().

Fixes: eb1f00237aca ("lockdep,trace: Expose tracepoints")
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210512120937.90211-1-leo.yan@linaro.org
kernel/locking/lockdep.c