eal: set iopl only when needed

[dpdk.git] / lib / librte_pmd_virtio / virtio_ethdev.c

diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c
index 6688ac7..19930c0 100644 (file)
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -271,20 +271,17 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
                        dev->data->port_id, queue_idx);
                vq = rte_zmalloc(vq_name, sizeof(struct virtqueue) +
                        vq_size * sizeof(struct vq_desc_extra), CACHE_LINE_SIZE);
-               memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name));
        } 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), CACHE_LINE_SIZE);
-               memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name));
        } 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),
                        CACHE_LINE_SIZE);
-               memcpy(vq->vq_name, vq_name, sizeof(vq->vq_name));
        }
        if (vq == NULL) {
                PMD_INIT_LOG(ERR, "%s: Can not allocate virtqueue", __func__);
@@ -340,7 +337,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
                snprintf(vq_name, sizeof(vq_name), "port%d_tvq%d_hdrzone",
                        dev->data->port_id, queue_idx);
                vq->virtio_net_hdr_mz = rte_memzone_reserve_aligned(vq_name,
-                       vq_size * sizeof(struct virtio_net_hdr),
+                       vq_size * hw->vtnet_hdr_size,
                        socket_id, 0, CACHE_LINE_SIZE);
                if (vq->virtio_net_hdr_mz == NULL) {
                        rte_free(vq);
@@ -349,7 +346,7 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev,
                vq->virtio_net_hdr_mem =
                        vq->virtio_net_hdr_mz->phys_addr;
                memset(vq->virtio_net_hdr_mz->addr, 0,
-                       vq_size * sizeof(struct virtio_net_hdr));
+                       vq_size * hw->vtnet_hdr_size);
        } else if (queue_type == VTNET_CQ) {
                /* Allocate a page for control vq command, data and status */
                snprintf(vq_name, sizeof(vq_name), "port%d_cvq_hdrzone",
@@ -562,7 +559,7 @@ virtio_get_hwaddr(struct virtio_hw *hw)
 static void
 virtio_negotiate_features(struct virtio_hw *hw)
 {
-       uint32_t guest_features, mask;
+       uint32_t host_features, mask;
 
        mask = VIRTIO_NET_F_CTRL_RX | VIRTIO_NET_F_CTRL_VLAN;
        mask |= VIRTIO_NET_F_CSUM | VIRTIO_NET_F_GUEST_CSUM;
@@ -574,27 +571,24 @@ virtio_negotiate_features(struct virtio_hw *hw)
        mask |= VIRTIO_NET_F_GUEST_TSO4 | VIRTIO_NET_F_GUEST_TSO6 | VIRTIO_NET_F_GUEST_ECN;
        mask |= VTNET_LRO_FEATURES;
 
-       /* rx_mbuf should not be in multiple merged segments */
-       mask |= VIRTIO_NET_F_MRG_RXBUF;
-
        /* not negotiating INDIRECT descriptor table support */
        mask |= VIRTIO_RING_F_INDIRECT_DESC;
 
        /* Prepare guest_features: feature that driver wants to support */
-       guest_features = VTNET_FEATURES & ~mask;
+       hw->guest_features = VTNET_FEATURES & ~mask;
        PMD_INIT_LOG(DEBUG, "guest_features before negotiate = %x",
-               guest_features);
+               hw->guest_features);
 
        /* Read device(host) feature bits */
-       hw->host_features = VIRTIO_READ_REG_4(hw, VIRTIO_PCI_HOST_FEATURES);
+       host_features = VIRTIO_READ_REG_4(hw, VIRTIO_PCI_HOST_FEATURES);
        PMD_INIT_LOG(DEBUG, "host_features before negotiate = %x",
-               hw->host_features);
+               host_features);
 
        /*
         * Negotiate features: Subset of device feature bits are written back
         * guest feature bits.
         */
-       hw->guest_features = vtpci_negotiate_features(hw, guest_features);
+       hw->guest_features = vtpci_negotiate_features(hw, host_features);
        PMD_INIT_LOG(DEBUG, "features after negotiate = %x",
                hw->guest_features);
 }
@@ -742,14 +736,7 @@ eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv,
                return -1;
        }
 
-       if (!(rte_eal_get_configuration()->flags & EAL_FLG_HIGH_IOPL)) {
-               PMD_INIT_LOG(ERR,
-                       "IOPL call failed in EAL init - cannot use virtio PMD driver\n");
-               return -1;
-       }
-
        eth_dev->dev_ops = &virtio_eth_dev_ops;
-       eth_dev->rx_pkt_burst = &virtio_recv_pkts;
        eth_dev->tx_pkt_burst = &virtio_xmit_pkts;
 
        if (rte_eal_process_type() == RTE_PROC_SECONDARY)
@@ -757,8 +744,6 @@ eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv,
 
        pci_dev = eth_dev->pci_dev;
 
-       hw->device_id = pci_dev->id.device_id;
-       hw->vendor_id = pci_dev->id.vendor_id;
 #ifdef RTE_EXEC_ENV_LINUXAPP
        {
                char dirname[PATH_MAX];
@@ -806,10 +791,13 @@ eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv,
        virtio_negotiate_features(hw);
 
        /* Setting up rx_header size for the device */
-       if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF))
+       if (vtpci_with_feature(hw, VIRTIO_NET_F_MRG_RXBUF)) {
+               eth_dev->rx_pkt_burst = &virtio_recv_mergeable_pkts;
                hw->vtnet_hdr_size = sizeof(struct virtio_net_hdr_mrg_rxbuf);
-       else
+       } else {
+               eth_dev->rx_pkt_burst = &virtio_recv_pkts;
                hw->vtnet_hdr_size = sizeof(struct virtio_net_hdr);
+       }
 
        /* Allocate memory for storing MAC addresses */
        eth_dev->data->mac_addrs = rte_zmalloc("virtio", ETHER_ADDR_LEN, 0);
@@ -902,8 +890,14 @@ static struct eth_driver rte_virtio_pmd = {
  * Returns 0 on success.
  */
 static int
-rte_virtio_pmd_init(const char *name __rte_unused, const char *param __rte_unused)
+rte_virtio_pmd_init(const char *name __rte_unused,
+                   const char *param __rte_unused)
 {
+       if (rte_eal_iopl_init() != 0) {
+               PMD_INIT_LOG(ERR, "IOPL call failed - cannot use virtio PMD");
+               return -1;
+       }
+
        rte_eth_driver_register(&rte_virtio_pmd);
        return 0;
 }
@@ -955,8 +949,6 @@ virtio_dev_start(struct rte_eth_dev *dev)
        /* Tell the host we've known how to drive the device. */
        vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER);
 
-       hw->adapter_stopped = 0;
-
        virtio_dev_cq_start(dev);
 
        /* Do final configuration before rx/tx engine starts */
@@ -1016,7 +1008,7 @@ static void virtio_dev_free_mbufs(struct rte_eth_dev *dev)
 
                while ((buf = (struct rte_mbuf *)virtqueue_detatch_unused(
                                        dev->data->rx_queues[i])) != NULL) {
-                       rte_pktmbuf_free_seg(buf);
+                       rte_pktmbuf_free(buf);
                        mbuf_num++;
                }
 
@@ -1035,7 +1027,8 @@ static void virtio_dev_free_mbufs(struct rte_eth_dev *dev)
                mbuf_num = 0;
                while ((buf = (struct rte_mbuf *)virtqueue_detatch_unused(
                                        dev->data->tx_queues[i])) != NULL) {
-                       rte_pktmbuf_free_seg(buf);
+                       rte_pktmbuf_free(buf);
+
                        mbuf_num++;
                }