net/bonding: support 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 815e0e4..7a1ef60 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1964,10 +1964,19 @@ slave_remove(struct bond_dev_private *internals,
                                slave_eth_dev->data->port_id)
                        break;
 
-       if (i < (internals->slave_count - 1))
+       if (i < (internals->slave_count - 1)) {
+               struct rte_flow *flow;
+
                memmove(&internals->slaves[i], &internals->slaves[i + 1],
                                sizeof(internals->slaves[0]) *
                                (internals->slave_count - i - 1));
+               TAILQ_FOREACH(flow, &internals->flow_list, next) {
+                       memmove(&flow->flows[i], &flow->flows[i + 1],
+                               sizeof(flow->flows[0]) *
+                               (internals->slave_count - i - 1));
+                       flow->flows[internals->slave_count - 1] = NULL;
+               }
+       }
 
        internals->slave_count--;
 
@@ -2191,6 +2200,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)
        struct bond_dev_private *internals = dev->data->dev_private;
        uint8_t bond_port_id = internals->port_id;
        int skipped = 0;
+       struct rte_flow_error ferror;
 
        RTE_LOG(INFO, EAL, "Closing bonded device %s\n", dev->device->name);
        while (internals->slave_count != skipped) {
@@ -2205,6 +2215,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)
                        skipped++;
                }
        }
+       bond_flow_ops.flush(dev, &ferror);
        bond_ethdev_free_queues(dev);
        rte_bitmap_reset(internals->vlan_filter_bmp);
 }
@@ -2883,6 +2894,17 @@ bond_ethdev_mac_address_set(struct rte_eth_dev *dev, struct ether_addr *addr)
        return 0;
 }
 
+static int
+bond_filter_ctrl(struct rte_eth_dev *dev __rte_unused,
+                enum rte_filter_type type, enum rte_filter_op op, void *arg)
+{
+       if (type == RTE_ETH_FILTER_GENERIC && op == RTE_ETH_FILTER_GET) {
+               *(const void **)arg = &bond_flow_ops;
+               return 0;
+       }
+       return -ENOTSUP;
+}
+
 const struct eth_dev_ops default_dev_ops = {
        .dev_start            = bond_ethdev_start,
        .dev_stop             = bond_ethdev_stop,
@@ -2904,7 +2926,8 @@ const struct eth_dev_ops default_dev_ops = {
        .rss_hash_update      = bond_ethdev_rss_hash_update,
        .rss_hash_conf_get    = bond_ethdev_rss_hash_conf_get,
        .mtu_set              = bond_ethdev_mtu_set,
-       .mac_addr_set         = bond_ethdev_mac_address_set
+       .mac_addr_set         = bond_ethdev_mac_address_set,
+       .filter_ctrl          = bond_filter_ctrl
 };
 
 static int
@@ -2972,10 +2995,13 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
        memset(internals->active_slaves, 0, sizeof(internals->active_slaves));
        memset(internals->slaves, 0, sizeof(internals->slaves));
 
+       TAILQ_INIT(&internals->flow_list);
+       internals->flow_isolated_valid = 0;
+
        /* 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",
+               RTE_BOND_LOG(ERR, "Failed to set bonded device %d mode to %d\n",
                                 eth_dev->data->port_id, mode);
                goto err;
        }
@@ -3021,6 +3047,7 @@ bond_probe(struct rte_vdev_device *dev)
        uint8_t bonding_mode, socket_id/*, agg_mode*/;
        int  arg_count, port_id;
        uint8_t agg_mode;
+       struct rte_eth_dev *eth_dev;
 
        if (!dev)
                return -EINVAL;
@@ -3028,6 +3055,18 @@ bond_probe(struct rte_vdev_device *dev)
        name = rte_vdev_device_name(dev);
        RTE_LOG(INFO, EAL, "Initializing pmd_bond for %s\n", name);
 
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+           strlen(rte_vdev_device_args(dev)) == 0) {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev) {
+                       RTE_LOG(ERR, PMD, "Failed to probe %s\n", name);
+                       return -1;
+               }
+               /* TODO: request info from primary to set up Rx and Tx */
+               eth_dev->dev_ops = &default_dev_ops;
+               return 0;
+       }
+
        kvlist = rte_kvargs_parse(rte_vdev_device_args(dev),
                pmd_bond_init_valid_arguments);
        if (kvlist == NULL)