Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 886adbed authored by Bart Van Assche's avatar Bart Van Assche Committed by Ingo Molnar
Browse files

tools/lib/lockdep/tests: Test the lockdep_reset_lock() implementation 



This patch makes sure that the lockdep_reset_lock() function gets
tested.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <longman@redhat.com>
Cc: johannes.berg@intel.com
Cc: tj@kernel.org
Link: https://lkml.kernel.org/r/20181207011148.251812-8-bvanassche@acm.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ac862d9b

tools/lib/lockdep/include/liblockdep/common.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ void lock_acquire(struct lockdep_map *lock, unsigned int subclass, 
			struct lockdep_map *nest_lock, unsigned long ip);

void lock_release(struct lockdep_map *lock, int nested,

			unsigned long ip);

void lockdep_reset_lock(struct lockdep_map *lock);

extern void debug_check_no_locks_freed(const void *from, unsigned long len);



#define STATIC_LOCKDEP_MAP_INIT(_name, _key) \

tools/lib/lockdep/include/liblockdep/mutex.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static inline int liblockdep_pthread_mutex_trylock(liblockdep_pthread_mutex_t *l 


static inline int liblockdep_pthread_mutex_destroy(liblockdep_pthread_mutex_t *lock)

{

	lockdep_reset_lock(&lock->dep_map);

	return pthread_mutex_destroy(&lock->mutex);

}

tools/lib/lockdep/tests/ABBA.c

+3 −0
Original line number Diff line number Diff line
@@ -11,4 +11,7 @@ void main(void) 


	LOCK_UNLOCK_2(a, b);

	LOCK_UNLOCK_2(b, a);



	pthread_mutex_destroy(&b);

	pthread_mutex_destroy(&a);

}

tools/lib/lockdep/tests/ABBCCA.c

+4 −0
Original line number Diff line number Diff line
@@ -13,4 +13,8 @@ void main(void) 
	LOCK_UNLOCK_2(a, b);

	LOCK_UNLOCK_2(b, c);

	LOCK_UNLOCK_2(c, a);



	pthread_mutex_destroy(&c);

	pthread_mutex_destroy(&b);

	pthread_mutex_destroy(&a);

}

tools/lib/lockdep/tests/ABBCCDDA.c

+5 −0
Original line number Diff line number Diff line
@@ -15,4 +15,9 @@ void main(void) 
	LOCK_UNLOCK_2(b, c);

	LOCK_UNLOCK_2(c, d);

	LOCK_UNLOCK_2(d, a);



	pthread_mutex_destroy(&d);

	pthread_mutex_destroy(&c);

	pthread_mutex_destroy(&b);

	pthread_mutex_destroy(&a);

}