3d5c9340d1
Even in the case when deadlock detection is not requested by the caller, we can detect deadlocks. Right now the code stops the lock chain walk and keeps the waiter enqueued, even on itself. Silly not to yell when such a scenario is detected and to keep the waiter enqueued. Return -EDEADLK unconditionally and handle it at the call sites. The futex calls return -EDEADLK. The non futex ones dequeue the waiter, throw a warning and put the task into a schedule loop. Tagged for stable as it makes the code more robust. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Brad Mouring <bmouring@ni.com> Link: http://lkml.kernel.org/r/20140605152801.836501969@linutronix.de Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
39 lines
1.5 KiB
C
39 lines
1.5 KiB
C
/*
|
|
* RT-Mutexes: blocking mutual exclusion locks with PI support
|
|
*
|
|
* started by Ingo Molnar and Thomas Gleixner:
|
|
*
|
|
* Copyright (C) 2004-2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
|
|
* Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
|
|
*
|
|
* This file contains macros used solely by rtmutex.c. Debug version.
|
|
*/
|
|
|
|
extern void
|
|
rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task);
|
|
extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);
|
|
extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
|
|
extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);
|
|
extern void debug_rt_mutex_init(struct rt_mutex *lock, const char *name);
|
|
extern void debug_rt_mutex_lock(struct rt_mutex *lock);
|
|
extern void debug_rt_mutex_unlock(struct rt_mutex *lock);
|
|
extern void debug_rt_mutex_proxy_lock(struct rt_mutex *lock,
|
|
struct task_struct *powner);
|
|
extern void debug_rt_mutex_proxy_unlock(struct rt_mutex *lock);
|
|
extern void debug_rt_mutex_deadlock(int detect, struct rt_mutex_waiter *waiter,
|
|
struct rt_mutex *lock);
|
|
extern void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter);
|
|
# define debug_rt_mutex_reset_waiter(w) \
|
|
do { (w)->deadlock_lock = NULL; } while (0)
|
|
|
|
static inline int debug_rt_mutex_detect_deadlock(struct rt_mutex_waiter *waiter,
|
|
int detect)
|
|
{
|
|
return (waiter != NULL);
|
|
}
|
|
|
|
static inline void rt_mutex_print_deadlock(struct rt_mutex_waiter *w)
|
|
{
|
|
debug_rt_mutex_print_deadlock(w);
|
|
}
|