Commit 09854ba9 authored by Linus Torvalds's avatar Linus Torvalds

mm: do_wp_page() simplification

How about we just make sure we're the only possible valid user fo the
page before we bother to reuse it?

Simplify, simplify, simplify.

And get rid of the nasty serialization on the page lock at the same time.

[peterx: add subject prefix]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bcf87687
...@@ -2924,50 +2924,25 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) ...@@ -2924,50 +2924,25 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf)
* not dirty accountable. * not dirty accountable.
*/ */
if (PageAnon(vmf->page)) { if (PageAnon(vmf->page)) {
int total_map_swapcount; struct page *page = vmf->page;
if (PageKsm(vmf->page) && (PageSwapCache(vmf->page) ||
page_count(vmf->page) != 1)) /* PageKsm() doesn't necessarily raise the page refcount */
if (PageKsm(page) || page_count(page) != 1)
goto copy; goto copy;
if (!trylock_page(vmf->page)) { if (!trylock_page(page))
get_page(vmf->page); goto copy;
pte_unmap_unlock(vmf->pte, vmf->ptl); if (PageKsm(page) || page_mapcount(page) != 1 || page_count(page) != 1) {
lock_page(vmf->page); unlock_page(page);
vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd,
vmf->address, &vmf->ptl);
if (!pte_same(*vmf->pte, vmf->orig_pte)) {
update_mmu_tlb(vma, vmf->address, vmf->pte);
unlock_page(vmf->page);
pte_unmap_unlock(vmf->pte, vmf->ptl);
put_page(vmf->page);
return 0;
}
put_page(vmf->page);
}
if (PageKsm(vmf->page)) {
bool reused = reuse_ksm_page(vmf->page, vmf->vma,
vmf->address);
unlock_page(vmf->page);
if (!reused)
goto copy; goto copy;
wp_page_reuse(vmf);
return VM_FAULT_WRITE;
} }
if (reuse_swap_page(vmf->page, &total_map_swapcount)) {
if (total_map_swapcount == 1) {
/* /*
* The page is all ours. Move it to * Ok, we've got the only map reference, and the only
* our anon_vma so the rmap code will * page count reference, and the page is locked,
* not search our parent or siblings. * it's dark out, and we're wearing sunglasses. Hit it.
* Protected against the rmap code by
* the page lock.
*/ */
page_move_anon_rmap(vmf->page, vma);
}
unlock_page(vmf->page);
wp_page_reuse(vmf); wp_page_reuse(vmf);
unlock_page(page);
return VM_FAULT_WRITE; return VM_FAULT_WRITE;
}
unlock_page(vmf->page);
} else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) == } else if (unlikely((vma->vm_flags & (VM_WRITE|VM_SHARED)) ==
(VM_WRITE|VM_SHARED))) { (VM_WRITE|VM_SHARED))) {
return wp_page_shared(vmf); return wp_page_shared(vmf);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment