net/virtio: fix crash when number of virtio devices > 1

[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 8025382..68dde08 100644 (file)
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -593,16 +593,29 @@ virtio_alloc_queues(struct rte_eth_dev *dev)
        return 0;
 }
 
+static void virtio_queues_unbind_intr(struct rte_eth_dev *dev);
+
 static void
 virtio_dev_close(struct rte_eth_dev *dev)
 {
        struct virtio_hw *hw = dev->data->dev_private;
+       struct rte_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
 
        PMD_INIT_LOG(DEBUG, "virtio_dev_close");
 
        /* reset the NIC */
        if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
                VTPCI_OPS(hw)->set_config_irq(hw, VIRTIO_MSI_NO_VECTOR);
+       if (intr_conf->rxq)
+               virtio_queues_unbind_intr(dev);
+
+       if (intr_conf->lsc || intr_conf->rxq) {
+               rte_intr_disable(dev->intr_handle);
+               rte_intr_efd_disable(dev->intr_handle);
+               rte_free(dev->intr_handle->intr_vec);
+               dev->intr_handle->intr_vec = NULL;
+       }
+
        vtpci_reset(hw);
        virtio_dev_free_mbufs(dev);
        virtio_free_queues(hw);
@@ -1233,6 +1246,19 @@ virtio_queues_bind_intr(struct rte_eth_dev *dev)
        return 0;
 }
 
+static void
+virtio_queues_unbind_intr(struct rte_eth_dev *dev)
+{
+       uint32_t i;
+       struct virtio_hw *hw = dev->data->dev_private;
+
+       PMD_INIT_LOG(INFO, "queue/interrupt unbinding\n");
+       for (i = 0; i < dev->data->nb_rx_queues; ++i)
+               VTPCI_OPS(hw)->set_queue_irq(hw,
+                                            hw->vqs[i * VTNET_CQ],
+                                            VIRTIO_MSI_NO_VECTOR);
+}
+
 static int
 virtio_configure_intr(struct rte_eth_dev *dev)
 {
@@ -1435,9 +1461,12 @@ virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_hw *hw)
 static void
 virtio_set_vtpci_ops(struct virtio_hw *hw)
 {
+#ifdef RTE_VIRTIO_USER
        if (hw->virtio_user_dev)
                VTPCI_OPS(hw) = &virtio_user_ops;
-       else if (hw->modern)
+       else
+#endif
+       if (hw->modern)
                VTPCI_OPS(hw) = &modern_ops;
        else
                VTPCI_OPS(hw) = &legacy_ops;
@@ -1486,6 +1515,7 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
                return -ENOMEM;
        }
 
+       hw->port_id = eth_dev->data->port_id;
        /* For virtio_user case the hw->virtio_user_dev is populated by
         * virtio_user_eth_dev_alloc() before eth_virtio_dev_init() is called.
         */
@@ -1496,7 +1526,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
                        return ret;
        }
 
-       hw->port_id = eth_dev->data->port_id;
        eth_dev->data->dev_flags = dev_flags;
 
        /* reset device and negotiate default features */
@@ -1652,6 +1681,15 @@ virtio_dev_start(struct rte_eth_dev *dev)
                        PMD_DRV_LOG(ERR, "link status not supported by host");
                        return -ENOTSUP;
                }
+       }
+
+       /* Enable uio/vfio intr/eventfd mapping: althrough we already did that
+        * in device configure, but it could be unmapped  when device is
+        * stopped.
+        */
+       if (dev->data->dev_conf.intr_conf.lsc ||
+           dev->data->dev_conf.intr_conf.rxq) {
+               rte_intr_disable(dev->intr_handle);
 
                if (rte_intr_enable(dev->intr_handle) < 0) {
                        PMD_DRV_LOG(ERR, "interrupt enable failed");
@@ -1746,10 +1784,11 @@ static void
 virtio_dev_stop(struct rte_eth_dev *dev)
 {
        struct rte_eth_link link;
+       struct rte_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
 
        PMD_INIT_LOG(DEBUG, "stop");
 
-       if (dev->data->dev_conf.intr_conf.lsc)
+       if (intr_conf->lsc || intr_conf->rxq)
                rte_intr_disable(dev->intr_handle);
 
        memset(&link, 0, sizeof(link));
@@ -1793,7 +1832,7 @@ virtio_dev_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complet
 static void
 virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
-       uint64_t tso_mask;
+       uint64_t tso_mask, host_features;
        struct virtio_hw *hw = dev->data->dev_private;
 
        dev_info->pci_dev = dev->device ? RTE_DEV_TO_PCI(dev->device) : NULL;
@@ -1807,18 +1846,25 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->default_txconf = (struct rte_eth_txconf) {
                .txq_flags = ETH_TXQ_FLAGS_NOOFFLOADS
        };
-       dev_info->rx_offload_capa =
-               DEV_RX_OFFLOAD_TCP_CKSUM |
-               DEV_RX_OFFLOAD_UDP_CKSUM |
-               DEV_RX_OFFLOAD_TCP_LRO;
-       dev_info->tx_offload_capa = 0;
 
+       host_features = VTPCI_OPS(hw)->get_features(hw);
+       dev_info->rx_offload_capa = 0;
+       if (host_features & (1ULL << VIRTIO_NET_F_GUEST_CSUM)) {
+               dev_info->rx_offload_capa |=
+                       DEV_RX_OFFLOAD_TCP_CKSUM |
+                       DEV_RX_OFFLOAD_UDP_CKSUM;
+       }
+       tso_mask = (1ULL << VIRTIO_NET_F_GUEST_TSO4) |
+               (1ULL << VIRTIO_NET_F_GUEST_TSO6);
+       if ((host_features & tso_mask) == tso_mask)
+               dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_TCP_LRO;
+
+       dev_info->tx_offload_capa = 0;
        if (hw->guest_features & (1ULL << VIRTIO_NET_F_CSUM)) {
                dev_info->tx_offload_capa |=
                        DEV_TX_OFFLOAD_UDP_CKSUM |
                        DEV_TX_OFFLOAD_TCP_CKSUM;
        }
-
        tso_mask = (1ULL << VIRTIO_NET_F_HOST_TSO4) |
                (1ULL << VIRTIO_NET_F_HOST_TSO6);
        if ((hw->guest_features & tso_mask) == tso_mask)