Patch "locking/lockdep: Correct calling tracepoints" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    locking/lockdep: Correct calling tracepoints

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     locking-lockdep-correct-calling-tracepoints.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 59b5b3613e92e4e23f35075d20deafa69b864ffb
Author: Leo Yan <leo.yan@xxxxxxxxxx>
Date:   Wed May 12 20:09:37 2021 +0800

    locking/lockdep: Correct calling tracepoints
    
    [ Upstream commit 89e70d5c583c55088faa2201d397ee30a15704aa ]
    
    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@xxxxxxxxxx>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
    Link: https://lkml.kernel.org/r/20210512120937.90211-1-leo.yan@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 38d7c03e694c..858b96b438ce 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -5664,7 +5664,7 @@ void lock_contended(struct lockdep_map *lock, unsigned long ip)
 {
 	unsigned long flags;
 
-	trace_lock_acquired(lock, ip);
+	trace_lock_contended(lock, ip);
 
 	if (unlikely(!lock_stat || !lockdep_enabled()))
 		return;
@@ -5682,7 +5682,7 @@ void lock_acquired(struct lockdep_map *lock, unsigned long ip)
 {
 	unsigned long flags;
 
-	trace_lock_contended(lock, ip);
+	trace_lock_acquired(lock, ip);
 
 	if (unlikely(!lock_stat || !lockdep_enabled()))
 		return;