From: Peter Zijlstra <peterz@infradead.org>
To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
mingo@kernel.org, will.deacon@arm.com,
paulmck@linux.vnet.ibm.com, Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 14/31] arch,ia64: Convert smp_mb__*
Date: Wed, 19 Mar 2014 07:47:43 +0100 [thread overview]
Message-ID: <20140319065204.526383736@infradead.org> (raw)
In-Reply-To: 20140319064729.660482086@infradead.org
[-- Attachment #1: peterz-ia64-smp_mb__atomic.patch --]
[-- Type: text/plain, Size: 2265 bytes --]
ia64 atomic ops are full barriers; implement the new
smp_mb__{before,after}_atomic().
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
---
arch/ia64/include/asm/atomic.h | 7 +------
arch/ia64/include/asm/barrier.h | 3 +++
arch/ia64/include/asm/bitops.h | 6 ++----
3 files changed, 6 insertions(+), 10 deletions(-)
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -15,6 +15,7 @@
#include <linux/types.h>
#include <asm/intrinsics.h>
+#include <asm/barrier.h>
#define ATOMIC_INIT(i) { (i) }
@@ -208,10 +209,4 @@ atomic64_add_negative (__s64 i, atomic64
#define atomic64_inc(v) atomic64_add(1, (v))
#define atomic64_dec(v) atomic64_sub(1, (v))
-/* Atomic operations are already serializing */
-#define smp_mb__before_atomic_dec() barrier()
-#define smp_mb__after_atomic_dec() barrier()
-#define smp_mb__before_atomic_inc() barrier()
-#define smp_mb__after_atomic_inc() barrier()
-
#endif /* _ASM_IA64_ATOMIC_H */
--- a/arch/ia64/include/asm/barrier.h
+++ b/arch/ia64/include/asm/barrier.h
@@ -55,6 +55,9 @@
#endif
+#define smp_mb__before_atomic() barrier()
+#define smp_mb__after_atomic() barrier()
+
/*
* IA64 GCC turns volatile stores into st.rel and volatile loads into ld.acq no
* need for asm trickery!
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
@@ -16,6 +16,7 @@
#include <linux/compiler.h>
#include <linux/types.h>
#include <asm/intrinsics.h>
+#include <asm/barrier.h>
/**
* set_bit - Atomically set a bit in memory
@@ -65,9 +66,6 @@ __set_bit (int nr, volatile void *addr)
*((__u32 *) addr + (nr >> 5)) |= (1 << (nr & 31));
}
-#define smp_mb__before_clear_bit() barrier();
-#define smp_mb__after_clear_bit() barrier();
-
/**
* clear_bit - Clears a bit in memory
* @nr: Bit to clear
@@ -75,7 +73,7 @@ __set_bit (int nr, volatile void *addr)
*
* clear_bit() is atomic and may not be reordered. However, it does
* not contain a memory barrier, so if it is used for locking purposes,
- * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
+ * you should call smp_mb__before_atomic() and/or smp_mb__after_atomic()
* in order to ensure changes are visible on other processors.
*/
static __inline__ void
next prev parent reply other threads:[~2014-03-19 6:47 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-19 6:47 [PATCH 00/31] Clean up smp_mb__ barriers Peter Zijlstra
2014-03-19 6:47 ` [PATCH 01/31] ia64: Fix up smp_mb__{before,after}_clear_bit Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 02/31] arc,hexagon: Delete asm/barrier.h Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 03/31] arch: Prepare for smp_mb__{before,after}_atomic() Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 04/31] arch,alpha: Convert smp_mb__* Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 05/31] arch,arc: " Peter Zijlstra
2014-03-19 6:47 ` [PATCH 06/31] arch,arm: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-04-14 16:19 ` Will Deacon
2014-04-14 16:19 ` Will Deacon
2014-03-19 6:47 ` [PATCH 07/31] arch,arm64: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-21 11:54 ` Catalin Marinas
2014-03-19 6:47 ` [PATCH 08/31] arch,avr32: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 09/31] arch,blackfin: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 10/31] arch,c6x: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-04-09 15:35 ` Mark Salter
2014-04-09 15:35 ` Mark Salter
2014-03-19 6:47 ` [PATCH 11/31] arch,cris: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-20 11:11 ` Jesper Nilsson
2014-03-20 11:11 ` Jesper Nilsson
2014-03-19 6:47 ` [PATCH 12/31] arch,frv: " Peter Zijlstra
2014-03-19 6:47 ` [PATCH 13/31] arch,hexagon: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra [this message]
2014-03-19 6:47 ` [PATCH 14/31] arch,ia64: " Peter Zijlstra
2014-03-19 6:47 ` [PATCH 15/31] arch,m32r: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 16/31] arch,m68k: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 17/31] arch,metag: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 18/31] arch,mips: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 19/31] arch,mn10300: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 20/31] arch,openrisc: " Peter Zijlstra
2014-03-19 6:47 ` [PATCH 21/31] arch,parisc: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 22/31] arch,powerpc: " Peter Zijlstra
2014-03-19 6:47 ` [PATCH 23/31] arch,s390: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 13:50 ` Heiko Carstens
2014-03-19 6:47 ` [PATCH 24/31] arch,score: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 18:53 ` Lennox Wu
2014-03-19 6:47 ` [PATCH 25/31] arch,sh: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 26/31] arch,sparc: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 17:54 ` David Miller
2014-03-19 6:47 ` [PATCH 27/31] arch,tile: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 17:49 ` Chris Metcalf
2014-03-19 17:49 ` Chris Metcalf
2014-03-19 6:47 ` [PATCH 28/31] arch, x86: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 29/31] arch,xtensa: " Peter Zijlstra
2014-03-19 13:11 ` Max Filippov
2014-03-19 13:11 ` Max Filippov
2014-03-19 13:30 ` Peter Zijlstra
2014-03-19 13:30 ` Peter Zijlstra
2014-03-19 6:47 ` [PATCH 30/31] arch,doc: " Peter Zijlstra
2014-03-19 6:47 ` Peter Zijlstra
2014-03-19 17:15 ` Paul E. McKenney
2014-03-19 6:48 ` [PATCH 31/31] arch: Mass conversion of smp_mb__* Peter Zijlstra
2014-03-19 6:48 ` Peter Zijlstra
2014-03-19 9:55 ` [PATCH 00/31] Clean up smp_mb__ barriers David Howells
2014-03-19 9:58 ` Peter Zijlstra
2014-03-19 10:07 ` David Howells
2014-03-19 17:36 ` [PATCH 30/31] arch,doc: Convert smp_mb__* David Howells
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=20140319065204.526383736@infradead.org \
--to=peterz@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
/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;
as well as URLs for NNTP newsgroup(s).