All of lore.kernel.org
 help / color / mirror / Atom feed
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>
Subject: [PATCH 02/34] asm-generic: guard smp_store_release/load_acquire
Date: Wed, 30 Dec 2015 15:24:20 +0200	[thread overview]
Message-ID: <1451473761-30019-3-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1451473761-30019-1-git-send-email-mst@redhat.com>

Allow architectures to override smp_store_release
and smp_load_acquire by guarding the defines
in asm-generic/barrier.h with ifndef directives.

This is in preparation to reusing asm-generic/barrier.h
on architectures which have their own definition
of these macros.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/asm-generic/barrier.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
index b42afad..538f8d1 100644
--- a/include/asm-generic/barrier.h
+++ b/include/asm-generic/barrier.h
@@ -104,13 +104,16 @@
 #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);				\
@@ -118,6 +121,7 @@ do {									\
 	smp_mb();							\
 	___p1;								\
 })
+#endif
 
 #endif /* !__ASSEMBLY__ */
 #endif /* __ASM_GENERIC_BARRIER_H */
-- 
MST

  parent reply	other threads:[~2015-12-30 13:24 UTC|newest]

Thread overview: 126+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-30 12:58 [PATCH 00/34] arch: barrier cleanup + __smp_xxx barriers for virt Michael S. Tsirkin
2015-12-30 12:58 ` Michael S. Tsirkin
2015-12-30 13:24   ` [PATCH 00/34] arch: barrier cleanup + __smp_XXX " Michael S. Tsirkin
2015-12-30 13:24   ` [PATCH 01/34] Documentation/memory-barriers.txt: document __smb_mb() Michael S. Tsirkin
2016-01-04 11:08     ` Stefano Stabellini
2016-01-04 11:08       ` Stefano Stabellini
2016-01-04 11:27       ` Michael S. Tsirkin
2016-01-04 11:27       ` Michael S. Tsirkin
2016-01-04 11:08     ` Stefano Stabellini
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24   ` [PATCH 02/34] asm-generic: guard smp_store_release/load_acquire Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin [this message]
2015-12-30 13:24   ` [PATCH 03/34] ia64: rename nop->iosapic_nop Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 16:39     ` Luck, Tony
2015-12-30 16:39       ` Luck, Tony
2015-12-30 13:24   ` [PATCH 04/34] ia64: reuse asm-generic/barrier.h Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 16:41     ` Luck, Tony
2015-12-30 16:41     ` Luck, Tony
2015-12-30 13:24   ` [PATCH 05/34] powerpc: " Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24   ` [PATCH 06/34] s390: " Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 13:24   ` [PATCH 07/34] sparc: " Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 17:56     ` David Miller
2015-12-30 17:56       ` David Miller
2015-12-30 19:55       ` Michael S. Tsirkin
2015-12-30 19:55         ` Michael S. Tsirkin
2015-12-30 19:55         ` Michael S. Tsirkin
2015-12-30 20:47         ` David Miller
2015-12-30 20:47           ` David Miller
2015-12-30 20:47           ` David Miller
2015-12-30 17:56     ` David Miller
2015-12-30 13:24   ` [PATCH 08/34] asm-generic: smp_store_mb should use smp_mb Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 13:44     ` Arnd Bergmann
2015-12-30 20:30       ` Michael S. Tsirkin
2015-12-30 20:30       ` Michael S. Tsirkin
2015-12-30 22:43         ` Arnd Bergmann
2015-12-30 22:43         ` Arnd Bergmann
2015-12-30 13:44     ` Arnd Bergmann
2015-12-30 13:24   ` [PATCH 09/34] arm: reuse asm-generic/barrier.h Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24   ` [PATCH 10/34] arm64: " Michael S. Tsirkin
2015-12-30 13:24     ` Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 11/34] metag: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 12/34] mips: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 13/34] x86/um: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 14/34] x86: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 15/34] asm-generic: add __smp_XXX wrappers Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 15/34] asm-generic: add __smp_xxx wrappers Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 16/34] powerpc: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25     ` Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 16/34] powerpc: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 16/34] powerpc: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 17/34] arm64: " Michael S. Tsirkin
2015-12-30 13:25     ` Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 17/34] arm64: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 17/34] arm64: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 18/34] arm: " Michael S. Tsirkin
2015-12-30 13:25     ` Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 18/34] arm: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 18/34] arm: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 19/34] blackfin: " Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 19/34] blackfin: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 20/34] ia64: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 20/34] ia64: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25     ` Michael S. Tsirkin
2015-12-30 16:43     ` [PATCH 20/34] ia64: define __smp_XXX Luck, Tony
2015-12-30 13:25   ` [PATCH 21/34] metag: " Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 21/34] metag: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 22/34] mips: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 22/34] mips: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 22/34] mips: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 23/34] s390: " Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 23/34] s390: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 24/34] sh: define __smp_XXX, fix smp_store_mb for !SMP Michael S. Tsirkin
2015-12-30 13:25     ` [PATCH 24/34] sh: define __smp_xxx, " Michael S. Tsirkin
2015-12-30 13:25     ` Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 25/34] sparc: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26     ` [PATCH 25/34] sparc: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:26     ` Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 26/34] tile: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26     ` [PATCH 26/34] tile: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 27/34] xtensa: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26     ` [PATCH 27/34] xtensa: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 28/34] x86: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26     ` [PATCH 28/34] x86: define __smp_xxX Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 29/34] Revert "virtio_ring: Update weak barriers to use dma_wmb/rmb" Michael S. Tsirkin
2015-12-30 13:26   ` Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 30/34] virtio_ring: update weak barriers to use __smp_XXX Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 31/34] xenbus: use __smp_XXX barriers Michael S. Tsirkin
2015-12-30 13:26   ` Michael S. Tsirkin
2015-12-30 13:26     ` [PATCH 31/34] xenbus: use __smp_xxx barriers Michael S. Tsirkin
2016-01-04 11:58     ` [PATCH 31/34] xenbus: use __smp_XXX barriers Stefano Stabellini
2016-01-04 11:58     ` Stefano Stabellini
2015-12-30 13:26   ` [PATCH 32/34] xen/io: " Michael S. Tsirkin
2015-12-30 13:26     ` [PATCH 32/34] xen/io: use __smp_xxx barriers Michael S. Tsirkin
2016-01-04 11:59     ` [PATCH 32/34] xen/io: use __smp_XXX barriers Stefano Stabellini
2016-01-04 11:59     ` Stefano Stabellini
2015-12-30 13:26   ` Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 33/34] virtio: use __smp_load_acquire/__smp_store_release Michael S. Tsirkin
2015-12-30 13:26   ` Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 34/34] virtio_ring: use __smp_store_mb Michael S. Tsirkin
2015-12-30 13:26   ` Michael S. Tsirkin
2015-12-30 13:49   ` [PATCH 00/34] arch: barrier cleanup + __smp_XXX barriers for virt Arnd Bergmann
2015-12-30 21:45     ` [PATCH 00/34] arch: barrier cleanup + __smp_xxx " Michael S. Tsirkin
2015-12-30 22:45       ` Arnd Bergmann
2015-12-30 22:45       ` Arnd Bergmann
2015-12-30 21:45     ` Michael S. Tsirkin
2015-12-30 20:46   ` David Miller
2015-12-30 20:46     ` David Miller
2015-12-30 21:36     ` Michael S. Tsirkin
2015-12-30 21:59       ` David Miller
2015-12-30 21:59         ` David Miller
2015-12-30 21:36     ` 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=1451473761-30019-3-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=arnd@arndb.de \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=virtualization@lists.linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.