From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932263AbbLBAC6 (ORCPT ); Tue, 1 Dec 2015 19:02:58 -0500 Received: from mail-pa0-f45.google.com ([209.85.220.45]:36845 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932185AbbLBAC4 (ORCPT ); Tue, 1 Dec 2015 19:02:56 -0500 Date: Tue, 1 Dec 2015 16:02:54 -0800 (PST) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Andrew Morton cc: Aristeu Rozanski , linux-kernel@vger.kernel.org, Greg Thelen , Johannes Weiner , linux-mm@kvack.org, cgroups@vger.kernel.org Subject: Re: [PATCH] oom_kill: add option to disable dump_stack() In-Reply-To: <20151201154353.87e2200b5cd1a99289ce6653@linux-foundation.org> Message-ID: References: <1445634150-27992-1-git-send-email-arozansk@redhat.com> <20151201154353.87e2200b5cd1a99289ce6653@linux-foundation.org> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 1 Dec 2015, Andrew Morton wrote: > > --- a/include/linux/oom.h > > +++ b/include/linux/oom.h > > @@ -115,6 +115,7 @@ static inline bool task_will_free_mem(struct task_struct *task) > > > > /* sysctls */ > > extern int sysctl_oom_dump_tasks; > > +extern int sysctl_oom_dump_stack; > > extern int sysctl_oom_kill_allocating_task; > > extern int sysctl_panic_on_oom; > > #endif /* _INCLUDE_LINUX_OOM_H */ > > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > > index e69201d..c812523 100644 > > --- a/kernel/sysctl.c > > +++ b/kernel/sysctl.c > > @@ -1176,6 +1176,13 @@ static struct ctl_table vm_table[] = { > > .proc_handler = proc_dointvec, > > }, > > { > > + .procname = "oom_dump_stack", > > + .data = &sysctl_oom_dump_stack, > > + .maxlen = sizeof(sysctl_oom_dump_stack), > > + .mode = 0644, > > + .proc_handler = proc_dointvec, > > + }, > > + { > > .procname = "overcommit_ratio", > > .data = &sysctl_overcommit_ratio, > > .maxlen = sizeof(sysctl_overcommit_ratio), > > diff --git a/mm/oom_kill.c b/mm/oom_kill.c > > index 1ecc0bc..bdbf83b 100644 > > --- a/mm/oom_kill.c > > +++ b/mm/oom_kill.c > > @@ -42,6 +42,7 @@ > > int sysctl_panic_on_oom; > > int sysctl_oom_kill_allocating_task; > > int sysctl_oom_dump_tasks = 1; > > +int sysctl_oom_dump_stack = 1; > > > > DEFINE_MUTEX(oom_lock); > > > > @@ -384,7 +385,8 @@ static void dump_header(struct oom_control *oc, struct task_struct *p, > > current->signal->oom_score_adj); > > cpuset_print_task_mems_allowed(current); > > task_unlock(current); > > - dump_stack(); > > + if (sysctl_oom_dump_stack) > > + dump_stack(); > > if (memcg) > > mem_cgroup_print_oom_info(memcg, p); > > else > > The patch seems reasonable to me, but it's missing the required update > to Documentation/sysctl/vm.txt. > Not sure why we'd want yet-another-sysctl for something that can trivially filtered from the log, but owell.