Merge tag 'v5.2-rc4' into mauro

We need to pick up post-rc1 changes to various document files so they don't
get lost in Mauro's massive RST conversion push.

1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 69938dbae2d0..31da7db3c1e6 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -413,8 +413,24 @@ static void vhost_dev_free_iovecs(struct vhost_dev *dev)
                 vhost_vq_free_iovecs(dev->vqs[i]);
 }
 
+bool vhost_exceeds_weight(struct vhost_virtqueue *vq,
+                          int pkts, int total_len)
+{
+        struct vhost_dev *dev = vq->dev;
+
+        if ((dev->byte_weight && total_len >= dev->byte_weight) ||
+            pkts >= dev->weight) {
+                vhost_poll_queue(&vq->poll);
+                return true;
+        }
+
+        return false;
+}
+EXPORT_SYMBOL_GPL(vhost_exceeds_weight);
+
 void vhost_dev_init(struct vhost_dev *dev,
-                    struct vhost_virtqueue **vqs, int nvqs, int iov_limit)
+                    struct vhost_virtqueue **vqs, int nvqs,
+                    int iov_limit, int weight, int byte_weight)
 {
         struct vhost_virtqueue *vq;
         int i;
@@ -428,6 +444,8 @@ void vhost_dev_init(struct vhost_dev *dev,
         dev->mm = NULL;
         dev->worker = NULL;
         dev->iov_limit = iov_limit;
+        dev->weight = weight;
+        dev->byte_weight = byte_weight;
         init_llist_head(&dev->work_list);
         init_waitqueue_head(&dev->wait);
         INIT_LIST_HEAD(&dev->read_list);