net/virtio: add missing read barrier for packed dequeue

[dpdk.git] / drivers / net / virtio / virtqueue.c

diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
index a7d0a9c..5b03f7a 100644 (file)
--- a/drivers/net/virtio/virtqueue.c
+++ b/drivers/net/virtio/virtqueue.c
@@ -54,9 +54,36 @@ virtqueue_detach_unused(struct virtqueue *vq)
        return NULL;
 }
 
+/* Flush used descs */
+static void
+virtqueue_rxvq_flush_packed(struct virtqueue *vq)
+{
+       struct vq_desc_extra *dxp;
+       uint16_t i;
+
+       struct vring_packed_desc *descs = vq->ring_packed.desc_packed;
+       int cnt = 0;
+
+       i = vq->vq_used_cons_idx;
+       while (desc_is_used(&descs[i], vq) && cnt++ < vq->vq_nentries) {
+               dxp = &vq->vq_descx[descs[i].id];
+               if (dxp->cookie != NULL) {
+                       rte_pktmbuf_free(dxp->cookie);
+                       dxp->cookie = NULL;
+               }
+               vq->vq_free_cnt++;
+               vq->vq_used_cons_idx++;
+               if (vq->vq_used_cons_idx >= vq->vq_nentries) {
+                       vq->vq_used_cons_idx -= vq->vq_nentries;
+                       vq->used_wrap_counter ^= 1;
+               }
+               i = vq->vq_used_cons_idx;
+       }
+}
+
 /* Flush the elements in the used ring. */
-void
-virtqueue_rxvq_flush(struct virtqueue *vq)
+static void
+virtqueue_rxvq_flush_split(struct virtqueue *vq)
 {
        struct virtnet_rx *rxq = &vq->rxq;
        struct virtio_hw *hw = vq->hw;
@@ -74,6 +101,14 @@ virtqueue_rxvq_flush(struct virtqueue *vq)
                        desc_idx = used_idx;
                        rte_pktmbuf_free(vq->sw_ring[desc_idx]);
                        vq->vq_free_cnt++;
+               } else if (hw->use_inorder_rx) {
+                       desc_idx = (uint16_t)uep->id;
+                       dxp = &vq->vq_descx[desc_idx];
+                       if (dxp->cookie != NULL) {
+                               rte_pktmbuf_free(dxp->cookie);
+                               dxp->cookie = NULL;
+                       }
+                       vq_ring_free_inorder(vq, desc_idx, 1);
                } else {
                        desc_idx = (uint16_t)uep->id;
                        dxp = &vq->vq_descx[desc_idx];
@@ -94,3 +129,15 @@ virtqueue_rxvq_flush(struct virtqueue *vq)
                }
        }
 }
+
+/* Flush the elements in the used ring. */
+void
+virtqueue_rxvq_flush(struct virtqueue *vq)
+{
+       struct virtio_hw *hw = vq->hw;
+
+       if (vtpci_packed_queue(hw))
+               virtqueue_rxvq_flush_packed(vq);
+       else
+               virtqueue_rxvq_flush_split(vq);
+}