diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2016-10-06 11:39:11 +0200 |
|---|---|---|
| committer |   Michael S. Tsirkin <mst@redhat.com> | 2016-10-31 00:21:43 +0200 |
| commit | d3c3589b8b3cd4fabf4cd137facb42a7fb36bd7f (patch) | |
| tree | d71957ed6843a84c8328587604b9bdfe84363094 /tools/virtio/ringtest/ring.c | |
| parent | ringtest: use link-time optimization (diff) | |
| download | linux-dev-d3c3589b8b3cd4fabf4cd137facb42a7fb36bd7f.tar.xz linux-dev-d3c3589b8b3cd4fabf4cd137facb42a7fb36bd7f.zip | |
ringtest: commonize implementation of poll_avail/poll_used
Provide new primitives used_empty/avail_empty and
build poll_avail/poll_used on top of it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tools/virtio/ringtest/ring.c')
| -rw-r--r-- | tools/virtio/ringtest/ring.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tools/virtio/ringtest/ring.c b/tools/virtio/ringtest/ring.c index c25c8d248b6b..747c5dd47be8 100644 --- a/tools/virtio/ringtest/ring.c +++ b/tools/virtio/ringtest/ring.c @@ -163,12 +163,11 @@ void *get_buf(unsigned *lenp, void **bufp) return datap; } -void poll_used(void) +bool used_empty() { unsigned head = (ring_size - 1) & guest.last_used_idx; - while (ring[head].flags & DESC_HW) - busy_wait(); + return (ring[head].flags & DESC_HW); } void disable_call() @@ -180,13 +179,11 @@ void disable_call() bool enable_call() { - unsigned head = (ring_size - 1) & guest.last_used_idx; - event->call_index = guest.last_used_idx; /* Flush call index write */ /* Barrier D (for pairing) */ smp_mb(); - return ring[head].flags & DESC_HW; + return used_empty(); } void kick_available(void) @@ -213,20 +210,17 @@ void disable_kick() bool enable_kick() { - unsigned head = (ring_size - 1) & host.used_idx; - event->kick_index = host.used_idx; /* Barrier C (for pairing) */ smp_mb(); - return !(ring[head].flags & DESC_HW); + return avail_empty(); } -void poll_avail(void) +bool avail_empty() { unsigned head = (ring_size - 1) & host.used_idx; - while (!(ring[head].flags & DESC_HW)) - busy_wait(); + return !(ring[head].flags & DESC_HW); } bool use_buf(unsigned *lenp, void **bufp) |