From: Peter Zijlstra <peterz@infradead.org>
To: Peter Xu <peterx@redhat.com>
Cc: linux-mm@kvack.org,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Hillf Danton <hdanton@sina.com>,
Thomas Gleixner <tglx@linutronix.de>,
syzbot+3be1a33f04dc782e9fd5@syzkaller.appspotmail.com,
Michal Hocko <mhocko@suse.com>
Subject: Re: [PATCH] mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal
Date: Wed, 8 Apr 2020 19:27:23 +0200 [thread overview]
Message-ID: <20200408172723.GR20730@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20200408155924.107722-1-peterx@redhat.com>
On Wed, Apr 08, 2020 at 11:59:24AM -0400, Peter Xu wrote:
> From: Hillf Danton <hdanton@sina.com>
>
> __get_user_pages_locked() will return 0 instead of -EINTR after commit
> 4426e945df588 which added extra code to allow gup detect fatal signal
> faster. Restore that behavior.
>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Fixes: 4426e945df58 ("mm/gup: allow VM_FAULT_RETRY for multiple times")
> Reported-by: syzbot+3be1a33f04dc782e9fd5@syzkaller.appspotmail.com
> Signed-off-by: Hillf Danton <hdanton@sina.com>
> Acked-by: Michal Hocko <mhocko@suse.com>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
>
> PS. Patch verified with syzbot.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> mm/gup.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/mm/gup.c b/mm/gup.c
> index afce0bc47e70..6076df8e04a4 100644
> --- a/mm/gup.c
> +++ b/mm/gup.c
> @@ -1326,8 +1326,11 @@ static __always_inline long __get_user_pages_locked(struct task_struct *tsk,
> * start trying again otherwise it can loop forever.
> */
>
> - if (fatal_signal_pending(current))
> + if (fatal_signal_pending(current)) {
> + if (!pages_done)
> + pages_done = -EINTR;
Why -EINTR here and -ERESTARTSYS at the other site?
> break;
> + }
>
> ret = down_read_killable(&mm->mmap_sem);
> if (ret) {
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-04-08 17:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 15:59 [PATCH] mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal Peter Xu
2020-04-08 16:20 ` Linus Torvalds
2020-04-08 17:13 ` Michal Hocko
2020-04-08 17:27 ` Peter Zijlstra [this message]
2020-04-08 17:32 ` Linus Torvalds
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=20200408172723.GR20730@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=hdanton@sina.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=peterx@redhat.com \
--cc=syzbot+3be1a33f04dc782e9fd5@syzkaller.appspotmail.com \
--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).