Commit 540005dc authored by Jason Wang's avatar Jason Wang Committed by Greg Kroah-Hartman

drivers: hv: switch to use mb() instead of smp_mb()

commit 35848f68 upstream.

Even if guest were compiled without SMP support, it could not assume that host
wasn't. So switch to use mb() instead of smp_mb() to force memory barriers for
UP guest.
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5ea8ca0
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
void hv_begin_read(struct hv_ring_buffer_info *rbi) void hv_begin_read(struct hv_ring_buffer_info *rbi)
{ {
rbi->ring_buffer->interrupt_mask = 1; rbi->ring_buffer->interrupt_mask = 1;
smp_mb(); mb();
} }
u32 hv_end_read(struct hv_ring_buffer_info *rbi) u32 hv_end_read(struct hv_ring_buffer_info *rbi)
...@@ -41,7 +41,7 @@ u32 hv_end_read(struct hv_ring_buffer_info *rbi) ...@@ -41,7 +41,7 @@ u32 hv_end_read(struct hv_ring_buffer_info *rbi)
u32 write; u32 write;
rbi->ring_buffer->interrupt_mask = 0; rbi->ring_buffer->interrupt_mask = 0;
smp_mb(); mb();
/* /*
* Now check to see if the ring buffer is still empty. * Now check to see if the ring buffer is still empty.
...@@ -71,7 +71,7 @@ u32 hv_end_read(struct hv_ring_buffer_info *rbi) ...@@ -71,7 +71,7 @@ u32 hv_end_read(struct hv_ring_buffer_info *rbi)
static bool hv_need_to_signal(u32 old_write, struct hv_ring_buffer_info *rbi) static bool hv_need_to_signal(u32 old_write, struct hv_ring_buffer_info *rbi)
{ {
smp_mb(); mb();
if (rbi->ring_buffer->interrupt_mask) if (rbi->ring_buffer->interrupt_mask)
return false; return false;
...@@ -442,7 +442,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info, ...@@ -442,7 +442,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info,
sizeof(u64)); sizeof(u64));
/* Issue a full memory barrier before updating the write index */ /* Issue a full memory barrier before updating the write index */
smp_mb(); mb();
/* Now, update the write location */ /* Now, update the write location */
hv_set_next_write_location(outring_info, next_write_location); hv_set_next_write_location(outring_info, next_write_location);
...@@ -549,7 +549,7 @@ int hv_ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer, ...@@ -549,7 +549,7 @@ int hv_ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer,
/* Make sure all reads are done before we update the read index since */ /* Make sure all reads are done before we update the read index since */
/* the writer may start writing to the read area once the read index */ /* the writer may start writing to the read area once the read index */
/*is updated */ /*is updated */
smp_mb(); mb();
/* Update the read index */ /* Update the read index */
hv_set_next_read_location(inring_info, next_read_location); hv_set_next_read_location(inring_info, next_read_location);
......
...@@ -434,7 +434,7 @@ static void vmbus_on_msg_dpc(unsigned long data) ...@@ -434,7 +434,7 @@ static void vmbus_on_msg_dpc(unsigned long data)
* will not deliver any more messages since there is * will not deliver any more messages since there is
* no empty slot * no empty slot
*/ */
smp_mb(); mb();
if (msg->header.message_flags.msg_pending) { if (msg->header.message_flags.msg_pending) {
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment