rtmutex: enable deadlock detection in ww_mutex_lock functions
The functions ww_mutex_lock_interruptible and ww_mutex_lock should return -EDEADLK when faced with a deadlock. To do so, the paramenter detect_deadlock in rt_mutex_slowlock must be TRUE. This patch corrects potential deadlocks when running PREEMPT_RT with nouveau driver. Cc: stable-rt@vger.kernel.org Signed-off-by: Gustavo Bittencourt <gbitten@gmail.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
0d54782ed8
commit
dc678d68b7
|
@ -2239,7 +2239,8 @@ __ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ww_c
|
||||||
might_sleep();
|
might_sleep();
|
||||||
|
|
||||||
mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
|
mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
|
||||||
ret = rt_mutex_slowlock(&lock->base.lock, TASK_INTERRUPTIBLE, NULL, 0, ww_ctx);
|
ret = rt_mutex_slowlock(&lock->base.lock, TASK_INTERRUPTIBLE, NULL,
|
||||||
|
RT_MUTEX_FULL_CHAINWALK, ww_ctx);
|
||||||
if (ret)
|
if (ret)
|
||||||
mutex_release(&lock->base.dep_map, 1, _RET_IP_);
|
mutex_release(&lock->base.dep_map, 1, _RET_IP_);
|
||||||
else if (!ret && ww_ctx->acquired > 1)
|
else if (!ret && ww_ctx->acquired > 1)
|
||||||
|
@ -2257,7 +2258,8 @@ __ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ww_ctx)
|
||||||
might_sleep();
|
might_sleep();
|
||||||
|
|
||||||
mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
|
mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
|
||||||
ret = rt_mutex_slowlock(&lock->base.lock, TASK_UNINTERRUPTIBLE, NULL, 0, ww_ctx);
|
ret = rt_mutex_slowlock(&lock->base.lock, TASK_UNINTERRUPTIBLE, NULL,
|
||||||
|
RT_MUTEX_FULL_CHAINWALK, ww_ctx);
|
||||||
if (ret)
|
if (ret)
|
||||||
mutex_release(&lock->base.dep_map, 1, _RET_IP_);
|
mutex_release(&lock->base.dep_map, 1, _RET_IP_);
|
||||||
else if (!ret && ww_ctx->acquired > 1)
|
else if (!ret && ww_ctx->acquired > 1)
|
||||||
|
|
Loading…
Reference in New Issue