From: Peter Zijlstra <peterz@infradead.org>
To: Yi Wang <wang.yi59@zte.com.cn>
Cc: tglx@linutronix.de, mingo@redhat.com, dvhart@infradead.org,
linux-kernel@vger.kernel.org, xue.zhihong@zte.com.cn,
jiang.xuexin@zte.com.cn, Yang Tao <yang.tao172@zte.com.cn>
Subject: Re: [PATCH] Robust-futex wakes up the waiters will be missed
Date: Mon, 4 Nov 2019 10:16:58 +0100 [thread overview]
Message-ID: <20191104091658.GC4131@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <1572573789-16557-1-git-send-email-wang.yi59@zte.com.cn>
On Fri, Nov 01, 2019 at 10:03:09AM +0800, Yi Wang wrote:
> kernel/futex.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/futex.c b/kernel/futex.c
> index bd18f60..c2fb590 100644
> --- a/kernel/futex.c
> +++ b/kernel/futex.c
> @@ -3456,7 +3456,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
> * Process a futex-list entry, check whether it's owned by the
> * dying task, and do notification if so:
> */
> -static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi)
> +static int handle_futex_death(u32 __user *uaddr,
> + struct task_struct *curr, int pi,
> + bool pending)
> {
> u32 uval, uninitialized_var(nval), mval;
> int err;
> @@ -3469,6 +3471,10 @@ static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int p
> if (get_user(uval, uaddr))
> return -1;
>
> + /* Robust-futex wakes up the waiters will be missed*/
> + if (pending && !pi && uval == 0)
> + futex_wake(uaddr, 1, 1, FUTEX_BITSET_MATCH_ANY);
> +
I'm thinking you're right and this should fix things, but that comment
is really terse and will not help us understand things the next time we
try and figure out what this code does.
> if ((uval & FUTEX_TID_MASK) != task_pid_vnr(curr))
> return 0;
>
> @@ -3590,7 +3596,7 @@ void exit_robust_list(struct task_struct *curr)
> */
> if (entry != pending)
> if (handle_futex_death((void __user *)entry + futex_offset,
> - curr, pi))
> + curr, pi, 0))
> return;
> if (rc)
> return;
> @@ -3607,7 +3613,7 @@ void exit_robust_list(struct task_struct *curr)
>
> if (pending)
> handle_futex_death((void __user *)pending + futex_offset,
> - curr, pip);
> + curr, pip, 1);
> }
>
> long do_futex(u32 __user *uaddr, int op, u32 val, ktime_t *timeout,
> @@ -3784,7 +3790,7 @@ void compat_exit_robust_list(struct task_struct *curr)
> if (entry != pending) {
> void __user *uaddr = futex_uaddr(entry, futex_offset);
>
> - if (handle_futex_death(uaddr, curr, pi))
> + if (handle_futex_death(uaddr, curr, pi, 0))
> return;
> }
> if (rc)
> @@ -3803,7 +3809,7 @@ void compat_exit_robust_list(struct task_struct *curr)
> if (pending) {
> void __user *uaddr = futex_uaddr(pending, futex_offset);
>
> - handle_futex_death(uaddr, curr, pip);
> + handle_futex_death(uaddr, curr, pip, 1);
> }
> }
>
> --
> 2.15.2
>
next prev parent reply other threads:[~2019-11-04 9:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 2:03 [PATCH] Robust-futex wakes up the waiters will be missed Yi Wang
2019-11-04 9:16 ` Peter Zijlstra [this message]
2019-11-06 3:23 Yi Wang
2019-11-06 19:02 ` Thomas Gleixner
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=20191104091658.GC4131@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=dvhart@infradead.org \
--cc=jiang.xuexin@zte.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=wang.yi59@zte.com.cn \
--cc=xue.zhihong@zte.com.cn \
--cc=yang.tao172@zte.com.cn \
/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).