net/bonding: call through EAL on create/free
[dpdk.git] / drivers / net / bonding / rte_eth_bond_pmd.c
index 340d793..2b1db0b 100644 (file)
@@ -51,6 +51,7 @@
 #include "rte_eth_bond_8023ad_private.h"
 
 #define REORDER_PERIOD_MS 10
+#define DEFAULT_POLLING_INTERVAL_10_MS (10)
 
 #define HASH_L4_PORTS(h) ((h)->src_port ^ (h)->dst_port)
 
@@ -2239,6 +2240,132 @@ const struct eth_dev_ops default_dev_ops = {
        .rss_hash_conf_get    = bond_ethdev_rss_hash_conf_get
 };
 
+static int
+bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
+{
+       const char *name = rte_vdev_device_name(dev);
+       uint8_t socket_id = dev->device.numa_node;
+       struct bond_dev_private *internals = NULL;
+       struct rte_eth_dev *eth_dev = NULL;
+       uint32_t vlan_filter_bmp_size;
+
+       /* now do all data allocation - for eth_dev structure, dummy pci driver
+        * and internal (private) data
+        */
+
+       if (name == NULL) {
+               RTE_BOND_LOG(ERR, "Invalid name specified");
+               goto err;
+       }
+
+       if (socket_id >= number_of_sockets()) {
+               RTE_BOND_LOG(ERR,
+                               "Invalid socket id specified to create bonded device on.");
+               goto err;
+       }
+
+       internals = rte_zmalloc_socket(name, sizeof(*internals), 0, socket_id);
+       if (internals == NULL) {
+               RTE_BOND_LOG(ERR, "Unable to malloc internals on socket");
+               goto err;
+       }
+
+       /* reserve an ethdev entry */
+       eth_dev = rte_eth_dev_allocate(name);
+       if (eth_dev == NULL) {
+               RTE_BOND_LOG(ERR, "Unable to allocate rte_eth_dev");
+               goto err;
+       }
+
+       eth_dev->data->dev_private = internals;
+       eth_dev->data->nb_rx_queues = (uint16_t)1;
+       eth_dev->data->nb_tx_queues = (uint16_t)1;
+
+       eth_dev->data->mac_addrs = rte_zmalloc_socket(name, ETHER_ADDR_LEN, 0,
+                       socket_id);
+       if (eth_dev->data->mac_addrs == NULL) {
+               RTE_BOND_LOG(ERR, "Unable to malloc mac_addrs");
+               goto err;
+       }
+
+       eth_dev->dev_ops = &default_dev_ops;
+       eth_dev->data->dev_flags = RTE_ETH_DEV_INTR_LSC |
+               RTE_ETH_DEV_DETACHABLE;
+       eth_dev->driver = NULL;
+       eth_dev->data->kdrv = RTE_KDRV_NONE;
+       eth_dev->data->drv_name = pmd_bond_drv.driver.name;
+       eth_dev->data->numa_node =  socket_id;
+
+       rte_spinlock_init(&internals->lock);
+
+       internals->port_id = eth_dev->data->port_id;
+       internals->mode = BONDING_MODE_INVALID;
+       internals->current_primary_port = RTE_MAX_ETHPORTS + 1;
+       internals->balance_xmit_policy = BALANCE_XMIT_POLICY_LAYER2;
+       internals->xmit_hash = xmit_l2_hash;
+       internals->user_defined_mac = 0;
+       internals->link_props_set = 0;
+
+       internals->link_status_polling_enabled = 0;
+
+       internals->link_status_polling_interval_ms =
+               DEFAULT_POLLING_INTERVAL_10_MS;
+       internals->link_down_delay_ms = 0;
+       internals->link_up_delay_ms = 0;
+
+       internals->slave_count = 0;
+       internals->active_slave_count = 0;
+       internals->rx_offload_capa = 0;
+       internals->tx_offload_capa = 0;
+       internals->candidate_max_rx_pktlen = 0;
+       internals->max_rx_pktlen = 0;
+
+       /* Initially allow to choose any offload type */
+       internals->flow_type_rss_offloads = ETH_RSS_PROTO_MASK;
+
+       memset(internals->active_slaves, 0, sizeof(internals->active_slaves));
+       memset(internals->slaves, 0, sizeof(internals->slaves));
+
+       /* Set mode 4 default configuration */
+       bond_mode_8023ad_setup(eth_dev, NULL);
+       if (bond_ethdev_mode_set(eth_dev, mode)) {
+               RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode too %d",
+                                eth_dev->data->port_id, mode);
+               goto err;
+       }
+
+       vlan_filter_bmp_size =
+               rte_bitmap_get_memory_footprint(ETHER_MAX_VLAN_ID + 1);
+       internals->vlan_filter_bmpmem = rte_malloc(name, vlan_filter_bmp_size,
+                                                  RTE_CACHE_LINE_SIZE);
+       if (internals->vlan_filter_bmpmem == NULL) {
+               RTE_BOND_LOG(ERR,
+                            "Failed to allocate vlan bitmap for bonded device %u\n",
+                            eth_dev->data->port_id);
+               goto err;
+       }
+
+       internals->vlan_filter_bmp = rte_bitmap_init(ETHER_MAX_VLAN_ID + 1,
+                       internals->vlan_filter_bmpmem, vlan_filter_bmp_size);
+       if (internals->vlan_filter_bmp == NULL) {
+               RTE_BOND_LOG(ERR,
+                            "Failed to init vlan bitmap for bonded device %u\n",
+                            eth_dev->data->port_id);
+               rte_free(internals->vlan_filter_bmpmem);
+               goto err;
+       }
+
+       return eth_dev->data->port_id;
+
+err:
+       rte_free(internals);
+       if (eth_dev != NULL) {
+               rte_free(eth_dev->data->mac_addrs);
+               rte_eth_dev_release_port(eth_dev);
+       }
+       return -1;
+}
+
 static int
 bond_probe(struct rte_vdev_device *dev)
 {
@@ -2248,6 +2375,9 @@ bond_probe(struct rte_vdev_device *dev)
        uint8_t bonding_mode, socket_id;
        int  arg_count, port_id;
 
+       if (!dev)
+               return -EINVAL;
+
        name = rte_vdev_device_name(dev);
        RTE_LOG(INFO, EAL, "Initializing pmd_bond for %s\n", name);
 
@@ -2289,8 +2419,10 @@ bond_probe(struct rte_vdev_device *dev)
                socket_id = rte_socket_id();
        }
 
+       dev->device.numa_node = socket_id;
+
        /* Create link bonding eth device */
-       port_id = rte_eth_bond_create(name, bonding_mode, socket_id);
+       port_id = bond_alloc(dev, bonding_mode);
        if (port_id < 0) {
                RTE_LOG(ERR, EAL, "Failed to create socket %s in mode %u on "
                                "socket %u.\n", name, bonding_mode, socket_id);
@@ -2312,8 +2444,9 @@ parse_error:
 static int
 bond_remove(struct rte_vdev_device *dev)
 {
+       struct rte_eth_dev *eth_dev;
+       struct bond_dev_private *internals;
        const char *name;
-       int  ret;
 
        if (!dev)
                return -EINVAL;
@@ -2321,12 +2454,39 @@ bond_remove(struct rte_vdev_device *dev)
        name = rte_vdev_device_name(dev);
        RTE_LOG(INFO, EAL, "Uninitializing pmd_bond for %s\n", name);
 
-       /* free link bonding eth device */
-       ret = rte_eth_bond_free(name);
-       if (ret < 0)
-               RTE_LOG(ERR, EAL, "Failed to free %s\n", name);
+       /* now free all data allocation - for eth_dev structure,
+        * dummy pci driver and internal (private) data
+        */
 
-       return ret;
+       /* find an ethdev entry */
+       eth_dev = rte_eth_dev_allocated(name);
+       if (eth_dev == NULL)
+               return -ENODEV;
+
+       RTE_ASSERT(eth_dev->device == &dev->device);
+
+       internals = eth_dev->data->dev_private;
+       if (internals->slave_count != 0)
+               return -EBUSY;
+
+       if (eth_dev->data->dev_started == 1) {
+               bond_ethdev_stop(eth_dev);
+               bond_ethdev_close(eth_dev);
+       }
+
+       eth_dev->dev_ops = NULL;
+       eth_dev->rx_pkt_burst = NULL;
+       eth_dev->tx_pkt_burst = NULL;
+
+       internals = eth_dev->data->dev_private;
+       rte_bitmap_free(internals->vlan_filter_bmp);
+       rte_free(internals->vlan_filter_bmpmem);
+       rte_free(eth_dev->data->dev_private);
+       rte_free(eth_dev->data->mac_addrs);
+
+       rte_eth_dev_release_port(eth_dev);
+
+       return 0;
 }
 
 /* this part will resolve the slave portids after all the other pdev and vdev