net/mlx5: Add MACsec Tx tables support to fs_core

Changed EGRESS_KERNEL namespace to EGRESS_IPSEC and add new
namespace for MACsec TX.
This namespace should be the last namespace for transmitted packets.

Signed-off-by: Lior Nahmanson <liorna@nvidia.com>
Reviewed-by: Raed Salem <raeds@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
index 976f5669b6e537e1305e95438c696ea3c0d0d4e4..b859e4a4c744ff80f58e2680c2acd19dec6128b1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_fs.c
@@ -577,7 +577,7 @@ int mlx5e_accel_ipsec_fs_init(struct mlx5e_ipsec *ipsec)
        int err = -ENOMEM;
 
        ns = mlx5_get_flow_namespace(ipsec->mdev,
-                                    MLX5_FLOW_NAMESPACE_EGRESS_KERNEL);
+                                    MLX5_FLOW_NAMESPACE_EGRESS_IPSEC);
        if (!ns)
                return -EOPNOTSUPP;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
index ff5d23f0e4b17b57d0f24485f55716dbd0231da5..c97aeccc6c2e98933b878c197a9bf3d1d4715dfa 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
@@ -928,7 +928,8 @@ static int mlx5_cmd_modify_header_alloc(struct mlx5_flow_root_namespace *ns,
                table_type = FS_FT_NIC_RX;
                break;
        case MLX5_FLOW_NAMESPACE_EGRESS:
-       case MLX5_FLOW_NAMESPACE_EGRESS_KERNEL:
+       case MLX5_FLOW_NAMESPACE_EGRESS_IPSEC:
+       case MLX5_FLOW_NAMESPACE_EGRESS_MACSEC:
                max_actions = MLX5_CAP_FLOWTABLE_NIC_TX(dev, max_modify_header_actions);
                table_type = FS_FT_NIC_TX;
                break;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index e3960cdf51318fd2df0d123ee0fa2f215897bdd0..6a6031d9181c57543f8616eb88375994fc631775 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -130,7 +130,11 @@
 
 #define KERNEL_TX_IPSEC_NUM_PRIOS  1
 #define KERNEL_TX_IPSEC_NUM_LEVELS 1
-#define KERNEL_TX_MIN_LEVEL        (KERNEL_TX_IPSEC_NUM_LEVELS)
+#define KERNEL_TX_IPSEC_MIN_LEVEL        (KERNEL_TX_IPSEC_NUM_LEVELS)
+
+#define KERNEL_TX_MACSEC_NUM_PRIOS  1
+#define KERNEL_TX_MACSEC_NUM_LEVELS 2
+#define KERNEL_TX_MACSEC_MIN_LEVEL       (KERNEL_TX_IPSEC_MIN_LEVEL + KERNEL_TX_MACSEC_NUM_PRIOS)
 
 struct node_caps {
        size_t  arr_sz;
@@ -186,18 +190,23 @@ static struct init_tree_node {
 
 static struct init_tree_node egress_root_fs = {
        .type = FS_TYPE_NAMESPACE,
-       .ar_size = 2,
+       .ar_size = 3,
        .children = (struct init_tree_node[]) {
                ADD_PRIO(0, MLX5_BY_PASS_NUM_PRIOS, 0,
                         FS_CHAINING_CAPS_EGRESS,
                         ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,
                                ADD_MULTIPLE_PRIO(MLX5_BY_PASS_NUM_PRIOS,
                                                  BY_PASS_PRIO_NUM_LEVELS))),
-               ADD_PRIO(0, KERNEL_TX_MIN_LEVEL, 0,
+               ADD_PRIO(0, KERNEL_TX_IPSEC_MIN_LEVEL, 0,
                         FS_CHAINING_CAPS_EGRESS,
                         ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,
                                ADD_MULTIPLE_PRIO(KERNEL_TX_IPSEC_NUM_PRIOS,
                                                  KERNEL_TX_IPSEC_NUM_LEVELS))),
+               ADD_PRIO(0, KERNEL_TX_MACSEC_MIN_LEVEL, 0,
+                        FS_CHAINING_CAPS_EGRESS,
+                        ADD_NS(MLX5_FLOW_TABLE_MISS_ACTION_DEF,
+                               ADD_MULTIPLE_PRIO(KERNEL_TX_MACSEC_NUM_PRIOS,
+                                                 KERNEL_TX_MACSEC_NUM_LEVELS))),
        }
 };
 
@@ -2315,7 +2324,8 @@ struct mlx5_flow_namespace *mlx5_get_flow_namespace(struct mlx5_core_dev *dev,
                prio =  FDB_BYPASS_PATH;
                break;
        case MLX5_FLOW_NAMESPACE_EGRESS:
-       case MLX5_FLOW_NAMESPACE_EGRESS_KERNEL:
+       case MLX5_FLOW_NAMESPACE_EGRESS_IPSEC:
+       case MLX5_FLOW_NAMESPACE_EGRESS_MACSEC:
                root_ns = steering->egress_root_ns;
                prio = type - MLX5_FLOW_NAMESPACE_EGRESS;
                break;

diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index e62d50acb6bd7486499727da1edb86517429aa39..53d1867742068b07f9811350cd49011bb566e970 100644 (file)
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -92,7 +92,8 @@ enum mlx5_flow_namespace_type {
        MLX5_FLOW_NAMESPACE_SNIFFER_RX,
        MLX5_FLOW_NAMESPACE_SNIFFER_TX,
        MLX5_FLOW_NAMESPACE_EGRESS,
-       MLX5_FLOW_NAMESPACE_EGRESS_KERNEL,
+       MLX5_FLOW_NAMESPACE_EGRESS_IPSEC,
+       MLX5_FLOW_NAMESPACE_EGRESS_MACSEC,
        MLX5_FLOW_NAMESPACE_RDMA_RX,
        MLX5_FLOW_NAMESPACE_RDMA_RX_KERNEL,
        MLX5_FLOW_NAMESPACE_RDMA_TX,