From: Mike Galbraith <efault@gmx.de>
To: linux-kernel@vger.kernel.org, linux-tip-commits@vger.kernel.org
Cc: Gratian Crisan <gratian.crisan@ni.com>,
Thomas Gleixner <tglx@linutronix.de>,
stable@vger.kernel.org, x86 <x86@kernel.org>
Subject: Re: [tip: locking/urgent] futex: Handle transient "ownerless" rtmutex state correctly
Date: Sat, 07 Nov 2020 18:05:50 +0100 [thread overview]
Message-ID: <c35f88c5eb00c69fa74bbc7225316307a5eb38d8.camel@gmx.de> (raw)
In-Reply-To: <160469801844.397.7418241151599681987.tip-bot2@tip-bot2>
On Fri, 2020-11-06 at 21:26 +0000, tip-bot2 for Mike Galbraith wrote:
>
> ---
> kernel/futex.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/futex.c b/kernel/futex.c
> index f8614ef..7406914 100644
> --- a/kernel/futex.c
> +++ b/kernel/futex.c
> @@ -2380,10 +2380,22 @@ retry:
> }
>
> /*
> - * Since we just failed the trylock; there must be an owner.
> + * The trylock just failed, so either there is an owner or
> + * there is a higher priority waiter than this one.
> */
> newowner = rt_mutex_owner(&pi_state->pi_mutex);
> - BUG_ON(!newowner);
> + /*
> + * If the higher priority waiter has not yet taken over the
> + * rtmutex then newowner is NULL. We can't return here with
> + * that state because it's inconsistent vs. the user space
> + * state. So drop the locks and try again. It's a valid
> + * situation and not any different from the other retry
> + * conditions.
> + */
> + if (unlikely(!newowner)) {
> + ret = -EAGAIN;
^^^
My box just discovered an unnoticed typo. That 'ret' should read 'err'
so we goto retry, else fbomb_v2 proggy will trigger gripeage.
[ 44.089233] fuse: init (API version 7.32)
[ 78.485163] ------------[ cut here ]------------
[ 78.485171] WARNING: CPU: 1 PID: 4557 at kernel/futex.c:2482 fixup_pi_state_owner.isra.17+0x125/0x350
[ 78.485171] ------------[ cut here ]------------
[ 78.485174] WARNING: CPU: 2 PID: 4559 at kernel/futex.c:1486 do_futex+0x920/0xaf0
<snip>
-Mike
next prev parent reply other threads:[~2020-11-07 17:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-28 23:24 BUG_ON(!newowner) in fixup_pi_state_owner() Gratian Crisan
2020-11-03 23:31 ` Gratian Crisan
2020-11-04 0:56 ` Mike Galbraith
2020-11-04 7:42 ` Mike Galbraith
2020-11-04 10:24 ` Thomas Gleixner
2020-11-04 11:17 ` Thomas Gleixner
2020-11-04 13:26 ` Thomas Gleixner
2020-11-04 13:43 ` Mike Galbraith
2020-11-04 15:12 ` [PATCH] futex: Handle transient "ownerless" rtmutex state correctly Thomas Gleixner
2020-11-04 15:22 ` Thomas Gleixner
2020-11-04 16:50 ` Mike Galbraith
2020-11-05 6:32 ` Gratian Crisan
2020-11-04 10:00 ` BUG_ON(!newowner) in fixup_pi_state_owner() Thomas Gleixner
2020-11-06 21:26 ` [tip: locking/urgent] futex: Handle transient "ownerless" rtmutex state correctly tip-bot2 for Mike Galbraith
2020-11-07 17:05 ` Mike Galbraith [this message]
2020-11-07 21:07 ` Thomas Gleixner
2020-11-07 21:08 ` tip-bot2 for Mike Galbraith
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=c35f88c5eb00c69fa74bbc7225316307a5eb38d8.camel@gmx.de \
--to=efault@gmx.de \
--cc=gratian.crisan@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®