From patchwork Thu Nov 23 10:40:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Yang X-Patchwork-Id: 168858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp351576vqx; Thu, 23 Nov 2023 02:40:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFta0B8AK/SgezkIvtcD1hjDMqjO+SA3Bwb4PxSNKM9qUWWy6pBC/PQBqdpt3Nc/t1Lou6P X-Received: by 2002:a17:902:e80c:b0:1c0:cbaf:6930 with SMTP id u12-20020a170902e80c00b001c0cbaf6930mr5933567plg.54.1700736045244; Thu, 23 Nov 2023 02:40:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700736045; cv=none; d=google.com; s=arc-20160816; b=B+53NRqSXwS45+Yg2O89GFJ3+CWMNq+n5vCXNLZw2giDk/g5YXTfhvgMqajCvRtoy/ gyjEjLrskxkYFHe4L5KhCzm9DXaVGaY7qHqiGRLZnBvPFFGtAofIfmZXLCMQxtVMG6a9 I3ABv7qub3IjvPDPLSAXESt4pTzZaa/BOOY8H01rZsCCb5KbpEJdko3lu2tw6/uc1wPZ O9FO8Kow4ZLdxHdrqQW58CQOk4YmmUMusniDHGDgRWnB9B585fPYlkPijN3fDAYCXLVj SLTbMmihZ/3BTv29xhFupsg+CmabOe01azLFjzLHLIGVf03YQkn2bk7t3YNNCR1IJSub SDqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=1MLDC64L2oPSpcoOZUdFxdIXKwSI3/F//KV540HDrbg=; fh=zymkmKBBAFllAAvGuloQe2z+TSUGWoV9n6RtXjMhtQU=; b=bWVXw6pkuFyD/SPQhSz3d+lHB7L9cQiB7pUgcsbKAHubQCz+hnMhrEwV1/0T/wlYH1 G+VbDYAZm/sleC9+MIpBwHEM6v+6s6eES5q6FTSehepvxs97ztS9rx3RloGSrcp6QRAQ BnGbr6JKxmIgA2pTpeTCZeydcFaEhMBhjbLKLJY9oex4yeZ3VXMW5eBAWd1olT/Njwwl kTetBUl/3uz0MlU2rBfa8X1qW7WQN71ghQcBBujHpgaOU25neOvTxhbU/xIlEvtYPRs+ mAKPW2y2p+2Ba/qqPS7WfKpCYw0WIw6sSczbsXyAJbna/9A/Pu/BWULLONwkLeFj0b5J 7uSA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id u10-20020a170902e5ca00b001c0c86a541asi936915plf.375.2023.11.23.02.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 02:40:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id EA2708075DE2; Thu, 23 Nov 2023 02:40:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344684AbjKWKk0 (ORCPT + 99 others); Thu, 23 Nov 2023 05:40:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232201AbjKWKkZ (ORCPT ); Thu, 23 Nov 2023 05:40:25 -0500 Received: from mxct.zte.com.cn (mxct.zte.com.cn [58.251.27.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94802D4A for ; Thu, 23 Nov 2023 02:40:30 -0800 (PST) Received: from mxde.zte.com.cn (unknown [10.35.20.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxct.zte.com.cn (FangMail) with ESMTPS id 4SbZQ345BBzCh3M for ; Thu, 23 Nov 2023 18:40:27 +0800 (CST) Received: from mxhk.zte.com.cn (unknown [192.168.250.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxde.zte.com.cn (FangMail) with ESMTPS id 4SbZQ03GbFzBRjZH for ; Thu, 23 Nov 2023 18:40:24 +0800 (CST) 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?q?=5BPATCH_linux-next=5Dmm=2C_oom=3Adump=5Ftasks_add_rss_de?= =?utf-8?q?tailed_information_printing?= X-MAIL: mse-fl1.zte.com.cn 3ANAeEas066399 X-Fangmail-Gw-Spam-Type: 0 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 655F2C1A.001/4SbZQ345BBzCh3M X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Thu, 23 Nov 2023 02:40:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783350999582531247 X-GMAIL-MSGID: 1783350999582531247 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);