[Devel] [PATCH RHEL7 COMMIT] ms/locking/lockdep: Provide lockdep_assert{, _once}() helpers

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-1160.80.1.vz7.190.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.80.1.vz7.190.1
------>
commit c7e3b0fe08e47762cc7ab4c46547e53844f4b8b5
Author: Peter Zijlstra <peterz at infradead.org>
Date:   Mon Aug 2 18:59:56 2021 +0800

    ms/locking/lockdep: Provide lockdep_assert{,_once}() helpers
    
    Extract lockdep_assert{,_once}() helpers to more easily write composite
    assertions like, for example:
    
            lockdep_assert(lockdep_is_held(&drm_device.master_mutex) ||
                           lockdep_is_held(&drm_file.master_lookup_lock));
    
    Signed-off-by: Peter Zijlstra (Intel) <peterz at infradead.org>
    Signed-off-by: Desmond Cheong Zhi Xi <desmondcheongzx at gmail.com>
    Acked-by: Boqun Feng <boqun.feng at gmail.com>
    Acked-by: Waiman Long <longman at redhat.com>
    Acked-by: Peter Zijlstra (Intel) <peterz at infradead.org>
    Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210802105957.77692-2-desmondcheongzx@gmail.com
    
    (cherry picked from ms commit d19c81378829e5d774c951219c5a973965b9202c)
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
    
    Backport notes:
      * lockdep_assert_none_held_once() in ms patch does not exist in vz7
        kernel
      * lockdep_assert_held_write() still is named as lockdep_assert_held_exclusive()
---
 include/linux/lockdep.h | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 208a9a11de90..97a1753de192 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -372,27 +372,26 @@ extern void lockdep_trace_alloc(gfp_t mask);
 
 #define lockdep_depth(tsk)	(debug_locks ? (tsk)->lockdep_depth : 0)
 
-#define lockdep_assert_held(l)	do {					\
-		WARN_ON(debug_locks &&					\
-			lockdep_is_held(l) == LOCK_STATE_NOT_HELD);	\
-	} while (0)
+#define lockdep_assert(cond)		\
+	do { WARN_ON(debug_locks && !(cond)); } while (0)
 
-#define lockdep_assert_not_held(l)	do {				\
-		WARN_ON(debug_locks &&					\
-			lockdep_is_held(l) == LOCK_STATE_HELD);		\
-	} while (0)
+#define lockdep_assert_once(cond)	\
+	do { WARN_ON_ONCE(debug_locks && !(cond)); } while (0)
 
-#define lockdep_assert_held_exclusive(l)	do {			\
-		WARN_ON(debug_locks && !lockdep_is_held_type(l, 0));	\
-	} while (0)
+#define lockdep_assert_held(l)		\
+	lockdep_assert(lockdep_is_held(l) != LOCK_STATE_NOT_HELD)
 
-#define lockdep_assert_held_read(l)	do {				\
-		WARN_ON(debug_locks && !lockdep_is_held_type(l, 1));	\
-	} while (0)
+#define lockdep_assert_not_held(l)	\
+	lockdep_assert(lockdep_is_held(l) != LOCK_STATE_HELD)
 
-#define lockdep_assert_held_once(l)	do {				\
-		WARN_ON_ONCE(debug_locks && !lockdep_is_held(l));	\
-	} while (0)
+#define lockdep_assert_held_exclusive(l)	\
+	lockdep_assert(lockdep_is_held_type(l, 0))
+
+#define lockdep_assert_held_read(l)	\
+	lockdep_assert(lockdep_is_held_type(l, 1))
+
+#define lockdep_assert_held_once(l)		\
+	lockdep_assert_once(lockdep_is_held(l) != LOCK_STATE_NOT_HELD)
 
 #define lockdep_recursing(tsk)	((tsk)->lockdep_recursion)
 
@@ -445,6 +444,9 @@ struct lock_class_key { };
 
 #define lockdep_is_held_type(l, r)		(1)
 
+#define lockdep_assert(c)			do { } while (0)
+#define lockdep_assert_once(c)			do { } while (0)
+
 #define lockdep_assert_held(l)			do { (void)(l); } while (0)
 #define lockdep_assert_not_held(l)		do { (void)(l); } while (0)
 #define lockdep_assert_held_exclusive(l)	do { (void)(l); } while (0)