From: "Hongjie Fang (方洪杰)" <Hongjie.Fang@spreadtrum.com>
To: "ebiederm@xmission.com" <ebiederm@xmission.com>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 4.3-rc6] proc: fix oom_adj value read from /proc/<pid>/oom_adj
Date: Tue, 20 Oct 2015 12:34:36 +0000 [thread overview]
Message-ID: <65a10261038346b1a778443fd15f0980@SHMBX01.spreadtrum.com> (raw)
The oom_adj's value reading through /proc/<pid>/oom_adj is different
with the value written into /proc/<pid>/oom_adj.
Fix this by adding a adjustment factor.
Signed-off-by: Hongjie Fang <hongjie.fang@spreadtrum.com>
---
diff --git a/fs/proc/base.c b/fs/proc/base.c
index b25eee4..1ea0589 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1043,6 +1043,7 @@ static ssize_t oom_adj_write(struct file *file, const char __user *buf,
int oom_adj;
unsigned long flags;
int err;
+ int adjust;
memset(buffer, 0, sizeof(buffer));
if (count > sizeof(buffer) - 1)
@@ -1084,8 +1085,10 @@ static ssize_t oom_adj_write(struct file *file, const char __user *buf,
*/
if (oom_adj == OOM_ADJUST_MAX)
oom_adj = OOM_SCORE_ADJ_MAX;
- else
- oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE;
+ else{
+ adjust = oom_adj > 0 ? (-OOM_DISABLE-1) : -(-OOM_DISABLE-1);
+ oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX + adjust) / -OOM_DISABLE;
+ }
if (oom_adj < task->signal->oom_score_adj &&
!capable(CAP_SYS_RESOURCE)) {
next reply other threads:[~2015-10-20 12:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 12:34 Hongjie Fang (方洪杰) [this message]
2015-10-20 17:27 ` Eric W. Biederman
2015-10-21 9:37 ` Michal Hocko
2015-10-21 20:59 ` David Rientjes
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=65a10261038346b1a778443fd15f0980@SHMBX01.spreadtrum.com \
--to=hongjie.fang@spreadtrum.com \
--cc=ebiederm@xmission.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.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®