From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
To: Dave Airlie <airlied@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>,
Alex Deucher <alexander.deucher@amd.com>
Subject: Re: [PATCH] mutex: fix deadlock injection
Date: Wed, 07 Aug 2013 08:22:40 +0200 [thread overview]
Message-ID: <5201E7B0.5070802@canonical.com> (raw)
In-Reply-To: <CAPM=9ty0B=HR-g1vLoe51LpRZH8zH1yBzTSfhJg5yXceF+afdw@mail.gmail.com>
Op 07-08-13 02:05, Dave Airlie schreef:
> On Tue, Jul 30, 2013 at 6:41 PM, Peter Zijlstra <peterz@infradead.org> wrote:
>> On Tue, Jul 30, 2013 at 10:13:41AM +0200, Maarten Lankhorst 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.
>>>
>>> Cc: Alex Deucher <alexander.deucher@amd.com>
>>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> Should this be merged via Ingo? or will I queue it in my -fixes?
>
> Dave.
>
It's in tip:core/urgent, so I imagine you don't need to queue it.
next prev parent reply other threads:[~2013-08-07 6:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-01 8:22 [GIT PULL] core/mutexes changes for v3.11: W/W mutex support Ingo Molnar
2013-07-03 0:54 ` Linus Torvalds
2013-07-03 6:29 ` Maarten Lankhorst
2013-07-05 6:23 ` Ingo Molnar
2013-07-05 7:29 ` [PATCH] mutex: move ww_mutex definitions to ww_mutex.h Maarten Lankhorst
2013-07-12 13:28 ` [tip:core/locking] mutex: Move " tip-bot for Maarten Lankhorst
2013-07-30 8:13 ` [PATCH] mutex: fix deadlock injection Maarten Lankhorst
2013-07-30 8:41 ` Peter Zijlstra
2013-08-07 0:05 ` Dave Airlie
2013-08-07 6:22 ` Maarten Lankhorst [this message]
2013-07-30 13:09 ` Alex Deucher
2013-07-31 8:55 ` [tip:core/urgent] mutex: Fix w/w mutex " tip-bot for Maarten Lankhorst
2013-08-05 7:58 ` [PATCH] mutex: fix " Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5201E7B0.5070802@canonical.com \
--to=maarten.lankhorst@canonical.com \
--cc=airlied@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).