Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55afbd08 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

macvtap: add ioctl to modify vnet header size 



This adds TUNSETVNETHDRSZ/TUNGETVNETHDRSZ support
to macvtap.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d9d52b51

drivers/net/macvtap.c

+23 −4
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ struct macvtap_queue { 
	struct sock sk;

	struct sock sk;

	struct socket sock;

	struct socket sock;

	struct socket_wq wq;

	struct socket_wq wq;

	int vnet_hdr_sz;

	struct macvlan_dev *vlan;

	struct macvlan_dev *vlan;

	struct file *file;

	struct file *file;

	unsigned int flags;

	unsigned int flags;
@@ -285,6 +286,7 @@ static int macvtap_open(struct inode *inode, struct file *file) 
	sock_init_data(&q->sock, &q->sk);

	sock_init_data(&q->sock, &q->sk);

	q->sk.sk_write_space = macvtap_sock_write_space;

	q->sk.sk_write_space = macvtap_sock_write_space;

	q->flags = IFF_VNET_HDR | IFF_NO_PI | IFF_TAP;

	q->flags = IFF_VNET_HDR | IFF_NO_PI | IFF_TAP;

	q->vnet_hdr_sz = sizeof(struct virtio_net_hdr);





	err = macvtap_set_queue(dev, file, q);

	err = macvtap_set_queue(dev, file, q);

	if (err)

	if (err)
@@ -445,14 +447,14 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, 
	int vnet_hdr_len = 0;

	int vnet_hdr_len = 0;





	if (q->flags & IFF_VNET_HDR) {

	if (q->flags & IFF_VNET_HDR) {

		vnet_hdr_len = sizeof(vnet_hdr);

		vnet_hdr_len = q->vnet_hdr_sz;





		err = -EINVAL;

		err = -EINVAL;

		if ((len -= vnet_hdr_len) < 0)

		if ((len -= vnet_hdr_len) < 0)

			goto err;

			goto err;





		err = memcpy_fromiovecend((void *)&vnet_hdr, iv, 0,

		err = memcpy_fromiovecend((void *)&vnet_hdr, iv, 0,

					   vnet_hdr_len);

					   sizeof(vnet_hdr));

		if (err < 0)

		if (err < 0)

			goto err;

			goto err;

		if ((vnet_hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) &&

		if ((vnet_hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) &&
@@ -534,7 +536,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, 




	if (q->flags & IFF_VNET_HDR) {

	if (q->flags & IFF_VNET_HDR) {

		struct virtio_net_hdr vnet_hdr;

		struct virtio_net_hdr vnet_hdr;

		vnet_hdr_len = sizeof (vnet_hdr);

		vnet_hdr_len = q->vnet_hdr_sz;

		if ((len -= vnet_hdr_len) < 0)

		if ((len -= vnet_hdr_len) < 0)

			return -EINVAL;

			return -EINVAL;
@@ -542,7 +544,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q, 
		if (ret)

		if (ret)

			return ret;

			return ret;





		if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, vnet_hdr_len))

		if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))

			return -EFAULT;

			return -EFAULT;

	}

	}
@@ -627,6 +629,8 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd, 
	struct ifreq __user *ifr = argp;

	struct ifreq __user *ifr = argp;

	unsigned int __user *up = argp;

	unsigned int __user *up = argp;

	unsigned int u;

	unsigned int u;

	int __user *sp = argp;

	int s;

	int ret;

	int ret;





	switch (cmd) {

	switch (cmd) {
@@ -672,6 +676,21 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd, 
		q->sk.sk_sndbuf = u;

		q->sk.sk_sndbuf = u;

		return 0;

		return 0;





	case TUNGETVNETHDRSZ:

		s = q->vnet_hdr_sz;

		if (put_user(s, sp))

			return -EFAULT;

		return 0;



	case TUNSETVNETHDRSZ:

		if (get_user(s, sp))

			return -EFAULT;

		if (s < (int)sizeof(struct virtio_net_hdr))

			return -EINVAL;



		q->vnet_hdr_sz = s;

		return 0;



	case TUNSETOFFLOAD:

	case TUNSETOFFLOAD:

		/* let the user check for future flags */

		/* let the user check for future flags */

		if (arg & ~(TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 |

		if (arg & ~(TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 |