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

vhost: restore mbuf first when freeing zmbuf

Browse Source 
The mbufs should also be restored in free_zmbufs().

Fixes: b0a985d1f340 ("vhost: add dequeue zero copy")
Fixes: 3ebd930588b7 ("vhost: fix mbuf free")
Cc: stable@dpdk.org

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Tiwei Bie 2019-02-22 10:42:06 +08:00 committed by Ferruh Yigit
parent fe2b986ac6
commit 041d37b2ef
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/librte_vhost/vhost.h
View File

@ -741,4 +741,20 @@ free_ind_table(void *idesc)
rte_free(idesc);
}
static __rte_always_inline void
restore_mbuf(struct rte_mbuf *m)
{
uint32_t mbuf_size, priv_size;
while (m) {
priv_size = rte_pktmbuf_priv_size(m->pool);
mbuf_size = sizeof(struct rte_mbuf) + priv_size;
/* start of buffer is after mbuf structure and priv data */
m->buf_addr = (char *)m + mbuf_size;
m->buf_iova = rte_mempool_virt2iova(m) + mbuf_size;
m = m->next;
}
}
#endif /* _VHOST_NET_CDEV_H_ */

1
lib/librte_vhost/vhost_user.c
View File

@ -1218,6 +1218,7 @@ free_zmbufs(struct vhost_virtqueue *vq)
zmbuf != NULL; zmbuf = next) {
next = TAILQ_NEXT(zmbuf, next);
restore_mbuf(zmbuf->mbuf);
rte_pktmbuf_free(zmbuf->mbuf);
TAILQ_REMOVE(&vq->zmbuf_list, zmbuf, next);
}

16
lib/librte_vhost/virtio_net.c
View File

@ -1318,22 +1318,6 @@ mbuf_is_consumed(struct rte_mbuf *m)
return true;
}
static __rte_always_inline void
restore_mbuf(struct rte_mbuf *m)
{
uint32_t mbuf_size, priv_size;
while (m) {
priv_size = rte_pktmbuf_priv_size(m->pool);
mbuf_size = sizeof(struct rte_mbuf) + priv_size;
/* start of buffer is after mbuf structure and priv data */
m->buf_addr = (char *)m + mbuf_size;
m->buf_iova = rte_mempool_virt2iova(m) + mbuf_size;
m = m->next;
}
}
static __rte_always_inline uint16_t
virtio_dev_tx_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
struct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count)