Commit 62cedf3e authored by Peter Rosin's avatar Peter Rosin Committed by Ingo Molnar
Browse files

locking/rtmutex: Allow specifying a subclass for nested locking 



Needed for annotating rt_mutex locks.

Tested-by: default avatarJohn Sperbeck <jsperbeck@google.com>
Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Deepa Dinamani <deepadinamani@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Chang <dpf@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Wolfram Sang <wsa@the-dreams.de>
Link: http://lkml.kernel.org/r/20180720083914.1950-2-peda@axentia.se


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

include/linux/rtmutex.h

+7 −0
Original line number Diff line number Diff line
@@ -106,7 +106,14 @@ static inline int rt_mutex_is_locked(struct rt_mutex *lock) 
extern void __rt_mutex_init(struct rt_mutex *lock, const char *name, struct lock_class_key *key);

extern void rt_mutex_destroy(struct rt_mutex *lock);



#ifdef CONFIG_DEBUG_LOCK_ALLOC

extern void rt_mutex_lock_nested(struct rt_mutex *lock, unsigned int subclass);

#define rt_mutex_lock(lock) rt_mutex_lock_nested(lock, 0)

#else

extern void rt_mutex_lock(struct rt_mutex *lock);

#define rt_mutex_lock_nested(lock, subclass) rt_mutex_lock(lock)

#endif



extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);

extern int rt_mutex_timed_lock(struct rt_mutex *lock,

			       struct hrtimer_sleeper *timeout);

kernel/locking/rtmutex.c

+25 −4
Original line number Diff line number Diff line
@@ -1465,6 +1465,29 @@ rt_mutex_fastunlock(struct rt_mutex *lock, 
		rt_mutex_postunlock(&wake_q);

}



static inline void __rt_mutex_lock(struct rt_mutex *lock, unsigned int subclass)

{

	might_sleep();



	mutex_acquire(&lock->dep_map, subclass, 0, _RET_IP_);

	rt_mutex_fastlock(lock, TASK_UNINTERRUPTIBLE, rt_mutex_slowlock);

}



#ifdef CONFIG_DEBUG_LOCK_ALLOC

/**

 * rt_mutex_lock_nested - lock a rt_mutex

 *

 * @lock: the rt_mutex to be locked

 * @subclass: the lockdep subclass

 */

void __sched rt_mutex_lock_nested(struct rt_mutex *lock, unsigned int subclass)

{

	__rt_mutex_lock(lock, subclass);

}

EXPORT_SYMBOL_GPL(rt_mutex_lock_nested);

#endif



#ifndef CONFIG_DEBUG_LOCK_ALLOC

/**

 * rt_mutex_lock - lock a rt_mutex

 *
@@ -1472,12 +1495,10 @@ rt_mutex_fastunlock(struct rt_mutex *lock, 
 */

void __sched rt_mutex_lock(struct rt_mutex *lock)

{

	might_sleep();



	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);

	rt_mutex_fastlock(lock, TASK_UNINTERRUPTIBLE, rt_mutex_slowlock);

	__rt_mutex_lock(lock, 0);

}

EXPORT_SYMBOL_GPL(rt_mutex_lock);

#endif



/**

 * rt_mutex_lock_interruptible - lock a rt_mutex interruptible

CRA Git | Maintained and supported by SUSTech CRA and CCSE