d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: do deep copy while reallocating queue

Browse Source 
When vhost reallocate dev and vq for NUMA enabled case, it doesn't perform
deep copy, which lead to 1) zmbuf list not valid 2) remote memory access.
This patch is to re-initlize the zmbuf list and also do the deep copy.

Signed-off-by: Junjie Chen <junjie.j.chen@intel.com>
Reviewed-by: Zhiyong Yang <zhiyong.yang@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Yuanhan Liu <yliu@fridaylinux.org>
This commit is contained in:
Junjie Chen 2018-01-15 06:32:19 -05:00 committed by Ferruh Yigit
parent c97da2cbc2
commit 2651726def
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/librte_vhost/vhost_user.c
View File

@ -232,6 +232,7 @@ vhost_user_set_vring_num(struct virtio_net *dev,
"zero copy is force disabled\n");
dev->dequeue_zero_copy = 0;
}
TAILQ_INIT(&vq->zmbuf_list);
}
vq->shadow_used_ring = rte_malloc(NULL,
@ -266,6 +267,9 @@ numa_realloc(struct virtio_net *dev, int index)
int oldnode, newnode;
struct virtio_net *old_dev;
struct vhost_virtqueue *old_vq, *vq;
struct zcopy_mbuf *new_zmbuf;
struct vring_used_elem *new_shadow_used_ring;
struct batch_copy_elem *new_batch_copy_elems;
int ret;
old_dev = dev;
@ -290,6 +294,33 @@ numa_realloc(struct virtio_net *dev, int index)
return dev;
memcpy(vq, old_vq, sizeof(*vq));
TAILQ_INIT(&vq->zmbuf_list);
new_zmbuf = rte_malloc_socket(NULL, vq->zmbuf_size *
sizeof(struct zcopy_mbuf), 0, newnode);
if (new_zmbuf) {
rte_free(vq->zmbufs);
vq->zmbufs = new_zmbuf;
}
new_shadow_used_ring = rte_malloc_socket(NULL,
vq->size * sizeof(struct vring_used_elem),
RTE_CACHE_LINE_SIZE,
newnode);
if (new_shadow_used_ring) {
rte_free(vq->shadow_used_ring);
vq->shadow_used_ring = new_shadow_used_ring;
}
new_batch_copy_elems = rte_malloc_socket(NULL,
vq->size * sizeof(struct batch_copy_elem),
RTE_CACHE_LINE_SIZE,
newnode);
if (new_batch_copy_elems) {
rte_free(vq->batch_copy_elems);
vq->batch_copy_elems = new_batch_copy_elems;
}
rte_free(old_vq);
}