Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin:
 "virtio: virtio 1.0 support, misc patches

  This adds a lot of infrastructure for virtio 1.0 support.  Notable
  missing pieces: virtio pci, virtio balloon (needs spec extension),
  vhost scsi.

  Plus, there are some minor fixes in a couple of places.

  Note: some net drivers are affected by these patches.  David said he's
  fine with merging these patches through my tree.

  Rusty's on vacation, he acked using my tree for these, too"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (70 commits)
  virtio_ccw: finalize_features error handling
  virtio_ccw: future-proof finalize_features
  virtio_pci: rename virtio_pci -> virtio_pci_common
  virtio_pci: update file descriptions and copyright
  virtio_pci: split out legacy device support
  virtio_pci: setup config vector indirectly
  virtio_pci: setup vqs indirectly
  virtio_pci: delete vqs indirectly
  virtio_pci: use priv for vq notification
  virtio_pci: free up vq->priv
  virtio_pci: fix coding style for structs
  virtio_pci: add isr field
  virtio: drop legacy_only driver flag
  virtio_balloon: drop legacy_only driver flag
  virtio_ccw: rev 1 devices set VIRTIO_F_VERSION_1
  virtio: allow finalize_features to fail
  virtio_ccw: legacy: don't negotiate rev 1/features
  virtio: add API to detect legacy devices
  virtio_console: fix sparse warnings
  vhost: remove unnecessary forward declarations in vhost.h
  ...

1 files changed, 71 insertions, 97 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 4d332dc93b70..798ce70e3d61 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -103,6 +103,15 @@ do {								\
 } while (0)
 #endif
 
+/* TUN device flags */
+
+/* IFF_ATTACH_QUEUE is never stored in device flags,
+ * overload it to mean fasync when stored there.
+ */
+#define TUN_FASYNC      IFF_ATTACH_QUEUE
+
+#define TUN_FEATURES (IFF_NO_PI | IFF_ONE_QUEUE | IFF_VNET_HDR | \
+                      IFF_VNET_LE | IFF_MULTI_QUEUE)
 #define GOODCOPY_LEN 128
 
 #define FLT_EXACT_COUNT 8
@@ -196,6 +205,16 @@ struct tun_struct {
         u32 flow_count;
 };
 
+static inline u16 tun16_to_cpu(struct tun_struct *tun, __virtio16 val)
+{
+        return __virtio16_to_cpu(tun->flags & IFF_VNET_LE, val);
+}
+
+static inline __virtio16 cpu_to_tun16(struct tun_struct *tun, u16 val)
+{
+        return __cpu_to_virtio16(tun->flags & IFF_VNET_LE, val);
+}
+
 static inline u32 tun_hashfn(u32 rxhash)
 {
         return rxhash & 0x3ff;
@@ -472,7 +491,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean)
                 if (tun && tun->numqueues == 0 && tun->numdisabled == 0) {
                         netif_carrier_off(tun->dev);
 
-                        if (!(tun->flags & TUN_PERSIST) &&
+                        if (!(tun->flags & IFF_PERSIST) &&
                             tun->dev->reg_state == NETREG_REGISTERED)
                                 unregister_netdevice(tun->dev);
                 }
@@ -523,7 +542,7 @@ static void tun_detach_all(struct net_device *dev)
         }
         BUG_ON(tun->numdisabled != 0);
 
-        if (tun->flags & TUN_PERSIST)
+        if (tun->flags & IFF_PERSIST)
                 module_put(THIS_MODULE);
 }
 
@@ -541,7 +560,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file, bool skip_filte
                 goto out;
 
         err = -EBUSY;
-        if (!(tun->flags & TUN_TAP_MQ) && tun->numqueues == 1)
+        if (!(tun->flags & IFF_MULTI_QUEUE) && tun->numqueues == 1)
                 goto out;
 
         err = -E2BIG;
@@ -920,7 +939,7 @@ static void tun_net_init(struct net_device *dev)
         struct tun_struct *tun = netdev_priv(dev);
 
         switch (tun->flags & TUN_TYPE_MASK) {
-        case TUN_TUN_DEV:
+        case IFF_TUN:
                 dev->netdev_ops = &tun_netdev_ops;
 
                 /* Point-to-Point TUN Device */
@@ -934,7 +953,7 @@ static void tun_net_init(struct net_device *dev)
                 dev->tx_queue_len = TUN_READQ_SIZE;  /* We prefer our own queue length */
                 break;
 
-        case TUN_TAP_DEV:
+        case IFF_TAP:
                 dev->netdev_ops = &tap_netdev_ops;
                 /* Ethernet TAP Device */
                 ether_setup(dev);
@@ -1025,7 +1044,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
         int err;
         u32 rxhash;
 
-        if (!(tun->flags & TUN_NO_PI)) {
+        if (!(tun->flags & IFF_NO_PI)) {
                 if (len < sizeof(pi))
                         return -EINVAL;
                 len -= sizeof(pi);
@@ -1035,7 +1054,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
                 offset += sizeof(pi);
         }
 
-        if (tun->flags & TUN_VNET_HDR) {
+        if (tun->flags & IFF_VNET_HDR) {
                 if (len < tun->vnet_hdr_sz)
                         return -EINVAL;
                 len -= tun->vnet_hdr_sz;
@@ -1044,18 +1063,18 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
                         return -EFAULT;
 
                 if ((gso.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) &&
-                    gso.csum_start + gso.csum_offset + 2 > gso.hdr_len)
-                        gso.hdr_len = gso.csum_start + gso.csum_offset + 2;
+                    tun16_to_cpu(tun, gso.csum_start) + tun16_to_cpu(tun, gso.csum_offset) + 2 > tun16_to_cpu(tun, gso.hdr_len))
+                        gso.hdr_len = cpu_to_tun16(tun, tun16_to_cpu(tun, gso.csum_start) + tun16_to_cpu(tun, gso.csum_offset) + 2);
 
-                if (gso.hdr_len > len)
+                if (tun16_to_cpu(tun, gso.hdr_len) > len)
                         return -EINVAL;
                 offset += tun->vnet_hdr_sz;
         }
 
-        if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) {
+        if ((tun->flags & TUN_TYPE_MASK) == IFF_TAP) {
                 align += NET_IP_ALIGN;
                 if (unlikely(len < ETH_HLEN ||
-                             (gso.hdr_len && gso.hdr_len < ETH_HLEN)))
+                             (gso.hdr_len && tun16_to_cpu(tun, gso.hdr_len) < ETH_HLEN)))
                         return -EINVAL;
         }
 
@@ -1066,7 +1085,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
                  * enough room for skb expand head in case it is used.
                  * The rest of the buffer is mapped from userspace.
                  */
-                copylen = gso.hdr_len ? gso.hdr_len : GOODCOPY_LEN;
+                copylen = gso.hdr_len ? tun16_to_cpu(tun, gso.hdr_len) : GOODCOPY_LEN;
                 if (copylen > good_linear)
                         copylen = good_linear;
                 linear = copylen;
@@ -1076,10 +1095,10 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
 
         if (!zerocopy) {
                 copylen = len;
-                if (gso.hdr_len > good_linear)
+                if (tun16_to_cpu(tun, gso.hdr_len) > good_linear)
                         linear = good_linear;
                 else
-                        linear = gso.hdr_len;
+                        linear = tun16_to_cpu(tun, gso.hdr_len);
         }
 
         skb = tun_alloc_skb(tfile, align, copylen, linear, noblock);
@@ -1106,8 +1125,8 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
         }
 
         if (gso.flags & VIRTIO_NET_HDR_F_NEEDS_CSUM) {
-                if (!skb_partial_csum_set(skb, gso.csum_start,
-                                          gso.csum_offset)) {
+                if (!skb_partial_csum_set(skb, tun16_to_cpu(tun, gso.csum_start),
+                                          tun16_to_cpu(tun, gso.csum_offset))) {
                         tun->dev->stats.rx_frame_errors++;
                         kfree_skb(skb);
                         return -EINVAL;
@@ -1115,8 +1134,8 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
         }
 
         switch (tun->flags & TUN_TYPE_MASK) {
-        case TUN_TUN_DEV:
-                if (tun->flags & TUN_NO_PI) {
+        case IFF_TUN:
+                if (tun->flags & IFF_NO_PI) {
                         switch (skb->data[0] & 0xf0) {
                         case 0x40:
                                 pi.proto = htons(ETH_P_IP);
@@ -1135,7 +1154,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
                 skb->protocol = pi.proto;
                 skb->dev = tun->dev;
                 break;
-        case TUN_TAP_DEV:
+        case IFF_TAP:
                 skb->protocol = eth_type_trans(skb, tun->dev);
                 break;
         }
@@ -1175,7 +1194,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
                 if (gso.gso_type & VIRTIO_NET_HDR_GSO_ECN)
                         skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
 
-                skb_shinfo(skb)->gso_size = gso.gso_size;
+                skb_shinfo(skb)->gso_size = tun16_to_cpu(tun, gso.gso_size);
                 if (skb_shinfo(skb)->gso_size == 0) {
                         tun->dev->stats.rx_frame_errors++;
                         kfree_skb(skb);
@@ -1241,10 +1260,10 @@ static ssize_t tun_put_user(struct tun_struct *tun,
         if (vlan_tx_tag_present(skb))
                 vlan_hlen = VLAN_HLEN;
 
-        if (tun->flags & TUN_VNET_HDR)
+        if (tun->flags & IFF_VNET_HDR)
                 vnet_hdr_sz = tun->vnet_hdr_sz;
 
-        if (!(tun->flags & TUN_NO_PI)) {
+        if (!(tun->flags & IFF_NO_PI)) {
                 if ((len -= sizeof(pi)) < 0)
                         return -EINVAL;
 
@@ -1267,8 +1286,8 @@ static ssize_t tun_put_user(struct tun_struct *tun,
                         struct skb_shared_info *sinfo = skb_shinfo(skb);
 
                         /* This is a hint as to how much should be linear. */
-                        gso.hdr_len = skb_headlen(skb);
-                        gso.gso_size = sinfo->gso_size;
+                        gso.hdr_len = cpu_to_tun16(tun, skb_headlen(skb));
+                        gso.gso_size = cpu_to_tun16(tun, sinfo->gso_size);
                         if (sinfo->gso_type & SKB_GSO_TCPV4)
                                 gso.gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
                         else if (sinfo->gso_type & SKB_GSO_TCPV6)
@@ -1276,12 +1295,12 @@ static ssize_t tun_put_user(struct tun_struct *tun,
                         else {
                                 pr_err("unexpected GSO type: "
                                        "0x%x, gso_size %d, hdr_len %d\n",
-                                       sinfo->gso_type, gso.gso_size,
-                                       gso.hdr_len);
+                                       sinfo->gso_type, tun16_to_cpu(tun, gso.gso_size),
+                                       tun16_to_cpu(tun, gso.hdr_len));
                                 print_hex_dump(KERN_ERR, "tun: ",
                                                DUMP_PREFIX_NONE,
                                                16, 1, skb->head,
-                                               min((int)gso.hdr_len, 64), true);
+                                               min((int)tun16_to_cpu(tun, gso.hdr_len), 64), true);
                                 WARN_ON_ONCE(1);
                                 return -EINVAL;
                         }
@@ -1292,9 +1311,9 @@ static ssize_t tun_put_user(struct tun_struct *tun,
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         gso.flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-                        gso.csum_start = skb_checksum_start_offset(skb) +
-                                         vlan_hlen;
-                        gso.csum_offset = skb->csum_offset;
+                        gso.csum_start = cpu_to_tun16(tun, skb_checksum_start_offset(skb) +
+                                                      vlan_hlen);
+                        gso.csum_offset = cpu_to_tun16(tun, skb->csum_offset);
                 } else if (skb->ip_summed == CHECKSUM_UNNECESSARY) {
                         gso.flags = VIRTIO_NET_HDR_F_DATA_VALID;
                 } /* else everything is zero */
@@ -1521,32 +1540,7 @@ static struct proto tun_proto = {
 
 static int tun_flags(struct tun_struct *tun)
 {
-        int flags = 0;
-
-        if (tun->flags & TUN_TUN_DEV)
-                flags |= IFF_TUN;
-        else
-                flags |= IFF_TAP;
-
-        if (tun->flags & TUN_NO_PI)
-                flags |= IFF_NO_PI;
-
-        /* This flag has no real effect.  We track the value for backwards
-         * compatibility.
-         */
-        if (tun->flags & TUN_ONE_QUEUE)
-                flags |= IFF_ONE_QUEUE;
-
-        if (tun->flags & TUN_VNET_HDR)
-                flags |= IFF_VNET_HDR;
-
-        if (tun->flags & TUN_TAP_MQ)
-                flags |= IFF_MULTI_QUEUE;
-
-        if (tun->flags & TUN_PERSIST)
-                flags |= IFF_PERSIST;
-
-        return flags;
+        return tun->flags & (TUN_FEATURES | IFF_PERSIST | IFF_TUN | IFF_TAP);
 }
 
 static ssize_t tun_show_flags(struct device *dev, struct device_attribute *attr,
@@ -1602,7 +1596,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                         return -EINVAL;
 
                 if (!!(ifr->ifr_flags & IFF_MULTI_QUEUE) !=
-                    !!(tun->flags & TUN_TAP_MQ))
+                    !!(tun->flags & IFF_MULTI_QUEUE))
                         return -EINVAL;
 
                 if (tun_not_capable(tun))
@@ -1615,7 +1609,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                 if (err < 0)
                         return err;
 
-                if (tun->flags & TUN_TAP_MQ &&
+                if (tun->flags & IFF_MULTI_QUEUE &&
                     (tun->numqueues + tun->numdisabled > 1)) {
                         /* One or more queue has already been attached, no need
                          * to initialize the device again.
@@ -1638,11 +1632,11 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                 /* Set dev type */
                 if (ifr->ifr_flags & IFF_TUN) {
                         /* TUN device */
-                        flags |= TUN_TUN_DEV;
+                        flags |= IFF_TUN;
                         name = "tun%d";
                 } else if (ifr->ifr_flags & IFF_TAP) {
                         /* TAP device */
-                        flags |= TUN_TAP_DEV;
+                        flags |= IFF_TAP;
                         name = "tap%d";
                 } else
                         return -EINVAL;
@@ -1706,28 +1700,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 
         tun_debug(KERN_INFO, tun, "tun_set_iff\n");
 
-        if (ifr->ifr_flags & IFF_NO_PI)
-                tun->flags |= TUN_NO_PI;
-        else
-                tun->flags &= ~TUN_NO_PI;
-
-        /* This flag has no real effect.  We track the value for backwards
-         * compatibility.
-         */
-        if (ifr->ifr_flags & IFF_ONE_QUEUE)
-                tun->flags |= TUN_ONE_QUEUE;
-        else
-                tun->flags &= ~TUN_ONE_QUEUE;
-
-        if (ifr->ifr_flags & IFF_VNET_HDR)
-                tun->flags |= TUN_VNET_HDR;
-        else
-                tun->flags &= ~TUN_VNET_HDR;
-
-        if (ifr->ifr_flags & IFF_MULTI_QUEUE)
-                tun->flags |= TUN_TAP_MQ;
-        else
-                tun->flags &= ~TUN_TAP_MQ;
+        tun->flags = (tun->flags & ~TUN_FEATURES) |
+                (ifr->ifr_flags & TUN_FEATURES);
 
         /* Make sure persistent devices do not get stuck in
          * xoff state.
@@ -1855,7 +1829,7 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr)
                 ret = tun_attach(tun, file, false);
         } else if (ifr->ifr_flags & IFF_DETACH_QUEUE) {
                 tun = rtnl_dereference(tfile->tun);
-                if (!tun || !(tun->flags & TUN_TAP_MQ) || tfile->detached)
+                if (!tun || !(tun->flags & IFF_MULTI_QUEUE) || tfile->detached)
                         ret = -EINVAL;
                 else
                         __tun_detach(tfile, false);
@@ -1890,9 +1864,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
         if (cmd == TUNGETFEATURES) {
                 /* Currently this just means: "what IFF flags are valid?".
                  * This is needed because we never checked for invalid flags on
-                 * TUNSETIFF. */
-                return put_user(IFF_TUN | IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE |
-                                IFF_VNET_HDR | IFF_MULTI_QUEUE,
+                 * TUNSETIFF.
+                 */
+                return put_user(IFF_TUN | IFF_TAP | TUN_FEATURES,
                                 (unsigned int __user*)argp);
         } else if (cmd == TUNSETQUEUE)
                 return tun_set_queue(file, &ifr);
@@ -1959,12 +1933,12 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
                 /* Disable/Enable persist mode. Keep an extra reference to the
                  * module to prevent the module being unprobed.
                  */
-                if (arg && !(tun->flags & TUN_PERSIST)) {
-                        tun->flags |= TUN_PERSIST;
+                if (arg && !(tun->flags & IFF_PERSIST)) {
+                        tun->flags |= IFF_PERSIST;
                         __module_get(THIS_MODULE);
                 }
-                if (!arg && (tun->flags & TUN_PERSIST)) {
-                        tun->flags &= ~TUN_PERSIST;
+                if (!arg && (tun->flags & IFF_PERSIST)) {
+                        tun->flags &= ~IFF_PERSIST;
                         module_put(THIS_MODULE);
                 }
 
@@ -2022,7 +1996,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
         case TUNSETTXFILTER:
                 /* Can be set only for TAPs */
                 ret = -EINVAL;
-                if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV)
+                if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
                         break;
                 ret = update_filter(&tun->txflt, (void __user *)arg);
                 break;
@@ -2081,7 +2055,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
         case TUNATTACHFILTER:
                 /* Can be set only for TAPs */
                 ret = -EINVAL;
-                if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV)
+                if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
                         break;
                 ret = -EFAULT;
                 if (copy_from_user(&tun->fprog, argp, sizeof(tun->fprog)))
@@ -2093,7 +2067,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
         case TUNDETACHFILTER:
                 /* Can be set only for TAPs */
                 ret = -EINVAL;
-                if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV)
+                if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
                         break;
                 ret = 0;
                 tun_detach_filter(tun, tun->numqueues);
@@ -2101,7 +2075,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 
         case TUNGETFILTER:
                 ret = -EINVAL;
-                if ((tun->flags & TUN_TYPE_MASK) != TUN_TAP_DEV)
+                if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
                         break;
                 ret = -EFAULT;
                 if (copy_to_user(argp, &tun->fprog, sizeof(tun->fprog)))
@@ -2294,10 +2268,10 @@ static void tun_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
         strlcpy(info->version, DRV_VERSION, sizeof(info->version));
 
         switch (tun->flags & TUN_TYPE_MASK) {
-        case TUN_TUN_DEV:
+        case IFF_TUN:
                 strlcpy(info->bus_info, "tun", sizeof(info->bus_info));
                 break;
-        case TUN_TAP_DEV:
+        case IFF_TAP:
                 strlcpy(info->bus_info, "tap", sizeof(info->bus_info));
                 break;
         }