diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2015-12-27 11:02:16 -0500 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2016-01-12 13:47:04 -0500 |
commit | 234927540e6ac82f5f083a11c3e860e346ed09bc (patch) | |
tree | 8b3a2ba97c047685bd8272abef5c5e5ec1f18061 | |
parent | 506b02eb1cf79838b76c6e3e43171cf960f01fc8 (diff) |
xen/events: use virt_xxx barriers
drivers/xen/events/events_fifo.c uses rmb() to communicate with the
other side.
For guests compiled with CONFIG_SMP, smp_rmb would be sufficient, so
rmb() here is only needed if a non-SMP guest runs on an SMP host.
Switch to the virt_rmb barrier which serves this exact purpose.
Pull in asm/barrier.h here to make sure the file is self-contained.
Suggested-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-rw-r--r-- | drivers/xen/events/events_fifo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/events/events_fifo.c b/drivers/xen/events/events_fifo.c index 96a1b8da5371..eff2b88003d9 100644 --- a/drivers/xen/events/events_fifo.c +++ b/drivers/xen/events/events_fifo.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/percpu.h> | 41 | #include <linux/percpu.h> |
42 | #include <linux/cpu.h> | 42 | #include <linux/cpu.h> |
43 | 43 | ||
44 | #include <asm/barrier.h> | ||
44 | #include <asm/sync_bitops.h> | 45 | #include <asm/sync_bitops.h> |
45 | #include <asm/xen/hypercall.h> | 46 | #include <asm/xen/hypercall.h> |
46 | #include <asm/xen/hypervisor.h> | 47 | #include <asm/xen/hypervisor.h> |
@@ -296,7 +297,7 @@ static void consume_one_event(unsigned cpu, | |||
296 | * control block. | 297 | * control block. |
297 | */ | 298 | */ |
298 | if (head == 0) { | 299 | if (head == 0) { |
299 | rmb(); /* Ensure word is up-to-date before reading head. */ | 300 | virt_rmb(); /* Ensure word is up-to-date before reading head. */ |
300 | head = control_block->head[priority]; | 301 | head = control_block->head[priority]; |
301 | } | 302 | } |
302 | 303 | ||