Commit 86e9424d authored by Michael S. Tsirkin's avatar Michael S. Tsirkin

vhost: logging thinko fix

vhost was dong some complex math to get
offset to log at, and got it wrong by a couple of bytes,
while in fact it's simple: get address where we write,
subtract start of buffer, add log base.

Do it this way.
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 655ffee2
...@@ -1004,10 +1004,14 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) ...@@ -1004,10 +1004,14 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len)
if (unlikely(vq->log_used)) { if (unlikely(vq->log_used)) {
/* Make sure data is seen before log. */ /* Make sure data is seen before log. */
smp_wmb(); smp_wmb();
log_write(vq->log_base, vq->log_addr + sizeof *vq->used->ring * /* Log used ring entry write. */
(vq->last_used_idx % vq->num), log_write(vq->log_base,
sizeof *vq->used->ring); vq->log_addr + ((void *)used - (void *)vq->used),
log_write(vq->log_base, vq->log_addr, sizeof *vq->used->ring); sizeof *used);
/* Log used index update. */
log_write(vq->log_base,
vq->log_addr + offsetof(struct vring_used, idx),
sizeof vq->used->idx);
if (vq->log_ctx) if (vq->log_ctx)
eventfd_signal(vq->log_ctx, 1); eventfd_signal(vq->log_ctx, 1);
} }
......
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