Commit 5201aa49 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by David S. Miller

vhost/net: fix up num_buffers endian-ness

In virtio 1.0 mode, when mergeable buffers are enabled on a big-endian
host, num_buffers wasn't byte-swapped correctly, so large incoming
packets got corrupted.

To fix, fill it in within hdr - this also makes sure it gets
the correct type.
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 75300ad2
...@@ -650,8 +650,10 @@ static void handle_rx(struct vhost_net *net) ...@@ -650,8 +650,10 @@ static void handle_rx(struct vhost_net *net)
break; break;
} }
/* TODO: Should check and handle checksum. */ /* TODO: Should check and handle checksum. */
hdr.num_buffers = cpu_to_vhost16(vq, headcount);
if (likely(mergeable) && if (likely(mergeable) &&
memcpy_toiovecend(nvq->hdr, (unsigned char *)&headcount, memcpy_toiovecend(nvq->hdr, (void *)&hdr.num_buffers,
offsetof(typeof(hdr), num_buffers), offsetof(typeof(hdr), num_buffers),
sizeof hdr.num_buffers)) { sizeof hdr.num_buffers)) {
vq_err(vq, "Failed num_buffers write"); vq_err(vq, "Failed num_buffers write");
......
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