|
@@ -1210,6 +1210,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
|
|
|
int write = !!(flags & GUP_FLAGS_WRITE);
|
|
|
int force = !!(flags & GUP_FLAGS_FORCE);
|
|
|
int ignore = !!(flags & GUP_FLAGS_IGNORE_VMA_PERMISSIONS);
|
|
|
+ int ignore_sigkill = !!(flags & GUP_FLAGS_IGNORE_SIGKILL);
|
|
|
|
|
|
if (len <= 0)
|
|
|
return 0;
|
|
@@ -1288,12 +1289,15 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
|
|
|
struct page *page;
|
|
|
|
|
|
/*
|
|
|
- * If tsk is ooming, cut off its access to large memory
|
|
|
- * allocations. It has a pending SIGKILL, but it can't
|
|
|
- * be processed until returning to user space.
|
|
|
+ * If we have a pending SIGKILL, don't keep faulting
|
|
|
+ * pages and potentially allocating memory, unless
|
|
|
+ * current is handling munlock--e.g., on exit. In
|
|
|
+ * that case, we are not allocating memory. Rather,
|
|
|
+ * we're only unlocking already resident/mapped pages.
|
|
|
*/
|
|
|
- if (unlikely(test_tsk_thread_flag(tsk, TIF_MEMDIE)))
|
|
|
- return i ? i : -ENOMEM;
|
|
|
+ if (unlikely(!ignore_sigkill &&
|
|
|
+ fatal_signal_pending(current)))
|
|
|
+ return i ? i : -ERESTARTSYS;
|
|
|
|
|
|
if (write)
|
|
|
foll_flags |= FOLL_WRITE;
|