[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/10] vhost-net: tell tap backend about the vnet end
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 06/10] vhost-net: tell tap backend about the vnet endianness |
Date: |
Wed, 17 Jun 2015 21:38:18 +0200 |
From: Greg Kurz <address@hidden>
The default behaviour for TAP/MACVTAP is to consider vnet as native endian.
This patch handles the cases when this is not true:
- virtio 1.0: always little-endian
- legacy cross-endian
Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/net/vhost_net.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index 1c55517..8cbb2f6 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -38,6 +38,7 @@
#include "standard-headers/linux/virtio_ring.h"
#include "hw/virtio/vhost.h"
#include "hw/virtio/virtio-bus.h"
+#include "hw/virtio/virtio-access.h"
struct vhost_net {
struct vhost_dev dev;
@@ -197,6 +198,27 @@ static void vhost_net_set_vq_index(struct vhost_net *net,
int vq_index)
net->dev.vq_index = vq_index;
}
+static int vhost_net_set_vnet_endian(VirtIODevice *dev, NetClientState *peer,
+ bool set)
+{
+ int r = 0;
+
+ if (virtio_has_feature(dev, VIRTIO_F_VERSION_1) ||
+ (virtio_legacy_is_cross_endian(dev) && !virtio_is_big_endian(dev))) {
+ r = qemu_set_vnet_le(peer, set);
+ if (r) {
+ error_report("backend does not support LE vnet headers");
+ }
+ } else if (virtio_legacy_is_cross_endian(dev)) {
+ r = qemu_set_vnet_be(peer, set);
+ if (r) {
+ error_report("backend does not support BE vnet headers");
+ }
+ }
+
+ return r;
+}
+
static int vhost_net_start_one(struct vhost_net *net,
VirtIODevice *dev)
{
@@ -314,6 +336,11 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
goto err;
}
+ r = vhost_net_set_vnet_endian(dev, ncs[0].peer, true);
+ if (r < 0) {
+ goto err;
+ }
+
for (i = 0; i < total_queues; i++) {
vhost_net_set_vq_index(get_vhost_net(ncs[i].peer), i * 2);
}
@@ -321,7 +348,7 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
r = k->set_guest_notifiers(qbus->parent, total_queues * 2, true);
if (r < 0) {
error_report("Error binding guest notifier: %d", -r);
- goto err;
+ goto err_endian;
}
for (i = 0; i < total_queues; i++) {
@@ -343,6 +370,8 @@ err_start:
fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e);
fflush(stderr);
}
+err_endian:
+ vhost_net_set_vnet_endian(dev, ncs[0].peer, false);
err:
return r;
}
@@ -365,6 +394,8 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
fflush(stderr);
}
assert(r >= 0);
+
+ assert(vhost_net_set_vnet_endian(dev, ncs[0].peer, false) >= 0);
}
void vhost_net_cleanup(struct vhost_net *net)
--
MST
- [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 01/10] vhost-user: part of virtio, Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 02/10] linux-headers: sync vhost.h, Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 03/10] virtio: introduce virtio_legacy_is_cross_endian(), Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 04/10] vhost: set vring endianness for legacy virtio, Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 05/10] tap: add VNET_LE/VNET_BE operations, Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 07/10] vhost_net: re-enable when cross endian, Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 08/10] hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf(), Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 06/10] vhost-net: tell tap backend about the vnet endianness,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/10] pci: Don't register a specialized 'config_write' if default behavior is intended, Michael S. Tsirkin, 2015/06/17
- [Qemu-devel] [PULL 10/10] vhost: enable vhost without without MSI-X, Michael S. Tsirkin, 2015/06/17
- Re: [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Peter Maydell, 2015/06/18
- Re: [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Michael S. Tsirkin, 2015/06/18
- Re: [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Peter Maydell, 2015/06/18
- Re: [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Michael S. Tsirkin, 2015/06/19
- Re: [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Peter Maydell, 2015/06/19
- Re: [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Michael S. Tsirkin, 2015/06/19
- Re: [Qemu-devel] [PULL 00/10] virtio, pci fixes, enhancements, Peter Maydell, 2015/06/19