diff mbox

[dpdk-dev,10/21] vhost: initialize vrings IOTLB caches

Message ID 20170831095023.21037-11-maxime.coquelin@redhat.com (mailing list archive)
State Superseded, archived
Delegated to: Yuanhan Liu
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Maxime Coquelin Aug. 31, 2017, 9:50 a.m. UTC 
  The per-virtqueue IOTLB cache init is done at virtqueue
init time. init_vring_queue() now takes vring id as parameter,
so that the IOTLB cache mempool name can be generated.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Comments

Remy Horton Sept. 4, 2017, 1:57 p.m. UTC | #1 
On 31/08/2017 10:50, Maxime Coquelin wrote:
[..]
> +reset_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
>  {
> +	struct vhost_virtqueue *vq = dev->virtqueue[vring_idx];
>  	int callfd;

Probably ought to have a bounds check on vring_idx..
Maxime Coquelin Sept. 4, 2017, 3:45 p.m. UTC | #2 
Hi Remy,

On 09/04/2017 03:57 PM, Remy Horton wrote:
> 
> On 31/08/2017 10:50, Maxime Coquelin wrote:
> [..]
>> +reset_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
>>  {
>> +    struct vhost_virtqueue *vq = dev->virtqueue[vring_idx];
>>      int callfd;
> 
> Probably ought to have a bounds check on vring_idx..

Indeed, you are right. I'll fix it in next round.

Thanks,
Maxime
diff mbox

Patch

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index f1099753c..bae98b02d 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -49,6 +49,7 @@ 
 #include <rte_rwlock.h>
 #include <rte_vhost.h>
 
+#include "iotlb.h"
 #include "vhost.h"
 
 struct vhost_device {
@@ -197,13 +198,16 @@  free_device(struct virtio_net *dev)
 }
 
 static void
-init_vring_queue(struct vhost_virtqueue *vq)
+init_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
 {
+	struct vhost_virtqueue *vq = dev->virtqueue[vring_idx];
+
 	memset(vq, 0, sizeof(struct vhost_virtqueue));
 
 	vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;
 	vq->callfd = VIRTIO_UNINITIALIZED_EVENTFD;
 
+	vhost_user_iotlb_init(dev, vring_idx);
 	/* Backends are set to -1 indicating an inactive device. */
 	vq->backend = -1;
 
@@ -217,12 +221,13 @@  init_vring_queue(struct vhost_virtqueue *vq)
 }
 
 static void
-reset_vring_queue(struct vhost_virtqueue *vq)
+reset_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
 {
+	struct vhost_virtqueue *vq = dev->virtqueue[vring_idx];
 	int callfd;
 
 	callfd = vq->callfd;
-	init_vring_queue(vq);
+	init_vring_queue(dev, vring_idx);
 	vq->callfd = callfd;
 }
 
@@ -239,7 +244,7 @@  alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
 	}
 
 	dev->virtqueue[vring_idx] = vq;
-	init_vring_queue(vq);
+	init_vring_queue(dev, vring_idx);
 
 	dev->nr_vring += 1;
 
@@ -261,7 +266,7 @@  reset_device(struct virtio_net *dev)
 	dev->flags = 0;
 
 	for (i = 0; i < dev->nr_vring; i++)
-		reset_vring_queue(dev->virtqueue[i]);
+		reset_vring_queue(dev, i);
 }
 
 /*