net/virtio: fix indirect descriptor reconnection

Add initialization for packed ring indirect descriptors
in reconnection path.

Fixes: 381f39ebb78a ("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>

diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
index 1f9af3c..65bf792 100644 (file)
--- a/drivers/net/virtio/virtqueue.c
+++ b/drivers/net/virtio/virtqueue.c
@@ -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);