2 files changed, 20 insertions, 11 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9537e1389ee6..c8336e8f8df0 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1841,13 +1841,18 @@ static void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
                                 break;
                         };
                         points = oom_badness(task, memcg, NULL, totalpages);
-                        if (points > chosen_points) {
-                                if (chosen)
-                                        put_task_struct(chosen);
-                                chosen = task;
-                                chosen_points = points;
-                                get_task_struct(chosen);
-                        }
+                        if (!points || points < chosen_points)
+                                continue;
+                        /* Prefer thread group leaders for display purposes */
+                        if (points == chosen_points &&
+                            thread_group_leader(chosen))
+                                continue;
+
+                        if (chosen)
+                                put_task_struct(chosen);
+                        chosen = task;
+                        chosen_points = points;
+                        get_task_struct(chosen);
                 }
                 css_task_iter_end(&it);
         }
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 054ff47c4478..37b1b1903fb2 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -327,10 +327,14 @@ static struct task_struct *select_bad_process(unsigned int *ppoints,
                         break;
                 };
                 points = oom_badness(p, NULL, nodemask, totalpages);
-                if (points > chosen_points) {
-                        chosen = p;
-                        chosen_points = points;
-                }
+                if (!points || points < chosen_points)
+                        continue;
+                /* Prefer thread group leaders for display purposes */
+                if (points == chosen_points && thread_group_leader(chosen))
+                        continue;
+
+                chosen = p;
+                chosen_points = points;
         }
         if (chosen)
                 get_task_struct(chosen);