lkml.org 
[lkml]   [2013]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] mutex: fix deadlock injection
From
On Tue, Jul 30, 2013 at 4:13 AM, Maarten Lankhorst
<maarten.lankhorst@canonical.com> wrote:
> The check needs to be for > 1, because ctx->acquired is already incremented.
> This will prevent ww_mutex_lock_slow from returning -EDEADLK and not locking
> the mutex. It caused a lot of false gpu lockups on radeon with
> CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y because a function that shouldn't be able
> to return -EDEADLK did.
>

I haven't followed the new reservation stuff too closely, but seems plausible.

Acked-by: Alex Deucher <alexander.deucher@amd.com>

> Cc: Alex Deucher <alexander.deucher@amd.com>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> ---
> diff --git a/kernel/mutex.c b/kernel/mutex.c
> index ff05f4b..a52ee7bb 100644
> --- a/kernel/mutex.c
> +++ b/kernel/mutex.c
> @@ -686,7 +686,7 @@ __ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
> might_sleep();
> ret = __mutex_lock_common(&lock->base, TASK_UNINTERRUPTIBLE,
> 0, &ctx->dep_map, _RET_IP_, ctx);
> - if (!ret && ctx->acquired > 0)
> + if (!ret && ctx->acquired > 1)
> return ww_mutex_deadlock_injection(lock, ctx);
>
> return ret;
> @@ -702,7 +702,7 @@ __ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
> ret = __mutex_lock_common(&lock->base, TASK_INTERRUPTIBLE,
> 0, &ctx->dep_map, _RET_IP_, ctx);
>
> - if (!ret && ctx->acquired > 0)
> + if (!ret && ctx->acquired > 1)
> return ww_mutex_deadlock_injection(lock, ctx);
>
> return ret;
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel


\
 
 \ /
  Last update: 2013-07-30 16:01    [W:0.349 / U:0.176 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site