Patchwork [14/19] virtio-net: add vnet_hdr support

login
register
mail settings
Submitter Mark McLoughlin
Date Oct. 21, 2009, 11:27 a.m.
Message ID <1256124478-2988-15-git-send-email-markmc@redhat.com>
Download mbox | patch
Permalink /patch/36541/
State New
Headers show

Comments

Mark McLoughlin - Oct. 21, 2009, 11:27 a.m.
With '-netdev tap,id=foo -nic model=virtio,netdev=foo' virtio-net can
detect that its peer (i.e. the tap backend) supports vnet headers
and advertise to the guest that it can send packets with partial
checksums and/or TSO packets.

One complication is that if we're migrating and the source host
supports IFF_VNET_HDR but the destination host doesn't, we can't then
stop the guest from using those features. In this scenario, we just
fail the migration.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
 hw/virtio-net.c |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 deletions(-)

Patch

diff --git a/hw/virtio-net.c b/hw/virtio-net.c
index 218f985..5ce4b42 100644
--- a/hw/virtio-net.c
+++ b/hw/virtio-net.c
@@ -120,8 +120,20 @@  static void virtio_net_reset(VirtIODevice *vdev)
     memset(n->vlans, 0, MAX_VLAN >> 3);
 }
 
+static int peer_has_vnet_hdr(VirtIONet *n)
+{
+    if (!n->vc->peer)
+        return 0;
+
+    if (n->vc->peer->type != NET_CLIENT_TYPE_TAP)
+        return 0;
+
+    return tap_has_vnet_hdr(n->vc->peer);
+}
+
 static uint32_t virtio_net_get_features(VirtIODevice *vdev)
 {
+    VirtIONet *n = to_virtio_net(vdev);
     uint32_t features = (1 << VIRTIO_NET_F_MAC) |
                         (1 << VIRTIO_NET_F_MRG_RXBUF) |
                         (1 << VIRTIO_NET_F_STATUS) |
@@ -130,6 +142,15 @@  static uint32_t virtio_net_get_features(VirtIODevice *vdev)
                         (1 << VIRTIO_NET_F_CTRL_VLAN) |
                         (1 << VIRTIO_NET_F_CTRL_RX_EXTRA);
 
+    if (peer_has_vnet_hdr(n)) {
+        tap_using_vnet_hdr(n->vc->peer, 1);
+
+        features |= (1 << VIRTIO_NET_F_CSUM);
+        features |= (1 << VIRTIO_NET_F_HOST_TSO4);
+        features |= (1 << VIRTIO_NET_F_HOST_TSO6);
+        features |= (1 << VIRTIO_NET_F_HOST_ECN);
+    }
+
     return features;
 }
 
@@ -359,6 +380,11 @@  static int receive_header(VirtIONet *n, struct iovec *iov, int iovcnt,
     hdr->flags = 0;
     hdr->gso_type = VIRTIO_NET_HDR_GSO_NONE;
 
+    if (peer_has_vnet_hdr(n)) {
+        memcpy(hdr, buf, sizeof(*hdr));
+        offset = sizeof(*hdr);
+    }
+
     /* We only ever receive a struct virtio_net_hdr from the tapfd,
      * but we may be passing along a larger header to the guest.
      */
@@ -378,6 +404,10 @@  static int receive_filter(VirtIONet *n, const uint8_t *buf, int size)
     if (n->promisc)
         return 1;
 
+    if (peer_has_vnet_hdr(n)) {
+        ptr += sizeof(struct virtio_net_hdr);
+    }
+
     if (!memcmp(&ptr[12], vlan, sizeof(vlan))) {
         int vid = be16_to_cpup((uint16_t *)(ptr + 14)) & 0xfff;
         if (!(n->vlans[vid >> 5] & (1U << (vid & 0x1f))))
@@ -510,7 +540,6 @@  static void virtio_net_tx_complete(VLANClientState *vc, ssize_t len)
 static void virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq)
 {
     VirtQueueElement elem;
-    int has_vnet_hdr = 0;
 
     if (!(n->vdev.status & VIRTIO_CONFIG_S_DRIVER_OK))
         return;
@@ -537,7 +566,7 @@  static void virtio_net_flush_tx(VirtIONet *n, VirtQueue *vq)
         }
 
         /* ignore the header if GSO is not supported */
-        if (!has_vnet_hdr) {
+        if (!peer_has_vnet_hdr(n)) {
             out_num--;
             out_sg++;
             len += hdr_len;
@@ -610,7 +639,7 @@  static void virtio_net_save(QEMUFile *f, void *opaque)
     qemu_put_be32(f, n->mac_table.in_use);
     qemu_put_buffer(f, n->mac_table.macs, n->mac_table.in_use * ETH_ALEN);
     qemu_put_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3);
-    qemu_put_be32(f, 0); /* vnet-hdr placeholder */
+    qemu_put_be32(f, peer_has_vnet_hdr(n));
     qemu_put_byte(f, n->mac_table.multi_overflow);
     qemu_put_byte(f, n->mac_table.uni_overflow);
     qemu_put_byte(f, n->alluni);
@@ -662,10 +691,16 @@  static int virtio_net_load(QEMUFile *f, void *opaque, int version_id)
     if (version_id >= 6)
         qemu_get_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3);
 
-    if (version_id >= 7 && qemu_get_be32(f)) {
-        fprintf(stderr,
-                "virtio-net: saved image requires vnet header support\n");
-        exit(1);
+    if (version_id >= 7) {
+        if (qemu_get_be32(f) && !peer_has_vnet_hdr(n)) {
+            fprintf(stderr,
+                    "virtio-net: saved image requires vnet_hdr=on\n");
+            return -1;
+        }
+
+        if (peer_has_vnet_hdr(n)) {
+            tap_using_vnet_hdr(n->vc->peer, 1);
+        }
     }
 
     if (version_id >= 9) {