diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2019-09-16 09:51:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2019-09-16 09:51:32 +0200 |
| commit | 83f541302cae9c20bf3d64dfca4e093e61bb2aa4 (patch) | |
| tree | 1be66d6c895531060eb07308415588d999a602c8 /drivers/vhost/test.c | |
| parent | 72c5343cdbc5ec257e45d5387ed7220065c2ecff (diff) | |
| parent | e19c5132f78a70cc53745558c0e728fecc74030a (diff) | |
Merge 4.4.193 into android-4.4-p
Changes in 4.4.193
ALSA: hda - Fix potential endless loop at applying quirks
ALSA: hda/realtek - Fix overridden device-specific initialization
xfrm: clean up xfrm protocol checks
vhost/test: fix build for vhost test
scripts/decode_stacktrace: match basepath using shell prefix operator, not regex
clk: s2mps11: Add used attribute to s2mps11_dt_match
x86, boot: Remove multiple copy of static function sanitize_boot_params()
af_packet: tone down the Tx-ring unsupported spew.
vhost: make sure log_num < in_num
Linux 4.4.193
Change-Id: If2283bf8bc29f3deaf1c047c8ec9e502fbdf0521
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/vhost/test.c')
| -rw-r--r-- | drivers/vhost/test.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c index 388eec4e1a90..accc88c7b29a 100644 --- 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 *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); @@ -116,7 +120,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); + vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, + VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT); f->private_data = n; |