lkml.org 
[lkml]   [2010]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] mlock: do not munlock pages in __do_fault()
    Date
    If the page is going to be written to, __do_page needs to break COW.
    However, the old page (before breaking COW) was never mapped mapped into
    the current pte (__do_fault is only called when the pte is not present),
    so vmscan can't have marked the old page as PageMlocked due to being
    mapped in __do_fault's VMA. Therefore, __do_fault() does not need to worry
    about clearing PageMlocked() on the old page.

    Signed-off-by: Michel Lespinasse <walken@google.com>
    ---
    mm/memory.c | 6 ------
    1 files changed, 0 insertions(+), 6 deletions(-)

    diff --git a/mm/memory.c b/mm/memory.c
    index 68f2dbe..7befd03 100644
    --- a/mm/memory.c
    +++ b/mm/memory.c
    @@ -3015,12 +3015,6 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
    goto out;
    }
    charged = 1;
    - /*
    - * Don't let another task, with possibly unlocked vma,
    - * keep the mlocked page.
    - */
    - if (vma->vm_flags & VM_LOCKED)
    - clear_page_mlock(vmf.page);
    copy_user_highpage(page, vmf.page, address, vma);
    __SetPageUptodate(page);
    } else {
    --
    1.7.3.1


    \
     
     \ /
      Last update: 2010-12-09 08:53    [W:0.025 / U:3.172 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site