mlx4_en: Enabling new steering

The mlx4_en module now uses the new steering mechanism.
The RX packets are now steered through the MCG table instead
of Mac table for unicast, and default entry for multicast.
The feature is enabled through INIT_HCA

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 151 insertions, 14 deletions

diff --git a/drivers/net/mlx4/port.c b/drivers/net/mlx4/port.c
index 451339559bdc..eca7d8596f87 100644
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/mlx4/port.c
@@ -90,12 +90,79 @@ static int mlx4_set_port_mac_table(struct mlx4_dev *dev, u8 port,
         return err;
 }
 
-int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index)
+static int mlx4_uc_steer_add(struct mlx4_dev *dev, u8 port,
+                             u64 mac, int *qpn, u8 reserve)
 {
-        struct mlx4_mac_table *table = &mlx4_priv(dev)->port[port].mac_table;
+        struct mlx4_qp qp;
+        u8 gid[16] = {0};
+        int err;
+
+        if (reserve) {
+                err = mlx4_qp_reserve_range(dev, 1, 1, qpn);
+                if (err) {
+                        mlx4_err(dev, "Failed to reserve qp for mac registration\n");
+                        return err;
+                }
+        }
+        qp.qpn = *qpn;
+
+        mac &= 0xffffffffffffULL;
+        mac = cpu_to_be64(mac << 16);
+        memcpy(&gid[10], &mac, ETH_ALEN);
+        gid[5] = port;
+        gid[7] = MLX4_UC_STEER << 1;
+
+        err = mlx4_qp_attach_common(dev, &qp, gid, 0,
+                                    MLX4_PROT_ETH, MLX4_UC_STEER);
+        if (err && reserve)
+                mlx4_qp_release_range(dev, *qpn, 1);
+
+        return err;
+}
+
+static void mlx4_uc_steer_release(struct mlx4_dev *dev, u8 port,
+                                  u64 mac, int qpn, u8 free)
+{
+        struct mlx4_qp qp;
+        u8 gid[16] = {0};
+
+        qp.qpn = qpn;
+        mac &= 0xffffffffffffULL;
+        mac = cpu_to_be64(mac << 16);
+        memcpy(&gid[10], &mac, ETH_ALEN);
+        gid[5] = port;
+        gid[7] = MLX4_UC_STEER << 1;
+
+        mlx4_qp_detach_common(dev, &qp, gid, MLX4_PROT_ETH, MLX4_UC_STEER);
+        if (free)
+                mlx4_qp_release_range(dev, qpn, 1);
+}
+
+int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *qpn, u8 wrap)
+{
+        struct mlx4_port_info *info = &mlx4_priv(dev)->port[port];
+        struct mlx4_mac_table *table = &info->mac_table;
+        struct mlx4_mac_entry *entry;
         int i, err = 0;
         int free = -1;
 
+        if (dev->caps.vep_uc_steering) {
+                err = mlx4_uc_steer_add(dev, port, mac, qpn, 1);
+                if (!err) {
+                        entry = kmalloc(sizeof *entry, GFP_KERNEL);
+                        if (!entry) {
+                                mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
+                                return -ENOMEM;
+                        }
+                        entry->mac = mac;
+                        err = radix_tree_insert(&info->mac_tree, *qpn, entry);
+                        if (err) {
+                                mlx4_uc_steer_release(dev, port, mac, *qpn, 1);
+                                return err;
+                        }
+                } else
+                        return err;
+        }
         mlx4_dbg(dev, "Registering MAC: 0x%llx\n", (unsigned long long) mac);
         mutex_lock(&table->mutex);
         for (i = 0; i < MLX4_MAX_MAC_NUM - 1; i++) {
@@ -106,7 +173,6 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index)
 
                 if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i]))) {
                         /* MAC already registered, increase refernce count */
-                        *index = i;
                         ++table->refs[i];
                         goto out;
                 }
@@ -137,7 +203,8 @@ int mlx4_register_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *index)
                 goto out;
         }
 
-        *index = free;
+        if (!dev->caps.vep_uc_steering)
+                *qpn = info->base_qpn + free;
         ++table->total;
 out:
         mutex_unlock(&table->mutex);
@@ -145,20 +212,52 @@ out:
 }
 EXPORT_SYMBOL_GPL(mlx4_register_mac);
 
-void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int index)
+static int validate_index(struct mlx4_dev *dev,
+                          struct mlx4_mac_table *table, int index)
 {
-        struct mlx4_mac_table *table = &mlx4_priv(dev)->port[port].mac_table;
+        int err = 0;
 
-        mutex_lock(&table->mutex);
-        if (!table->refs[index]) {
-                mlx4_warn(dev, "No MAC entry for index %d\n", index);
-                goto out;
+        if (index < 0 || index >= table->max || !table->entries[index]) {
+                mlx4_warn(dev, "No valid Mac entry for the given index\n");
+                err = -EINVAL;
         }
-        if (--table->refs[index]) {
-                mlx4_warn(dev, "Have more references for index %d,"
-                          "no need to modify MAC table\n", index);
-                goto out;
+        return err;
+}
+
+static int find_index(struct mlx4_dev *dev,
+                      struct mlx4_mac_table *table, u64 mac)
+{
+        int i;
+        for (i = 0; i < MLX4_MAX_MAC_NUM; i++) {
+                if (mac == (MLX4_MAC_MASK & be64_to_cpu(table->entries[i])))
+                        return i;
         }
+        /* Mac not found */
+        return -EINVAL;
+}
+
+void mlx4_unregister_mac(struct mlx4_dev *dev, u8 port, int qpn)
+{
+        struct mlx4_port_info *info = &mlx4_priv(dev)->port[port];
+        struct mlx4_mac_table *table = &info->mac_table;
+        int index = qpn - info->base_qpn;
+        struct mlx4_mac_entry *entry;
+
+        if (dev->caps.vep_uc_steering) {
+                entry = radix_tree_lookup(&info->mac_tree, qpn);
+                if (entry) {
+                        mlx4_uc_steer_release(dev, port, entry->mac, qpn, 1);
+                        radix_tree_delete(&info->mac_tree, qpn);
+                        index = find_index(dev, table, entry->mac);
+                        kfree(entry);
+                }
+        }
+
+        mutex_lock(&table->mutex);
+
+        if (validate_index(dev, table, index))
+                goto out;
+
         table->entries[index] = 0;
         mlx4_set_port_mac_table(dev, port, table->entries);
         --table->total;
@@ -167,6 +266,44 @@ out:
 }
 EXPORT_SYMBOL_GPL(mlx4_unregister_mac);
 
+int mlx4_replace_mac(struct mlx4_dev *dev, u8 port, int qpn, u64 new_mac, u8 wrap)
+{
+        struct mlx4_port_info *info = &mlx4_priv(dev)->port[port];
+        struct mlx4_mac_table *table = &info->mac_table;
+        int index = qpn - info->base_qpn;
+        struct mlx4_mac_entry *entry;
+        int err;
+
+        if (dev->caps.vep_uc_steering) {
+                entry = radix_tree_lookup(&info->mac_tree, qpn);
+                if (!entry)
+                        return -EINVAL;
+                index = find_index(dev, table, entry->mac);
+                mlx4_uc_steer_release(dev, port, entry->mac, qpn, 0);
+                entry->mac = new_mac;
+                err = mlx4_uc_steer_add(dev, port, entry->mac, &qpn, 0);
+                if (err || index < 0)
+                        return err;
+        }
+
+        mutex_lock(&table->mutex);
+
+        err = validate_index(dev, table, index);
+        if (err)
+                goto out;
+
+        table->entries[index] = cpu_to_be64(new_mac | MLX4_MAC_VALID);
+
+        err = mlx4_set_port_mac_table(dev, port, table->entries);
+        if (unlikely(err)) {
+                mlx4_err(dev, "Failed adding MAC: 0x%llx\n", (unsigned long long) new_mac);
+                table->entries[index] = 0;
+        }
+out:
+        mutex_unlock(&table->mutex);
+        return err;
+}
+EXPORT_SYMBOL_GPL(mlx4_replace_mac);
 static int mlx4_set_port_vlan_table(struct mlx4_dev *dev, u8 port,
                                     __be32 *entries)
 {