From: Aristeu Rozanski <arozansk@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Aristeu Rozanski <arozansk@redhat.com>,
Greg Thelen <gthelen@google.com>,
Johannes Weiner <hannes@cmpxchg.org>,
linux-mm@kvack.org, cgroups@vger.kernel.org
Subject: [PATCH] oom_kill: add option to disable dump_stack()
Date: Fri, 23 Oct 2015 17:02:30 -0400 [thread overview]
Message-ID: <1445634150-27992-1-git-send-email-arozansk@redhat.com> (raw)
One of the largest chunks of log messages in a OOM is from dump_stack() and in
some cases it isn't even necessary to figure out what's going on. In
systems with multiple tenants/containers with limited resources each
OOMs can be way more frequent and being able to reduce the amount of log
output for each situation is useful.
This patch adds a sysctl to allow disabling dump_stack() during an OOM while
keeping the default to behave the same way it behaves today.
Cc: Greg Thelen <gthelen@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: linux-mm@kvack.org
Cc: cgroups@vger.kernel.org
Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
---
include/linux/oom.h | 1 +
kernel/sysctl.c | 7 +++++++
mm/oom_kill.c | 4 +++-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 03e6257..bdd03e5 100644
--- 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
--
1.8.3.1
next reply other threads:[~2015-10-23 21:03 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 21:02 Aristeu Rozanski [this message]
2015-10-26 16:01 ` [PATCH] oom_kill: add option to disable dump_stack() Johannes Weiner
2015-10-26 17:46 ` Aristeu Rozanski
2015-10-26 17:20 ` Michal Hocko
2015-10-26 17:40 ` Aristeu Rozanski
2015-10-27 8:09 ` Michal Hocko
2015-10-27 15:43 ` Aristeu Rozanski
2015-10-27 16:20 ` Michal Hocko
2015-10-27 17:51 ` Aristeu Rozanski
2015-10-28 23:55 ` David Rientjes
2015-10-26 21:38 ` David Rientjes
2015-12-01 23:43 ` Andrew Morton
2015-12-02 0:02 ` David Rientjes
2015-12-02 8:18 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445634150-27992-1-git-send-email-arozansk@redhat.com \
--to=arozansk@redhat.com \
--cc=cgroups@vger.kernel.org \
--cc=gthelen@google.com \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).