[PATCH] mm/gup: Let __get_user_pages_locked() return -EINTR for fatal signal

From: Hillf Danton
Date: Wed Apr 08 2020 - 11:01:25 EST


__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: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Hillf Danton <hdanton@xxxxxxxx>
[peterx: write commit message]
Signed-off-by: Peter Xu <peterx@xxxxxxxxxx>
---
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;
break;
+ }

ret = down_read_killable(&mm->mmap_sem);
if (ret) {
--
2.24.1


--
Peter Xu