mm: don't call mark_page_accessed() in do_swap_page()

[safe/jmp/linux-2.6] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index c592965..d3b9bac 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -31,7 +31,7 @@
 int sysctl_panic_on_oom;
 int sysctl_oom_kill_allocating_task;
 int sysctl_oom_dump_tasks;
-static DEFINE_SPINLOCK(zone_scan_mutex);
+static DEFINE_SPINLOCK(zone_scan_lock);
 /* #define DEBUG */
 
 /**
@@ -55,7 +55,7 @@ static DEFINE_SPINLOCK(zone_scan_mutex);
 
 unsigned long badness(struct task_struct *p, unsigned long uptime)
 {
-       unsigned long points, cpu_time, run_time, s;
+       unsigned long points, cpu_time, run_time;
        struct mm_struct *mm;
        struct task_struct *child;
 
@@ -110,12 +110,10 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
        else
                run_time = 0;
 
-       s = int_sqrt(cpu_time);
-       if (s)
-               points /= s;
-       s = int_sqrt(int_sqrt(run_time));
-       if (s)
-               points /= s;
+       if (cpu_time)
+               points /= int_sqrt(cpu_time);
+       if (run_time)
+               points /= int_sqrt(int_sqrt(run_time));
 
        /*
         * Niced processes are most likely less important, so double
@@ -392,6 +390,9 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
                printk(KERN_WARNING "%s invoked oom-killer: "
                        "gfp_mask=0x%x, order=%d, oomkilladj=%d\n",
                        current->comm, gfp_mask, order, current->oomkilladj);
+               task_lock(current);
+               cpuset_print_task_mems_allowed(current);
+               task_unlock(current);
                dump_stack();
                show_mem();
                if (sysctl_oom_dump_tasks)
@@ -426,7 +427,6 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
        unsigned long points = 0;
        struct task_struct *p;
 
-       cgroup_lock();
        read_lock(&tasklist_lock);
 retry:
        p = select_bad_process(&points, mem);
@@ -441,7 +441,6 @@ retry:
                goto retry;
 out:
        read_unlock(&tasklist_lock);
-       cgroup_unlock();
 }
 #endif
 
@@ -470,7 +469,7 @@ int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
        struct zone *zone;
        int ret = 1;
 
-       spin_lock(&zone_scan_mutex);
+       spin_lock(&zone_scan_lock);
        for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
                if (zone_is_oom_locked(zone)) {
                        ret = 0;
@@ -480,7 +479,7 @@ int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
 
        for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
                /*
-                * Lock each zone in the zonelist under zone_scan_mutex so a
+                * Lock each zone in the zonelist under zone_scan_lock so a
                 * parallel invocation of try_set_zone_oom() doesn't succeed
                 * when it shouldn't.
                 */
@@ -488,7 +487,7 @@ int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
        }
 
 out:
-       spin_unlock(&zone_scan_mutex);
+       spin_unlock(&zone_scan_lock);
        return ret;
 }
 
@@ -502,11 +501,11 @@ void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_mask)
        struct zoneref *z;
        struct zone *zone;
 
-       spin_lock(&zone_scan_mutex);
+       spin_lock(&zone_scan_lock);
        for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
                zone_clear_flag(zone, ZONE_OOM_LOCKED);
        }
-       spin_unlock(&zone_scan_mutex);
+       spin_unlock(&zone_scan_lock);
 }
 
 /*
@@ -557,6 +556,13 @@ void pagefault_out_of_memory(void)
                /* Got some memory back in the last second. */
                return;
 
+       /*
+        * If this is from memcg, oom-killer is already invoked.
+        * and not worth to go system-wide-oom.
+        */
+       if (mem_cgroup_oom_called(current))
+               goto rest_and_return;
+
        if (sysctl_panic_on_oom)
                panic("out of memory from page fault. panic_on_oom is selected.\n");
 
@@ -568,6 +574,7 @@ void pagefault_out_of_memory(void)
         * Give "p" a good chance of killing itself before we
         * retry to allocate memory.
         */
+rest_and_return:
        if (!test_thread_flag(TIF_MEMDIE))
                schedule_timeout_uninterruptible(1);
 }