lkml.org 
[lkml]   [2019]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 08/14] vhost/test: fix build for vhost test
    Date
    From: Tiwei Bie <tiwei.bie@intel.com>

    commit 264b563b8675771834419057cbe076c1a41fb666 upstream.

    Since vhost_exceeds_weight() was introduced, callers need to specify
    the packet weight and byte weight in vhost_dev_init(). Note that, the
    packet weight isn't counted in this patch to keep the original behavior
    unchanged.

    Fixes: e82b9b0727ff ("vhost: introduce vhost_exceeds_weight()")
    Cc: stable@vger.kernel.org
    Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Acked-by: Jason Wang <jasowang@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/vhost/test.c | 13 +++++++++----
    1 file changed, 9 insertions(+), 4 deletions(-)

    --- a/drivers/vhost/test.c
    +++ b/drivers/vhost/test.c
    @@ -23,6 +23,12 @@
    * Using this limit prevents one virtqueue from starving others. */
    #define VHOST_TEST_WEIGHT 0x80000

    +/* Max number of packets transferred before requeueing the job.
    + * Using this limit prevents one virtqueue from starving others with
    + * pkts.
    + */
    +#define VHOST_TEST_PKT_WEIGHT 256
    +
    enum {
    VHOST_TEST_VQ = 0,
    VHOST_TEST_VQ_MAX = 1,
    @@ -81,10 +87,8 @@ static void handle_vq(struct vhost_test
    }
    vhost_add_used_and_signal(&n->dev, vq, head, 0);
    total_len += len;
    - if (unlikely(total_len >= VHOST_TEST_WEIGHT)) {
    - vhost_poll_queue(&vq->poll);
    + if (unlikely(vhost_exceeds_weight(vq, 0, total_len)))
    break;
    - }
    }

    mutex_unlock(&vq->mutex);
    @@ -116,7 +120,8 @@ static int vhost_test_open(struct inode
    dev = &n->dev;
    vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ];
    n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick;
    - vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX);
    + vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX,
    + VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT);

    f->private_data = n;


    \
     
     \ /
      Last update: 2019-09-13 15:09    [W:4.100 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site