From: Vaibhav Nagarnaik <vnagarnaik@google.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
Frederic Weisbecker <fweisbec@gmail.com>
Cc: Michael Rubin <mrubin@google.com>,
David Sharp <dhsharp@google.com>,
linux-kernel@vger.kernel.org,
Vaibhav Nagarnaik <vnagarnaik@google.com>
Subject: [PATCH] trace: Set oom_score_adj to maximum for ring buffer allocating process
Date: Thu, 26 May 2011 12:52:17 -0700 [thread overview]
Message-ID: <1306439537-23706-1-git-send-email-vnagarnaik@google.com> (raw)
The tracing ring buffer is allocated from kernel memory. While
allocating the memory, if OOM happens, the allocating process might not
be the one that gets killed, since the ring-buffer memory is not
allocated as process memory. Thus random processes might get killed
during the allocation.
This patch makes sure that the allocating process is considered the most
likely oom-kill-able process while the allocating is going on. Thus if
oom-killer is invoked because of ring-buffer allocation, it is easier
for the ring buffer memory to be freed and save important system
processes from being killed.
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
---
kernel/trace/trace.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index b926578..15a667a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -37,6 +37,7 @@
#include <linux/init.h>
#include <linux/poll.h>
#include <linux/fs.h>
+#include <linux/oom.h>
#include "trace.h"
#include "trace_output.h"
@@ -3498,6 +3499,7 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
unsigned long val;
char buf[64];
int ret;
+ int oom_score_adj;
if (cnt >= sizeof(buf))
return -EINVAL;
@@ -3518,7 +3520,14 @@ tracing_entries_write(struct file *filp, const char __user *ubuf,
/* value is in KB */
val <<= 10;
+ /*
+ * make sure this process is picked over others to be killed in OOM
+ * condition
+ */
+ oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
ret = tracing_resize_ring_buffer(val);
+ /* restore the original oom_score_adj value */
+ test_set_oom_score_adj(oom_score_adj);
if (ret < 0)
return ret;
--
1.7.3.1
next reply other threads:[~2011-05-26 19:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-26 19:52 Vaibhav Nagarnaik [this message]
2011-05-26 20:04 ` Steven Rostedt
2011-05-26 20:22 ` David Rientjes
2011-05-26 20:23 ` Vaibhav Nagarnaik
2011-05-26 20:33 ` David Rientjes
2011-05-26 21:00 ` Steven Rostedt
2011-05-26 22:28 ` Vaibhav Nagarnaik
2011-05-26 23:38 ` Steven Rostedt
2011-05-27 9:43 ` David Rientjes
2011-05-27 12:48 ` Steven Rostedt
2011-05-26 23:23 ` Vaibhav Nagarnaik
2011-05-27 17:58 ` Vaibhav Nagarnaik
2011-05-27 23:22 ` David Rientjes
2011-05-28 0:44 ` Vaibhav Nagarnaik
2011-05-28 1:50 ` Steven Rostedt
2011-05-30 6:23 ` KOSAKI Motohiro
2011-05-30 23:54 ` Vaibhav Nagarnaik
2011-05-30 23:46 ` Vaibhav Nagarnaik
2011-06-07 23:07 ` Steven Rostedt
2011-06-07 23:30 ` Vaibhav Nagarnaik
2011-06-07 23:41 ` [PATCH] trace: Set __GFP_NORETRY flag " Vaibhav Nagarnaik
2011-06-07 23:47 ` Frederic Weisbecker
2011-06-08 0:01 ` [PATCH v2] " Vaibhav Nagarnaik
2011-06-08 2:30 ` David Rientjes
2011-06-09 11:37 ` KOSAKI Motohiro
2011-06-09 12:14 ` Steven Rostedt
2011-06-09 18:41 ` Vaibhav Nagarnaik
2011-06-09 19:42 ` David Rientjes
2011-06-09 19:52 ` Steven Rostedt
2011-07-05 12:54 ` [tip:perf/core] ring-buffer: " tip-bot for Vaibhav Nagarnaik
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=1306439537-23706-1-git-send-email-vnagarnaik@google.com \
--to=vnagarnaik@google.com \
--cc=dhsharp@google.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mrubin@google.com \
--cc=rostedt@goodmis.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
all inboxes | Powered by JetHome®