Commit f6a4c825 authored by Yong Wang's avatar Yong Wang Committed by Liu Shixin
Browse files

mm, oom:dump_tasks add rss detailed information printing 

mainline inclusion
from mainline-v6.8-rc1
commit 27873192ac5938bfa9d27348d79b931e5b438ba6
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9OCYO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=27873192ac5938bfa9d27348d79b931e5b438ba6

--------------------------------

When the system is under oom, it prints out the RSS information of each
process.  However, we don't know the size of rss_anon, rss_file, and
rss_shmem.

To distinguish the memory occupied by anonymous or file mappings
or shmem, could help us identify the root cause of the oom.

So this patch adds RSS details, which refers to the /proc/<pid>/status[1].
It can help us know more about process memory usage.

Example of oom including the new rss_* fields:
[ 1630.902466] Tasks state (memory values in pages):
[ 1630.902870] [  pid  ]   uid  tgid total_vm      rss rss_anon rss_file rss_shmem pgtables_bytes swapents oom_score_adj name
[ 1630.903619] [    149]     0   149      486      288        0      288         0    36864        0             0 ash
[ 1630.904210] [    156]     0   156   153531   153345   153345        0         0  1269760        0             0 mm_test

[1] commit 8cee852e ("mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status").

Link: https://lkml.kernel.org/r/202311231840181856667@zte.com.cn


Signed-off-by: default avatarYong Wang <wang.yong12@zte.com.cn>
Reviewed-by: default avatarYang Yang <yang.yang29@zte.com.cn>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Xuexin Jiang <jiang.xuexin@zte.com.cn>
Cc: Michal Hocko <mhocko@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent 451ce7f0

mm/oom_kill.c

+4 −3
Original line number Diff line number Diff line
@@ -450,10 +450,11 @@ static int dump_task(struct task_struct *p, void *arg) 
		return 0;

	}



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

	pr_info("[%7d] %5d %5d %8lu %8lu %8lu %8lu %9lu %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),

		get_mm_counter(task->mm, MM_ANONPAGES), get_mm_counter(task->mm, MM_FILEPAGES),

		get_mm_counter(task->mm, MM_SHMEMPAGES), mm_pgtables_bytes(task->mm),

		get_mm_counter(task->mm, MM_SWAPENTS),

		task->signal->oom_score_adj, task->comm);

	task_unlock(task);
@@ -474,7 +475,7 @@ static int dump_task(struct task_struct *p, void *arg) 
static void dump_tasks(struct oom_control *oc)

{

	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");

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



	if (is_memcg_oom(oc)) {

		mem_cgroup_scan_tasks(oc->memcg, dump_task, oc);