virtio: simplify queue allocation

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

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 63a368a..ddc1b2b 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -59,7 +59,6 @@
 #include "virtqueue.h"
 #include "virtio_rxtx.h"
 
-
 static int eth_virtio_dev_init(struct rte_eth_dev *eth_dev);
 static int eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev);
 static int  virtio_dev_configure(struct rte_eth_dev *dev);
@@ -286,6 +285,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
        unsigned int vq_size, size;
        struct virtio_hw *hw = dev->data->dev_private;
        struct virtqueue *vq = NULL;
+       const char *queue_names[] = {"rvq", "txq", "cvq"};
 
        PMD_INIT_LOG(DEBUG, "setting up queue: %u", vtpci_queue_idx);
 
@@ -305,34 +305,29 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
                return -EINVAL;
        }
 
-       if (queue_type == VTNET_RQ) {
-               snprintf(vq_name, sizeof(vq_name), "port%d_rvq%d",
-                       dev->data->port_id, queue_idx);
-               vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
-                       vq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);
-               vq->sw_ring = rte_zmalloc_socket("rxq->sw_ring",
-                       (RTE_PMD_VIRTIO_RX_MAX_BURST + vq_size) *
-                       sizeof(vq->sw_ring[0]), RTE_CACHE_LINE_SIZE, socket_id);
-       } else if (queue_type == VTNET_TQ) {
-               snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d",
-                       dev->data->port_id, queue_idx);
-               vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
-                       vq_size * sizeof(struct vq_desc_extra), RTE_CACHE_LINE_SIZE);
-       } else if (queue_type == VTNET_CQ) {
-               snprintf(vq_name, sizeof(vq_name), "port%d_cvq",
-                       dev->data->port_id);
-               vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
-                       vq_size * sizeof(struct vq_desc_extra),
-                       RTE_CACHE_LINE_SIZE);
-       }
+       snprintf(vq_name, sizeof(vq_name), "port%d_%s%d",
+                dev->data->port_id, queue_names[queue_type], queue_idx);
+       vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
+                        vq_size * sizeof(struct vq_desc_extra),
+                        RTE_CACHE_LINE_SIZE);
        if (vq == NULL) {
                PMD_INIT_LOG(ERR, "Can not allocate virtqueue");
                return -ENOMEM;
        }
-       if (queue_type == VTNET_RQ && vq->sw_ring == NULL) {
-               PMD_INIT_LOG(ERR, "Can not allocate RX soft ring");
-               rte_free(vq);
-               return -ENOMEM;
+
+       if (queue_type == VTNET_RQ) {
+               size_t sz_sw;
+
+               sz_sw = (RTE_PMD_VIRTIO_RX_MAX_BURST + vq_size) *
+                       sizeof(vq->sw_ring[0]);
+               vq->sw_ring = rte_zmalloc_socket("rxq->sw_ring", sz_sw,
+                                                RTE_CACHE_LINE_SIZE,
+                                                socket_id);
+               if (!vq->sw_ring) {
+                       PMD_INIT_LOG(ERR, "Can not allocate RX soft ring");
+                       rte_free(vq);
+                       return -ENOMEM;
+               }
        }
 
        vq->hw = hw;
@@ -491,7 +486,6 @@ static void
 virtio_dev_close(struct rte_eth_dev *dev)
 {
        struct virtio_hw *hw = dev->data->dev_private;
-       struct rte_pci_device *pci_dev = dev->pci_dev;
 
        PMD_INIT_LOG(DEBUG, "virtio_dev_close");
 
@@ -499,7 +493,7 @@ virtio_dev_close(struct rte_eth_dev *dev)
                virtio_dev_stop(dev);
 
        /* reset the NIC */
-       if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)
+       if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
                vtpci_irq_config(hw, VIRTIO_MSI_NO_VECTOR);
        vtpci_reset(hw);
        virtio_dev_free_mbufs(dev);
@@ -827,7 +821,7 @@ virtio_mac_table_set(struct virtio_hw *hw,
        int err, len[2];
 
        if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_MAC_ADDR)) {
-               PMD_DRV_LOG(INFO, "host does not support mac table\n");
+               PMD_DRV_LOG(INFO, "host does not support mac table");
                return;
        }
 
@@ -1034,9 +1028,10 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
        struct virtio_net_config *config;
        struct virtio_net_config local_config;
        struct rte_pci_device *pci_dev;
+       uint32_t dev_flags = RTE_ETH_DEV_DETACHABLE;
        int ret;
 
-       RTE_BUILD_BUG_ON(RTE_PKTMBUF_HEADROOM < sizeof(struct virtio_net_hdr));
+       RTE_BUILD_BUG_ON(RTE_PKTMBUF_HEADROOM < sizeof(struct virtio_net_hdr_mrg_rxbuf));
 
        eth_dev->dev_ops = &virtio_eth_dev_ops;
        eth_dev->tx_pkt_burst = &virtio_xmit_pkts;
@@ -1057,7 +1052,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 
        pci_dev = eth_dev->pci_dev;
 
-       ret = vtpci_init(pci_dev, hw);
+       ret = vtpci_init(pci_dev, hw, &dev_flags);
        if (ret)
                return ret;
 
@@ -1074,9 +1069,10 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 
        /* If host does not support status then disable LSC */
        if (!vtpci_with_feature(hw, VIRTIO_NET_F_STATUS))
-               pci_dev->driver->drv_flags &= ~RTE_PCI_DRV_INTR_LSC;
+               dev_flags &= ~RTE_ETH_DEV_INTR_LSC;
 
        rte_eth_copy_pci_info(eth_dev, pci_dev);
+       eth_dev->data->dev_flags = dev_flags;
 
        rx_func_get(eth_dev);
 
@@ -1155,7 +1151,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
                        pci_dev->id.device_id);
 
        /* Setup interrupt callback  */
-       if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)
+       if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
                rte_intr_callback_register(&pci_dev->intr_handle,
                                   virtio_interrupt_handler, eth_dev);
 
@@ -1190,7 +1186,7 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
        eth_dev->data->mac_addrs = NULL;
 
        /* reset interrupt callback  */
-       if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)
+       if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
                rte_intr_callback_unregister(&pci_dev->intr_handle,
                                                virtio_interrupt_handler,
                                                eth_dev);
@@ -1240,7 +1236,6 @@ virtio_dev_configure(struct rte_eth_dev *dev)
 {
        const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
        struct virtio_hw *hw = dev->data->dev_private;
-       struct rte_pci_device *pci_dev = dev->pci_dev;
 
        PMD_INIT_LOG(DEBUG, "configure");
 
@@ -1258,7 +1253,7 @@ virtio_dev_configure(struct rte_eth_dev *dev)
                return -ENOTSUP;
        }
 
-       if (pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)
+       if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
                if (vtpci_irq_config(hw, 0) == VIRTIO_MSI_NO_VECTOR) {
                        PMD_DRV_LOG(ERR, "failed to set config vector");
                        return -EBUSY;
@@ -1273,11 +1268,10 @@ virtio_dev_start(struct rte_eth_dev *dev)
 {
        uint16_t nb_queues, i;
        struct virtio_hw *hw = dev->data->dev_private;
-       struct rte_pci_device *pci_dev = dev->pci_dev;
 
        /* check if lsc interrupt feature is enabled */
        if (dev->data->dev_conf.intr_conf.lsc) {
-               if (!(pci_dev->driver->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
+               if (!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)) {
                        PMD_DRV_LOG(ERR, "link status not supported by host");
                        return -ENOTSUP;
                }