net/virtio: initiate vring at init stage

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

diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index b4c4aa4..24129d6 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -378,42 +378,12 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
        vq_update_avail_ring(vq, head_idx);
 }
 
-static void
-virtio_dev_vring_start(struct virtqueue *vq)
-{
-       int size = vq->vq_nentries;
-       struct vring *vr = &vq->vq_ring;
-       uint8_t *ring_mem = vq->vq_ring_virt_mem;
-
-       PMD_INIT_FUNC_TRACE();
-
-       /*
-        * Reinitialise since virtio port might have been stopped and restarted
-        */
-       memset(vq->vq_ring_virt_mem, 0, vq->vq_ring_size);
-       vring_init(vr, size, ring_mem, VIRTIO_PCI_VRING_ALIGN);
-       vq->vq_used_cons_idx = 0;
-       vq->vq_desc_head_idx = 0;
-       vq->vq_avail_idx = 0;
-       vq->vq_desc_tail_idx = (uint16_t)(vq->vq_nentries - 1);
-       vq->vq_free_cnt = vq->vq_nentries;
-       memset(vq->vq_descx, 0, sizeof(struct vq_desc_extra) * vq->vq_nentries);
-
-       vring_desc_init(vr->desc, size);
-
-       /*
-        * Disable device(host) interrupting guest
-        */
-       virtqueue_disable_intr(vq);
-}
-
 void
 virtio_dev_cq_start(struct rte_eth_dev *dev)
 {
        struct virtio_hw *hw = dev->data->dev_private;
 
        if (hw->cvq && hw->cvq->vq) {
-               virtio_dev_vring_start(hw->cvq->vq);
                VIRTQUEUE_DUMP((struct virtqueue *)hw->cvq->vq);
        }
 }
@@ -441,7 +411,6 @@ virtio_dev_rxtx_start(struct rte_eth_dev *dev)
                int error, nbufs;
                struct rte_mbuf *m;
 
-               virtio_dev_vring_start(vq);
                if (rxvq->mpool == NULL) {
                        rte_exit(EXIT_FAILURE,
                                "Cannot allocate mbufs for rx virtqueue");
@@ -499,7 +468,6 @@ virtio_dev_rxtx_start(struct rte_eth_dev *dev)
                struct virtnet_tx *txvq = dev->data->tx_queues[i];
                struct virtqueue *vq = txvq->vq;
 
-               virtio_dev_vring_start(vq);
                if (hw->use_simple_rxtx) {
                        uint16_t mid_idx  = vq->vq_nentries >> 1;
 
@@ -530,24 +498,24 @@ int
 virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
                        uint16_t queue_idx,
                        uint16_t nb_desc,
-                       unsigned int socket_id,
+                       unsigned int socket_id __rte_unused,
                        __rte_unused const struct rte_eth_rxconf *rx_conf,
                        struct rte_mempool *mp)
 {
        uint16_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_RQ_QUEUE_IDX;
+       struct virtio_hw *hw = dev->data->dev_private;
+       struct virtqueue *vq = hw->vqs[vtpci_queue_idx];
        struct virtnet_rx *rxvq;
-       int ret;
 
        PMD_INIT_FUNC_TRACE();
-       ret = virtio_dev_queue_setup(dev, VTNET_RQ, queue_idx, vtpci_queue_idx,
-                       nb_desc, socket_id, (void **)&rxvq);
-       if (ret < 0) {
-               PMD_INIT_LOG(ERR, "rvq initialization failed");
-               return ret;
-       }
 
-       /* Create mempool for rx mbuf allocation */
+       if (nb_desc == 0 || nb_desc > vq->vq_nentries)
+               nb_desc = vq->vq_nentries;
+       vq->vq_free_cnt = RTE_MIN(vq->vq_free_cnt, nb_desc);
+
+       rxvq = &vq->rxq;
        rxvq->mpool = mp;
+       rxvq->queue_id = queue_idx;
 
        dev->data->rx_queues[queue_idx] = rxvq;
 
@@ -556,27 +524,6 @@ virtio_dev_rx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
-void
-virtio_dev_rx_queue_release(void *rxq)
-{
-       struct virtnet_rx *rxvq = rxq;
-       struct virtqueue *vq;
-       const struct rte_memzone *mz;
-
-       if (rxvq == NULL)
-               return;
-
-       /*
-        * rxvq is freed when vq is freed, and as mz should be freed after the
-        * del_queue, so we reserve the mz pointer first.
-        */
-       vq = rxvq->vq;
-       mz = rxvq->mz;
-
-       virtio_dev_queue_release(vq);
-       rte_memzone_free(mz);
-}
-
 static void
 virtio_update_rxtx_handler(struct rte_eth_dev *dev,
                           const struct rte_eth_txconf *tx_conf)
@@ -613,27 +560,25 @@ int
 virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
                        uint16_t queue_idx,
                        uint16_t nb_desc,
-                       unsigned int socket_id,
+                       unsigned int socket_id __rte_unused,
                        const struct rte_eth_txconf *tx_conf)
 {
        uint8_t vtpci_queue_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX;
+       struct virtio_hw *hw = dev->data->dev_private;
+       struct virtqueue *vq = hw->vqs[vtpci_queue_idx];
        struct virtnet_tx *txvq;
-       struct virtqueue *vq;
        uint16_t tx_free_thresh;
-       int ret;
 
        PMD_INIT_FUNC_TRACE();
 
-
        virtio_update_rxtx_handler(dev, tx_conf);
 
-       ret = virtio_dev_queue_setup(dev, VTNET_TQ, queue_idx, vtpci_queue_idx,
-                       nb_desc, socket_id, (void **)&txvq);
-       if (ret < 0) {
-               PMD_INIT_LOG(ERR, "tvq initialization failed");
-               return ret;
-       }
-       vq = txvq->vq;
+       if (nb_desc == 0 || nb_desc > vq->vq_nentries)
+               nb_desc = vq->vq_nentries;
+       vq->vq_free_cnt = RTE_MIN(vq->vq_free_cnt, nb_desc);
+
+       txvq = &vq->txq;
+       txvq->queue_id = queue_idx;
 
        tx_free_thresh = tx_conf->tx_free_thresh;
        if (tx_free_thresh == 0)
@@ -655,30 +600,6 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev,
        return 0;
 }
 
-void
-virtio_dev_tx_queue_release(void *txq)
-{
-       struct virtnet_tx *txvq = txq;
-       struct virtqueue *vq;
-       const struct rte_memzone *mz;
-       const struct rte_memzone *hdr_mz;
-
-       if (txvq == NULL)
-               return;
-
-       /*
-        * txvq is freed when vq is freed, and as mz should be freed after the
-        * del_queue, so we reserve the mz pointer first.
-        */
-       vq = txvq->vq;
-       mz = txvq->mz;
-       hdr_mz = txvq->virtio_net_hdr_mz;
-
-       virtio_dev_queue_release(vq);
-       rte_memzone_free(mz);
-       rte_memzone_free(hdr_mz);
-}
-
 static void
 virtio_discard_rxbuf(struct virtqueue *vq, struct rte_mbuf *m)
 {