vhost/test: fix build for vhost test
Subsystems (6)
PATCH 1/2 vhost/test: fix build for vhost test
Since below commit, callers need to specify the iov_limit in vhost_dev_init() explicitly.
--- drivers/vhost/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vhost/test.c +1 -1
@@ -115,7 +115,7 @@ 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 ,UIO_MAXIOV ); f->private_data = n;
Signature · 1 line
2.17.1
PATCH 2/2 vhost/test: fix build for vhost test
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.
--- drivers/vhost/test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/vhost/test.c +9 -4
@@ -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;
Signature · 1 line
2.17.1
PATCH 2/2 vhost/test: fix build for vhost test
In reply to Tiwei BieSince 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.
--- drivers/vhost/test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/vhost/test.c +9 -4
@@ -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;
Signature · 1 line
2.17.1
Quoted 42 lines · Tiwei Bie
Since
vhost_exceeds_weight()was introduced, callers need to specify the packet weight and byte weight invhost_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()")Signed-off-by Tiwei Bie <[email protected]>--- drivers/vhost/test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/vhost/test.c +7
-3@@ -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);
drivers/vhost/test.c static int vhost_test_open(struct inode *inode, struct file *f) · line 126
Quoted 9 lines
drivers/vhost/test.c +2
-1@@ -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;
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 42 lines · Tiwei Bie
Since
vhost_exceeds_weight()was introduced, callers need to specify the packet weight and byte weight invhost_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()")Signed-off-by Tiwei Bie <[email protected]>--- drivers/vhost/test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/vhost/test.c +7
-3@@ -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);
drivers/vhost/test.c static int vhost_test_open(struct inode *inode, struct file *f) · line 126
Quoted 9 lines
drivers/vhost/test.c +2
-1@@ -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;
Quoted 15 lines · Tiwei Bie
Since below commit, callers need to specify the
iov_limitinvhost_dev_init()explicitly.Fixes b46a0bf78ad7 ("vhost: fix OOB in get_rx_bufs()")Signed-off-by Tiwei Bie <[email protected]>--- drivers/vhost/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/vhost/test.c +0
-0
drivers/vhost/test.c static int vhost_test_open(struct inode *inode, struct file *f) · line 121
Quoted 8 lines
drivers/vhost/test.c +1
-1@@ -115,7 +115,7 @@ 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 ,UIO_MAXIOV ); f->private_data = n;
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Quoted 15 lines · Tiwei Bie
Since below commit, callers need to specify the
iov_limitinvhost_dev_init()explicitly.Fixes b46a0bf78ad7 ("vhost: fix OOB in get_rx_bufs()")Signed-off-by Tiwei Bie <[email protected]>--- drivers/vhost/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/vhost/test.c +0
-0
drivers/vhost/test.c static int vhost_test_open(struct inode *inode, struct file *f) · line 121
Quoted 8 lines
drivers/vhost/test.c +1
-1@@ -115,7 +115,7 @@ 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 ,UIO_MAXIOV ); f->private_data = n;