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

net/virtio: fix indirect descriptor reconnection

Browse Source 
Add initialization for packed ring indirect descriptors
in reconnection path.

Fixes: 381f39ebb7 ("net/virtio: fix packed ring indirect descricptors setup")
Cc: stable@dpdk.org

Signed-off-by: Xuan Ding <xuan.ding@intel.com>
Tested-by: Yinan Wang <yinan.wang@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Xuan Ding 2021-10-13 01:36:40 +00:00 committed by Maxime Coquelin
parent 5a4fbe79e6
commit 04bcc80204
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/virtio/virtqueue.c
View File

@ -186,6 +186,8 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)
struct vq_desc_extra *dxp;
struct virtnet_tx *txvq;
uint16_t desc_idx;
struct virtio_tx_region *txr;
struct vring_packed_desc *start_dp;
vq->vq_used_cons_idx = 0;
vq->vq_desc_head_idx = 0;
@ -198,6 +200,7 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)
vq->vq_packed.event_flags_shadow = 0;
txvq = &vq->txq;
txr = txvq->virtio_net_hdr_mz->addr;
memset(txvq->mz->addr, 0, txvq->mz->len);
memset(txvq->virtio_net_hdr_mz->addr, 0,
txvq->virtio_net_hdr_mz->len);
@ -208,6 +211,17 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)
rte_pktmbuf_free(dxp->cookie);
dxp->cookie = NULL;
}
if (virtio_with_feature(vq->hw, VIRTIO_RING_F_INDIRECT_DESC)) {
/* first indirect descriptor is always the tx header */
start_dp = txr[desc_idx].tx_packed_indir;
vring_desc_init_indirect_packed(start_dp,
RTE_DIM(txr[desc_idx].tx_packed_indir));
start_dp->addr = txvq->virtio_net_hdr_mem
+ desc_idx * sizeof(*txr)
+ offsetof(struct virtio_tx_region, tx_hdr);
start_dp->len = vq->hw->vtnet_hdr_size;
}
}
vring_desc_init_packed(vq, size);