| Message ID | 1259363167-9347-16-git-send-email-jslaby@suse.cz (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 11/28/2009 01:19 AM, Benjamin Herrenschmidt wrote: > On Sat, 2009-11-28 at 00:05 +0100, Jiri Slaby wrote: >> 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. >> >> I.e. either use newly added rlimit helpers or ACCESS_ONCE if not >> applicable. > > Thanks. I have that already queued up. Are you sure? The previous version with ACCESS_ONCE was generally NACKed. This one uses a newly added helper which is much more cleaner way to do it. thanks,
On Sat, 2009-11-28 at 09:47 +0100, Jiri Slaby wrote: > Are you sure? The previous version with ACCESS_ONCE was generally > NACKed. This one uses a newly added helper which is much more cleaner > way to do it. I haven't seen a nack, but then I haven't pushed out yet so I can easily back it off and replace it with this one. Cheers, Ben.
Hi Ben, On Sun, 29 Nov 2009 08:16:03 +1100 Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote: > > On Sat, 2009-11-28 at 09:47 +0100, Jiri Slaby wrote: > > Are you sure? The previous version with ACCESS_ONCE was generally > > NACKed. This one uses a newly added helper which is much more cleaner > > way to do it. > > I haven't seen a nack, but then I haven't pushed out yet so I can easily > back it off and replace it with this one. You need to hold off adding this to your tree until after patch 14/27 ("resource: add helpers for fetching rlimits") of this series (or a modified version of it) reaches Linus' tree.
diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c index 0d957a4..8df1299 100644 --- a/arch/powerpc/mm/mmap_64.c +++ b/arch/powerpc/mm/mmap_64.c @@ -47,7 +47,7 @@ static inline int mmap_is_legacy(void) if (current->personality & ADDR_COMPAT_LAYOUT) return 1; - if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) + if (rlim_get_cur(RLIMIT_STACK) == RLIM_INFINITY) return 1; return sysctl_legacy_va_layout; @@ -77,7 +77,7 @@ static unsigned long mmap_rnd(void) static inline unsigned long mmap_base(void) { - unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; + unsigned long gap = rlim_get_cur(RLIMIT_STACK); if (gap < MIN_GAP) gap = MIN_GAP; diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c index c4d4a19..4ef1c92 100644 --- a/arch/powerpc/platforms/cell/spufs/coredump.c +++ b/arch/powerpc/platforms/cell/spufs/coredump.c @@ -54,7 +54,7 @@ static ssize_t do_coredump_read(int num, struct spu_context *ctx, void *buffer, */ static int spufs_dump_write(struct file *file, const void *addr, int nr, loff_t *foffset) { - unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur; + unsigned long limit = rlim_get_cur(RLIMIT_CORE); ssize_t written; if (*foffset + nr > limit)
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. I.e. either use newly added rlimit helpers or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby <jslaby@suse.cz> 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: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@ozlabs.org --- arch/powerpc/mm/mmap_64.c | 4 ++-- arch/powerpc/platforms/cell/spufs/coredump.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)