From: Michel Lespinasse Date: Tue, 1 Feb 2011 01:03:41 +0000 (-0800) Subject: mlock: operate on any regions with protection != PROT_NONE X-Git-Tag: upstream/snapshot3+hdmi~11551 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fdf4c587a793ba87935e38e7f25a9540bc9a7b95;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git mlock: operate on any regions with protection != PROT_NONE As Tao Ma noticed, change 5ecfda0 breaks blktrace. This is because blktrace mmaps a file with PROT_WRITE permissions but without PROT_READ, so my attempt to not unnecessarity break COW during mlock ended up causing mlock to fail with a permission problem. I am proposing to let mlock ignore vma protection in all cases except PROT_NONE. In particular, mlock should not fail for PROT_WRITE regions (as in the blktrace case, which broke at 5ecfda0) or for PROT_EXEC regions (which seem to me like they were always broken). Signed-off-by: Michel Lespinasse Acked-by: Rik van Riel Signed-off-by: Linus Torvalds --- diff --git a/mm/mlock.c b/mm/mlock.c index 13e81ee..c3924c7f 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -178,6 +178,13 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma, if ((vma->vm_flags & (VM_WRITE | VM_SHARED)) == VM_WRITE) gup_flags |= FOLL_WRITE; + /* + * We want mlock to succeed for regions that have any permissions + * other than PROT_NONE. + */ + if (vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) + gup_flags |= FOLL_FORCE; + if (vma->vm_flags & VM_LOCKED) gup_flags |= FOLL_MLOCK;