From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
Arnd Bergmann <arnd@arndb.de>,
linux-arch@vger.kernel.org,
Andrew Cooper <andrew.cooper3@citrix.com>,
virtualization@lists.linux-foundation.org,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
David Miller <davem@davemloft.net>,
linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-s390@vger.kernel.org, sparclinux@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-metag@vger.kernel.org, linux-mips@linux-mips.org,
x86@kernel.org, user-mode-linux-devel@lists.sourceforge.net,
adi-buildroot-devel@lists.sourceforge.net,
linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org,
xen-devel@lists.xenproject.org
Subject: [PATCH v2 14/32] asm-generic: add __smp_xxx wrappers
Date: Thu, 31 Dec 2015 21:07:35 +0200 [thread overview]
Message-ID: <1451572003-2440-15-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1451572003-2440-1-git-send-email-mst@redhat.com>
On !SMP, most architectures define their
barriers as compiler barriers.
On SMP, most need an actual barrier.
Make it possible to remove the code duplication for
!SMP by defining low-level __smp_xxx barriers
which do not depend on the value of SMP, then
use them from asm-generic conditionally.
Besides reducing code duplication, these low level APIs will also be
useful for virtualization, where a barrier is sometimes needed even if
!SMP since we might be talking to another kernel on the same SMP system.
Both virtio and Xen drivers will benefit.
The smp_xxx variants should use __smp_XXX ones or barrier() depending on
SMP, identically for all architectures.
We keep ifndef guards around them for now - once/if all
architectures are converted to use the generic
code, we'll be able to remove these.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
---
include/asm-generic/barrier.h | 91 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 82 insertions(+), 9 deletions(-)
diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
index 987b2e0..8752964 100644
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
@@ -54,22 +54,38 @@
#define read_barrier_depends() do { } while (0)
#endif
+#ifndef __smp_mb
+#define __smp_mb() mb()
+#endif
+
+#ifndef __smp_rmb
+#define __smp_rmb() rmb()
+#endif
+
+#ifndef __smp_wmb
+#define __smp_wmb() wmb()
+#endif
+
+#ifndef __smp_read_barrier_depends
+#define __smp_read_barrier_depends() read_barrier_depends()
+#endif
+
#ifdef CONFIG_SMP
#ifndef smp_mb
-#define smp_mb() mb()
+#define smp_mb() __smp_mb()
#endif
#ifndef smp_rmb
-#define smp_rmb() rmb()
+#define smp_rmb() __smp_rmb()
#endif
#ifndef smp_wmb
-#define smp_wmb() wmb()
+#define smp_wmb() __smp_wmb()
#endif
#ifndef smp_read_barrier_depends
-#define smp_read_barrier_depends() read_barrier_depends()
+#define smp_read_barrier_depends() __smp_read_barrier_depends()
#endif
#else /* !CONFIG_SMP */
@@ -92,23 +108,78 @@
#endif /* CONFIG_SMP */
+#ifndef __smp_store_mb
+#define __smp_store_mb(var, value) do { WRITE_ONCE(var, value); __smp_mb(); } while (0)
+#endif
+
+#ifndef __smp_mb__before_atomic
+#define __smp_mb__before_atomic() __smp_mb()
+#endif
+
+#ifndef __smp_mb__after_atomic
+#define __smp_mb__after_atomic() __smp_mb()
+#endif
+
+#ifndef __smp_store_release
+#define __smp_store_release(p, v) \
+do { \
+ compiletime_assert_atomic_type(*p); \
+ __smp_mb(); \
+ WRITE_ONCE(*p, v); \
+} while (0)
+#endif
+
+#ifndef __smp_load_acquire
+#define __smp_load_acquire(p) \
+({ \
+ typeof(*p) ___p1 = READ_ONCE(*p); \
+ compiletime_assert_atomic_type(*p); \
+ __smp_mb(); \
+ ___p1; \
+})
+#endif
+
+#ifdef CONFIG_SMP
+
+#ifndef smp_store_mb
+#define smp_store_mb(var, value) __smp_store_mb(var, value)
+#endif
+
+#ifndef smp_mb__before_atomic
+#define smp_mb__before_atomic() __smp_mb__before_atomic()
+#endif
+
+#ifndef smp_mb__after_atomic
+#define smp_mb__after_atomic() __smp_mb__after_atomic()
+#endif
+
+#ifndef smp_store_release
+#define smp_store_release(p, v) __smp_store_release(p, v)
+#endif
+
+#ifndef smp_load_acquire
+#define smp_load_acquire(p) __smp_load_acquire(p)
+#endif
+
+#else /* !CONFIG_SMP */
+
#ifndef smp_store_mb
-#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); smp_mb(); } while (0)
+#define smp_store_mb(var, value) do { WRITE_ONCE(var, value); barrier(); } while (0)
#endif
#ifndef smp_mb__before_atomic
-#define smp_mb__before_atomic() smp_mb()
+#define smp_mb__before_atomic() barrier()
#endif
#ifndef smp_mb__after_atomic
-#define smp_mb__after_atomic() smp_mb()
+#define smp_mb__after_atomic() barrier()
#endif
#ifndef smp_store_release
#define smp_store_release(p, v) \
do { \
compiletime_assert_atomic_type(*p); \
- smp_mb(); \
+ barrier(); \
WRITE_ONCE(*p, v); \
} while (0)
#endif
@@ -118,10 +189,12 @@ do { \
({ \
typeof(*p) ___p1 = READ_ONCE(*p); \
compiletime_assert_atomic_type(*p); \
- smp_mb(); \
+ barrier(); \
___p1; \
})
#endif
+#endif
+
#endif /* !__ASSEMBLY__ */
#endif /* __ASM_GENERIC_BARRIER_H */
--
MST
next prev parent reply other threads:[~2015-12-31 19:07 UTC|newest]
Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-31 19:05 [PATCH v2 00/34] arch: barrier cleanup + barriers for virt Michael S. Tsirkin
2015-12-31 19:05 ` [PATCH v2 01/32] lcoking/barriers, arch: Use smp barriers in smp_store_release() Michael S. Tsirkin
2015-12-31 19:05 ` [PATCH v2 02/32] asm-generic: guard smp_store_release/load_acquire Michael S. Tsirkin
2015-12-31 19:06 ` [PATCH v2 03/32] ia64: rename nop->iosapic_nop Michael S. Tsirkin
2015-12-31 19:06 ` [PATCH v2 04/32] ia64: reuse asm-generic/barrier.h Michael S. Tsirkin
2015-12-31 19:06 ` [PATCH v2 05/32] powerpc: " Michael S. Tsirkin
2015-12-31 19:06 ` [PATCH v2 06/32] s390: " Michael S. Tsirkin
2016-01-04 13:20 ` Peter Zijlstra
2016-01-04 15:03 ` Martin Schwidefsky
2016-01-04 20:42 ` Michael S. Tsirkin
2016-01-05 8:03 ` Martin Schwidefsky
2016-01-04 20:34 ` Michael S. Tsirkin
2015-12-31 19:06 ` [PATCH v2 07/32] sparc: " Michael S. Tsirkin
2015-12-31 19:43 ` David Miller
2015-12-31 19:06 ` [PATCH v2 08/32] arm: " Michael S. Tsirkin
2016-01-02 11:20 ` Russell King - ARM Linux
2015-12-31 19:06 ` [PATCH v2 09/32] arm64: " Michael S. Tsirkin
2015-12-31 19:07 ` [PATCH v2 10/32] metag: " Michael S. Tsirkin
2016-01-04 23:24 ` James Hogan
2015-12-31 19:07 ` [PATCH v2 11/32] mips: " Michael S. Tsirkin
2016-01-04 13:26 ` Peter Zijlstra
2015-12-31 19:07 ` [PATCH v2 12/32] x86/um: " Michael S. Tsirkin
2016-01-05 23:12 ` Richard Weinberger
2015-12-31 19:07 ` [PATCH v2 13/32] x86: " Michael S. Tsirkin
2015-12-31 19:07 ` Michael S. Tsirkin [this message]
2015-12-31 19:07 ` [PATCH v2 15/32] powerpc: define __smp_xxx Michael S. Tsirkin
2016-01-05 1:36 ` Boqun Feng
2016-01-05 8:51 ` Michael S. Tsirkin
2016-01-05 9:53 ` Boqun Feng
2016-01-05 16:16 ` Michael S. Tsirkin
2016-01-06 1:51 ` Boqun Feng
2016-01-06 20:23 ` Michael S. Tsirkin
2016-01-07 0:43 ` Boqun Feng
2015-12-31 19:07 ` [PATCH v2 16/32] arm64: " Michael S. Tsirkin
2015-12-31 19:07 ` [PATCH v2 17/32] arm: " Michael S. Tsirkin
2016-01-02 11:24 ` Russell King - ARM Linux
2016-01-03 9:12 ` Michael S. Tsirkin
2016-01-04 13:36 ` Peter Zijlstra
2016-01-04 13:54 ` Peter Zijlstra
2016-01-04 13:59 ` Russell King - ARM Linux
2016-01-05 14:38 ` Michael S. Tsirkin
2016-01-04 20:39 ` Michael S. Tsirkin
2016-01-04 20:12 ` Michael S. Tsirkin
2015-12-31 19:08 ` [PATCH v2 18/32] blackfin: " Michael S. Tsirkin
2015-12-31 19:08 ` [PATCH v2 19/32] ia64: " Michael S. Tsirkin
2015-12-31 19:08 ` [PATCH v2 20/32] metag: " Michael S. Tsirkin
2016-01-04 13:41 ` Peter Zijlstra
2016-01-04 15:25 ` James Hogan
2016-01-04 15:30 ` Peter Zijlstra
2016-01-04 16:04 ` James Hogan
2016-01-05 0:09 ` James Hogan
2016-01-11 11:10 ` Michael S. Tsirkin
2015-12-31 19:08 ` [PATCH v2 21/32] mips: " Michael S. Tsirkin
2015-12-31 19:08 ` [PATCH v2 22/32] s390: " Michael S. Tsirkin
2016-01-04 13:45 ` Peter Zijlstra
2016-01-04 20:18 ` Michael S. Tsirkin
2016-01-05 8:13 ` Martin Schwidefsky
2016-01-05 9:30 ` Michael S. Tsirkin
2016-01-05 12:08 ` Martin Schwidefsky
2016-01-05 13:04 ` Michael S. Tsirkin
2016-01-05 14:21 ` Martin Schwidefsky
2016-01-05 15:39 ` Christian Borntraeger
2016-01-05 16:04 ` Michael S. Tsirkin
2015-12-31 19:08 ` [PATCH v2 23/32] sh: define __smp_xxx, fix smp_store_mb for !SMP Michael S. Tsirkin
2015-12-31 19:08 ` [PATCH v2 24/32] sparc: define __smp_xxx Michael S. Tsirkin
2015-12-31 19:44 ` David Miller
2015-12-31 19:09 ` [PATCH v2 25/32] tile: " Michael S. Tsirkin
2015-12-31 19:09 ` [PATCH v2 26/32] xtensa: " Michael S. Tsirkin
2015-12-31 19:09 ` [PATCH v2 27/32] x86: " Michael S. Tsirkin
2015-12-31 19:09 ` [PATCH v2 28/32] asm-generic: implement virt_xxx memory barriers Michael S. Tsirkin
2015-12-31 19:09 ` [PATCH v2 29/32] Revert "virtio_ring: Update weak barriers to use dma_wmb/rmb" Michael S. Tsirkin
2015-12-31 19:09 ` [PATCH v2 31/32] sh: support a 2-byte smp_store_mb Michael S. Tsirkin
2016-01-04 14:05 ` Peter Zijlstra
2016-01-05 23:27 ` Rich Felker
2016-01-06 11:19 ` Michael S. Tsirkin
2016-01-06 11:40 ` Peter Zijlstra
2016-01-06 11:52 ` Michael S. Tsirkin
2016-01-06 14:32 ` Peter Zijlstra
2016-01-06 15:42 ` Rob Landley
2016-01-06 16:57 ` Peter Zijlstra
2016-01-06 20:21 ` Rob Landley
2016-01-06 18:57 ` Geert Uytterhoeven
2016-01-06 18:23 ` Rich Felker
2016-01-06 20:23 ` Michael S. Tsirkin
2016-01-06 23:53 ` Rich Felker
2016-01-07 13:37 ` Peter Zijlstra
2016-01-07 19:05 ` Rich Felker
2016-01-07 15:50 ` Michael S. Tsirkin
2016-01-07 17:48 ` Michael S. Tsirkin
2016-01-07 19:10 ` Rich Felker
2016-01-07 22:41 ` Michael S. Tsirkin
2016-01-08 4:25 ` Rich Felker
2016-01-08 7:23 ` Michael S. Tsirkin
2016-01-06 22:14 ` Michael S. Tsirkin
2015-12-31 19:09 ` [PATCH v2 32/32] virtio_ring: use virt_store_mb Michael S. Tsirkin
2016-01-01 17:23 ` Sergei Shtylyov
2016-01-03 9:01 ` Michael S. Tsirkin
2015-12-31 19:10 ` [PATCH v2 33/34] xenbus: use virt_xxx barriers Michael S. Tsirkin
2016-01-04 11:32 ` [Xen-devel] " David Vrabel
2016-01-04 12:03 ` Stefano Stabellini
2016-01-04 14:09 ` Peter Zijlstra
2015-12-31 19:10 ` [PATCH v2 34/34] xen/io: " Michael S. Tsirkin
2016-01-04 11:32 ` [Xen-devel] " David Vrabel
2016-01-04 12:05 ` Stefano Stabellini
2016-01-01 9:39 ` [PATCH v2 30/32] virtio_ring: update weak barriers to use __smp_xxx Michael S. Tsirkin
2016-01-01 10:21 ` Michael S. Tsirkin
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=1451572003-2440-15-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=andrew.cooper3@citrix.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-metag@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sparclinux@vger.kernel.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tglx@linutronix.de \
--cc=user-mode-linux-devel@lists.sourceforge.net \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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;
as well as URLs for NNTP newsgroup(s).