Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1299509

[PATCH 31/34] xenbus: use __smp_xxx barriers

Show all headers | View raw

drivers/xen/xenbus/xenbus_comms.c uses
full memory barriers to communicate with the other side.

For guests compiled with CONFIG_SMP, smp_wmb and smp_mb
would be sufficient, so mb() and wmb() here are only needed if
a non-SMP guest runs on an SMP host.

Switch to __smp_XXX barriers which serve this exact purpose.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

This is straight-forward, but untested.
I can either merge this patchset through my tree if this is
acked, or defer this and merge the patchset first,
and xen bits through xen tree afterwards.

Pls let me know.

 drivers/xen/xenbus/xenbus_comms.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c
index fdb0f33..09b17c7 100644
--- a/drivers/xen/xenbus/xenbus_comms.c
+++ b/drivers/xen/xenbus/xenbus_comms.c
@@ -123,14 +123,14 @@ int xb_write(const void *data, unsigned len)
 			avail = len;
 
 		/* Must write data /after/ reading the consumer index. */
-		mb();
+		__smp_mb();
 
 		memcpy(dst, data, avail);
 		data += avail;
 		len -= avail;
 
 		/* Other side must not see new producer until data is there. */
-		wmb();
+		__smp_wmb();
 		intf->req_prod += avail;
 
 		/* Implies mb(): other side will see the updated producer. */
@@ -180,14 +180,14 @@ int xb_read(void *data, unsigned len)
 			avail = len;
 
 		/* Must read data /after/ reading the producer index. */
-		rmb();
+		__smp_rmb();
 
 		memcpy(data, src, avail);
 		data += avail;
 		len -= avail;
 
 		/* Other side must not see free space until we've copied out */
-		mb();
+		__smp_mb();
 		intf->rsp_cons += avail;
 
 		pr_debug("Finished read of %i bytes (%i to go)\n", avail, len);
-- 
MST

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/34] arch: barrier cleanup + __smp_xxx barriers for virt "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 20:40 +0100
  Re: [PATCH 00/34] arch: barrier cleanup + __smp_xxx barriers for  virt David Miller <davem@davemloft.net> - 2015-12-30 21:50 +0100
    Re: [PATCH 00/34] arch: barrier cleanup + __smp_xxx barriers for virt "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 22:40 +0100
      Re: [PATCH 00/34] arch: barrier cleanup + __smp_xxx barriers for  virt David Miller <davem@davemloft.net> - 2015-12-30 23:00 +0100
  [PATCH 17/34] arm64: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 22:50 +0100
  [PATCH 18/34] arm: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 22:50 +0100
  Re: [PATCH 00/34] arch: barrier cleanup + __smp_xxx barriers for virt "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 22:50 +0100
    Re: [PATCH 00/34] arch: barrier cleanup + __smp_xxx barriers for virt Arnd Bergmann <arnd@arndb.de> - 2015-12-30 23:50 +0100
  [PATCH 20/34] ia64: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 28/34] x86: define __smp_xxX "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 26/34] tile: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 31/34] xenbus: use __smp_xxx barriers "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 23/34] s390: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 21/34] metag: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 22/34] mips: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 24/34] sh: define __smp_xxx, fix smp_store_mb for !SMP "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 27/34] xtensa: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 25/34] sparc: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 19/34] blackfin: define __smp_xxx "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100
  [PATCH 32/34] xen/io: use __smp_xxx barriers "Michael S. Tsirkin" <mst@redhat.com> - 2015-12-30 23:00 +0100

csiph-web