Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b78b11 authored by Rodrigo Freire's avatar Rodrigo Freire Committed by Linus Torvalds
Browse files

mm, oom: describe task memory unit, larger PID pad 

The default page memory unit of OOM task dump events might not be
intuitive and potentially misleading for the non-initiated when debugging
OOM events: These are pages and not kBs.  Add a small printk prior to the
task dump informing that the memory units are actually memory _pages_.

Also extends PID field to align on up to 7 characters.
Reference https://lkml.org/lkml/2018/7/3/1201

Link: http://lkml.kernel.org/r/c795eb5129149ed8a6345c273aba167ff1bbd388.1530715938.git.rfreire@redhat.com


Signed-off-by: default avatarRodrigo Freire <rfreire@redhat.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarRafael Aquini <aquini@redhat.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af5679fb

mm/oom_kill.c

+3 −2
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask) 
	struct task_struct *p;

	struct task_struct *task;



	pr_info("Tasks state (memory values in pages):\n");

	pr_info("[  pid  ]   uid  tgid total_vm      rss pgtables_bytes swapents oom_score_adj name\n");

	rcu_read_lock();

	for_each_process(p) {
@@ -416,7 +417,7 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask) 
			continue;

		}



		pr_info("[%5d] %5d %5d %8lu %8lu %8ld %8lu         %5hd %s\n",

		pr_info("[%7d] %5d %5d %8lu %8lu %8ld %8lu         %5hd %s\n",

			task->pid, from_kuid(&init_user_ns, task_uid(task)),

			task->tgid, task->mm->total_vm, get_mm_rss(task->mm),

			mm_pgtables_bytes(task->mm),