From: Jiri Slaby <jslaby@novell.com>
To: jirislaby@gmail.com
Cc: mingo@elte.hu, nhorman@tuxdriver.com, sfr@canb.auug.org.au,
linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
marcin.slusarz@gmail.com, tglx@linutronix.de, mingo@redhat.com,
hpa@zytor.com, torvalds@linux-foundation.org,
Jiri Slaby <jslaby@novell.com>, James Morris <jmorris@namei.org>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
linux-mm@kvack.org
Subject: [PATCH 09/16] MM: use ACCESS_ONCE for rlimits
Date: Wed, 18 Nov 2009 15:51:55 +0100 [thread overview]
Message-ID: <1258555922-2064-9-git-send-email-jslaby@novell.com> (raw)
In-Reply-To: <4B040A03.2020508@gmail.com>
Make sure compiler won't do weird things with limits. E.g. fetching
them twice may return 2 different values after writable limits are
implemented.
Signed-off-by: Jiri Slaby <jslaby@novell.com>
Cc: James Morris <jmorris@namei.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: linux-mm@kvack.org
---
mm/filemap.c | 3 ++-
mm/mlock.c | 15 +++++++++------
mm/mmap.c | 16 ++++++++++------
mm/mremap.c | 3 ++-
4 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index ef169f3..667e62e 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1971,7 +1971,8 @@ EXPORT_SYMBOL(iov_iter_single_seg_count);
inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk)
{
struct inode *inode = file->f_mapping->host;
- unsigned long limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
+ unsigned long limit = ACCESS_ONCE(current->signal->
+ rlim[RLIMIT_FSIZE].rlim_cur);
if (unlikely(*pos < 0))
return -EINVAL;
diff --git a/mm/mlock.c b/mm/mlock.c
index bd6f0e4..9fcd392 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -25,7 +25,7 @@ int can_do_mlock(void)
{
if (capable(CAP_IPC_LOCK))
return 1;
- if (current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur != 0)
+ if (ACCESS_ONCE(current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) != 0)
return 1;
return 0;
}
@@ -490,7 +490,8 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
locked = len >> PAGE_SHIFT;
locked += current->mm->locked_vm;
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ lock_limit = ACCESS_ONCE(current->signal->
+ rlim[RLIMIT_MEMLOCK].rlim_cur);
lock_limit >>= PAGE_SHIFT;
/* check against resource limits */
@@ -553,7 +554,8 @@ SYSCALL_DEFINE1(mlockall, int, flags)
down_write(¤t->mm->mmap_sem);
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ lock_limit = ACCESS_ONCE(current->signal->rlim[RLIMIT_MEMLOCK].
+ rlim_cur);
lock_limit >>= PAGE_SHIFT;
ret = -ENOMEM;
@@ -587,7 +589,8 @@ int user_shm_lock(size_t size, struct user_struct *user)
int allowed = 0;
locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ lock_limit = ACCESS_ONCE(current->signal->
+ rlim[RLIMIT_MEMLOCK].rlim_cur);
if (lock_limit == RLIM_INFINITY)
allowed = 1;
lock_limit >>= PAGE_SHIFT;
@@ -621,12 +624,12 @@ int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim,
down_write(&mm->mmap_sem);
- lim = rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
+ lim = ACCESS_ONCE(rlim[RLIMIT_AS].rlim_cur) >> PAGE_SHIFT;
vm = mm->total_vm + pgsz;
if (lim < vm)
goto out;
- lim = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
+ lim = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur) >> PAGE_SHIFT;
vm = mm->locked_vm + pgsz;
if (lim < vm)
goto out;
diff --git a/mm/mmap.c b/mm/mmap.c
index 73f5e4b..5017ed5 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -266,7 +266,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
* segment grow beyond its set limit the in case where the limit is
* not page aligned -Ram Gupta
*/
- rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
+ rlim = ACCESS_ONCE(current->signal->rlim[RLIMIT_DATA].rlim_cur);
if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
(mm->end_data - mm->start_data) > rlim)
goto out;
@@ -990,7 +990,8 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
unsigned long locked, lock_limit;
locked = len >> PAGE_SHIFT;
locked += mm->locked_vm;
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ lock_limit = ACCESS_ONCE(current->signal->
+ rlim[RLIMIT_MEMLOCK].rlim_cur);
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
@@ -1565,7 +1566,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
return -ENOMEM;
/* Stack limit test */
- if (size > rlim[RLIMIT_STACK].rlim_cur)
+ if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
return -ENOMEM;
/* mlock limit tests */
@@ -1573,7 +1574,8 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
unsigned long locked;
unsigned long limit;
locked = mm->locked_vm + grow;
- limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
+ limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
+ limit >>= PAGE_SHIFT;
if (locked > limit && !capable(CAP_IPC_LOCK))
return -ENOMEM;
}
@@ -2026,7 +2028,8 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
unsigned long locked, lock_limit;
locked = len >> PAGE_SHIFT;
locked += mm->locked_vm;
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ lock_limit = ACCESS_ONCE(current->signal->
+ rlim[RLIMIT_MEMLOCK].rlim_cur);
lock_limit >>= PAGE_SHIFT;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
return -EAGAIN;
@@ -2240,7 +2243,8 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
unsigned long cur = mm->total_vm; /* pages */
unsigned long lim;
- lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
+ lim = ACCESS_ONCE(current->signal->rlim[RLIMIT_AS].rlim_cur);
+ lim >>= PAGE_SHIFT;
if (cur + npages > lim)
return 0;
diff --git a/mm/mremap.c b/mm/mremap.c
index 97bff25..809641b 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -358,7 +358,8 @@ unsigned long do_mremap(unsigned long addr,
if (vma->vm_flags & VM_LOCKED) {
unsigned long locked, lock_limit;
locked = mm->locked_vm << PAGE_SHIFT;
- lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+ lock_limit = ACCESS_ONCE(current->signal->
+ rlim[RLIMIT_MEMLOCK].rlim_cur);
locked += new_len - old_len;
ret = -EAGAIN;
if (locked > lock_limit && !capable(CAP_IPC_LOCK))
--
1.6.4.2
next prev parent reply other threads:[~2009-11-18 14:54 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-28 20:06 [PATCH] proc: augment /proc/pid/limits to allow setting of process limits Neil Horman
2009-09-28 22:44 ` Andrew Morton
2009-09-29 1:14 ` Neil Horman
2009-09-29 20:25 ` [PATCH] proc: augment /proc/pid/limits to allow setting of process limits (v2) Neil Horman
2009-09-29 20:46 ` Andrew Morton
2009-09-30 0:59 ` Neil Horman
2009-10-01 17:15 ` [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v3) Neil Horman
2009-10-01 17:16 ` [PATCH 1/3] " Neil Horman
2009-10-04 12:14 ` Marcin Slusarz
2009-10-04 16:50 ` Neil Horman
2009-10-04 20:04 ` Marcin Slusarz
2009-10-04 23:10 ` Neil Horman
2009-10-04 20:30 ` Marcin Slusarz
2009-10-01 17:21 ` [PATCH 2/3] " Neil Horman
2009-10-01 17:22 ` [PATCH 3/3] " Neil Horman
2009-10-05 0:26 ` [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v4) Neil Horman
2009-10-05 0:53 ` [PATCH 1/3] " Neil Horman
2009-10-08 21:32 ` Marcin Slusarz
2009-10-09 2:00 ` Neil Horman
2009-10-05 0:54 ` [PATCH 2/3] " Neil Horman
2009-10-05 1:57 ` Américo Wang
2009-10-05 12:32 ` Neil Horman
2009-10-05 0:54 ` [PATCH 3/3] " Neil Horman
2009-10-12 16:13 ` [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v5) Neil Horman
2009-10-12 16:20 ` [PATCH 1/3] " Neil Horman
2009-10-12 16:25 ` [PATCH 2/3] " Neil Horman
2009-10-12 16:27 ` [PATCH 3/3] " Neil Horman
2009-10-12 20:13 ` [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v6) Neil Horman
2009-10-12 20:20 ` [PATCH 1/3] " Neil Horman
2009-10-12 20:23 ` [PATCH 2/3] " Neil Horman
2009-10-12 20:25 ` [PATCH 3/3] " Neil Horman
2009-10-20 0:52 ` [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v7) Neil Horman
2009-10-20 0:53 ` [PATCH 1/3] " Neil Horman
2009-10-20 0:54 ` [PATCH 2/3] " Neil Horman
2009-11-02 15:10 ` Ingo Molnar
2009-11-02 17:40 ` Neil Horman
2009-10-20 0:55 ` [PATCH 3/3] " Neil Horman
2009-10-28 14:44 ` [PATCH 0/3] " Neil Horman
2009-10-30 18:24 ` Neil Horman
2009-11-02 15:25 ` Ingo Molnar
2009-11-02 17:54 ` Neil Horman
2009-11-02 18:51 ` Ingo Molnar
2009-11-03 0:23 ` Neil Horman
2009-11-04 11:26 ` Ingo Molnar
2009-11-05 20:48 ` Neil Horman
2009-11-06 9:26 ` Ingo Molnar
2009-11-06 10:00 ` Jiri Slaby
2009-11-08 10:36 ` Ingo Molnar
2009-11-09 0:10 ` Neil Horman
2009-11-09 8:32 ` Jiri Slaby
2009-11-09 13:34 ` Neil Horman
2009-11-09 8:54 ` Jiri Slaby
2009-11-09 9:01 ` Ingo Molnar
2009-11-09 9:22 ` Jiri Slaby
2009-11-09 9:26 ` Ingo Molnar
2009-11-09 13:35 ` Neil Horman
2009-11-09 15:56 ` Jiri Slaby
2009-11-09 16:40 ` Oleg Nesterov
2009-11-09 17:15 ` Jiri Slaby
2009-11-09 17:26 ` Linus Torvalds
2009-11-09 17:36 ` Oleg Nesterov
2009-11-18 14:51 ` Jiri Slaby
2009-11-18 14:51 ` [PATCH 01/16] core: posix-cpu-timers, cleanup rlimits usage Jiri Slaby
2009-11-18 16:48 ` Peter Zijlstra
2009-11-18 14:51 ` [PATCH 02/16] core: do security check under task_lock Jiri Slaby
2009-11-18 21:47 ` James Morris
2009-11-18 14:51 ` [PATCH 03/16] IA64: use ACCESS_ONCE for rlimits Jiri Slaby
2009-11-18 18:56 ` Luck, Tony
2009-11-18 19:48 ` Linus Torvalds
2009-11-19 2:28 ` Ingo Molnar
2009-11-18 14:51 ` [PATCH 04/16] PPC: " Jiri Slaby
2009-11-18 14:51 ` [PATCH 05/16] S390: " Jiri Slaby
2009-11-18 14:51 ` [PATCH 06/16] SPARC: " Jiri Slaby
2009-11-18 17:55 ` David Miller
2009-11-18 18:09 ` Linus Torvalds
2009-11-18 14:51 ` [PATCH 07/16] X86: " Jiri Slaby
2009-11-18 14:51 ` [PATCH 08/16] FS: " Jiri Slaby
2009-11-18 14:51 ` Jiri Slaby [this message]
2009-11-18 15:29 ` [PATCH 09/16] MM: " Linus Torvalds
2009-11-18 14:51 ` [PATCH 10/16] core: " Jiri Slaby
2009-11-18 14:51 ` [PATCH 11/16] misc: " Jiri Slaby
2009-11-18 14:51 ` [PATCH 12/16] core: rename setrlimit to do_setrlimit Jiri Slaby
2009-11-20 6:10 ` Américo Wang
2009-11-18 14:51 ` [PATCH 13/16] core: implement getprlimit and setprlimit syscalls Jiri Slaby
2009-11-20 13:14 ` Neil Horman
2009-11-18 14:52 ` [PATCH 14/16] unistd: add __NR_[get|set]prlimit syscall numbers Jiri Slaby
2009-11-18 14:52 ` [PATCH 15/16] COMPAT: add get/put_compat_rlimit Jiri Slaby
2009-12-30 23:55 ` Arnd Bergmann
2010-01-06 9:35 ` Jiri Slaby
2009-11-18 14:52 ` [PATCH 16/16] x86: add ia32 compat prlimit syscalls Jiri Slaby
2009-11-18 23:15 ` [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v7) Oleg Nesterov
2009-11-19 15:43 ` Jiri Slaby
2009-11-20 2:11 ` acct_file_reopen() && do_acct_process() (Was: [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v7)) Oleg Nesterov
2009-11-20 10:27 ` Jiri Slaby
2009-10-12 21:58 ` [PATCH 0/3] extend get/setrlimit to support setting rlimits external to a process (v5) Andrew Morton
2009-10-13 0:06 ` Neil Horman
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=1258555922-2064-9-git-send-email-jslaby@novell.com \
--to=jslaby@novell.com \
--cc=akpm@linux-foundation.org \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=jirislaby@gmail.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=marcin.slusarz@gmail.com \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=nhorman@tuxdriver.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®