From patchwork Sat Jun 30 16:38: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: 10498327 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C852260284 for ; Sat, 30 Jun 2018 16:39:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A030C28C86 for ; Sat, 30 Jun 2018 16:39:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 942A328CA9; Sat, 30 Jun 2018 16:39:20 +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 0A36928C86 for ; Sat, 30 Jun 2018 16:39:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D34F56B0006; Sat, 30 Jun 2018 12:39:18 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CBC9F6B0007; Sat, 30 Jun 2018 12:39:18 -0400 (EDT) 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 B5ED56B0008; Sat, 30 Jun 2018 12:39:18 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 6A8DF6B0006 for ; Sat, 30 Jun 2018 12:39:18 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id h14-v6so6157318pfi.19 for ; Sat, 30 Jun 2018 09:39:18 -0700 (PDT) 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=ASszBtraV4O+cPzTqyDB0NneVp9cVHuGuI+Sa1Q5PgI=; b=HRJGjlE6ofoF/tn8SkzCLdOgsZUFm2kIl4gLojlhRSOwm4rcpD4VXgfnLHKDIjpMm3 Zoz/t1AUYHB3Hgbb6+D3duRgdmKE4Vp82bcIlLeHu1c+mQGpEjjEwjDZ6WMlM5blMN0W +KLrCR0MiwI6JwUFBKuUqHMu+Gk3x9pxGEjjX4aIOS/D5vFWaBP0Aei9DI5mgXgynfWV qcZPHr/niZIsLLZoOeMTtpO/kf9RNDgIupGZ4mmtRTWDm2uZ7kpz+BBoQX7iKnp7wmxl LUuNhvZOag81RkBPB6fW2lY4N/y5uLKrfEwyfRTYbYco1LyoFWj8aOpQ6KGz6yImXuVJ CKhw== X-Gm-Message-State: APt69E1p8GF6WVk3SIcJmFOuulYSjgwPuKoreFYpiAFZ772oheA1XtDF 1ySPPnWhWwq9tDpYsJfWb0kHz4gqJepK26z953m6IdVL76eW2TSTEvS/jUdrTIAddc7KAkoknTs Ypm8Nk6PjGPpDYoBBlCf3oRzD91VmGD90M16A3Nzq8YPac2rdo9AqsQqs2Ez/o9hx+Jf5Nc7BcH BG0Ivs90Fn1nAzph8TX5cQeAlKTQ9ufKiPafMWK7UiCjwEJc1f9A4VH3Y/8ME8QHvJvW65WZdQJ kR8gJPCfnhYQEgqwLqvRugt9NwIKyBS+qf8MvbGWHEy7ReimrfWIRFKTC6632p2R0R3m5nJJ/Mp FY6DcabMXisET6wLhDkaKQ0Zkadlerk0vSbjSpl0PEiuDsrhnVo65eKV0JzpmDuagTOcYYK0byx 1 X-Received: by 2002:a17:902:d716:: with SMTP id w22-v6mr19291332ply.98.1530376758121; Sat, 30 Jun 2018 09:39:18 -0700 (PDT) X-Received: by 2002:a17:902:d716:: with SMTP id w22-v6mr19291303ply.98.1530376757353; Sat, 30 Jun 2018 09:39:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530376757; cv=none; d=google.com; s=arc-20160816; b=fA5zd4IKKyWLV2FHKVU4CJcH8qKagQKUJmFzAMohpnvcZMQoTw8GWt7H2iCx0lUm1w W/eRDvAaEtoYfgupl8OIW3U8zqCuWfnyhLha3GA2TngvyeHKVmbtIqI7NXnb183Iwof8 YJFwVN5f8qnOgIBh45pgTOiHInK5Ss2a6QCSlW1Ks2uJRC291ZdCyxwmkZmF5QCeHUDS aMLaKkmCYleLl5qdrTcAEvL27WlC6mWLM39f4Zpy9Qdcx7e4JMTAXHTvHI4za2HdZVOV /Xu+RPxqdWUsuiY2WZ6zRfa9520s0E9iD3kzpsEwtFhvcLbA3gPZ2wNiSpE51SnBtB6p kPgg== 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:arc-authentication-results; bh=ASszBtraV4O+cPzTqyDB0NneVp9cVHuGuI+Sa1Q5PgI=; b=WSKbuufyJA9LTX7k7fNBAGK+tCUVQdLnWninFVqQ66pf2qe/kVIfLE/wp39CsAFHsA 3stdJ+74R4iYbOY85Ktlr5zh7tDlJ0uDPADzltc6OGr2qCDHk7+319ftDx3MDc9jXBUi HEurCcelKDGzQ/pbSVEd1GCo6AfpXAwzUSYffNEcmCCZlQAj5cpBip2Of9iWLeHWtAIE MKPP6misY3vaJCNatiUvccFXFeOFCyrbtvBhLcGHLm3IZFZ/co9AyDgNXz+IyjMLSQRO BiwpturLPjc75gc+lTPKBP9/j/ndzC2ab4Uz5NovCsYDLLvvhwx3tC1E4aRSJBVCc69s 3ncQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=IBL+ij0+; 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 i80-v6sor1097958pfj.25.2018.06.30.09.39.17 for (Google Transport Security); Sat, 30 Jun 2018 09:39:17 -0700 (PDT) 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=IBL+ij0+; 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=ASszBtraV4O+cPzTqyDB0NneVp9cVHuGuI+Sa1Q5PgI=; b=IBL+ij0+qnFX7rmIVvgLcl3L9m5LLYAoBrRz1BDvMzRn8icE91Q16Nh6xU0wiOnCTH It8ZHckOuYWP16T7Ipjrelz028wTlqbOcXCDojb9ssoIP3fYX9mWjJaQED2ydhfyKdK/ 8TMBtOkqqDoWoF6gYTAsi2Z0XGAnEIVVhK17alWr1wXtdRkFlC/sXgQY8KCbPaVtSld1 8JOemaVurxrqNpMv6wlEeQWUwG6yWgpJLXwUFrfzFE6bzBVH8r+K1iTZMgdLYoHpQkyk TKP1Y6Kr5+huNvH/khlpaqTxRL8Vu7LQlBiCTQlKJL7BRZobw/WD3i25I0whT0omIDoQ g3iw== X-Google-Smtp-Source: AAOMgpfe5EN+Yi49GQKFutDIkqI0xBoE3237AsUDoyO1dXTC9fNcg1KApcdrkIn0cxXuRe/YsPL18Q== X-Received: by 2002:a62:569c:: with SMTP id h28-v6mr14895992pfj.201.1530376757084; Sat, 30 Jun 2018 09:39:17 -0700 (PDT) Received: from dest.didichuxing.com ([168.63.150.120]) by smtp.gmail.com with ESMTPSA id b65-v6sm21473158pfg.34.2018.06.30.09.39.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jun 2018 09:39:16 -0700 (PDT) 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 v11 2/2] Add the missing information in dump_header Date: Sun, 1 Jul 2018 00:38:59 +0800 Message-Id: <1530376739-20459-2-git-send-email-ufo19890607@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530376739-20459-1-git-send-email-ufo19890607@gmail.com> References: <1530376739-20459-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 Add a new func mem_cgroup_print_oom_context to print missing information for the system-wide oom report which includes the oom memcg that has reached its limit, task memcg that contains the killed task. Signed-off-by: yuzhoujian --- include/linux/memcontrol.h | 15 ++++++++++++--- mm/memcontrol.c | 36 ++++++++++++++++++++++-------------- mm/oom_kill.c | 10 ++++++---- 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 6c6fb116e925..90855880bca2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -491,8 +492,10 @@ void mem_cgroup_handle_over_high(void); unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg); -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); + +void mem_cgroup_print_oom_meminfo(struct mem_cgroup *memcg); static inline void mem_cgroup_oom_enable(void) { @@ -903,7 +906,13 @@ 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 e6f0d5ef320a..18deea974cfd 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1119,32 +1119,40 @@ static const char *const memcg1_stat_names[] = { #define K(x) ((x) << (PAGE_SHIFT-10)) /** - * mem_cgroup_print_oom_info: Print OOM information relevant to memory controller. - * @memcg: The memory cgroup that went over limit + * mem_cgroup_print_oom_context: Print OOM context information relevant to + * memory controller. + * @memcg: The origin 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; + struct cgroup *origin_cgrp, *kill_cgrp; rcu_read_lock(); - + if (memcg) { + pr_cont(",oom_memcg="); + pr_cont_cgroup_path(memcg->css.cgroup); + } else + pr_cont(",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 f9b08e455fd1..e990c45d2e7d 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -424,12 +424,14 @@ static void dump_header(struct oom_control *oc, struct task_struct *p) dump_stack(); /* one line summary of the oom killer context. */ - pr_info("oom-kill:constraint=%s,nodemask=%*pbl,task=%s,pid=%5d,uid=%5d", + pr_info("oom-kill:constraint=%s,nodemask=%*pbl", oom_constraint_text[oc->constraint], - nodemask_pr_args(oc->nodemask), - p->comm, p->pid, from_kuid(&init_user_ns, task_uid(p))); + nodemask_pr_args(oc->nodemask)); + mem_cgroup_print_oom_context(oc->memcg, p); + pr_cont(",task=%s,pid=%5d,uid=%5d\n", p->comm, p->pid, + from_kuid(&init_user_ns, task_uid(p))); 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())