lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 18 Nov 2009 16:34:51 +0000 (GMT) From: Hugh Dickins <hugh.dickins@...cali.co.uk> To: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com> cc: LKML <linux-kernel@...r.kernel.org>, linux-mm <linux-mm@...ck.org>, Andrew Morton <akpm@...ux-foundation.org> Subject: Re: [PATCH] [for mmotm-1113] mm: Simplify try_to_unmap_one() On Tue, 17 Nov 2009, KOSAKI Motohiro wrote: > SWAP_MLOCK mean "We marked the page as PG_MLOCK, please move it to > unevictable-lru". So, following code is easy confusable. > > if (vma->vm_flags & VM_LOCKED) { > ret = SWAP_MLOCK; > goto out_unmap; > } > > Plus, if the VMA doesn't have VM_LOCKED, We don't need to check > the needed of calling mlock_vma_page(). > > Cc: Hugh Dickins <hugh.dickins@...cali.co.uk> > Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com> Acked-by: Hugh Dickins <hugh.dickins@...cali.co.uk> > --- > mm/rmap.c | 26 +++++++++++++------------- > 1 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/mm/rmap.c b/mm/rmap.c > index 82e31fb..70dec01 100644 > --- a/mm/rmap.c > +++ b/mm/rmap.c > @@ -779,10 +779,9 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, > * skipped over this mm) then we should reactivate it. > */ > if (!(flags & TTU_IGNORE_MLOCK)) { > - if (vma->vm_flags & VM_LOCKED) { > - ret = SWAP_MLOCK; > - goto out_unmap; > - } > + if (vma->vm_flags & VM_LOCKED) > + goto out_mlock; > + > if (TTU_ACTION(flags) == TTU_MUNLOCK) > goto out_unmap; > } > @@ -855,18 +854,19 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, > > out_unmap: > pte_unmap_unlock(pte, ptl); > +out: > + return ret; > > - if (ret == SWAP_MLOCK) { > - ret = SWAP_AGAIN; > - if (down_read_trylock(&vma->vm_mm->mmap_sem)) { > - if (vma->vm_flags & VM_LOCKED) { > - mlock_vma_page(page); > - ret = SWAP_MLOCK; > - } > - up_read(&vma->vm_mm->mmap_sem); > +out_mlock: > + pte_unmap_unlock(pte, ptl); > + > + if (down_read_trylock(&vma->vm_mm->mmap_sem)) { > + if (vma->vm_flags & VM_LOCKED) { > + mlock_vma_page(page); > + ret = SWAP_MLOCK; > } > + up_read(&vma->vm_mm->mmap_sem); > } > -out: > return ret; > } > > -- > 1.6.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists