From: Eric B Munson <emunson@akamai.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Eric B Munson <emunson@akamai.com>, Michal Hocko <mhocko@suse.cz>, Vlastimil Babka <vbabka@suse.cz>, "Kirill A. Shutemov" <kirill@shutemov.name>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH V5 1/7] mm: mlock: Refactor mlock, munlock, and munlockall code Date: Fri, 24 Jul 2015 17:28:39 -0400 [thread overview] Message-ID: <1437773325-8623-2-git-send-email-emunson@akamai.com> (raw) In-Reply-To: <1437773325-8623-1-git-send-email-emunson@akamai.com> Extending the mlock system call is very difficult because it currently does not take a flags argument. A later patch in this set will extend mlock to support a middle ground between pages that are locked and faulted in immediately and unlocked pages. To pave the way for the new system call, the code needs some reorganization so that all the actual entry point handles is checking input and translating to VMA flags. Signed-off-by: Eric B Munson <emunson@akamai.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/mlock.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/mm/mlock.c b/mm/mlock.c index 6fd2cf1..1585cca 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -553,7 +553,8 @@ out: return ret; } -static int do_mlock(unsigned long start, size_t len, int on) +static int apply_vma_lock_flags(unsigned long start, size_t len, + vm_flags_t flags) { unsigned long nstart, end, tmp; struct vm_area_struct * vma, * prev; @@ -575,14 +576,10 @@ static int do_mlock(unsigned long start, size_t len, int on) prev = vma; for (nstart = start ; ; ) { - vm_flags_t newflags; + vm_flags_t newflags = vma->vm_flags & ~VM_LOCKED; + newflags |= flags; /* Here we know that vma->vm_start <= nstart < vma->vm_end. */ - - newflags = vma->vm_flags & ~VM_LOCKED; - if (on) - newflags |= VM_LOCKED; - tmp = vma->vm_end; if (tmp > end) tmp = end; @@ -604,7 +601,7 @@ static int do_mlock(unsigned long start, size_t len, int on) return error; } -SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) +static int do_mlock(unsigned long start, size_t len, vm_flags_t flags) { unsigned long locked; unsigned long lock_limit; @@ -628,7 +625,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) /* check against resource limits */ if ((locked <= lock_limit) || capable(CAP_IPC_LOCK)) - error = do_mlock(start, len, 1); + error = apply_vma_lock_flags(start, len, flags); up_write(¤t->mm->mmap_sem); if (error) @@ -640,6 +637,11 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) return 0; } +SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) +{ + return do_mlock(start, len, VM_LOCKED); +} + SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) { int ret; @@ -648,13 +650,13 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) start &= PAGE_MASK; down_write(¤t->mm->mmap_sem); - ret = do_mlock(start, len, 0); + ret = apply_vma_lock_flags(start, len, 0); up_write(¤t->mm->mmap_sem); return ret; } -static int do_mlockall(int flags) +static int apply_mlockall_flags(int flags) { struct vm_area_struct * vma, * prev = NULL; @@ -662,6 +664,7 @@ static int do_mlockall(int flags) current->mm->def_flags |= VM_LOCKED; else current->mm->def_flags &= ~VM_LOCKED; + if (flags == MCL_FUTURE) goto out; @@ -703,7 +706,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) - ret = do_mlockall(flags); + ret = apply_mlockall_flags(flags); up_write(¤t->mm->mmap_sem); if (!ret && (flags & MCL_CURRENT)) mm_populate(0, TASK_SIZE); @@ -716,7 +719,7 @@ SYSCALL_DEFINE0(munlockall) int ret; down_write(¤t->mm->mmap_sem); - ret = do_mlockall(0); + ret = apply_mlockall_flags(0); up_write(¤t->mm->mmap_sem); return ret; } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric B Munson <emunson@akamai.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Eric B Munson <emunson@akamai.com>, Michal Hocko <mhocko@suse.cz>, Vlastimil Babka <vbabka@suse.cz>, "Kirill A. Shutemov" <kirill@shutemov.name>, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH V5 1/7] mm: mlock: Refactor mlock, munlock, and munlockall code Date: Fri, 24 Jul 2015 17:28:39 -0400 [thread overview] Message-ID: <1437773325-8623-2-git-send-email-emunson@akamai.com> (raw) In-Reply-To: <1437773325-8623-1-git-send-email-emunson@akamai.com> Extending the mlock system call is very difficult because it currently does not take a flags argument. A later patch in this set will extend mlock to support a middle ground between pages that are locked and faulted in immediately and unlocked pages. To pave the way for the new system call, the code needs some reorganization so that all the actual entry point handles is checking input and translating to VMA flags. Signed-off-by: Eric B Munson <emunson@akamai.com> Cc: Michal Hocko <mhocko@suse.cz> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/mlock.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/mm/mlock.c b/mm/mlock.c index 6fd2cf1..1585cca 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -553,7 +553,8 @@ out: return ret; } -static int do_mlock(unsigned long start, size_t len, int on) +static int apply_vma_lock_flags(unsigned long start, size_t len, + vm_flags_t flags) { unsigned long nstart, end, tmp; struct vm_area_struct * vma, * prev; @@ -575,14 +576,10 @@ static int do_mlock(unsigned long start, size_t len, int on) prev = vma; for (nstart = start ; ; ) { - vm_flags_t newflags; + vm_flags_t newflags = vma->vm_flags & ~VM_LOCKED; + newflags |= flags; /* Here we know that vma->vm_start <= nstart < vma->vm_end. */ - - newflags = vma->vm_flags & ~VM_LOCKED; - if (on) - newflags |= VM_LOCKED; - tmp = vma->vm_end; if (tmp > end) tmp = end; @@ -604,7 +601,7 @@ static int do_mlock(unsigned long start, size_t len, int on) return error; } -SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) +static int do_mlock(unsigned long start, size_t len, vm_flags_t flags) { unsigned long locked; unsigned long lock_limit; @@ -628,7 +625,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) /* check against resource limits */ if ((locked <= lock_limit) || capable(CAP_IPC_LOCK)) - error = do_mlock(start, len, 1); + error = apply_vma_lock_flags(start, len, flags); up_write(¤t->mm->mmap_sem); if (error) @@ -640,6 +637,11 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) return 0; } +SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len) +{ + return do_mlock(start, len, VM_LOCKED); +} + SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) { int ret; @@ -648,13 +650,13 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len) start &= PAGE_MASK; down_write(¤t->mm->mmap_sem); - ret = do_mlock(start, len, 0); + ret = apply_vma_lock_flags(start, len, 0); up_write(¤t->mm->mmap_sem); return ret; } -static int do_mlockall(int flags) +static int apply_mlockall_flags(int flags) { struct vm_area_struct * vma, * prev = NULL; @@ -662,6 +664,7 @@ static int do_mlockall(int flags) current->mm->def_flags |= VM_LOCKED; else current->mm->def_flags &= ~VM_LOCKED; + if (flags == MCL_FUTURE) goto out; @@ -703,7 +706,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) - ret = do_mlockall(flags); + ret = apply_mlockall_flags(flags); up_write(¤t->mm->mmap_sem); if (!ret && (flags & MCL_CURRENT)) mm_populate(0, TASK_SIZE); @@ -716,7 +719,7 @@ SYSCALL_DEFINE0(munlockall) int ret; down_write(¤t->mm->mmap_sem); - ret = do_mlockall(0); + ret = apply_mlockall_flags(0); up_write(¤t->mm->mmap_sem); return ret; } -- 1.9.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-07-24 21:28 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-24 21:28 [PATCH V5 0/7] Allow user to request memory to be locked on page fault Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson [this message] 2015-07-24 21:28 ` [PATCH V5 1/7] mm: mlock: Refactor mlock, munlock, and munlockall code Eric B Munson 2015-07-27 6:31 ` Kirill A. Shutemov 2015-07-27 6:31 ` Kirill A. Shutemov 2015-07-24 21:28 ` [PATCH V5 2/7] mm: mlock: Add new mlock system call Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-27 6:43 ` Kirill A. Shutemov 2015-07-27 6:43 ` Kirill A. Shutemov 2015-07-27 6:43 ` Kirill A. Shutemov 2015-07-27 6:43 ` Kirill A. Shutemov 2015-07-27 6:43 ` Kirill A. Shutemov 2015-07-27 6:43 ` Kirill A. Shutemov 2015-07-24 21:28 ` [PATCH V5 3/7] mm: Introduce VM_LOCKONFAULT Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-27 7:02 ` Kirill A. Shutemov 2015-07-27 7:02 ` Kirill A. Shutemov 2015-07-27 7:02 ` Kirill A. Shutemov 2015-07-24 21:28 ` [PATCH V5 4/7] mm: mlock: Add mlock flags to enable VM_LOCKONFAULT usage Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-27 7:15 ` Kirill A. Shutemov 2015-07-27 7:15 ` Kirill A. Shutemov 2015-07-27 7:15 ` Kirill A. Shutemov 2015-07-24 21:28 ` [PATCH V5 5/7] mm: mmap: Add mmap flag to request VM_LOCKONFAULT Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-27 7:31 ` Kirill A. Shutemov 2015-07-27 7:31 ` Kirill A. Shutemov 2015-07-27 7:31 ` Kirill A. Shutemov 2015-07-27 13:41 ` Eric B Munson 2015-07-27 13:41 ` Eric B Munson 2015-07-27 14:03 ` Kirill A. Shutemov 2015-07-27 14:03 ` Kirill A. Shutemov 2015-07-27 14:03 ` Kirill A. Shutemov 2015-07-27 14:11 ` Eric B Munson 2015-07-27 14:11 ` Eric B Munson 2015-07-24 21:28 ` [PATCH V5 6/7] selftests: vm: Add tests for lock on fault Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-24 21:28 ` [PATCH V5 7/7] mips: Add entry for new mlock2 syscall Eric B Munson 2015-07-24 21:28 ` Eric B Munson 2015-07-27 9:08 ` [PATCH V5 0/7] Allow user to request memory to be locked on page fault Vlastimil Babka 2015-07-27 9:08 ` Vlastimil Babka 2015-07-27 9:08 ` Vlastimil Babka 2015-07-27 13:35 ` Eric B Munson 2015-07-27 13:35 ` Eric B Munson 2015-07-27 14:16 ` Vlastimil Babka 2015-07-27 14:16 ` Vlastimil Babka 2015-07-27 14:16 ` Vlastimil Babka 2015-07-27 14:54 ` Eric B Munson 2015-07-27 14:54 ` Eric B Munson 2015-07-27 15:40 ` Vlastimil Babka 2015-07-27 15:40 ` Vlastimil Babka 2015-07-27 15:40 ` Vlastimil Babka 2015-07-28 11:17 ` Michal Hocko 2015-07-28 11:17 ` Michal Hocko 2015-07-28 11:17 ` Michal Hocko 2015-07-28 11:23 ` Vlastimil Babka 2015-07-28 11:23 ` Vlastimil Babka 2015-07-28 11:23 ` Vlastimil Babka 2015-07-28 13:49 ` Eric B Munson 2015-07-28 13:49 ` Eric B Munson 2015-07-28 15:10 ` Vlastimil Babka 2015-07-28 15:10 ` Vlastimil Babka 2015-07-28 15:10 ` Vlastimil Babka 2015-07-28 18:06 ` Eric B Munson 2015-07-28 18:06 ` Eric B Munson 2015-07-29 10:45 ` Michal Hocko 2015-07-29 10:45 ` Michal Hocko 2015-07-29 10:45 ` Michal Hocko 2015-07-29 10:49 ` Vlastimil Babka 2015-07-29 10:49 ` Vlastimil Babka 2015-07-29 10:49 ` Vlastimil Babka
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1437773325-8623-2-git-send-email-emunson@akamai.com \ --to=emunson@akamai.com \ --cc=akpm@linux-foundation.org \ --cc=kirill@shutemov.name \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.cz \ --cc=vbabka@suse.cz \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.