net/mlx5: implement isolated mode from flow API

[dpdk.git] / drivers / net / bonding / rte_eth_bond_pmd.c

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 5fd733c..e0e73b2 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -793,8 +793,8 @@ bond_ethdev_tx_burst_alb(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
        uint16_t slave_bufs_pkts[RTE_MAX_ETHPORTS + 1] = { 0 };
 
        /*
-        * We create separate transmit buffers for update packets as they wont be
-        * counted in num_tx_total.
+        * We create separate transmit buffers for update packets as they won't
+        * be counted in num_tx_total.
         */
        struct rte_mbuf *update_bufs[RTE_MAX_ETHPORTS][ALB_HASH_TABLE_SIZE];
        uint16_t update_bufs_pkts[RTE_MAX_ETHPORTS] = { 0 };
@@ -1435,9 +1435,12 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
        }
 
        /* If lsc interrupt is set, check initial slave's link status */
-       if (slave_eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
+       if (slave_eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) {
+               slave_eth_dev->dev_ops->link_update(slave_eth_dev, 0);
                bond_ethdev_lsc_event_callback(slave_eth_dev->data->port_id,
-                       RTE_ETH_EVENT_INTR_LSC, &bonded_eth_dev->data->port_id);
+                       RTE_ETH_EVENT_INTR_LSC, &bonded_eth_dev->data->port_id,
+                       NULL);
+       }
 
        return 0;
 }
@@ -1664,7 +1667,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)
        uint8_t bond_port_id = internals->port_id;
        int skipped = 0;
 
-       RTE_LOG(INFO, EAL, "Closing bonded device %s\n", dev->data->name);
+       RTE_LOG(INFO, EAL, "Closing bonded device %s\n", dev->device->name);
        while (internals->slave_count != skipped) {
                uint8_t port_id = internals->slaves[skipped].port_id;
 
@@ -1673,7 +1676,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)
                if (rte_eth_bond_slave_remove(bond_port_id, port_id) != 0) {
                        RTE_LOG(ERR, EAL,
                                "Failed to remove port %d from bonded device "
-                               "%s\n", port_id, dev->data->name);
+                               "%s\n", port_id, dev->device->name);
                        skipped++;
                }
        }
@@ -1691,8 +1694,9 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
        dev_info->max_mac_addrs = 1;
 
-       dev_info->max_rx_pktlen = internals->candidate_max_rx_pktlen ?
-                                 internals->candidate_max_rx_pktlen : 2048;
+       dev_info->max_rx_pktlen = internals->candidate_max_rx_pktlen
+                                 ? internals->candidate_max_rx_pktlen
+                                 : ETHER_MAX_JUMBO_FRAME_LEN;
 
        dev_info->max_rx_queues = (uint16_t)128;
        dev_info->max_tx_queues = (uint16_t)512;
@@ -1846,7 +1850,8 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg)
 
                                bond_ethdev_lsc_event_callback(internals->slaves[i].port_id,
                                                RTE_ETH_EVENT_INTR_LSC,
-                                               &bonded_ethdev->data->port_id);
+                                               &bonded_ethdev->data->port_id,
+                                               NULL);
                        }
                }
                rte_spinlock_unlock(&internals->lock);
@@ -1992,35 +1997,36 @@ bond_ethdev_delayed_lsc_propagation(void *arg)
                return;
 
        _rte_eth_dev_callback_process((struct rte_eth_dev *)arg,
-                       RTE_ETH_EVENT_INTR_LSC, NULL);
+                       RTE_ETH_EVENT_INTR_LSC, NULL, NULL);
 }
 
-void
+int
 bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
-               void *param)
+               void *param, void *ret_param __rte_unused)
 {
        struct rte_eth_dev *bonded_eth_dev, *slave_eth_dev;
        struct bond_dev_private *internals;
        struct rte_eth_link link;
+       int rc = -1;
 
        int i, valid_slave = 0;
        uint8_t active_pos;
        uint8_t lsc_flag = 0;
 
        if (type != RTE_ETH_EVENT_INTR_LSC || param == NULL)
-               return;
+               return rc;
 
        bonded_eth_dev = &rte_eth_devices[*(uint8_t *)param];
        slave_eth_dev = &rte_eth_devices[port_id];
 
        if (check_for_bonded_ethdev(bonded_eth_dev))
-               return;
+               return rc;
 
        internals = bonded_eth_dev->data->dev_private;
 
        /* If the device isn't started don't handle interrupts */
        if (!bonded_eth_dev->data->dev_started)
-               return;
+               return rc;
 
        /* verify that port_id is a valid slave of bonded port */
        for (i = 0; i < internals->slave_count; i++) {
@@ -2031,7 +2037,7 @@ bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
        }
 
        if (!valid_slave)
-               return;
+               return rc;
 
        /* Search for port in active port list */
        active_pos = find_slave_by_id(internals->active_slaves,
@@ -2040,7 +2046,7 @@ bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
        rte_eth_link_get_nowait(port_id, &link);
        if (link.link_status) {
                if (active_pos < internals->active_slave_count)
-                       return;
+                       return rc;
 
                /* if no active slave ports then set this port to be primary port */
                if (internals->active_slave_count < 1) {
@@ -2062,7 +2068,7 @@ bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
                                RTE_LOG(ERR, PMD,
                                        "port %u invalid speed/duplex\n",
                                        port_id);
-                               return;
+                               return rc;
                        }
                }
 
@@ -2074,7 +2080,7 @@ bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
                        bond_ethdev_primary_set(internals, port_id);
        } else {
                if (active_pos == internals->active_slave_count)
-                       return;
+                       return rc;
 
                /* Remove from active slave list */
                deactivate_slave(bonded_eth_dev, port_id);
@@ -2113,7 +2119,8 @@ bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
                                                (void *)bonded_eth_dev);
                        else
                                _rte_eth_dev_callback_process(bonded_eth_dev,
-                                               RTE_ETH_EVENT_INTR_LSC, NULL);
+                                               RTE_ETH_EVENT_INTR_LSC,
+                                               NULL, NULL);
 
                } else {
                        if (internals->link_down_delay_ms > 0)
@@ -2122,9 +2129,11 @@ bond_ethdev_lsc_event_callback(uint8_t port_id, enum rte_eth_event_type type,
                                                (void *)bonded_eth_dev);
                        else
                                _rte_eth_dev_callback_process(bonded_eth_dev,
-                                               RTE_ETH_EVENT_INTR_LSC, NULL);
+                                               RTE_ETH_EVENT_INTR_LSC,
+                                               NULL, NULL);
                }
        }
+       return 0;
 }
 
 static int
@@ -2269,12 +2278,6 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
         * and internal (private) data
         */
 
-       if (socket_id >= number_of_sockets()) {
-               RTE_BOND_LOG(ERR,
-                               "Invalid socket id specified to create bonded device on.");
-               goto err;
-       }
-
        /* reserve an ethdev entry */
        eth_dev = rte_eth_vdev_allocate(dev, sizeof(*internals));
        if (eth_dev == NULL) {
@@ -2495,7 +2498,7 @@ bond_remove(struct rte_vdev_device *dev)
 static int
 bond_ethdev_configure(struct rte_eth_dev *dev)
 {
-       char *name = dev->data->name;
+       const char *name = dev->device->name;
        struct bond_dev_private *internals = dev->data->dev_private;
        struct rte_kvargs *kvlist = internals->kvlist;
        int arg_count;