Patchwork tap: reset vnet header size on open

login
register
mail settings
Submitter Michael S. Tsirkin
Date Nov. 12, 2012, 7:19 a.m.
Message ID <20121112071918.GA31752@redhat.com>
Download mbox | patch
Permalink /patch/198322/
State New
Headers show

Comments

Michael S. Tsirkin - Nov. 12, 2012, 7:19 a.m.
For tap, we currently assume the vnet header size is 10
(the default value) but that might not be the case
if tap is persistent and has been used by qemu previously.
To fix, set vnet header size correctly on open.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

This fixes the issue reported by Alexander Graf on the kvm forum.
Alexander, could you confirm please?
Thanks,

 net/tap-linux.c | 8 ++++++++
 1 file changed, 8 insertions(+)
Stefan Hajnoczi - Nov. 12, 2012, 12:23 p.m.
On Mon, Nov 12, 2012 at 09:19:18AM +0200, Michael S. Tsirkin wrote:
> For tap, we currently assume the vnet header size is 10
> (the default value) but that might not be the case
> if tap is persistent and has been used by qemu previously.
> To fix, set vnet header size correctly on open.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> 
> This fixes the issue reported by Alexander Graf on the kvm forum.
> Alexander, could you confirm please?
> Thanks,
> 
>  net/tap-linux.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/net/tap-linux.c b/net/tap-linux.c
> index c6521be..3eaedc4 100644
> --- a/net/tap-linux.c
> +++ b/net/tap-linux.c
> @@ -39,6 +39,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
>  {
>      struct ifreq ifr;
>      int fd, ret;
> +    int len = sizeof(struct virtio_net_hdr);

We probably want the same behavior in the tap,fd= codepath.  How about a
call to tap_set_vnet_hdr_len() in net_init_tap() instead?

Stefan

Patch

diff --git a/net/tap-linux.c b/net/tap-linux.c
index c6521be..3eaedc4 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -39,6 +39,7 @@  int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
 {
     struct ifreq ifr;
     int fd, ret;
+    int len = sizeof(struct virtio_net_hdr);
 
     TFR(fd = open(PATH_NET_TUN, O_RDWR));
     if (fd < 0) {
@@ -65,6 +66,13 @@  int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
             close(fd);
             return -1;
         }
+        /*
+         * Make sure vnet header size has the default value: for a persistent
+         * tap it might have been modified e.g. by another instance of qemu.
+         * Ignore errors since old kernels do not support this ioctl: in this
+         * case the header size implicitly has the correct value.
+         */
+        ioctl(fd, TUNSETVNETHDRSZ, &len);
     }
 
     if (ifname[0] != '\0')