The patch titled
Subject: memcg, oom: clarify some oom dump messages
has been removed from the -mm tree. Its filename was
memcg-oom-clarify-some-oom-dump-messages.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Sha Zhengju <handai.szj@xxxxxxxxxx>
Subject: memcg, oom: clarify some oom dump messages
Revise some oom dump messages to avoid misleading admin.
[akpm@xxxxxxxxxxxxxxxxxxxx: checkpatch fixes]
Signed-off-by: Sha Zhengju <handai.szj@xxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Greg Thelen <gthelen@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 2 +-
mm/oom_kill.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff -puN mm/memcontrol.c~memcg-oom-clarify-some-oom-dump-messages mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-oom-clarify-some-oom-dump-messages
+++ a/mm/memcontrol.c
@@ -1471,7 +1471,7 @@ void mem_cgroup_print_oom_info(struct me
}
rcu_read_unlock();
- printk(KERN_INFO "Task in %s killed", memcg_name);
+ pr_info("Task in %s will be killed", memcg_name);
rcu_read_lock();
ret = cgroup_path(mem_cgrp, memcg_name, PATH_MAX);
diff -puN mm/oom_kill.c~memcg-oom-clarify-some-oom-dump-messages mm/oom_kill.c
--- a/mm/oom_kill.c~memcg-oom-clarify-some-oom-dump-messages
+++ a/mm/oom_kill.c
@@ -472,7 +472,7 @@ void oom_kill_process(struct task_struct
dump_header(p, gfp_mask, order, memcg, nodemask);
task_lock(p);
- pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n",
+ pr_err("%s: Will kill process %d (%s) score %d or sacrifice child\n",
message, task_pid_nr(p), p->comm, points);
task_unlock(p);
@@ -509,6 +509,7 @@ void oom_kill_process(struct task_struct
if (!p) {
rcu_read_unlock();
put_task_struct(victim);
+ pr_err("No process has been killed!\n");
return;
} else if (victim != p) {
get_task_struct(p);
@@ -540,7 +541,7 @@ void oom_kill_process(struct task_struct
continue;
task_lock(p); /* Protect ->comm from prctl() */
- pr_err("Kill process %d (%s) sharing same memory\n",
+ pr_err("Killed process %d (%s) sharing same memory\n",
task_pid_nr(p), p->comm);
task_unlock(p);
do_send_sig_info(SIGKILL, SEND_SIG_FORCED, p, true);
_
Patches currently in -mm which might be from handai.szj@xxxxxxxxxx are
mm-oom-introduce-helper-function-to-process-threads-during-scan.patch
mm-memcg-introduce-own-oom-handler-to-iterate-only-over-its-own-threads.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
