memcg: oom kill disable and oom status

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

diff --git a/mm/mremap.c b/mm/mremap.c
index 9d07539..cde56ee 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -9,7 +9,6 @@
 
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
-#include <linux/slab.h>
 #include <linux/shm.h>
 #include <linux/ksm.h>
 #include <linux/mman.h>
@@ -27,10 +26,6 @@
 
 #include "internal.h"
 
-#ifndef arch_mmap_check
-#define arch_mmap_check(addr, len, flags)      (0)
-#endif
-
 static pmd_t *get_old_pmd(struct mm_struct *mm, unsigned long addr)
 {
        pgd_t *pgd;
@@ -289,7 +284,7 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
        if (vma->vm_flags & VM_LOCKED) {
                unsigned long locked, lock_limit;
                locked = mm->locked_vm << PAGE_SHIFT;
-               lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+               lock_limit = rlimit(RLIMIT_MEMLOCK);
                locked += new_len - old_len;
                if (locked > lock_limit && !capable(CAP_IPC_LOCK))
                        goto Eagain;
@@ -325,6 +320,7 @@ static unsigned long mremap_to(unsigned long addr,
        struct vm_area_struct *vma;
        unsigned long ret = -EINVAL;
        unsigned long charged = 0;
+       unsigned long map_flags;
 
        if (new_addr & ~PAGE_MASK)
                goto out;
@@ -362,9 +358,21 @@ static unsigned long mremap_to(unsigned long addr,
                goto out;
        }
 
-       ret = move_vma(vma, addr, old_len, new_len, new_addr);
+       map_flags = MAP_FIXED;
+       if (vma->vm_flags & VM_MAYSHARE)
+               map_flags |= MAP_SHARED;
+
+       ret = get_unmapped_area(vma->vm_file, new_addr, new_len, vma->vm_pgoff +
+                               ((addr - vma->vm_start) >> PAGE_SHIFT),
+                               map_flags);
        if (ret & ~PAGE_MASK)
-               vm_unacct_memory(charged);
+               goto out1;
+
+       ret = move_vma(vma, addr, old_len, new_len, new_addr);
+       if (!(ret & ~PAGE_MASK))
+               goto out;
+out1:
+       vm_unacct_memory(charged);
 
 out:
        return ret;
@@ -373,12 +381,9 @@ out:
 static int vma_expandable(struct vm_area_struct *vma, unsigned long delta)
 {
        unsigned long end = vma->vm_end + delta;
-       unsigned long max_addr = TASK_SIZE;
-       if (vma->vm_next)
-               max_addr = vma->vm_next->vm_start;
-       if (max_addr < end || end < vma->vm_end)
+       if (end < vma->vm_end) /* overflow */
                return 0;
-       if (arch_mmap_check(vma->vm_start, end - vma->vm_start, MAP_FIXED))
+       if (vma->vm_next && vma->vm_next->vm_start < end) /* intersection */
                return 0;
        if (get_unmapped_area(NULL, vma->vm_start, end - vma->vm_start,
                              0, MAP_FIXED) & ~PAGE_MASK)
@@ -454,8 +459,11 @@ unsigned long do_mremap(unsigned long addr,
                if (vma_expandable(vma, new_len - old_len)) {
                        int pages = (new_len - old_len) >> PAGE_SHIFT;
 
-                       vma_adjust(vma, vma->vm_start,
-                               addr + new_len, vma->vm_pgoff, NULL);
+                       if (vma_adjust(vma, vma->vm_start, addr + new_len,
+                                      vma->vm_pgoff, NULL)) {
+                               ret = -ENOMEM;
+                               goto out;
+                       }
 
                        mm->total_vm += pages;
                        vm_stat_account(mm, vma->vm_flags, vma->vm_file, pages);
@@ -480,7 +488,9 @@ unsigned long do_mremap(unsigned long addr,
                        map_flags |= MAP_SHARED;
 
                new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
-                                       vma->vm_pgoff, map_flags);
+                                       vma->vm_pgoff +
+                                       ((addr - vma->vm_start) >> PAGE_SHIFT),
+                                       map_flags);
                if (new_addr & ~PAGE_MASK) {
                        ret = new_addr;
                        goto out;