macvtap: drop broken IFF_VNET_LE

[cascardo/linux.git] / drivers / net / macvtap.c

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 2c157cc..7df2217 100644 (file)
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -46,6 +46,20 @@ struct macvtap_queue {
        struct list_head next;
 };
 
+#define MACVTAP_FEATURES (IFF_VNET_HDR | IFF_MULTI_QUEUE)
+
+#define MACVTAP_VNET_LE 0x80000000
+
+static inline u16 macvtap16_to_cpu(struct macvtap_queue *q, __virtio16 val)
+{
+       return __virtio16_to_cpu(q->flags & MACVTAP_VNET_LE, val);
+}
+
+static inline __virtio16 cpu_to_macvtap16(struct macvtap_queue *q, u16 val)
+{
+       return __cpu_to_virtio16(q->flags & MACVTAP_VNET_LE, val);
+}
+
 static struct proto macvtap_proto = {
        .name = "macvtap",
        .owner = THIS_MODULE,
@@ -558,7 +572,8 @@ static inline struct sk_buff *macvtap_alloc_skb(struct sock *sk, size_t prepad,
  * macvtap_skb_from_vnet_hdr and macvtap_skb_to_vnet_hdr should
  * be shared with the tun/tap driver.
  */
-static int macvtap_skb_from_vnet_hdr(struct sk_buff *skb,
+static int macvtap_skb_from_vnet_hdr(struct macvtap_queue *q,
+                                    struct sk_buff *skb,
                                     struct virtio_net_hdr *vnet_hdr)
 {
        unsigned short gso_type = 0;
@@ -589,13 +604,13 @@ static int macvtap_skb_from_vnet_hdr(struct sk_buff *skb,
        }
 
        if (vnet_hdr->flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) {
-               if (!skb_partial_csum_set(skb, vnet_hdr->csum_start,
-                                         vnet_hdr->csum_offset))
+               if (!skb_partial_csum_set(skb, macvtap16_to_cpu(q, vnet_hdr->csum_start),
+                                         macvtap16_to_cpu(q, vnet_hdr->csum_offset)))
                        return -EINVAL;
        }
 
        if (vnet_hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) {
-               skb_shinfo(skb)->gso_size = vnet_hdr->gso_size;
+               skb_shinfo(skb)->gso_size = macvtap16_to_cpu(q, vnet_hdr->gso_size);
                skb_shinfo(skb)->gso_type = gso_type;
 
                /* Header must be checked, and gso_segs computed. */
@@ -605,8 +620,9 @@ static int macvtap_skb_from_vnet_hdr(struct sk_buff *skb,
        return 0;
 }
 
-static void macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,
-                                  struct virtio_net_hdr *vnet_hdr)
+static void macvtap_skb_to_vnet_hdr(struct macvtap_queue *q,
+                                   const struct sk_buff *skb,
+                                   struct virtio_net_hdr *vnet_hdr)
 {
        memset(vnet_hdr, 0, sizeof(*vnet_hdr));
 
@@ -614,8 +630,8 @@ static void macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,
                struct skb_shared_info *sinfo = skb_shinfo(skb);
 
                /* This is a hint as to how much should be linear. */
-               vnet_hdr->hdr_len = skb_headlen(skb);
-               vnet_hdr->gso_size = sinfo->gso_size;
+               vnet_hdr->hdr_len = cpu_to_macvtap16(q, skb_headlen(skb));
+               vnet_hdr->gso_size = cpu_to_macvtap16(q, sinfo->gso_size);
                if (sinfo->gso_type & SKB_GSO_TCPV4)
                        vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
                else if (sinfo->gso_type & SKB_GSO_TCPV6)
@@ -629,10 +645,13 @@ static void macvtap_skb_to_vnet_hdr(const struct sk_buff *skb,
 
        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                vnet_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-               vnet_hdr->csum_start = skb_checksum_start_offset(skb);
                if (vlan_tx_tag_present(skb))
-                       vnet_hdr->csum_start += VLAN_HLEN;
-               vnet_hdr->csum_offset = skb->csum_offset;
+                       vnet_hdr->csum_start = cpu_to_macvtap16(q,
+                               skb_checksum_start_offset(skb) + VLAN_HLEN);
+               else
+                       vnet_hdr->csum_start = cpu_to_macvtap16(q,
+                               skb_checksum_start_offset(skb));
+               vnet_hdr->csum_offset = cpu_to_macvtap16(q, skb->csum_offset);
        } else if (skb->ip_summed == CHECKSUM_UNNECESSARY) {
                vnet_hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID;
        } /* else everything is zero */
@@ -669,12 +688,14 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
                        goto err;
                iov_iter_advance(from, vnet_hdr_len - sizeof(vnet_hdr));
                if ((vnet_hdr.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) &&
-                    vnet_hdr.csum_start + vnet_hdr.csum_offset + 2 >
-                                                       vnet_hdr.hdr_len)
-                       vnet_hdr.hdr_len = vnet_hdr.csum_start +
-                                               vnet_hdr.csum_offset + 2;
+                    macvtap16_to_cpu(q, vnet_hdr.csum_start) +
+                    macvtap16_to_cpu(q, vnet_hdr.csum_offset) + 2 >
+                            macvtap16_to_cpu(q, vnet_hdr.hdr_len))
+                       vnet_hdr.hdr_len = cpu_to_macvtap16(q,
+                                macvtap16_to_cpu(q, vnet_hdr.csum_start) +
+                                macvtap16_to_cpu(q, vnet_hdr.csum_offset) + 2);
                err = -EINVAL;
-               if (vnet_hdr.hdr_len > len)
+               if (macvtap16_to_cpu(q, vnet_hdr.hdr_len) > len)
                        goto err;
        }
 
@@ -685,7 +706,8 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
        if (m && m->msg_control && sock_flag(&q->sk, SOCK_ZEROCOPY)) {
                struct iov_iter i;
 
-               copylen = vnet_hdr.hdr_len ? vnet_hdr.hdr_len : GOODCOPY_LEN;
+               copylen = vnet_hdr.hdr_len ?
+                       macvtap16_to_cpu(q, vnet_hdr.hdr_len) : GOODCOPY_LEN;
                if (copylen > good_linear)
                        copylen = good_linear;
                linear = copylen;
@@ -697,10 +719,10 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
 
        if (!zerocopy) {
                copylen = len;
-               if (vnet_hdr.hdr_len > good_linear)
+               if (macvtap16_to_cpu(q, vnet_hdr.hdr_len) > good_linear)
                        linear = good_linear;
                else
-                       linear = vnet_hdr.hdr_len;
+                       linear = macvtap16_to_cpu(q, vnet_hdr.hdr_len);
        }
 
        skb = macvtap_alloc_skb(&q->sk, NET_IP_ALIGN, copylen,
@@ -726,7 +748,7 @@ static ssize_t macvtap_get_user(struct macvtap_queue *q, struct msghdr *m,
        skb->protocol = eth_hdr(skb)->h_proto;
 
        if (vnet_hdr_len) {
-               err = macvtap_skb_from_vnet_hdr(skb, &vnet_hdr);
+               err = macvtap_skb_from_vnet_hdr(q, skb, &vnet_hdr);
                if (err)
                        goto err_kfree;
        }
@@ -788,7 +810,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
                if (iov_iter_count(iter) < vnet_hdr_len)
                        return -EINVAL;
 
-               macvtap_skb_to_vnet_hdr(skb, &vnet_hdr);
+               macvtap_skb_to_vnet_hdr(q, skb, &vnet_hdr);
 
                if (copy_to_iter(&vnet_hdr, sizeof(vnet_hdr), iter) !=
                    sizeof(vnet_hdr))
@@ -979,7 +1001,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
        void __user *argp = (void __user *)arg;
        struct ifreq __user *ifr = argp;
        unsigned int __user *up = argp;
-       unsigned int u;
+       unsigned short u;
        int __user *sp = argp;
        int s;
        int ret;
@@ -991,11 +1013,10 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
                        return -EFAULT;
 
                ret = 0;
-               if ((u & ~(IFF_VNET_HDR | IFF_MULTI_QUEUE)) !=
-                   (IFF_NO_PI | IFF_TAP))
+               if ((u & ~MACVTAP_FEATURES) != (IFF_NO_PI | IFF_TAP))
                        ret = -EINVAL;
                else
-                       q->flags = u;
+                       q->flags = (q->flags & ~MACVTAP_FEATURES) | u;
 
                return ret;
 
@@ -1008,8 +1029,9 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
                }
 
                ret = 0;
+               u = q->flags;
                if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
-                   put_user(q->flags, &ifr->ifr_flags))
+                   put_user(u, &ifr->ifr_flags))
                        ret = -EFAULT;
                macvtap_put_vlan(vlan);
                rtnl_unlock();
@@ -1024,8 +1046,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
                return ret;
 
        case TUNGETFEATURES:
-               if (put_user(IFF_TAP | IFF_NO_PI | IFF_VNET_HDR |
-                            IFF_MULTI_QUEUE, up))
+               if (put_user(IFF_TAP | IFF_NO_PI | MACVTAP_FEATURES, up))
                        return -EFAULT;
                return 0;
 
@@ -1051,6 +1072,21 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
                q->vnet_hdr_sz = s;
                return 0;
 
+       case TUNGETVNETLE:
+               s = !!(q->flags & MACVTAP_VNET_LE);
+               if (put_user(s, sp))
+                       return -EFAULT;
+               return 0;
+
+       case TUNSETVNETLE:
+               if (get_user(s, sp))
+                       return -EFAULT;
+               if (s)
+                       q->flags |= MACVTAP_VNET_LE;
+               else
+                       q->flags &= ~MACVTAP_VNET_LE;
+               return 0;
+
        case TUNSETOFFLOAD:
                /* let the user check for future flags */
                if (arg & ~(TUN_F_CSUM | TUN_F_TSO4 | TUN_F_TSO6 |