]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/mlx5: SD, Implement steering for primary and secondaries
authorTariq Toukan <tariqt@nvidia.com>
Tue, 12 Dec 2023 12:02:45 +0000 (14:02 +0200)
committerSaeed Mahameed <saeedm@nvidia.com>
Thu, 21 Dec 2023 00:54:25 +0000 (16:54 -0800)
Implement the needed SD steering adjustments for the primary and
secondaries.

While the SD multiple devices are used to avoid cross-numa memory, when
it comes to chip level all traffic goes only through the primary device.
The secondaries are forced to silent mode, to guarantee they are not
involved in any unexpected ingress/egress traffic.

In RX, secondary devices will not have steering objects. Traffic will be
steered from the primary device to the RQs of a secondary device using
advanced cross-vhca RX steering capabilities.

In TX, the primary creates a new TX flow table, which is aliased by the
secondaries.

Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c

index 19e674dd1af7873e87f037ca9155a5f66f54f8fd..3309f21d892efd9db1b1a95a715d965c0cd29926 100644 (file)
@@ -4,6 +4,7 @@
 #include "lib/sd.h"
 #include "mlx5_core.h"
 #include "lib/mlx5.h"
+#include "fs_cmd.h"
 #include <linux/mlx5/vport.h>
 
 #define sd_info(__dev, format, ...) \
@@ -19,9 +20,11 @@ struct mlx5_sd {
        union {
                struct { /* primary */
                        struct mlx5_core_dev *secondaries[MLX5_SD_MAX_GROUP_SZ - 1];
+                       struct mlx5_flow_table *tx_ft;
                };
                struct { /* secondary */
                        struct mlx5_core_dev *primary_dev;
+                       u32 alias_obj_id;
                };
        };
 };
@@ -78,6 +81,21 @@ struct mlx5_core_dev *mlx5_sd_ch_ix_get_dev(struct mlx5_core_dev *primary, int c
        return mlx5_sd_primary_get_peer(primary, mdev_idx);
 }
 
+static bool ft_create_alias_supported(struct mlx5_core_dev *dev)
+{
+       u64 obj_allowed = MLX5_CAP_GEN_2_64(dev, allowed_object_for_other_vhca_access);
+       u32 obj_supp = MLX5_CAP_GEN_2(dev, cross_vhca_object_to_object_supported);
+
+       if (!(obj_supp &
+           MLX5_CROSS_VHCA_OBJ_TO_OBJ_SUPPORTED_LOCAL_FLOW_TABLE_ROOT_TO_REMOTE_FLOW_TABLE))
+               return false;
+
+       if (!(obj_allowed & MLX5_ALLOWED_OBJ_FOR_OTHER_VHCA_ACCESS_FLOW_TABLE))
+               return false;
+
+       return true;
+}
+
 static bool mlx5_sd_is_supported(struct mlx5_core_dev *dev, u8 host_buses)
 {
        /* Feature is currently implemented for PFs only */
@@ -88,6 +106,24 @@ static bool mlx5_sd_is_supported(struct mlx5_core_dev *dev, u8 host_buses)
        if (host_buses > MLX5_SD_MAX_GROUP_SZ)
                return false;
 
+       /* Disconnect secondaries from the network */
+       if (!MLX5_CAP_GEN(dev, eswitch_manager))
+               return false;
+       if (!MLX5_CAP_GEN(dev, silent_mode))
+               return false;
+
+       /* RX steering from primary to secondaries */
+       if (!MLX5_CAP_GEN(dev, cross_vhca_rqt))
+               return false;
+       if (host_buses > MLX5_CAP_GEN_2(dev, max_rqt_vhca_id))
+               return false;
+
+       /* TX steering from secondaries to primary */
+       if (!ft_create_alias_supported(dev))
+               return false;
+       if (!MLX5_CAP_FLOWTABLE_NIC_TX(dev, reset_root_to_default))
+               return false;
+
        return true;
 }
 
@@ -227,10 +263,122 @@ static void sd_unregister(struct mlx5_core_dev *dev)
        mlx5_devcom_unregister_component(sd->devcom);
 }
 
+static int sd_cmd_set_primary(struct mlx5_core_dev *primary, u8 *alias_key)
+{
+       struct mlx5_cmd_allow_other_vhca_access_attr allow_attr = {};
+       struct mlx5_sd *sd = mlx5_get_sd(primary);
+       struct mlx5_flow_table_attr ft_attr = {};
+       struct mlx5_flow_namespace *nic_ns;
+       struct mlx5_flow_table *ft;
+       int err;
+
+       nic_ns = mlx5_get_flow_namespace(primary, MLX5_FLOW_NAMESPACE_EGRESS);
+       if (!nic_ns)
+               return -EOPNOTSUPP;
+
+       ft = mlx5_create_flow_table(nic_ns, &ft_attr);
+       if (IS_ERR(ft)) {
+               err = PTR_ERR(ft);
+               return err;
+       }
+       sd->tx_ft = ft;
+       memcpy(allow_attr.access_key, alias_key, ACCESS_KEY_LEN);
+       allow_attr.obj_type = MLX5_GENERAL_OBJECT_TYPES_FLOW_TABLE_ALIAS;
+       allow_attr.obj_id = (ft->type << FT_ID_FT_TYPE_OFFSET) | ft->id;
+
+       err = mlx5_cmd_allow_other_vhca_access(primary, &allow_attr);
+       if (err) {
+               mlx5_core_err(primary, "Failed to allow other vhca access err=%d\n",
+                             err);
+               mlx5_destroy_flow_table(ft);
+               return err;
+       }
+
+       return 0;
+}
+
+static void sd_cmd_unset_primary(struct mlx5_core_dev *primary)
+{
+       struct mlx5_sd *sd = mlx5_get_sd(primary);
+
+       mlx5_destroy_flow_table(sd->tx_ft);
+}
+
+static int sd_secondary_create_alias_ft(struct mlx5_core_dev *secondary,
+                                       struct mlx5_core_dev *primary,
+                                       struct mlx5_flow_table *ft,
+                                       u32 *obj_id, u8 *alias_key)
+{
+       u32 aliased_object_id = (ft->type << FT_ID_FT_TYPE_OFFSET) | ft->id;
+       u16 vhca_id_to_be_accessed = MLX5_CAP_GEN(primary, vhca_id);
+       struct mlx5_cmd_alias_obj_create_attr alias_attr = {};
+       int ret;
+
+       memcpy(alias_attr.access_key, alias_key, ACCESS_KEY_LEN);
+       alias_attr.obj_id = aliased_object_id;
+       alias_attr.obj_type = MLX5_GENERAL_OBJECT_TYPES_FLOW_TABLE_ALIAS;
+       alias_attr.vhca_id = vhca_id_to_be_accessed;
+       ret = mlx5_cmd_alias_obj_create(secondary, &alias_attr, obj_id);
+       if (ret) {
+               mlx5_core_err(secondary, "Failed to create alias object err=%d\n",
+                             ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static void sd_secondary_destroy_alias_ft(struct mlx5_core_dev *secondary)
+{
+       struct mlx5_sd *sd = mlx5_get_sd(secondary);
+
+       mlx5_cmd_alias_obj_destroy(secondary, sd->alias_obj_id,
+                                  MLX5_GENERAL_OBJECT_TYPES_FLOW_TABLE_ALIAS);
+}
+
+static int sd_cmd_set_secondary(struct mlx5_core_dev *secondary,
+                               struct mlx5_core_dev *primary,
+                               u8 *alias_key)
+{
+       struct mlx5_sd *primary_sd = mlx5_get_sd(primary);
+       struct mlx5_sd *sd = mlx5_get_sd(secondary);
+       int err;
+
+       err = mlx5_fs_cmd_set_l2table_entry_silent(secondary, 1);
+       if (err)
+               return err;
+
+       err = sd_secondary_create_alias_ft(secondary, primary, primary_sd->tx_ft,
+                                          &sd->alias_obj_id, alias_key);
+       if (err)
+               goto err_unset_silent;
+
+       err = mlx5_fs_cmd_set_tx_flow_table_root(secondary, sd->alias_obj_id, false);
+       if (err)
+               goto err_destroy_alias_ft;
+
+       return 0;
+
+err_destroy_alias_ft:
+       sd_secondary_destroy_alias_ft(secondary);
+err_unset_silent:
+       mlx5_fs_cmd_set_l2table_entry_silent(secondary, 0);
+       return err;
+}
+
+static void sd_cmd_unset_secondary(struct mlx5_core_dev *secondary)
+{
+       mlx5_fs_cmd_set_tx_flow_table_root(secondary, 0, true);
+       sd_secondary_destroy_alias_ft(secondary);
+       mlx5_fs_cmd_set_l2table_entry_silent(secondary, 0);
+}
+
 int mlx5_sd_init(struct mlx5_core_dev *dev)
 {
+       struct mlx5_core_dev *primary, *pos, *to;
        struct mlx5_sd *sd = mlx5_get_sd(dev);
-       int err;
+       u8 alias_key[ACCESS_KEY_LEN];
+       int err, i;
 
        err = sd_init(dev);
        if (err)
@@ -244,8 +392,33 @@ int mlx5_sd_init(struct mlx5_core_dev *dev)
        if (err)
                goto err_sd_cleanup;
 
+       if (!mlx5_devcom_comp_is_ready(sd->devcom))
+               return 0;
+
+       primary = mlx5_sd_get_primary(dev);
+
+       for (i = 0; i < ACCESS_KEY_LEN; i++)
+               alias_key[i] = get_random_u8();
+
+       err = sd_cmd_set_primary(primary, alias_key);
+       if (err)
+               goto err_sd_unregister;
+
+       mlx5_sd_for_each_secondary(i, primary, pos) {
+               err = sd_cmd_set_secondary(pos, primary, alias_key);
+               if (err)
+                       goto err_unset_secondaries;
+       }
+
        return 0;
 
+err_unset_secondaries:
+       to = pos;
+       mlx5_sd_for_each_secondary_to(i, primary, to, pos)
+               sd_cmd_unset_secondary(pos);
+       sd_cmd_unset_primary(primary);
+err_sd_unregister:
+       sd_unregister(dev);
 err_sd_cleanup:
        sd_cleanup(dev);
        return err;
@@ -254,10 +427,20 @@ err_sd_cleanup:
 void mlx5_sd_cleanup(struct mlx5_core_dev *dev)
 {
        struct mlx5_sd *sd = mlx5_get_sd(dev);
+       struct mlx5_core_dev *primary, *pos;
+       int i;
 
        if (!sd)
                return;
 
+       if (!mlx5_devcom_comp_is_ready(sd->devcom))
+               goto out;
+
+       primary = mlx5_sd_get_primary(dev);
+       mlx5_sd_for_each_secondary(i, primary, pos)
+               sd_cmd_unset_secondary(pos);
+       sd_cmd_unset_primary(primary);
+out:
        sd_unregister(dev);
        sd_cleanup(dev);
 }