From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B96AC61D85 for ; Thu, 23 Nov 2023 10:40:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C7216B0579; Thu, 23 Nov 2023 05:40:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8767D6B0605; Thu, 23 Nov 2023 05:40:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 765076B065C; Thu, 23 Nov 2023 05:40:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 65F7A6B0579 for ; Thu, 23 Nov 2023 05:40:29 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3CDAC160EC3 for ; Thu, 23 Nov 2023 10:40:29 +0000 (UTC) X-FDA: 81488874978.26.6B605EB Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by imf24.hostedemail.com (Postfix) with ESMTP id 1A4AC180014 for ; Thu, 23 Nov 2023 10:40:24 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; spf=pass (imf24.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.35 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn; dmarc=pass (policy=none) header.from=zte.com.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700736026; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=1MLDC64L2oPSpcoOZUdFxdIXKwSI3/F//KV540HDrbg=; b=SmegjrpENTP683bd1fn2hhpmiX5nGQNTBo3xTAqt6LStJP/00BUCBV+ilpKeq4kBCrQ7sQ yEH5nad7ofLbLShCJw9bgkefmgRh5dVALZUjRk1kdPTad1RPNjkYQhiGAM1NXpqkpm0ZIC IVAp30UbBVX6hZ3AdcGXcJqxSV1YhgE= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; spf=pass (imf24.hostedemail.com: domain of yang.yang29@zte.com.cn designates 63.216.63.35 as permitted sender) smtp.mailfrom=yang.yang29@zte.com.cn; dmarc=pass (policy=none) header.from=zte.com.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700736026; a=rsa-sha256; cv=none; b=fn3gPNy2jVnP+Fm7UtlKCWcCsju+Nr5nbSDBkdjvJfNG09QsX8cjjUdsIM8kLhxnYOOxE2 8toi+GCxQeSYGqTm8AS7Qlw8hNTm/EG7sE9bcBKHWXGWgBOM+F7Xgf5oGbMJFgM5+L4Bax UZUzGNEWoraAmlRO6oF/yOYEPPxTE80= Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4SbZPx1LXdz4xPYm; Thu, 23 Nov 2023 18:40:21 +0800 (CST) Received: from szxlzmapp01.zte.com.cn ([10.5.231.85]) by mse-fl1.zte.com.cn with SMTP id 3ANAeEas066399; Thu, 23 Nov 2023 18:40:14 +0800 (+08) (envelope-from yang.yang29@zte.com.cn) Received: from mapi (szxlzmapp01[null]) by mapi (Zmail) with MAPI id mid14; Thu, 23 Nov 2023 18:40:18 +0800 (CST) Date: Thu, 23 Nov 2023 18:40:18 +0800 (CST) X-Zmail-TransId: 2b03655f2c124cb-d546e X-Mailer: Zmail v1.0 Message-ID: <202311231840181856667@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHRdbW0sIG9vbTpkdW1wX3Rhc2tzIGFkZCByc3MgZGV0YWlsZWQgaW5mb3JtYXRpb24gcHJpbnRpbmc=?= Content-Type: text/plain; charset="UTF-8" X-MAIL:mse-fl1.zte.com.cn 3ANAeEas066399 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 655F2C15.000/4SbZPx1LXdz4xPYm X-Rspamd-Queue-Id: 1A4AC180014 X-Rspam-User: X-Stat-Signature: qa4ibhr6rcyyn9pawa51uw4hg3onwznf X-Rspamd-Server: rspam01 X-HE-Tag: 1700736024-357846 X-HE-Meta: U2FsdGVkX1+nb3OWTn9+WyfPYt5Pxr2q3ctwoMoLe20jZk0OmDjWPea74vcBkOtqMmfufMP3Pw6h4b+KoDboBRl2pBRY10pBexz9PgIXjnLF1xFe4e1NKnb2jg+yKVLJhB3EK7nqalmC9qtJDXJtkefERp/DIa9kmKMAkewnqrTPFonr7eBrHVoQcw9YfvdbikGkF+EciaJ3WLOw0aO/Mq6zwUzpErSV8Ei0UfIhv68GPRsedEcU8JjYGBtrc+pP8XA78VIZUr4KpUT3lFEsY92WGAFUSHthqsrL7LYJSG0UwIkoZ7j1EDY7Du9GhX+gA3kh2rsq9/RLHfP4PQeoz9268J8g2Uc/WtsiIDDnJT2qfqlS4h9l7Ye4qpSfwefbsfwVavYGmkq44ahWG6EgNgxG0U8cu5Jx/N8sT5ccchO7ppXi6ApAmOkm4WZwjX/iBhljocyxnTsPaomgU3DkHVFoW2xQLTqKXNlyHfx4MXPp8J8HJdwuKYPbkmoZoTWMhckxgv5R10+vGeGz2fAOAQSYaQfG/JD7aChHBs+v0pTZNobXItWvNOMLerDRLH0aC3EnJdIlvpG3Xt3xBnnSuSTbmvWOfy7hfjNzzFzdLh5gPa7+kTIHBUvlcTuwP/moOSKN5Dg8TWYqsIhFDRZNZE5qonUiVqOI4GBpdjWqC15ApbOztcj/L7AHW4tm/O+D28i6kdcE1+/vaR+BdDDMzsPMnfb8pgCzRH9+/IaZW2MwMZHFAvfhJQyteIm3usX5WsUwVTMSLP9/B/fOm2HQgz5T1R1Vt9f4c4oiXPwNov21It5vq8XYetuv4yiE0VTuj78i0oQ57ut7Yqu6IlngtL1/ITFRjsMcnZNXnhGo2GNaAlxgMKmZz7lLsQt5+LblURo0Uwr1Af9+lpnOgSzzqCD6kXnIWMIXThb5r7chJ+1zxk3IVvF6roP8ChZIZcAFcEkKIFkjbZ3Xv/tbcjD huUUPF5C MkYdPHrSvkRYwmRrqPpcHOb0PDTfGVPHA74y1qlXl+Y5HkkT9DedRc2prvVV7Br+CC48PfLm3KmDMy1KWqEl/P/efLEMblIByelKo4iEuo/ah56VOj4LcAvDOu33baxJUcWKlJMAOw784k2fo5TKuM772JGA+iH0cTYJCkkrPgXfPNBZBlOinqBPqwQGN1PlkcADoDRzNMMiySnPDdktLRMK0MXrEqkJ3FOqgFiy5xQAfn65mdaS9bqL5qkKqdZjyT+zh X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Yong Wang 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//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 8cee852ec53f ("mm, procfs: breakdown RSS for anon, shmem and file in /proc/pid/status"). Signed-off-by: Yong Wang Reviewed-by: Yang Yang --- mm/oom_kill.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 9e6071fde34a..91ccd82097c2 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -399,10 +399,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); @@ -423,7 +424,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); -- 2.15.2