| Message ID | 20190828053700.26022-2-tiwei.bie@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] vhost/test: fix build for vhost test | expand |
On 2019/8/28 下午1:37, Tiwei Bie wrote: > 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> > --- > drivers/vhost/test.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c > index ac4f762c4f65..7804869c6a31 100644 > --- a/drivers/vhost/test.c > +++ b/drivers/vhost/test.c > @@ -22,6 +22,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, > @@ -80,10 +86,8 @@ static void handle_vq(struct vhost_test *n) > } > 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); > @@ -115,7 +119,8 @@ static int vhost_test_open(struct inode *inode, struct file *f) > 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, UIO_MAXIOV); > + vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV, > + VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT); > > f->private_data = n; > Acked-by: Jason Wang <jasowang@redhat.com>
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index ac4f762c4f65..7804869c6a31 100644 --- a/drivers/vhost/test.c +++ b/drivers/vhost/test.c @@ -22,6 +22,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, @@ -80,10 +86,8 @@ static void handle_vq(struct vhost_test *n) } 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); @@ -115,7 +119,8 @@ static int vhost_test_open(struct inode *inode, struct file *f) 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, UIO_MAXIOV); + vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV, + VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT); f->private_data = n;
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> --- drivers/vhost/test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)