1 files changed, 57 insertions, 10 deletions

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index e032ca397371..5dc128a8da83 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -61,7 +61,8 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;"
 enum {
         VHOST_NET_FEATURES = VHOST_FEATURES |
                          (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |
-                         (1ULL << VIRTIO_NET_F_MRG_RXBUF)
+                         (1ULL << VIRTIO_NET_F_MRG_RXBUF) |
+                         (1ULL << VIRTIO_F_IOMMU_PLATFORM)
 };
 
 enum {
@@ -334,7 +335,7 @@ static int vhost_net_tx_get_vq_desc(struct vhost_net *net,
 {
         unsigned long uninitialized_var(endtime);
         int r = vhost_get_vq_desc(vq, vq->iov, ARRAY_SIZE(vq->iov),
-                                    out_num, in_num, NULL, NULL);
+                                  out_num, in_num, NULL, NULL);
 
         if (r == vq->num && vq->busyloop_timeout) {
                 preempt_disable();
@@ -344,7 +345,7 @@ static int vhost_net_tx_get_vq_desc(struct vhost_net *net,
                         cpu_relax_lowlatency();
                 preempt_enable();
                 r = vhost_get_vq_desc(vq, vq->iov, ARRAY_SIZE(vq->iov),
-                                        out_num, in_num, NULL, NULL);
+                                      out_num, in_num, NULL, NULL);
         }
 
         return r;
@@ -377,6 +378,9 @@ static void handle_tx(struct vhost_net *net)
         if (!sock)
                 goto out;
 
+        if (!vq_iotlb_prefetch(vq))
+                goto out;
+
         vhost_disable_notify(&net->dev, vq);
 
         hdr_size = nvq->vhost_hlen;
@@ -652,6 +656,10 @@ static void handle_rx(struct vhost_net *net)
         sock = vq->private_data;
         if (!sock)
                 goto out;
+
+        if (!vq_iotlb_prefetch(vq))
+                goto out;
+
         vhost_disable_notify(&net->dev, vq);
         vhost_net_disable_vq(net, vq);
 
@@ -1052,20 +1060,20 @@ static long vhost_net_reset_owner(struct vhost_net *n)
         struct socket *tx_sock = NULL;
         struct socket *rx_sock = NULL;
         long err;
-        struct vhost_memory *memory;
+        struct vhost_umem *umem;
 
         mutex_lock(&n->dev.mutex);
         err = vhost_dev_check_owner(&n->dev);
         if (err)
                 goto done;
-        memory = vhost_dev_reset_owner_prepare();
-        if (!memory) {
+        umem = vhost_dev_reset_owner_prepare();
+        if (!umem) {
                 err = -ENOMEM;
                 goto done;
         }
         vhost_net_stop(n, &tx_sock, &rx_sock);
         vhost_net_flush(n);
-        vhost_dev_reset_owner(&n->dev, memory);
+        vhost_dev_reset_owner(&n->dev, umem);
         vhost_net_vq_reset(n);
 done:
         mutex_unlock(&n->dev.mutex);
@@ -1096,10 +1104,14 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features)
         }
         mutex_lock(&n->dev.mutex);
         if ((features & (1 << VHOST_F_LOG_ALL)) &&
-            !vhost_log_access_ok(&n->dev)) {
-                mutex_unlock(&n->dev.mutex);
-                return -EFAULT;
+            !vhost_log_access_ok(&n->dev))
+                goto out_unlock;
+
+        if ((features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))) {
+                if (vhost_init_device_iotlb(&n->dev, true))
+                        goto out_unlock;
         }
+
         for (i = 0; i < VHOST_NET_VQ_MAX; ++i) {
                 mutex_lock(&n->vqs[i].vq.mutex);
                 n->vqs[i].vq.acked_features = features;
@@ -1109,6 +1121,10 @@ static int vhost_net_set_features(struct vhost_net *n, u64 features)
         }
         mutex_unlock(&n->dev.mutex);
         return 0;
+
+out_unlock:
+        mutex_unlock(&n->dev.mutex);
+        return -EFAULT;
 }
 
 static long vhost_net_set_owner(struct vhost_net *n)
@@ -1182,9 +1198,40 @@ static long vhost_net_compat_ioctl(struct file *f, unsigned int ioctl,
 }
 #endif
 
+static ssize_t vhost_net_chr_read_iter(struct kiocb *iocb, struct iov_iter *to)
+{
+        struct file *file = iocb->ki_filp;
+        struct vhost_net *n = file->private_data;
+        struct vhost_dev *dev = &n->dev;
+        int noblock = file->f_flags & O_NONBLOCK;
+
+        return vhost_chr_read_iter(dev, to, noblock);
+}
+
+static ssize_t vhost_net_chr_write_iter(struct kiocb *iocb,
+                                        struct iov_iter *from)
+{
+        struct file *file = iocb->ki_filp;
+        struct vhost_net *n = file->private_data;
+        struct vhost_dev *dev = &n->dev;
+
+        return vhost_chr_write_iter(dev, from);
+}
+
+static unsigned int vhost_net_chr_poll(struct file *file, poll_table *wait)
+{
+        struct vhost_net *n = file->private_data;
+        struct vhost_dev *dev = &n->dev;
+
+        return vhost_chr_poll(file, dev, wait);
+}
+
 static const struct file_operations vhost_net_fops = {
         .owner          = THIS_MODULE,
         .release        = vhost_net_release,
+        .read_iter      = vhost_net_chr_read_iter,
+        .write_iter     = vhost_net_chr_write_iter,
+        .poll           = vhost_net_chr_poll,
         .unlocked_ioctl = vhost_net_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = vhost_net_compat_ioctl,