This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / mm / fremap.c

diff --git a/mm/fremap.c b/mm/fremap.c
index eb056db..e9282de 100644 (file)
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -14,6 +14,7 @@
 #include <linux/swapops.h>
 #include <linux/rmap.h>
 #include <linux/module.h>
+#include <linux/vs_memory.h>
 
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
@@ -38,7 +39,8 @@ static inline void zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
                                        set_page_dirty(page);
                                page_remove_rmap(page);
                                page_cache_release(page);
-                               mm->rss--;
+                               // mm->rss--;
+                               vx_rsspages_dec(mm);
                        }
                }
        } else {
@@ -61,15 +63,12 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
        pmd_t *pmd;
        pte_t pte_val;
 
-       /*
-        * We use page_add_file_rmap below: if install_page is
-        * ever extended to anonymous pages, this will warn us.
-        */
-       BUG_ON(!page_mapping(page));
-
        pgd = pgd_offset(mm, addr);
        spin_lock(&mm->page_table_lock);
 
+       if (!vx_rsspages_avail(mm, 1))
+               goto err_unlock;
+
        pmd = pmd_alloc(mm, pgd, addr);
        if (!pmd)
                goto err_unlock;
@@ -80,7 +79,8 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
        zap_pte(mm, vma, addr, pte);
 
-       mm->rss++;
+       // mm->rss++;
+       vx_rsspages_inc(mm);
        flush_icache_page(vma, page);
        set_pte(pte, mk_pte(page, prot));
        page_add_file_rmap(page);
@@ -161,6 +161,7 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
        unsigned long end = start + size;
        struct vm_area_struct *vma;
        int err = -EINVAL;
+       int has_write_lock = 0;
 
        if (__prot)
                return err;
@@ -181,7 +182,8 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
 #endif
 
        /* We need down_write() to change vma->vm_flags. */
-       down_write(&mm->mmap_sem);
+       down_read(&mm->mmap_sem);
+ retry:
        vma = find_vma(mm, start);
 
        /*
@@ -200,6 +202,12 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
                /* Must set VM_NONLINEAR before any pages are populated. */
                if (pgoff != linear_page_index(vma, start) &&
                    !(vma->vm_flags & VM_NONLINEAR)) {
+                       if (!has_write_lock) {
+                               up_read(&mm->mmap_sem);
+                               down_write(&mm->mmap_sem);
+                               has_write_lock = 1;
+                               goto retry;
+                       }
                        mapping = vma->vm_file->f_mapping;
                        spin_lock(&mapping->i_mmap_lock);
                        flush_dcache_mmap_lock(mapping);
@@ -212,8 +220,6 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
                        spin_unlock(&mapping->i_mmap_lock);
                }
 
-               /* ->populate can take a long time, so downgrade the lock. */
-               downgrade_write(&mm->mmap_sem);
                err = vma->vm_ops->populate(vma, start, size,
                                            vma->vm_page_prot,
                                            pgoff, flags & MAP_NONBLOCK);
@@ -223,10 +229,11 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
                 * it after ->populate completes, and that would prevent
                 * downgrading the lock.  (Locks can't be upgraded).
                 */
+       }
+       if (likely(!has_write_lock))
                up_read(&mm->mmap_sem);
-       } else {
+       else
                up_write(&mm->mmap_sem);
-       }
 
        return err;
 }