net/mlx5e: Check if inner FT is supported outside of create/destroy functions

Move the mlx5e_tunnel_inner_ft_supported() check for inner flow tables
support outside of mlx5e_create_inner_ttc_table() and
mlx5e_destroy_inner_ttc_table(). It allows to avoid accessing invalid
TIRNs of inner indirect TIRs. In a later commit these accesses will be
replaced by getters that will WARN if inner indirect TIRs don't exist.

Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
index 6464ac3f294e71648ffda8be74cbcad387ecaf27..1a38c527423eda94ab920f66688230c9c2eb2497 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_fs.c
@@ -1349,9 +1349,6 @@ static int mlx5e_create_inner_ttc_table(struct mlx5e_priv *priv, struct ttc_para
        struct mlx5e_flow_table *ft = &ttc->ft;
        int err;
 
-       if (!mlx5e_tunnel_inner_ft_supported(priv->mdev))
-               return 0;
-
        ft->t = mlx5_create_flow_table(priv->fs.ns, &params->ft_attr);
        if (IS_ERR(ft->t)) {
                err = PTR_ERR(ft->t);
@@ -1377,9 +1374,6 @@ err:
 static void mlx5e_destroy_inner_ttc_table(struct mlx5e_priv *priv,
                                          struct mlx5e_ttc_table *ttc)
 {
-       if (!mlx5e_tunnel_inner_ft_supported(priv->mdev))
-               return;
-
        mlx5e_cleanup_ttc_rules(ttc);
        mlx5e_destroy_flow_table(&ttc->ft);
 }
@@ -1788,15 +1782,18 @@ int mlx5e_create_flow_steering(struct mlx5e_priv *priv)
        }
 
        mlx5e_set_ttc_basic_params(priv, &ttc_params);
-       mlx5e_set_inner_ttc_ft_params(&ttc_params);
-       for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++)
-               ttc_params.indir_tirn[tt] = priv->inner_indir_tir[tt].tirn;
 
-       err = mlx5e_create_inner_ttc_table(priv, &ttc_params, &priv->fs.inner_ttc);
-       if (err) {
-               netdev_err(priv->netdev, "Failed to create inner ttc table, err=%d\n",
-                          err);
-               goto err_destroy_arfs_tables;
+       if (mlx5e_tunnel_inner_ft_supported(priv->mdev)) {
+               mlx5e_set_inner_ttc_ft_params(&ttc_params);
+               for (tt = 0; tt < MLX5E_NUM_INDIR_TIRS; tt++)
+                       ttc_params.indir_tirn[tt] = priv->inner_indir_tir[tt].tirn;
+
+               err = mlx5e_create_inner_ttc_table(priv, &ttc_params, &priv->fs.inner_ttc);
+               if (err) {
+                       netdev_err(priv->netdev, "Failed to create inner ttc table, err=%d\n",
+                                  err);
+                       goto err_destroy_arfs_tables;
+               }
        }
 
        mlx5e_set_ttc_ft_params(&ttc_params);
@@ -1839,7 +1836,8 @@ err_destroy_l2_table:
 err_destroy_ttc_table:
        mlx5e_destroy_ttc_table(priv, &priv->fs.ttc);
 err_destroy_inner_ttc_table:
-       mlx5e_destroy_inner_ttc_table(priv, &priv->fs.inner_ttc);
+       if (mlx5e_tunnel_inner_ft_supported(priv->mdev))
+               mlx5e_destroy_inner_ttc_table(priv, &priv->fs.inner_ttc);
 err_destroy_arfs_tables:
        mlx5e_arfs_destroy_tables(priv);
 
@@ -1852,7 +1850,8 @@ void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv)
        mlx5e_destroy_vlan_table(priv);
        mlx5e_destroy_l2_table(priv);
        mlx5e_destroy_ttc_table(priv, &priv->fs.ttc);
-       mlx5e_destroy_inner_ttc_table(priv, &priv->fs.inner_ttc);
+       if (mlx5e_tunnel_inner_ft_supported(priv->mdev))
+               mlx5e_destroy_inner_ttc_table(priv, &priv->fs.inner_ttc);
        mlx5e_arfs_destroy_tables(priv);
        mlx5e_ethtool_cleanup_steering(priv);
 }