From patchwork Wed Nov 21 11:29:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?56a56Iif6ZSu?= X-Patchwork-Id: 10692455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A7C3C1751 for ; Wed, 21 Nov 2018 11:30:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94E2C2B61C for ; Wed, 21 Nov 2018 11:30:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 894BC2B64A; Wed, 21 Nov 2018 11:30:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D5B12B61C for ; Wed, 21 Nov 2018 11:30:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6702F6B2608; Wed, 21 Nov 2018 06:30:15 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 621226B2609; Wed, 21 Nov 2018 06:30:15 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5120D6B260A; Wed, 21 Nov 2018 06:30:15 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 081556B2608 for ; Wed, 21 Nov 2018 06:30:15 -0500 (EST) Received: by mail-pl1-f199.google.com with SMTP id g12-v6so7643617plo.14 for ; Wed, 21 Nov 2018 03:30:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=MGmzSFD9yA9B8zvndJgZDTVvOwRl+YrBF/tFuCK8eBs=; b=YPfUv0Wuz6XGsPE2FRj0Tytwwuiep9prSTGAyhwHx3u9fTJ4zLwRnl9EsAEelfbxGX 57jM+lE198uurNGn1Zbsa6ehy3cpr6oXZVj7D9dqsPE0iZHBtr+iqTZ5H7hK+DZgJ60A cJznzfn0c/cgdfB4ie3Hvx7E5E+ClnJUpMTT5rK4GrZRCF4KvjYYbpbE883/q/R6v0Jt ft5m9xGxHwGkJbFpBiKGmjdDrVdRuBlShGz6k//r28T0y5U2AZzUutKM4keTDbJQ+LaX uQGUPsgPgJFEEEX6fW8fUOUJq8jjQAuVpWU9pPePGJlpUBlh7y/o7Y4lyllD55r/0TQC fBuw== X-Gm-Message-State: AA+aEWYbhvDeH5qAIL8RUEIUBqxellwsBGqQ+PXeKKg5SFFQOTAPvX2E kEwbuL4w67Iq1vJ8AA0hzj+KWJNvb9r16dgu7YpuPGQVvSBJh6YPkFg1C5DstEJrBztqSKj/eiu Ud7uapmvI6TwlP8pmyfF5geOt2A3twG77J90HRF9q4qNdmWN+M4NIuWAFQcZG1h/un2vVSO56lP E6a2aR+RoC6bFl0skYyzmcs+bKuP/MetKSLgTL7toHsydQfh2geTJRDBqM1xVX48U4jP6TGlAa3 KeNQ/pQTmabRzElfXTAvmyU3jR6IimftVrglTMl7mJtZAq0vpm/MLu3JBQlABVUusVM1rWhxll0 /VzdrkZBzn/D1kyjytLJKXAVNxIuMsOkFxUMl5ej9ZwWYRrfh8s/CeEG/VFtAri4MY/scGfWY3Y N X-Received: by 2002:a63:d513:: with SMTP id c19mr5634001pgg.287.1542799814570; Wed, 21 Nov 2018 03:30:14 -0800 (PST) X-Received: by 2002:a63:d513:: with SMTP id c19mr5633922pgg.287.1542799813345; Wed, 21 Nov 2018 03:30:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542799813; cv=none; d=google.com; s=arc-20160816; b=McHqbw9lK/eJlOfQb4MRUEbVWtYcq0sEJ4B9msJeGJpfJx04xLYDJH5owWGe7vHjKM /K/AUOXG+oa4VV62UuLd7ncXtGZNtwvi+bugttHRI+zC5k+ZC6JCBGL2qtdk9YpbDs5P xuKgd5IXYb00rcGM7k+eqa/xnlYRrL/NegXrWpsfPeQVdPpxZVt2ZXun6Zin0i9Z4ozr 9izD/1Pd8Qh28RsJBkNt7w3g8nPH2u2rc+G9O7Ld8XoNz2thnDlFkCuLaDXBzrAtgOlf AaonJBfNuxwfxYAqbzvbab2PeK1sr+UIXj4b6pKe5hy8HLTFojpOhaj36lDlZW0vW8r1 4uNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=MGmzSFD9yA9B8zvndJgZDTVvOwRl+YrBF/tFuCK8eBs=; b=QdxHhrf5nlheWAH788HNgm0HsyFFWdAEMOzv7oxhzlL9OzmTOVFop1lMgEICPnBBzP sDgn6OQmIqKQNvFbHZOmYbOanY0WgDl9X1fQEpvsYIIWrnZyL76SyLY1Tm+nAcYb8gg6 Fyv5cdC3XCwNngbv9Jlgoi2SKRxBRun+be1b3jnmgrRrybf0npYeABsAI1UW9WieiC4D xEINX99UOPCzSinRK5pE2xBbk1AR2/4Ur4tXurO3+Yp+qpWHa7/J1UX6GY2OXmC4PSIG KeI59EjISexIku168HUmseRNCKT+q8rezjQOCqoQv59G55TdjuKdq+W1NY00j5QPNqAQ bRiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Auynbds0; spf=pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ufo19890607@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 14-v6sor57703523pfs.60.2018.11.21.03.30.13 for (Google Transport Security); Wed, 21 Nov 2018 03:30:13 -0800 (PST) Received-SPF: pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Auynbds0; spf=pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ufo19890607@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=MGmzSFD9yA9B8zvndJgZDTVvOwRl+YrBF/tFuCK8eBs=; b=Auynbds0y+t11pga665KudTb3qzoA0hVnSMQXYHO2LeMWy7KasJBWj0Uc6q3LHhNUa WKDddVr6NHNlAd/F7jpkCBZyl3Toa8rtKC/IzfCdXU1tLXwjl73ym5NxlLm9DiDX9MXg EGxQF9XgO4TxqchQpRA9zefE0BZqUX64246mh2xxaJTaZThzHQUxabVeGQyPGLgxl0qw n+4axQE2QJUs9vzp2+Kn3KhW1jbpoojQK2sawy6IKJtCxxT3S61mBbuED4A/h/+bI/kN ciGqTHbDS3azel7+pCCcdH74aFzigQkbdAamBkUhSYefpjeIjBxNwudMAG8SG/f55NQj YspA== X-Google-Smtp-Source: AJdET5dIEpb8+pe9RniySs3Kdk0Umol4tnScVt18EpzY1bDSlYBZZVLtvPOVnmqoYpxALhxXc09RTA== X-Received: by 2002:a62:d148:: with SMTP id t8mr6556778pfl.52.1542799812778; Wed, 21 Nov 2018 03:30:12 -0800 (PST) Received: from dest.didichuxing.com ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id t13sm90753952pgr.42.2018.11.21.03.30.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 03:30:12 -0800 (PST) From: ufo19890607@gmail.com To: akpm@linux-foundation.org, mhocko@suse.com, rientjes@google.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, penguin-kernel@i-love.sakura.ne.jp, guro@fb.com, yang.s@alibaba-inc.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, yuzhoujian@didichuxing.com Subject: [PATCH v15 1/2] Reorganize the oom report in dump_header Date: Wed, 21 Nov 2018 19:29:58 +0800 Message-Id: <1542799799-36184-1-git-send-email-ufo19890607@gmail.com> X-Mailer: git-send-email 1.8.3.1 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: X-Virus-Scanned: ClamAV using ClamSMTP From: yuzhoujian OOM report contains several sections. The first one is the allocation context that has triggered the OOM. Then we have cpuset context followed by the stack trace of the OOM path. The tird one is the OOM memory information. Followed by the current memory state of all system tasks. At last, we will show oom eligible tasks and the information about the chosen oom victim. One thing that makes parsing more awkward than necessary is that we do not have a single and easily parsable line about the oom context. This patch is reorganizing the oom report to 1) who invoked oom and what was the allocation request [ 515.902945] tuned invoked oom-killer: gfp_mask=0x6200ca(GFP_HIGHUSER_MOVABLE), order=0, oom_score_adj=0 2) OOM stack trace [ 515.904273] CPU: 24 PID: 1809 Comm: tuned Not tainted 4.20.0-rc3+ #3 [ 515.905518] Hardware name: Inspur SA5212M4/YZMB-00370-107, BIOS 4.1.10 11/14/2016 [ 515.906821] Call Trace: [ 515.908062] dump_stack+0x5a/0x73 [ 515.909311] dump_header+0x55/0x28c [ 515.914260] oom_kill_process+0x2d8/0x300 [ 515.916708] out_of_memory+0x145/0x4a0 [ 515.917932] __alloc_pages_slowpath+0x7d2/0xa16 [ 515.919157] __alloc_pages_nodemask+0x277/0x290 [ 515.920367] filemap_fault+0x3d0/0x6c0 [ 515.921529] ? filemap_map_pages+0x2b8/0x420 [ 515.922709] ext4_filemap_fault+0x2c/0x40 [ext4] [ 515.923884] __do_fault+0x20/0x80 [ 515.925032] __handle_mm_fault+0xbc0/0xe80 [ 515.926195] handle_mm_fault+0xfa/0x210 [ 515.927357] __do_page_fault+0x233/0x4c0 [ 515.928506] do_page_fault+0x32/0x140 [ 515.929646] ? page_fault+0x8/0x30 [ 515.930770] page_fault+0x1e/0x30 3) OOM memory information [ 515.958093] Mem-Info: [ 515.959647] active_anon:26501758 inactive_anon:1179809 isolated_anon:0 active_file:4402672 inactive_file:483963 isolated_file:1344 unevictable:0 dirty:4886753 writeback:0 unstable:0 slab_reclaimable:148442 slab_unreclaimable:18741 mapped:1347 shmem:1347 pagetables:58669 bounce:0 free:88663 free_pcp:0 free_cma:0 ... 4) current memory state of all system tasks [ 516.079544] [ 744] 0 744 9211 1345 114688 82 0 systemd-journal [ 516.082034] [ 787] 0 787 31764 0 143360 92 0 lvmetad [ 516.084465] [ 792] 0 792 10930 1 110592 208 -1000 systemd-udevd [ 516.086865] [ 1199] 0 1199 13866 0 131072 112 -1000 auditd [ 516.089190] [ 1222] 0 1222 31990 1 110592 157 0 smartd [ 516.091477] [ 1225] 0 1225 4864 85 81920 43 0 irqbalance [ 516.093712] [ 1226] 0 1226 52612 0 258048 426 0 abrtd [ 516.112128] [ 1280] 0 1280 109774 55 299008 400 0 NetworkManager [ 516.113998] [ 1295] 0 1295 28817 37 69632 24 0 ksmtuned [ 516.144596] [ 10718] 0 10718 2622484 1721372 15998976 267219 0 panic [ 516.145792] [ 10719] 0 10719 2622484 1164767 9818112 53576 0 panic [ 516.146977] [ 10720] 0 10720 2622484 1174361 9904128 53709 0 panic [ 516.148163] [ 10721] 0 10721 2622484 1209070 10194944 54824 0 panic [ 516.149329] [ 10722] 0 10722 2622484 1745799 14774272 91138 0 panic 5) oom context (contrains and the chosen victim). oom-kill:constraint=CONSTRAINT_NONE,nodemask=(null),cpuset=/,mems_allowed=0-1,task=panic,pid=10737,uid=0 An admin can easily get the full oom context at a single line which makes parsing much easier. Signed-off-by: yuzhoujian Acked-by: Michal Hocko --- Changes since v14: - add the dump_oom_summary for the single line output of oom context. - fix the null pointer in the dump_header. Changes since v13: - remove the spaces for printing pid and uid. Changes since v12: - print the cpuset and memory allocation information after oom victim comm, pid. Changes since v11: - move the array of const char oom_constraint_text to oom_kill.c - add the cpuset information in the one line output. Changes since v10: - divide the patch v8 into two parts. One part is to add the array of const char and put enum oom_constaint into oom.h; the other adds a new func to print the missing information for the system- wide oom report. Changes since v9: - divide the patch v8 into two parts. One part is to move enum oom_constraint into memcontrol.h; the other refactors the output info in the dump_header. - replace orgin_memcg and kill_memcg with oom_memcg and task_memcg resptively. Changes since v8: - add the constraint in the oom_control structure. - put enum oom_constraint and constraint array into the oom.h file. - simplify the description for mem_cgroup_print_oom_context. Changes since v7: - add the constraint parameter to dump_header and oom_kill_process. - remove the static char array in the mem_cgroup_print_oom_context, and invoke pr_cont_cgroup_path to print memcg' name. - combine the patchset v6 into one. Changes since v6: - divide the patch v5 into two parts. One part is to add an array of const char and put enum oom_constraint into the memcontrol.h; the other refactors the output in the dump_header. - limit the memory usage for the static char array by using NAME_MAX in the mem_cgroup_print_oom_context. - eliminate the spurious spaces in the oom's output and fix the spelling of "constrain". Changes since v5: - add an array of const char for each constraint. - replace all of the pr_cont with a single line print of the pr_info. - put enum oom_constraint into the memcontrol.c file for printing oom constraint. Changes since v4: - rename the helper's name to mem_cgroup_print_oom_context. - rename the mem_cgroup_print_oom_info to mem_cgroup_print_oom_meminfo. - add the constrain info in the dump_header. Changes since v3: - rename the helper's name to mem_cgroup_print_oom_memcg_name. - add the rcu lock held to the helper. - remove the print info of memcg's name in mem_cgroup_print_oom_info. Changes since v2: - add the mem_cgroup_print_memcg_name helper to print the memcg's name which contains the task that will be killed by the oom-killer. Changes since v1: - replace adding mem_cgroup_print_oom_info with printing the memcg's name only. include/linux/oom.h | 10 ++++++++++ kernel/cgroup/cpuset.c | 4 ++-- mm/oom_kill.c | 29 ++++++++++++++++++++--------- mm/page_alloc.c | 4 ++-- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/include/linux/oom.h b/include/linux/oom.h index 69864a5..d079920 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -15,6 +15,13 @@ struct mem_cgroup; struct task_struct; +enum oom_constraint { + CONSTRAINT_NONE, + CONSTRAINT_CPUSET, + CONSTRAINT_MEMORY_POLICY, + CONSTRAINT_MEMCG, +}; + /* * Details of the page allocation that triggered the oom killer that are used to * determine what should be killed. @@ -42,6 +49,9 @@ struct oom_control { unsigned long totalpages; struct task_struct *chosen; unsigned long chosen_points; + + /* Used to print the constraint info. */ + enum oom_constraint constraint; }; extern struct mutex oom_lock; diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 266f10c..9510a5b 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -2666,9 +2666,9 @@ void cpuset_print_current_mems_allowed(void) rcu_read_lock(); cgrp = task_cs(current)->css.cgroup; - pr_info("%s cpuset=", current->comm); + pr_cont(",cpuset="); pr_cont_cgroup_name(cgrp); - pr_cont(" mems_allowed=%*pbl\n", + pr_cont(",mems_allowed=%*pbl", nodemask_pr_args(¤t->mems_allowed)); rcu_read_unlock(); diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 6589f60..2c686d2 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -245,11 +245,11 @@ unsigned long oom_badness(struct task_struct *p, struct mem_cgroup *memcg, return points > 0 ? points : 1; } -enum oom_constraint { - CONSTRAINT_NONE, - CONSTRAINT_CPUSET, - CONSTRAINT_MEMORY_POLICY, - CONSTRAINT_MEMCG, +static const char * const oom_constraint_text[] = { + [CONSTRAINT_NONE] = "CONSTRAINT_NONE", + [CONSTRAINT_CPUSET] = "CONSTRAINT_CPUSET", + [CONSTRAINT_MEMORY_POLICY] = "CONSTRAINT_MEMORY_POLICY", + [CONSTRAINT_MEMCG] = "CONSTRAINT_MEMCG", }; /* @@ -428,16 +428,25 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask) rcu_read_unlock(); } +static void dump_oom_summary(struct oom_control *oc, struct task_struct *victim) +{ + /* one line summary of the oom killer context. */ + pr_info("oom-kill:constraint=%s,nodemask=%*pbl", + oom_constraint_text[oc->constraint], + nodemask_pr_args(oc->nodemask)); + cpuset_print_current_mems_allowed(); + pr_cont(",task=%s,pid=%d,uid=%d\n", victim->comm, victim->pid, + from_kuid(&init_user_ns, task_uid(victim))); +} + static void dump_header(struct oom_control *oc, struct task_struct *p) { - pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=%*pbl, order=%d, oom_score_adj=%hd\n", - current->comm, oc->gfp_mask, &oc->gfp_mask, - nodemask_pr_args(oc->nodemask), oc->order, + pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), order=%d, oom_score_adj=%hd\n", + current->comm, oc->gfp_mask, &oc->gfp_mask, oc->order, current->signal->oom_score_adj); if (!IS_ENABLED(CONFIG_COMPACTION) && oc->order) pr_warn("COMPACTION is disabled!!!\n"); - cpuset_print_current_mems_allowed(); dump_stack(); if (is_memcg_oom(oc)) mem_cgroup_print_oom_info(oc->memcg, p); @@ -448,6 +457,8 @@ static void dump_header(struct oom_control *oc, struct task_struct *p) } if (sysctl_oom_dump_tasks) dump_tasks(oc->memcg, oc->nodemask); + if (p) + dump_oom_summary(oc, p); } /* diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6847177..e7cff0b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3413,13 +3413,13 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...) va_start(args, fmt); vaf.fmt = fmt; vaf.va = &args; - pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=%*pbl\n", + pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=%*pbl", current->comm, &vaf, gfp_mask, &gfp_mask, nodemask_pr_args(nodemask)); va_end(args); cpuset_print_current_mems_allowed(); - + pr_cont("\n"); dump_stack(); warn_alloc_show_mem(gfp_mask, nodemask); } From patchwork Wed Nov 21 11:29:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?56a56Iif6ZSu?= X-Patchwork-Id: 10692457 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 271AA13BB for ; Wed, 21 Nov 2018 11:30:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 155F42B6CF for ; Wed, 21 Nov 2018 11:30:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A1162B611; Wed, 21 Nov 2018 11:30:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D39A2B6CF for ; Wed, 21 Nov 2018 11:30:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B3F66B260A; Wed, 21 Nov 2018 06:30:19 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 362996B260B; Wed, 21 Nov 2018 06:30:19 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 253746B260C; Wed, 21 Nov 2018 06:30:19 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id D02036B260A for ; Wed, 21 Nov 2018 06:30:18 -0500 (EST) Received: by mail-pl1-f200.google.com with SMTP id e68so7443865plb.3 for ; Wed, 21 Nov 2018 03:30:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=ylCHwBAJTmPIaOdxe6D4qpf2xk7cxDYmrUoJdcdixoc=; b=D+Zy3a6fMcIYclwRdQADrsjsV0G/0wPfmvJ3G4cf04q6dW5M9vuBDwLT2v3DXQVrPr r4+1OlY4c5WA1LTt578fzS8x+x0ws1e+BKjo0D8NIpRjpcXa6LZgiyzKY2bklX2/zXzU yrTQYn21EXGmqwnw3vG2D0UQ+3FdT0ICj2mAbt4zCYHQcaD7ckOGr2eEQraf+46Q32nL +kgnzrpUfeseMxsW8QghjlYoF8NFWOKd6XLDXqlseIzEUenM0koHnVS7MS1nbVWm3E1W YMpyzPAgvnGJTP38eQGjriRLIsFnOHsEDzomUnFpR7gF/5o0GWREuGyomSY+cpiyYaCR tCjg== X-Gm-Message-State: AGRZ1gI/0lxDTQ/XruJK0hEcoFagP5mgbgHccC3tKFGCEfm/+cuzSaeI se2pibup46P3KtFV0m/OPUwzfdrwDltJWvZr109tHvcRaDbBsUdyu4d2JJmFLWQLYwYER6Zlw73 hIiK0pT45pobNd31S2Darzr/j1MZZp44D7+IzZGzsL7AnQjXOgbr3d5ZXMnEKu6QkjHfDIu2wXt znjfAMsYVGZ4Klt8PmiCHV6EXk7JYfstRjVni03q5GuU4+MjNr39LIra4Xal+I83ci3ELmoEp4c sOADdk3v0MsmiiR52pKVtvghzawfRr9rLhxD4vTD4W3i8GdbbV5NSt38Ssg55S7kfsx9yYMbH6G h/BTLUxA9E0noB3X5a6VmKJoX8ZhU1k7NXSt/ag86Axra2k8a2u0JL1Sln6UYEAGJwJQ7xCFTGz X X-Received: by 2002:a62:6181:: with SMTP id v123-v6mr6500994pfb.117.1542799818512; Wed, 21 Nov 2018 03:30:18 -0800 (PST) X-Received: by 2002:a62:6181:: with SMTP id v123-v6mr6500930pfb.117.1542799817672; Wed, 21 Nov 2018 03:30:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542799817; cv=none; d=google.com; s=arc-20160816; b=SH2troBtc5BO43kWNcxQ+3C6VR2zqD8hU09Xmlx/wleUMaIT27dMkOkqbVDYHAgPNw DV6Mghx2RquSIDFSU64dsvQmc1GuLwRcR4xESeZnX7JHDl4ifw3U8YOiWF7p3rAXlD/g zbHH+NETdyUTCO0ow/XBMXqcjyU7pFQIiWgUo6ZchEBI/7bYeUXDZd73jMrCT5iHZ+td O9EwYwRFldehjMWZfdG9zv/SOguHGDcO74Vxk78SzUowZx1pNAdW9F8kRfut0h1/6vks sPpwzPp0KO0foDlrGLRvr00LtNn1q0+JG33T+7lxzfjBh2euq0DznoW069Ms7Zgf4aw4 MXtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ylCHwBAJTmPIaOdxe6D4qpf2xk7cxDYmrUoJdcdixoc=; b=yFSmtMNZVS88zlYFS7IytRZ/XpxCuVwujKeEKmNKNpZaOS/WoFYGg9WAg4a/1EzdbI qy5PwxDezFE9T2RelpToju4ah28wFDv1XOU31RFMy7mU7OkRqv74fa0ih0gqgDxpOL+q NbyrXfeO1G75Xb16cF3zfZG4/nrFrCt2j2cBl5Kr4ZUyOk6Q9R5RfCyD/pT6Ge96GsPc dXZ4w4dvSzFpwmda+6RTMkkK8XPvBhzUkEnv6lvIHd5kLMO9gzeqlve7G5WNHr0g5+6W s4pNJVAiovcwmK5NEdAX2hAD/c/15e2fHIy0rQ8HyEsnDP8Xi+K2PiO3ADr4WK74qJ6Y xHLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dE+70IAL; spf=pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ufo19890607@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id p18sor53497064pgl.33.2018.11.21.03.30.17 for (Google Transport Security); Wed, 21 Nov 2018 03:30:17 -0800 (PST) Received-SPF: pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=dE+70IAL; spf=pass (google.com: domain of ufo19890607@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=ufo19890607@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ylCHwBAJTmPIaOdxe6D4qpf2xk7cxDYmrUoJdcdixoc=; b=dE+70IALVpR1aU8LFaUxI3u+s7wupMAQa3upaWdKnXgbxVyFfxyKO//GRnBuegoZ2Y RzbauJitgakVMQAezGHkgD+KFKpz1s+CJS2ltSbksoxKCx1wsYd8HAo22mXzK5329dcc BiJNqqCZ9X+jZYsetmrUjx1nJdsr5tzxoUlWPyYEljRnCGmuAxQ4fWyVUoG2yjIdQzLu BoMW2qY/deUCW2t4y6lqscI2ZDppauzhIAwiNz/DDlTfPXplzT6wnNzvg7L1/a2nZh7n UETEshCdL/CxujxniADeidHs34S5/Wg/0do6o98t/J92hGSAcgK0joD2dfjnHImykACG Znlg== X-Google-Smtp-Source: AFSGD/X350H88Q9Ed+EhlgoJgCIhKwnZEyF/GbEwylyRO1QpNSss3ZPhNMQ3CMjm2TM68Mw5R/gfqA== X-Received: by 2002:a63:ce50:: with SMTP id r16mr5569991pgi.217.1542799817296; Wed, 21 Nov 2018 03:30:17 -0800 (PST) Received: from dest.didichuxing.com ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id t13sm90753952pgr.42.2018.11.21.03.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 03:30:16 -0800 (PST) From: ufo19890607@gmail.com To: akpm@linux-foundation.org, mhocko@suse.com, rientjes@google.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, penguin-kernel@i-love.sakura.ne.jp, guro@fb.com, yang.s@alibaba-inc.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, yuzhoujian@didichuxing.com Subject: [PATCH v15 2/2] Add oom victim's memcg to the oom context information Date: Wed, 21 Nov 2018 19:29:59 +0800 Message-Id: <1542799799-36184-2-git-send-email-ufo19890607@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1542799799-36184-1-git-send-email-ufo19890607@gmail.com> References: <1542799799-36184-1-git-send-email-ufo19890607@gmail.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP From: yuzhoujian The current oom report doesn't display victim's memcg context during the global OOM situation. While this information is not strictly needed, it can be really helpful for containerized environments to locate which container has lost a process. Now that we have a single line for the oom context, we can trivially add both the oom memcg (this can be either global_oom or a specific memcg which hits its hard limits) and task_memcg which is the victim's memcg. Below is the single line output in the oom report after this patch. - global oom context information: oom-kill:constraint=,nodemask=,cpuset=,mems_allowed=,global_oom,task_memcg=,task=,pid=,uid= - memcg oom context information: oom-kill:constraint=,nodemask=,cpuset=,mems_allowed=,oom_memcg=,task_memcg=,task=,pid=,uid= Signed-off-by: yuzhoujian Acked-by: Michal Hocko Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Tetsuo Handa --- include/linux/memcontrol.h | 11 +++++++++-- mm/memcontrol.c | 33 ++++++++++++++++++++------------- mm/oom_kill.c | 3 ++- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 7ab2120..83ae11c 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -526,9 +526,11 @@ unsigned long mem_cgroup_get_zone_lru_size(struct lruvec *lruvec, unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg); -void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, +void mem_cgroup_print_oom_context(struct mem_cgroup *memcg, struct task_struct *p); +void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg); + static inline void mem_cgroup_enter_user_fault(void) { WARN_ON(current->in_user_fault); @@ -970,7 +972,12 @@ static inline unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg) } static inline void -mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) +mem_cgroup_print_oom_context(struct mem_cgroup *memcg, struct task_struct *p) +{ +} + +static inline void +mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) { } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 6e1469b..b860dd4 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1293,32 +1293,39 @@ static bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg) #define K(x) ((x) << (PAGE_SHIFT-10)) /** - * mem_cgroup_print_oom_info: Print OOM information relevant to memory controller. + * mem_cgroup_print_oom_context: Print OOM information relevant to + * memory controller. * @memcg: The memory cgroup that went over limit * @p: Task that is going to be killed * * NOTE: @memcg and @p's mem_cgroup can be different when hierarchy is * enabled */ -void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) +void mem_cgroup_print_oom_context(struct mem_cgroup *memcg, struct task_struct *p) { - struct mem_cgroup *iter; - unsigned int i; - rcu_read_lock(); + if (memcg) { + pr_info(",oom_memcg="); + pr_cont_cgroup_path(memcg->css.cgroup); + } else + pr_info(",global_oom"); if (p) { - pr_info("Task in "); + pr_cont(",task_memcg="); pr_cont_cgroup_path(task_cgroup(p, memory_cgrp_id)); - pr_cont(" killed as a result of limit of "); - } else { - pr_info("Memory limit reached of cgroup "); } - - pr_cont_cgroup_path(memcg->css.cgroup); - pr_cont("\n"); - rcu_read_unlock(); +} + +/** + * mem_cgroup_print_oom_meminfo: Print OOM memory information relevant to + * memory controller. + * @memcg: The memory cgroup that went over limit + */ +void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg) +{ + struct mem_cgroup *iter; + unsigned int i; pr_info("memory: usage %llukB, limit %llukB, failcnt %lu\n", K((u64)page_counter_read(&memcg->memory)), diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 2c686d2..6fd1ead 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -435,6 +435,7 @@ static void dump_oom_summary(struct oom_control *oc, struct task_struct *victim) oom_constraint_text[oc->constraint], nodemask_pr_args(oc->nodemask)); cpuset_print_current_mems_allowed(); + mem_cgroup_print_oom_context(oc->memcg, victim); pr_cont(",task=%s,pid=%d,uid=%d\n", victim->comm, victim->pid, from_kuid(&init_user_ns, task_uid(victim))); } @@ -449,7 +450,7 @@ static void dump_header(struct oom_control *oc, struct task_struct *p) dump_stack(); if (is_memcg_oom(oc)) - mem_cgroup_print_oom_info(oc->memcg, p); + mem_cgroup_print_oom_meminfo(oc->memcg); else { show_mem(SHOW_MEM_FILTER_NODES, oc->nodemask); if (is_dump_unreclaim_slabs())