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 22/31] arch,powerpc: Convert smp_mb__*
Date: Wed, 19 Mar 2014 07:47:51 +0100 [thread overview]
Message-ID: <20140319065204.956605799@infradead.org> (raw)
In-Reply-To: 20140319064729.660482086@infradead.org
[-- Attachment #1: peterz-powerpc-smp_mb__atomic.patch --]
[-- Type: text/plain, Size: 2035 bytes --]
Powerpc allows reordering over its ll/sc implementation. Implement the
two new barriers as appropriate.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
---
arch/powerpc/include/asm/atomic.h | 6 +-----
arch/powerpc/include/asm/barrier.h | 3 +++
arch/powerpc/include/asm/bitops.h | 6 +-----
arch/powerpc/kernel/crash.c | 2 +-
4 files changed, 6 insertions(+), 11 deletions(-)
--- a/arch/powerpc/include/asm/atomic.h
+++ b/arch/powerpc/include/asm/atomic.h
@@ -8,6 +8,7 @@
#ifdef __KERNEL__
#include <linux/types.h>
#include <asm/cmpxchg.h>
+#include <asm/barrier.h>
#define ATOMIC_INIT(i) { (i) }
@@ -270,11 +271,6 @@ static __inline__ int atomic_dec_if_posi
}
#define atomic_dec_if_positive atomic_dec_if_positive
-#define smp_mb__before_atomic_dec() smp_mb()
-#define smp_mb__after_atomic_dec() smp_mb()
-#define smp_mb__before_atomic_inc() smp_mb()
-#define smp_mb__after_atomic_inc() smp_mb()
-
#ifdef __powerpc64__
#define ATOMIC64_INIT(i) { (i) }
--- a/arch/powerpc/include/asm/barrier.h
+++ b/arch/powerpc/include/asm/barrier.h
@@ -84,4 +84,7 @@ do { \
___p1; \
})
+#define smp_mb__before_atomic() smp_mb()
+#define smp_mb__after_atomic() smp_mb()
+
#endif /* _ASM_POWERPC_BARRIER_H */
--- a/arch/powerpc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
@@ -51,11 +51,7 @@
#define PPC_BIT(bit) (1UL << PPC_BITLSHIFT(bit))
#define PPC_BITMASK(bs, be) ((PPC_BIT(bs) - PPC_BIT(be)) | PPC_BIT(bs))
-/*
- * clear_bit doesn't imply a memory barrier
- */
-#define smp_mb__before_clear_bit() smp_mb()
-#define smp_mb__after_clear_bit() smp_mb()
+#include <asm/barrier.h>
/* Macro for generating the ***_bits() functions */
#define DEFINE_BITOP(fn, op, prefix) \
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -81,7 +81,7 @@ void crash_ipi_callback(struct pt_regs *
}
atomic_inc(&cpus_in_crash);
- smp_mb__after_atomic_inc();
+ smp_mb__after_atomic();
/*
* Starting the kdump boot.
next prev parent reply other threads:[~2014-03-19 6:56 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 ` [PATCH 14/31] arch,ia64: " Peter Zijlstra
2014-03-19 6:47 ` 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 ` Peter Zijlstra [this message]
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.956605799@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).