From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from server1.wserver.cz (server1.wserver.cz [82.113.45.157]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 976ADB6F0C for ; Thu, 19 Nov 2009 02:00:13 +1100 (EST) From: Jiri Slaby To: jirislaby@gmail.com Subject: [PATCH 04/16] PPC: use ACCESS_ONCE for rlimits Date: Wed, 18 Nov 2009 15:51:50 +0100 Message-Id: <1258555922-2064-4-git-send-email-jslaby@novell.com> In-Reply-To: <4B040A03.2020508@gmail.com> References: <4B040A03.2020508@gmail.com> Cc: sfr@canb.auug.org.au, Jiri Slaby , nhorman@tuxdriver.com, Heiko Carstens , linux-kernel@vger.kernel.org, James Morris , linuxppc-dev@ozlabs.org, mingo@redhat.com, tglx@linutronix.de, marcin.slusarz@gmail.com, hpa@zytor.com, Paul Mackerras , akpm@linux-foundation.org, torvalds@linux-foundation.org, mingo@elte.hu List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Cc: James Morris Cc: Heiko Carstens Cc: Andrew Morton Cc: Ingo Molnar Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@ozlabs.org --- arch/powerpc/mm/mmap_64.c | 6 ++++-- arch/powerpc/platforms/cell/spufs/coredump.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c index 0d957a4..e96a5f6 100644 --- a/arch/powerpc/mm/mmap_64.c +++ b/arch/powerpc/mm/mmap_64.c @@ -47,7 +47,8 @@ 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 (ACCESS_ONCE(current->signal->rlim[RLIMIT_STACK].rlim_cur) == + RLIM_INFINITY) return 1; return sysctl_legacy_va_layout; @@ -77,7 +78,8 @@ 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 = ACCESS_ONCE(current->signal-> + rlim[RLIMIT_STACK].rlim_cur); 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..2abf290 100644 --- a/arch/powerpc/platforms/cell/spufs/coredump.c +++ b/arch/powerpc/platforms/cell/spufs/coredump.c @@ -54,7 +54,8 @@ 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 = ACCESS_ONCE(current->signal-> + rlim[RLIMIT_CORE].rlim_cur); ssize_t written; if (*foffset + nr > limit) -- 1.6.4.2