oom: give the dying task a higher priority
[sfrench/cifs-2.6.git] / mm / oom_kill.c
index 709aedfaa014946664f2b83857b749d92f79752f..31bd0c344fa771cb31a5479cbde4d7983678f614 100644 (file)
 #include <linux/module.h>
 #include <linux/notifier.h>
 #include <linux/memcontrol.h>
+#include <linux/mempolicy.h>
 #include <linux/security.h>
 
 int sysctl_panic_on_oom;
 int sysctl_oom_kill_allocating_task;
-int sysctl_oom_dump_tasks;
+int sysctl_oom_dump_tasks = 1;
 static DEFINE_SPINLOCK(zone_scan_lock);
 /* #define DEBUG */
 
+#ifdef CONFIG_NUMA
+/**
+ * has_intersects_mems_allowed() - check task eligiblity for kill
+ * @tsk: task struct of which task to consider
+ * @mask: nodemask passed to page allocator for mempolicy ooms
+ *
+ * Task eligibility is determined by whether or not a candidate task, @tsk,
+ * shares the same mempolicy nodes as current if it is bound by such a policy
+ * and whether or not it has the same set of allowed cpuset nodes.
+ */
+static bool has_intersects_mems_allowed(struct task_struct *tsk,
+                                       const nodemask_t *mask)
+{
+       struct task_struct *start = tsk;
+
+       do {
+               if (mask) {
+                       /*
+                        * If this is a mempolicy constrained oom, tsk's
+                        * cpuset is irrelevant.  Only return true if its
+                        * mempolicy intersects current, otherwise it may be
+                        * needlessly killed.
+                        */
+                       if (mempolicy_nodemask_intersects(tsk, mask))
+                               return true;
+               } else {
+                       /*
+                        * This is not a mempolicy constrained oom, so only
+                        * check the mems of tsk's cpuset.
+                        */
+                       if (cpuset_mems_allowed_intersects(current, tsk))
+                               return true;
+               }
+       } while_each_thread(start, tsk);
+
+       return false;
+}
+#else
+static bool has_intersects_mems_allowed(struct task_struct *tsk,
+                                       const nodemask_t *mask)
+{
+       return true;
+}
+#endif /* CONFIG_NUMA */
+
 /*
- * Is all threads of the target process nodes overlap ours?
+ * If this is a system OOM (not a memcg OOM) and the task selected to be
+ * killed is not already running at high (RT) priorities, speed up the
+ * recovery by boosting the dying task to the lowest FIFO priority.
+ * That helps with the recovery and avoids interfering with RT tasks.
  */
-static int has_intersects_mems_allowed(struct task_struct *tsk)
+static void boost_dying_task_prio(struct task_struct *p,
+                                 struct mem_cgroup *mem)
 {
-       struct task_struct *t;
+       struct sched_param param = { .sched_priority = 1 };
+
+       if (mem)
+               return;
+
+       if (!rt_task(p))
+               sched_setscheduler_nocheck(p, SCHED_FIFO, &param);
+}
+
+/*
+ * The process p may have detached its own ->mm while exiting or through
+ * use_mm(), but one or more of its subthreads may still have a valid
+ * pointer.  Return p, or any of its subthreads with a valid ->mm, with
+ * task_lock() held.
+ */
+static struct task_struct *find_lock_task_mm(struct task_struct *p)
+{
+       struct task_struct *t = p;
 
-       t = tsk;
        do {
-               if (cpuset_mems_allowed_intersects(current, t))
-                       return 1;
-               t = next_thread(t);
-       } while (t != tsk);
+               task_lock(t);
+               if (likely(t->mm))
+                       return t;
+               task_unlock(t);
+       } while_each_thread(p, t);
 
-       return 0;
+       return NULL;
+}
+
+/* return true if the task is not adequate as candidate victim task. */
+static bool oom_unkillable_task(struct task_struct *p, struct mem_cgroup *mem,
+                          const nodemask_t *nodemask)
+{
+       if (is_global_init(p))
+               return true;
+       if (p->flags & PF_KTHREAD)
+               return true;
+
+       /* When mem_cgroup_out_of_memory() and p is not member of the group */
+       if (mem && !task_in_mem_cgroup(p, mem))
+               return true;
+
+       /* p may not have freeable memory in nodemask */
+       if (!has_intersects_mems_allowed(p, nodemask))
+               return true;
+
+       return false;
 }
 
 /**
@@ -70,35 +157,30 @@ static int has_intersects_mems_allowed(struct task_struct *tsk)
  *    algorithm has been meticulously tuned to meet the principle
  *    of least surprise ... (be careful when you change it)
  */
-
-unsigned long badness(struct task_struct *p, unsigned long uptime)
+unsigned long badness(struct task_struct *p, struct mem_cgroup *mem,
+                     const nodemask_t *nodemask, unsigned long uptime)
 {
        unsigned long points, cpu_time, run_time;
-       struct mm_struct *mm;
        struct task_struct *child;
+       struct task_struct *c, *t;
        int oom_adj = p->signal->oom_adj;
        struct task_cputime task_time;
        unsigned long utime;
        unsigned long stime;
 
+       if (oom_unkillable_task(p, mem, nodemask))
+               return 0;
        if (oom_adj == OOM_DISABLE)
                return 0;
 
-       task_lock(p);
-       mm = p->mm;
-       if (!mm) {
-               task_unlock(p);
+       p = find_lock_task_mm(p);
+       if (!p)
                return 0;
-       }
 
        /*
         * The memory size of the process is the basis for the badness.
         */
-       points = mm->total_vm;
-
-       /*
-        * After this unlock we can no longer dereference local variable `mm'
-        */
+       points = p->mm->total_vm;
        task_unlock(p);
 
        /*
@@ -115,12 +197,17 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
         * child is eating the vast majority of memory, adding only half
         * to the parents will make the child our kill candidate of choice.
         */
-       list_for_each_entry(child, &p->children, sibling) {
-               task_lock(child);
-               if (child->mm != mm && child->mm)
-                       points += child->mm->total_vm/2 + 1;
-               task_unlock(child);
-       }
+       t = p;
+       do {
+               list_for_each_entry(c, &t->children, sibling) {
+                       child = find_lock_task_mm(c);
+                       if (child) {
+                               if (child->mm != p->mm)
+                                       points += child->mm->total_vm/2 + 1;
+                               task_unlock(child);
+                       }
+               }
+       } while_each_thread(p, t);
 
        /*
         * CPU time is in tens of seconds and run time is in thousands
@@ -167,14 +254,6 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
        if (has_capability_noaudit(p, CAP_SYS_RAWIO))
                points /= 4;
 
-       /*
-        * If p's nodes don't overlap ours, it may still help to kill p
-        * because p may have allocated or otherwise mapped memory on
-        * this node before. However it will be less likely.
-        */
-       if (!has_intersects_mems_allowed(p))
-               points /= 8;
-
        /*
         * Adjust the score by oom_adj.
         */
@@ -245,7 +324,7 @@ static enum oom_constraint constrained_alloc(struct zonelist *zonelist,
  * (not docbooked, we don't want this one cluttering up the manual)
  */
 static struct task_struct *select_bad_process(unsigned long *ppoints,
-                                               struct mem_cgroup *mem)
+               struct mem_cgroup *mem, const nodemask_t *nodemask)
 {
        struct task_struct *p;
        struct task_struct *chosen = NULL;
@@ -256,16 +335,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
        for_each_process(p) {
                unsigned long points;
 
-               /*
-                * skip kernel threads and tasks which have already released
-                * their mm.
-                */
-               if (!p->mm)
-                       continue;
-               /* skip the init task */
-               if (is_global_init(p))
-                       continue;
-               if (mem && !task_in_mem_cgroup(p, mem))
+               if (oom_unkillable_task(p, mem, nodemask))
                        continue;
 
                /*
@@ -290,7 +360,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
                 * the process of exiting and releasing its resources.
                 * Otherwise we could get an easy OOM deadlock.
                 */
-               if (p->flags & PF_EXITING) {
+               if ((p->flags & PF_EXITING) && p->mm) {
                        if (p != current)
                                return ERR_PTR(-1UL);
 
@@ -298,10 +368,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
                        *ppoints = ULONG_MAX;
                }
 
-               if (p->signal->oom_adj == OOM_DISABLE)
-                       continue;
-
-               points = badness(p, uptime.tv_sec);
+               points = badness(p, mem, nodemask, uptime.tv_sec);
                if (points > *ppoints || !chosen) {
                        chosen = p;
                        *ppoints = points;
@@ -313,7 +380,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
 
 /**
  * dump_tasks - dump current memory state of all system tasks
- * @mem: target memory controller
+ * @mem: current's memory controller, if constrained
  *
  * Dumps the current memory state of all system tasks, excluding kernel threads.
  * State information includes task's pid, uid, tgid, vm size, rss, cpu, oom_adj
@@ -326,44 +393,42 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
  */
 static void dump_tasks(const struct mem_cgroup *mem)
 {
-       struct task_struct *g, *p;
+       struct task_struct *p;
+       struct task_struct *task;
 
        printk(KERN_INFO "[ pid ]   uid  tgid total_vm      rss cpu oom_adj "
               "name\n");
-       do_each_thread(g, p) {
-               struct mm_struct *mm;
-
-               if (mem && !task_in_mem_cgroup(p, mem))
+       for_each_process(p) {
+               if (p->flags & PF_KTHREAD)
                        continue;
-               if (!thread_group_leader(p))
+               if (mem && !task_in_mem_cgroup(p, mem))
                        continue;
 
-               task_lock(p);
-               mm = p->mm;
-               if (!mm) {
+               task = find_lock_task_mm(p);
+               if (!task) {
                        /*
-                        * total_vm and rss sizes do not exist for tasks with no
-                        * mm so there's no need to report them; they can't be
-                        * oom killed anyway.
+                        * This is a kthread or all of p's threads have already
+                        * detached their mm's.  There's no need to report
+                        * them; they can't be oom killed anyway.
                         */
-                       task_unlock(p);
                        continue;
                }
-               printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3d     %3d %s\n",
-                      p->pid, __task_cred(p)->uid, p->tgid, mm->total_vm,
-                      get_mm_rss(mm), (int)task_cpu(p), p->signal->oom_adj,
-                      p->comm);
-               task_unlock(p);
-       } while_each_thread(g, p);
+
+               printk(KERN_INFO "[%5d] %5d %5d %8lu %8lu %3u     %3d %s\n",
+                      task->pid, __task_cred(task)->uid, task->tgid,
+                      task->mm->total_vm, get_mm_rss(task->mm),
+                      task_cpu(task), task->signal->oom_adj, task->comm);
+               task_unlock(task);
+       }
 }
 
 static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
                                                        struct mem_cgroup *mem)
 {
+       task_lock(current);
        pr_warning("%s invoked oom-killer: gfp_mask=0x%x, order=%d, "
                "oom_adj=%d\n",
                current->comm, gfp_mask, order, current->signal->oom_adj);
-       task_lock(current);
        cpuset_print_task_mems_allowed(current);
        task_unlock(current);
        dump_stack();
@@ -374,72 +439,43 @@ static void dump_header(struct task_struct *p, gfp_t gfp_mask, int order,
 }
 
 #define K(x) ((x) << (PAGE_SHIFT-10))
-
-/*
- * Send SIGKILL to the selected  process irrespective of  CAP_SYS_RAW_IO
- * flag though it's unlikely that  we select a process with CAP_SYS_RAW_IO
- * set.
- */
-static void __oom_kill_task(struct task_struct *p, int verbose)
+static int oom_kill_task(struct task_struct *p, struct mem_cgroup *mem)
 {
-       if (is_global_init(p)) {
-               WARN_ON(1);
-               printk(KERN_WARNING "tried to kill init!\n");
-               return;
-       }
-
-       task_lock(p);
-       if (!p->mm) {
-               WARN_ON(1);
-               printk(KERN_WARNING "tried to kill an mm-less task %d (%s)!\n",
-                       task_pid_nr(p), p->comm);
+       p = find_lock_task_mm(p);
+       if (!p) {
                task_unlock(p);
-               return;
+               return 1;
        }
-
-       if (verbose)
-               printk(KERN_ERR "Killed process %d (%s) "
-                      "vsz:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
-                      task_pid_nr(p), p->comm,
-                      K(p->mm->total_vm),
-                      K(get_mm_counter(p->mm, MM_ANONPAGES)),
-                      K(get_mm_counter(p->mm, MM_FILEPAGES)));
+       pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n",
+               task_pid_nr(p), p->comm, K(p->mm->total_vm),
+               K(get_mm_counter(p->mm, MM_ANONPAGES)),
+               K(get_mm_counter(p->mm, MM_FILEPAGES)));
        task_unlock(p);
 
+
+       set_tsk_thread_flag(p, TIF_MEMDIE);
+       force_sig(SIGKILL, p);
+
        /*
         * We give our sacrificial lamb high priority and access to
         * all the memory it needs. That way it should be able to
         * exit() and clear out its resources quickly...
         */
-       p->rt.time_slice = HZ;
-       set_tsk_thread_flag(p, TIF_MEMDIE);
-
-       force_sig(SIGKILL, p);
-}
-
-static int oom_kill_task(struct task_struct *p)
-{
-       /* WARNING: mm may not be dereferenced since we did not obtain its
-        * value from get_task_mm(p).  This is OK since all we need to do is
-        * compare mm to q->mm below.
-        *
-        * Furthermore, even if mm contains a non-NULL value, p->mm may
-        * change to NULL at any time since we do not hold task_lock(p).
-        * However, this is of no concern to us.
-        */
-       if (!p->mm || p->signal->oom_adj == OOM_DISABLE)
-               return 1;
-
-       __oom_kill_task(p, 1);
+       boost_dying_task_prio(p, mem);
 
        return 0;
 }
+#undef K
 
 static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
                            unsigned long points, struct mem_cgroup *mem,
-                           const char *message)
+                           nodemask_t *nodemask, const char *message)
 {
-       struct task_struct *c;
+       struct task_struct *victim = p;
+       struct task_struct *child;
+       struct task_struct *t = p;
+       unsigned long victim_points = 0;
+       struct timespec uptime;
 
        if (printk_ratelimit())
                dump_header(p, gfp_mask, order, mem);
@@ -449,23 +485,62 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
         * its children or threads, just set TIF_MEMDIE so it can die quickly
         */
        if (p->flags & PF_EXITING) {
-               __oom_kill_task(p, 0);
+               set_tsk_thread_flag(p, TIF_MEMDIE);
+               boost_dying_task_prio(p, mem);
                return 0;
        }
 
-       printk(KERN_ERR "%s: kill process %d (%s) score %li or a child\n",
-                                       message, task_pid_nr(p), p->comm, points);
+       task_lock(p);
+       pr_err("%s: Kill process %d (%s) score %lu or sacrifice child\n",
+               message, task_pid_nr(p), p->comm, points);
+       task_unlock(p);
 
-       /* Try to kill a child first */
-       list_for_each_entry(c, &p->children, sibling) {
-               if (c->mm == p->mm)
-                       continue;
-               if (mem && !task_in_mem_cgroup(c, mem))
-                       continue;
-               if (!oom_kill_task(c))
-                       return 0;
+       /*
+        * If any of p's children has a different mm and is eligible for kill,
+        * the one with the highest badness() score is sacrificed for its
+        * parent.  This attempts to lose the minimal amount of work done while
+        * still freeing memory.
+        */
+       do_posix_clock_monotonic_gettime(&uptime);
+       do {
+               list_for_each_entry(child, &t->children, sibling) {
+                       unsigned long child_points;
+
+                       /* badness() returns 0 if the thread is unkillable */
+                       child_points = badness(child, mem, nodemask,
+                                              uptime.tv_sec);
+                       if (child_points > victim_points) {
+                               victim = child;
+                               victim_points = child_points;
+                       }
+               }
+       } while_each_thread(p, t);
+
+       return oom_kill_task(victim, mem);
+}
+
+/*
+ * Determines whether the kernel must panic because of the panic_on_oom sysctl.
+ */
+static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
+                               int order)
+{
+       if (likely(!sysctl_panic_on_oom))
+               return;
+       if (sysctl_panic_on_oom != 2) {
+               /*
+                * panic_on_oom == 1 only affects CONSTRAINT_NONE, the kernel
+                * does not panic for cpuset, mempolicy, or memcg allocation
+                * failures.
+                */
+               if (constraint != CONSTRAINT_NONE)
+                       return;
        }
-       return oom_kill_task(p);
+       read_lock(&tasklist_lock);
+       dump_header(NULL, gfp_mask, order, NULL);
+       read_unlock(&tasklist_lock);
+       panic("Out of memory: %s panic_on_oom is enabled\n",
+               sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide");
 }
 
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
@@ -474,15 +549,14 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
        unsigned long points = 0;
        struct task_struct *p;
 
-       if (sysctl_panic_on_oom == 2)
-               panic("out of memory(memcg). panic_on_oom is selected.\n");
+       check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, 0);
        read_lock(&tasklist_lock);
 retry:
-       p = select_bad_process(&points, mem);
+       p = select_bad_process(&points, mem, NULL);
        if (!p || PTR_ERR(p) == -1UL)
                goto out;
 
-       if (oom_kill_process(p, gfp_mask, 0, points, mem,
+       if (oom_kill_process(p, gfp_mask, 0, points, mem, NULL,
                                "Memory cgroup out of memory"))
                goto retry;
 out:
@@ -509,7 +583,7 @@ EXPORT_SYMBOL_GPL(unregister_oom_notifier);
  * if a parallel OOM killing is already taking place that includes a zone in
  * the zonelist.  Otherwise, locks all zones in the zonelist and returns 1.
  */
-int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
+int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_mask)
 {
        struct zoneref *z;
        struct zone *zone;
@@ -526,7 +600,7 @@ int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
        for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
                /*
                 * Lock each zone in the zonelist under zone_scan_lock so a
-                * parallel invocation of try_set_zone_oom() doesn't succeed
+                * parallel invocation of try_set_zonelist_oom() doesn't succeed
                 * when it shouldn't.
                 */
                zone_set_flag(zone, ZONE_OOM_LOCKED);
@@ -555,65 +629,40 @@ void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_mask)
 }
 
 /*
- * Must be called with tasklist_lock held for read.
+ * Try to acquire the oom killer lock for all system zones.  Returns zero if a
+ * parallel oom killing is taking place, otherwise locks all zones and returns
+ * non-zero.
  */
-static void __out_of_memory(gfp_t gfp_mask, int order)
+static int try_set_system_oom(void)
 {
-       struct task_struct *p;
-       unsigned long points;
-
-       if (sysctl_oom_kill_allocating_task)
-               if (!oom_kill_process(current, gfp_mask, order, 0, NULL,
-                               "Out of memory (oom_kill_allocating_task)"))
-                       return;
-retry:
-       /*
-        * Rambo mode: Shoot down a process and hope it solves whatever
-        * issues we may have.
-        */
-       p = select_bad_process(&points, NULL);
-
-       if (PTR_ERR(p) == -1UL)
-               return;
-
-       /* Found nothing?!?! Either we hang forever, or we panic. */
-       if (!p) {
-               read_unlock(&tasklist_lock);
-               dump_header(NULL, gfp_mask, order, NULL);
-               panic("Out of memory and no killable processes...\n");
-       }
+       struct zone *zone;
+       int ret = 1;
 
-       if (oom_kill_process(p, gfp_mask, order, points, NULL,
-                            "Out of memory"))
-               goto retry;
+       spin_lock(&zone_scan_lock);
+       for_each_populated_zone(zone)
+               if (zone_is_oom_locked(zone)) {
+                       ret = 0;
+                       goto out;
+               }
+       for_each_populated_zone(zone)
+               zone_set_flag(zone, ZONE_OOM_LOCKED);
+out:
+       spin_unlock(&zone_scan_lock);
+       return ret;
 }
 
 /*
- * pagefault handler calls into here because it is out of memory but
- * doesn't know exactly how or why.
+ * Clears ZONE_OOM_LOCKED for all system zones so that failed allocation
+ * attempts or page faults may now recall the oom killer, if necessary.
  */
-void pagefault_out_of_memory(void)
+static void clear_system_oom(void)
 {
-       unsigned long freed = 0;
-
-       blocking_notifier_call_chain(&oom_notify_list, 0, &freed);
-       if (freed > 0)
-               /* Got some memory back in the last second. */
-               return;
-
-       if (sysctl_panic_on_oom)
-               panic("out of memory from page fault. panic_on_oom is selected.\n");
-
-       read_lock(&tasklist_lock);
-       __out_of_memory(0, 0); /* unknown gfp_mask and order */
-       read_unlock(&tasklist_lock);
+       struct zone *zone;
 
-       /*
-        * Give "p" a good chance of killing itself before we
-        * retry to allocate memory.
-        */
-       if (!test_thread_flag(TIF_MEMDIE))
-               schedule_timeout_uninterruptible(1);
+       spin_lock(&zone_scan_lock);
+       for_each_populated_zone(zone)
+               zone_clear_flag(zone, ZONE_OOM_LOCKED);
+       spin_unlock(&zone_scan_lock);
 }
 
 /**
@@ -621,6 +670,7 @@ void pagefault_out_of_memory(void)
  * @zonelist: zonelist pointer
  * @gfp_mask: memory allocation flags
  * @order: amount of memory being requested as a power of 2
+ * @nodemask: nodemask passed to page allocator
  *
  * If we run out of memory, we have the choice between either
  * killing a random task (bad), letting the system crash (worse)
@@ -630,43 +680,67 @@ void pagefault_out_of_memory(void)
 void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
                int order, nodemask_t *nodemask)
 {
+       struct task_struct *p;
        unsigned long freed = 0;
-       enum oom_constraint constraint;
+       unsigned long points;
+       enum oom_constraint constraint = CONSTRAINT_NONE;
 
        blocking_notifier_call_chain(&oom_notify_list, 0, &freed);
        if (freed > 0)
                /* Got some memory back in the last second. */
                return;
 
-       if (sysctl_panic_on_oom == 2) {
-               dump_header(NULL, gfp_mask, order, NULL);
-               panic("out of memory. Compulsory panic_on_oom is selected.\n");
+       /*
+        * If current has a pending SIGKILL, then automatically select it.  The
+        * goal is to allow it to allocate so that it may quickly exit and free
+        * its memory.
+        */
+       if (fatal_signal_pending(current)) {
+               set_thread_flag(TIF_MEMDIE);
+               boost_dying_task_prio(current, NULL);
+               return;
        }
 
        /*
         * Check if there were limitations on the allocation (only relevant for
         * NUMA) that may require different handling.
         */
-       constraint = constrained_alloc(zonelist, gfp_mask, nodemask);
+       if (zonelist)
+               constraint = constrained_alloc(zonelist, gfp_mask, nodemask);
+       check_panic_on_oom(constraint, gfp_mask, order);
+
        read_lock(&tasklist_lock);
+       if (sysctl_oom_kill_allocating_task &&
+           !oom_unkillable_task(current, NULL, nodemask) &&
+           (current->signal->oom_adj != OOM_DISABLE)) {
+               /*
+                * oom_kill_process() needs tasklist_lock held.  If it returns
+                * non-zero, current could not be killed so we must fallback to
+                * the tasklist scan.
+                */
+               if (!oom_kill_process(current, gfp_mask, order, 0, NULL,
+                               nodemask,
+                               "Out of memory (oom_kill_allocating_task)"))
+                       return;
+       }
 
-       switch (constraint) {
-       case CONSTRAINT_MEMORY_POLICY:
-               oom_kill_process(current, gfp_mask, order, 0, NULL,
-                               "No available memory (MPOL_BIND)");
-               break;
+retry:
+       p = select_bad_process(&points, NULL,
+                       constraint == CONSTRAINT_MEMORY_POLICY ? nodemask :
+                                                                NULL);
+       if (PTR_ERR(p) == -1UL)
+               return;
 
-       case CONSTRAINT_NONE:
-               if (sysctl_panic_on_oom) {
-                       dump_header(NULL, gfp_mask, order, NULL);
-                       panic("out of memory. panic_on_oom is selected\n");
-               }
-               /* Fall-through */
-       case CONSTRAINT_CPUSET:
-               __out_of_memory(gfp_mask, order);
-               break;
+       /* Found nothing?!?! Either we hang forever, or we panic. */
+       if (!p) {
+               dump_header(NULL, gfp_mask, order, NULL);
+               read_unlock(&tasklist_lock);
+               panic("Out of memory and no killable processes...\n");
        }
 
+       if (oom_kill_process(p, gfp_mask, order, points, NULL, nodemask,
+                            "Out of memory"))
+               goto retry;
        read_unlock(&tasklist_lock);
 
        /*
@@ -676,3 +750,19 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
        if (!test_thread_flag(TIF_MEMDIE))
                schedule_timeout_uninterruptible(1);
 }
+
+/*
+ * The pagefault handler calls here because it is out of memory, so kill a
+ * memory-hogging task.  If a populated zone has ZONE_OOM_LOCKED set, a parallel
+ * oom killing is already in progress so do nothing.  If a task is found with
+ * TIF_MEMDIE set, it has been killed so do nothing and allow it to exit.
+ */
+void pagefault_out_of_memory(void)
+{
+       if (try_set_system_oom()) {
+               out_of_memory(NULL, 0, 0, NULL);
+               clear_system_oom();
+       }
+       if (!test_thread_flag(TIF_MEMDIE))
+               schedule_timeout_uninterruptible(1);
+}