oom: badness heuristic rewrite

[pandora-kernel.git] / fs / proc / base.c

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 5949d0a..f923b72 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -63,6 +63,7 @@
 #include <linux/namei.h>
 #include <linux/mnt_namespace.h>
 #include <linux/mm.h>
+#include <linux/swap.h>
 #include <linux/rcupdate.h>
 #include <linux/kallsyms.h>
 #include <linux/stacktrace.h>
@@ -430,12 +431,11 @@ static const struct file_operations proc_lstats_operations = {
 static int proc_oom_score(struct task_struct *task, char *buffer)
 {
        unsigned long points = 0;
-       struct timespec uptime;
 
-       do_posix_clock_monotonic_gettime(&uptime);
        read_lock(&tasklist_lock);
        if (pid_alive(task))
-               points = badness(task, NULL, NULL, uptime.tv_sec);
+               points = oom_badness(task, NULL, NULL,
+                                       totalram_pages + total_swap_pages);
        read_unlock(&tasklist_lock);
        return sprintf(buffer, "%lu\n", points);
 }
@@ -1038,7 +1038,15 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
        }
 
        task->signal->oom_adj = oom_adjust;
-
+       /*
+        * Scale /proc/pid/oom_score_adj appropriately ensuring that a maximum
+        * value is always attainable.
+        */
+       if (task->signal->oom_adj == OOM_ADJUST_MAX)
+               task->signal->oom_score_adj = OOM_SCORE_ADJ_MAX;
+       else
+               task->signal->oom_score_adj = (oom_adjust * OOM_SCORE_ADJ_MAX) /
+                                                               -OOM_DISABLE;
        unlock_task_sighand(task, &flags);
        put_task_struct(task);
 
@@ -1051,6 +1059,82 @@ static const struct file_operations proc_oom_adjust_operations = {
        .llseek         = generic_file_llseek,
 };
 
+static ssize_t oom_score_adj_read(struct file *file, char __user *buf,
+                                       size_t count, loff_t *ppos)
+{
+       struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
+       char buffer[PROC_NUMBUF];
+       int oom_score_adj = OOM_SCORE_ADJ_MIN;
+       unsigned long flags;
+       size_t len;
+
+       if (!task)
+               return -ESRCH;
+       if (lock_task_sighand(task, &flags)) {
+               oom_score_adj = task->signal->oom_score_adj;
+               unlock_task_sighand(task, &flags);
+       }
+       put_task_struct(task);
+       len = snprintf(buffer, sizeof(buffer), "%d\n", oom_score_adj);
+       return simple_read_from_buffer(buf, count, ppos, buffer, len);
+}
+
+static ssize_t oom_score_adj_write(struct file *file, const char __user *buf,
+                                       size_t count, loff_t *ppos)
+{
+       struct task_struct *task;
+       char buffer[PROC_NUMBUF];
+       unsigned long flags;
+       long oom_score_adj;
+       int err;
+
+       memset(buffer, 0, sizeof(buffer));
+       if (count > sizeof(buffer) - 1)
+               count = sizeof(buffer) - 1;
+       if (copy_from_user(buffer, buf, count))
+               return -EFAULT;
+
+       err = strict_strtol(strstrip(buffer), 0, &oom_score_adj);
+       if (err)
+               return -EINVAL;
+       if (oom_score_adj < OOM_SCORE_ADJ_MIN ||
+                       oom_score_adj > OOM_SCORE_ADJ_MAX)
+               return -EINVAL;
+
+       task = get_proc_task(file->f_path.dentry->d_inode);
+       if (!task)
+               return -ESRCH;
+       if (!lock_task_sighand(task, &flags)) {
+               put_task_struct(task);
+               return -ESRCH;
+       }
+       if (oom_score_adj < task->signal->oom_score_adj &&
+                       !capable(CAP_SYS_RESOURCE)) {
+               unlock_task_sighand(task, &flags);
+               put_task_struct(task);
+               return -EACCES;
+       }
+
+       task->signal->oom_score_adj = oom_score_adj;
+       /*
+        * Scale /proc/pid/oom_adj appropriately ensuring that OOM_DISABLE is
+        * always attainable.
+        */
+       if (task->signal->oom_score_adj == OOM_SCORE_ADJ_MIN)
+               task->signal->oom_adj = OOM_DISABLE;
+       else
+               task->signal->oom_adj = (oom_score_adj * OOM_ADJUST_MAX) /
+                                                       OOM_SCORE_ADJ_MAX;
+       unlock_task_sighand(task, &flags);
+       put_task_struct(task);
+       return count;
+}
+
+static const struct file_operations proc_oom_score_adj_operations = {
+       .read           = oom_score_adj_read,
+       .write          = oom_score_adj_write,
+};
+
 #ifdef CONFIG_AUDITSYSCALL
 #define TMPBUFLEN 21
 static ssize_t proc_loginuid_read(struct file * file, char __user * buf,
@@ -2623,6 +2707,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 #endif
        INF("oom_score",  S_IRUGO, proc_oom_score),
        REG("oom_adj",    S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
+       REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
 #ifdef CONFIG_AUDITSYSCALL
        REG("loginuid",   S_IWUSR|S_IRUGO, proc_loginuid_operations),
        REG("sessionid",  S_IRUGO, proc_sessionid_operations),
@@ -2957,6 +3042,7 @@ static const struct pid_entry tid_base_stuff[] = {
 #endif
        INF("oom_score", S_IRUGO, proc_oom_score),
        REG("oom_adj",   S_IRUGO|S_IWUSR, proc_oom_adjust_operations),
+       REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations),
 #ifdef CONFIG_AUDITSYSCALL
        REG("loginuid",  S_IWUSR|S_IRUGO, proc_loginuid_operations),
        REG("sessionid",  S_IRUSR, proc_sessionid_operations),