net/mlx5: Introduce alloc/dealloc modify header context commands

Implement the low-level commands to support packet header re-write.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
index c3c6e931cc3589a5faeaa871e769443cf53534ff..5bdaf3d545b2fc656a318d5b562f940e14ecd9d9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -307,6 +307,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
        case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:
        case MLX5_CMD_OP_SET_FLOW_TABLE_ROOT:
        case MLX5_CMD_OP_DEALLOC_ENCAP_HEADER:
+       case MLX5_CMD_OP_DEALLOC_MODIFY_HEADER_CONTEXT:
                return MLX5_CMD_STAT_OK;
 
        case MLX5_CMD_OP_QUERY_HCA_CAP:
@@ -418,6 +419,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op,
        case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:
        case MLX5_CMD_OP_QUERY_FLOW_COUNTER:
        case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:
+       case MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT:
                *status = MLX5_DRIVER_STATUS_ABORTED;
                *synd = MLX5_DRIVER_SYND;
                return -EIO;
@@ -582,6 +584,8 @@ const char *mlx5_command_str(int command)
        MLX5_COMMAND_STR_CASE(MODIFY_FLOW_TABLE);
        MLX5_COMMAND_STR_CASE(ALLOC_ENCAP_HEADER);
        MLX5_COMMAND_STR_CASE(DEALLOC_ENCAP_HEADER);
+       MLX5_COMMAND_STR_CASE(ALLOC_MODIFY_HEADER_CONTEXT);
+       MLX5_COMMAND_STR_CASE(DEALLOC_MODIFY_HEADER_CONTEXT);
        default: return "unknown command opcode";
        }
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
index 20d1fd516d0328a30218bc69e46d062b1a039fa0..c6178ea1a46161223ba73598c328cfd7c36ffa06 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
@@ -516,3 +516,69 @@ void mlx5_encap_dealloc(struct mlx5_core_dev *dev, u32 encap_id)
 
        mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
 }
+
+int mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
+                            u8 namespace, u8 num_actions,
+                            void *modify_actions, u32 *modify_header_id)
+{
+       u32 out[MLX5_ST_SZ_DW(alloc_modify_header_context_out)];
+       int max_actions, actions_size, inlen, err;
+       void *actions_in;
+       u8 table_type;
+       u32 *in;
+
+       switch (namespace) {
+       case MLX5_FLOW_NAMESPACE_FDB:
+               max_actions = MLX5_CAP_ESW_FLOWTABLE_FDB(dev, max_modify_header_actions);
+               table_type = FS_FT_FDB;
+               break;
+       case MLX5_FLOW_NAMESPACE_KERNEL:
+               max_actions = MLX5_CAP_FLOWTABLE_NIC_RX(dev, max_modify_header_actions);
+               table_type = FS_FT_NIC_RX;
+               break;
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       if (num_actions > max_actions) {
+               mlx5_core_warn(dev, "too many modify header actions %d, max supported %d\n",
+                              num_actions, max_actions);
+               return -EOPNOTSUPP;
+       }
+
+       actions_size = MLX5_UN_SZ_BYTES(set_action_in_add_action_in_auto) * num_actions;
+       inlen = MLX5_ST_SZ_BYTES(alloc_modify_header_context_in) + actions_size;
+
+       in = kzalloc(inlen, GFP_KERNEL);
+       if (!in)
+               return -ENOMEM;
+
+       MLX5_SET(alloc_modify_header_context_in, in, opcode,
+                MLX5_CMD_OP_ALLOC_MODIFY_HEADER_CONTEXT);
+       MLX5_SET(alloc_modify_header_context_in, in, table_type, table_type);
+       MLX5_SET(alloc_modify_header_context_in, in, num_of_actions, num_actions);
+
+       actions_in = MLX5_ADDR_OF(alloc_modify_header_context_in, in, actions);
+       memcpy(actions_in, modify_actions, actions_size);
+
+       memset(out, 0, sizeof(out));
+       err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));
+
+       *modify_header_id = MLX5_GET(alloc_modify_header_context_out, out, modify_header_id);
+       kfree(in);
+       return err;
+}
+
+void mlx5_modify_header_dealloc(struct mlx5_core_dev *dev, u32 modify_header_id)
+{
+       u32 in[MLX5_ST_SZ_DW(dealloc_modify_header_context_in)];
+       u32 out[MLX5_ST_SZ_DW(dealloc_modify_header_context_out)];
+
+       memset(in, 0, sizeof(in));
+       MLX5_SET(dealloc_modify_header_context_in, in, opcode,
+                MLX5_CMD_OP_DEALLOC_MODIFY_HEADER_CONTEXT);
+       MLX5_SET(dealloc_modify_header_context_in, in, modify_header_id,
+                modify_header_id);
+
+       mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));
+}

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
index b3dabe6e88366133fd07dab68f059d4f5d7e5e3a..fbc6e9e9e3053a7527cf49e7d00c54104acf50af 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
@@ -141,6 +141,11 @@ int mlx5_encap_alloc(struct mlx5_core_dev *dev,
                     u32 *encap_id);
 void mlx5_encap_dealloc(struct mlx5_core_dev *dev, u32 encap_id);
 
+int mlx5_modify_header_alloc(struct mlx5_core_dev *dev,
+                            u8 namespace, u8 num_actions,
+                            void *modify_actions, u32 *modify_header_id);
+void mlx5_modify_header_dealloc(struct mlx5_core_dev *dev, u32 modify_header_id);
+
 bool mlx5_lag_intf_add(struct mlx5_interface *intf, struct mlx5_priv *priv);
 
 int mlx5_query_mtpps(struct mlx5_core_dev *dev, u32 *mtpps, u32 mtpps_size);