git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
mm
/
fremap.c
diff --git
a/mm/fremap.c
b/mm/fremap.c
index
eaa8333
..
414b5bc
100644
(file)
--- a/
mm/fremap.c
+++ b/
mm/fremap.c
@@
-14,40
+14,35
@@
#include <linux/swapops.h>
#include <linux/rmap.h>
#include <linux/module.h>
#include <linux/swapops.h>
#include <linux/rmap.h>
#include <linux/module.h>
+#include <linux/syscalls.h>
#include <linux/vs_memory.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <linux/vs_memory.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
-static in
line void
zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
+static in
t
zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long addr, pte_t *ptep)
{
pte_t pte = *ptep;
unsigned long addr, pte_t *ptep)
{
pte_t pte = *ptep;
+ struct page *page = NULL;
- if (pte_none(pte))
- return;
if (pte_present(pte)) {
if (pte_present(pte)) {
- unsigned long pfn = pte_pfn(pte);
-
- flush_cache_page(vma, addr);
+ flush_cache_page(vma, addr, pte_pfn(pte));
pte = ptep_clear_flush(vma, addr, ptep);
pte = ptep_clear_flush(vma, addr, ptep);
- if (pfn_valid(pfn)) {
- struct page *page = pfn_to_page(pfn);
- if (!PageReserved(page)) {
- if (pte_dirty(pte))
- set_page_dirty(page);
- page_remove_rmap(page);
- page_cache_release(page);
- // mm->rss--;
- vx_rsspages_dec(mm);
- }
+ page = vm_normal_page(vma, addr, pte);
+ if (page) {
+ if (pte_dirty(pte))
+ set_page_dirty(page);
+ page_remove_rmap(page);
+ page_cache_release(page);
}
} else {
if (!pte_file(pte))
free_swap_and_cache(pte_to_swp_entry(pte));
}
} else {
if (!pte_file(pte))
free_swap_and_cache(pte_to_swp_entry(pte));
- pte_clear(ptep);
+ pte_clear(
mm, addr,
ptep);
}
}
+ return !!page;
}
/*
}
/*
@@
-61,53
+56,46
@@
int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
pgoff_t size;
int err = -ENOMEM;
pte_t *pte;
pgoff_t size;
int err = -ENOMEM;
pte_t *pte;
- pgd_t *pgd;
- pmd_t *pmd;
pte_t pte_val;
pte_t pte_val;
+ spinlock_t *ptl;
- 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;
-
- pte = pte_alloc_map(mm, pmd, addr);
+ pte = get_locked_pte(mm, addr, &ptl);
if (!pte)
if (!pte)
- goto
err_unlock
;
+ goto
out
;
/*
* This page may have been truncated. Tell the
* caller about it.
*/
err = -EINVAL;
/*
* This page may have been truncated. Tell the
* caller about it.
*/
err = -EINVAL;
- inode = vma->vm_file->f_mapping->host;
- size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
- if (!page->mapping || page->index >= size)
- goto err_unlock;
+ if (vma->vm_file) {
+ inode = vma->vm_file->f_mapping->host;
+ size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+ if (!page->mapping || page->index >= size)
+ goto unlock;
+ err = -ENOMEM;
+ if (page_mapcount(page) > INT_MAX/2)
+ goto unlock;
+ if (!vx_rsspages_avail(mm, 1))
+ goto unlock;
+ }
- zap_pte(mm, vma, addr, pte);
+ if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte))
+ inc_mm_counter(mm, file_rss);
- // mm->rss++;
- vx_rsspages_inc(mm);
flush_icache_page(vma, page);
flush_icache_page(vma, page);
- set_pte
(
pte, mk_pte(page, prot));
+ set_pte
_at(mm, addr,
pte, mk_pte(page, prot));
page_add_file_rmap(page);
pte_val = *pte;
page_add_file_rmap(page);
pte_val = *pte;
- pte_unmap(pte);
update_mmu_cache(vma, addr, pte_val);
update_mmu_cache(vma, addr, pte_val);
-
err = 0;
err = 0;
-err_unlock:
- spin_unlock(&mm->page_table_lock);
+unlock:
+ pte_unmap_unlock(pte, ptl);
+out:
return err;
}
EXPORT_SYMBOL(install_page);
return err;
}
EXPORT_SYMBOL(install_page);
-
/*
* Install a file pte to a given virtual memory address, release any
* previously existing mapping.
/*
* Install a file pte to a given virtual memory address, release any
* previously existing mapping.
@@
-117,36
+105,27
@@
int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma,
{
int err = -ENOMEM;
pte_t *pte;
{
int err = -ENOMEM;
pte_t *pte;
- pgd_t *pgd;
- pmd_t *pmd;
pte_t pte_val;
pte_t pte_val;
+ spinlock_t *ptl;
- pgd = pgd_offset(mm, addr);
- spin_lock(&mm->page_table_lock);
-
- pmd = pmd_alloc(mm, pgd, addr);
- if (!pmd)
- goto err_unlock;
-
- pte = pte_alloc_map(mm, pmd, addr);
+ pte = get_locked_pte(mm, addr, &ptl);
if (!pte)
if (!pte)
- goto
err_unlock
;
+ goto
out
;
- zap_pte(mm, vma, addr, pte);
+ if (!pte_none(*pte) && zap_pte(mm, vma, addr, pte)) {
+ update_hiwater_rss(mm);
+ dec_mm_counter(mm, file_rss);
+ }
- set_pte
(
pte, pgoff_to_pte(pgoff));
+ set_pte
_at(mm, addr,
pte, pgoff_to_pte(pgoff));
pte_val = *pte;
pte_val = *pte;
- pte_unmap(pte);
update_mmu_cache(vma, addr, pte_val);
update_mmu_cache(vma, addr, pte_val);
- spin_unlock(&mm->page_table_lock);
- return 0;
-
-err_unlock:
- spin_unlock(&mm->page_table_lock);
+ pte_unmap_unlock(pte, ptl);
+ err = 0;
+out:
return err;
}
return err;
}
-
/***
* sys_remap_file_pages - remap arbitrary pages of a shared backing store
* file within an existing vma.
/***
* sys_remap_file_pages - remap arbitrary pages of a shared backing store
* file within an existing vma.
@@
-202,12
+181,10
@@
asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
* the single existing vma. vm_private_data is used as a
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
* the single existing vma. vm_private_data is used as a
- * swapout cursor in a VM_NONLINEAR vma (unless VM_RESERVED
- * or VM_LOCKED, but VM_LOCKED could be revoked later on).
+ * swapout cursor in a VM_NONLINEAR vma.
*/
if (vma && (vma->vm_flags & VM_SHARED) &&
*/
if (vma && (vma->vm_flags & VM_SHARED) &&
- (!vma->vm_private_data ||
- (vma->vm_flags & (VM_NONLINEAR|VM_RESERVED))) &&
+ (!vma->vm_private_data || (vma->vm_flags & VM_NONLINEAR)) &&
vma->vm_ops && vma->vm_ops->populate &&
end > start && start >= vma->vm_start &&
end <= vma->vm_end) {
vma->vm_ops && vma->vm_ops->populate &&
end > start && start >= vma->vm_start &&
end <= vma->vm_end) {