net/mlx5: HWS, register reformat actions with fw

Hardware steering handles actions differently from firmware, but for
termination rules that use encapsulation the firmware needs to be aware
of the action.

Fix this by registering reformat actions with the firmware the first
time this is needed. To do this, add a third possible owner for an
action, and also a lock to protect against registration of the same
action from different threads.

Signed-off-by: Vlad Dogaru <vdogaru@nvidia.com>
Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1747766802-958178-3-git-send-email-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index a81b81a3b8f0ebc1c6a7b4e22fae686d572daa5d..23a7e8e7adfabe2c8a7ac4fe2b219182550cec26 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@ -1839,6 +1839,8 @@ int mlx5_fs_get_packet_reformat_id(struct mlx5_pkt_reformat *pkt_reformat,
                return 0;
        case MLX5_FLOW_RESOURCE_OWNER_SW:
                return mlx5_fs_dr_action_get_pkt_reformat_id(pkt_reformat, id);
+       case MLX5_FLOW_RESOURCE_OWNER_HWS:
+               return mlx5_fs_hws_action_get_pkt_reformat_id(pkt_reformat, id);
        default:
                return -EINVAL;
        }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
index 248a74108fb19a1b38deb5421199b764bbad4829..500826229b0beb5573085b94fe28ce31e053a5db 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
@@ -58,6 +58,7 @@ struct mlx5_flow_definer {
 enum mlx5_flow_resource_owner {
        MLX5_FLOW_RESOURCE_OWNER_FW,
        MLX5_FLOW_RESOURCE_OWNER_SW,
+       MLX5_FLOW_RESOURCE_OWNER_HWS,
 };
 
 struct mlx5_modify_hdr {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
index bef4d25c1a2a2537ebc578a96d3f605d0fac517e..aa47a7af6f50aca2b2ae8c3eb15fac5466a55281 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/action.c
@@ -72,6 +72,11 @@ enum mlx5hws_action_type mlx5hws_action_get_type(struct mlx5hws_action *action)
        return action->type;
 }
 
+struct mlx5_core_dev *mlx5hws_action_get_dev(struct mlx5hws_action *action)
+{
+       return action->ctx->mdev;
+}
+
 static int hws_action_get_shared_stc_nic(struct mlx5hws_context *ctx,
                                         enum mlx5hws_context_shared_stc_type stc_type,
                                         u8 tbl_type)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
index 1b787cd66e6fd3c0ad5c8710005e4a1fdc3fa152..9d1c0e4b224ad1d3c8b71be1e387b8ff9702b794 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c
@@ -1081,13 +1081,8 @@ static int mlx5_cmd_hws_create_fte(struct mlx5_flow_root_namespace *ns,
        struct mlx5hws_bwc_rule *rule;
        int err = 0;
 
-       if (mlx5_fs_cmd_is_fw_term_table(ft)) {
-               /* Packet reformat on terminamtion table not supported yet */
-               if (fte->act_dests.action.action &
-                   MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT)
-                       return -EOPNOTSUPP;
+       if (mlx5_fs_cmd_is_fw_term_table(ft))
                return mlx5_fs_cmd_get_fw_cmds()->create_fte(ns, ft, group, fte);
-       }
 
        err = mlx5_fs_fte_get_hws_actions(ns, ft, group, fte, &ractions);
        if (err)
@@ -1362,7 +1357,7 @@ mlx5_cmd_hws_packet_reformat_alloc(struct mlx5_flow_root_namespace *ns,
                pkt_reformat->fs_hws_action.pr_data = pr_data;
        }
 
-       pkt_reformat->owner = MLX5_FLOW_RESOURCE_OWNER_SW;
+       pkt_reformat->owner = MLX5_FLOW_RESOURCE_OWNER_HWS;
        pkt_reformat->fs_hws_action.hws_action = hws_action;
        return 0;
 
@@ -1380,6 +1375,15 @@ static void mlx5_cmd_hws_packet_reformat_dealloc(struct mlx5_flow_root_namespace
        struct mlx5_fs_hws_pr *pr_data;
        struct mlx5_fs_pool *pr_pool;
 
+       if (pkt_reformat->fs_hws_action.fw_reformat_id != 0) {
+               struct mlx5_pkt_reformat fw_pkt_reformat = { 0 };
+
+               fw_pkt_reformat.id = pkt_reformat->fs_hws_action.fw_reformat_id;
+               mlx5_fs_cmd_get_fw_cmds()->
+                       packet_reformat_dealloc(ns, &fw_pkt_reformat);
+               pkt_reformat->fs_hws_action.fw_reformat_id = 0;
+       }
+
        if (pkt_reformat->reformat_type == MLX5_REFORMAT_TYPE_REMOVE_HDR)
                return;
 
@@ -1499,6 +1503,7 @@ static int mlx5_cmd_hws_modify_header_alloc(struct mlx5_flow_root_namespace *ns,
                err = -ENOMEM;
                goto release_mh;
        }
+       mutex_init(&modify_hdr->fs_hws_action.lock);
        modify_hdr->fs_hws_action.mh_data = mh_data;
        modify_hdr->fs_hws_action.fs_pool = pool;
        modify_hdr->owner = MLX5_FLOW_RESOURCE_OWNER_SW;
@@ -1532,6 +1537,58 @@ static void mlx5_cmd_hws_modify_header_dealloc(struct mlx5_flow_root_namespace *
        modify_hdr->fs_hws_action.mh_data = NULL;
 }
 
+int
+mlx5_fs_hws_action_get_pkt_reformat_id(struct mlx5_pkt_reformat *pkt_reformat,
+                                      u32 *reformat_id)
+{
+       enum mlx5_flow_namespace_type ns_type = pkt_reformat->ns_type;
+       struct mutex *lock = &pkt_reformat->fs_hws_action.lock;
+       u32 *id = &pkt_reformat->fs_hws_action.fw_reformat_id;
+       struct mlx5_pkt_reformat fw_pkt_reformat = { 0 };
+       struct mlx5_pkt_reformat_params params = { 0 };
+       struct mlx5_flow_root_namespace *ns;
+       struct mlx5_core_dev *dev;
+       int ret;
+
+       mutex_lock(lock);
+
+       if (*id != 0) {
+               *reformat_id = *id;
+               ret = 0;
+               goto unlock;
+       }
+
+       dev = mlx5hws_action_get_dev(pkt_reformat->fs_hws_action.hws_action);
+       if (!dev) {
+               ret = -EINVAL;
+               goto unlock;
+       }
+
+       ns = mlx5_get_root_namespace(dev, ns_type);
+       if (!ns) {
+               ret = -EINVAL;
+               goto unlock;
+       }
+
+       params.type = pkt_reformat->reformat_type;
+       params.size = pkt_reformat->fs_hws_action.pr_data->data_size;
+       params.data = pkt_reformat->fs_hws_action.pr_data->data;
+
+       ret = mlx5_fs_cmd_get_fw_cmds()->
+               packet_reformat_alloc(ns, &params, ns_type, &fw_pkt_reformat);
+       if (ret)
+               goto unlock;
+
+       *id = fw_pkt_reformat.id;
+       *reformat_id = *id;
+       ret = 0;
+
+unlock:
+       mutex_unlock(lock);
+
+       return ret;
+}
+
 static int mlx5_cmd_hws_create_match_definer(struct mlx5_flow_root_namespace *ns,
                                             u16 format_id, u32 *match_mask)
 {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h
index 8b56298288da2dee5d1f8d85b45d318ef5d6ba13..b92d55b2d147a1870049dc9018163b99db923efc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.h
@@ -41,6 +41,11 @@ struct mlx5_fs_hws_action {
        struct mlx5_fs_pool *fs_pool;
        struct mlx5_fs_hws_pr *pr_data;
        struct mlx5_fs_hws_mh *mh_data;
+       u32 fw_reformat_id;
+       /* Protect `fw_reformat_id` against being initialized from multiple
+        * threads.
+        */
+       struct mutex lock;
 };
 
 struct mlx5_fs_hws_matcher {
@@ -84,12 +89,23 @@ void mlx5_fs_put_hws_action(struct mlx5_fs_hws_data *fs_hws_data);
 
 #ifdef CONFIG_MLX5_HW_STEERING
 
+int
+mlx5_fs_hws_action_get_pkt_reformat_id(struct mlx5_pkt_reformat *pkt_reformat,
+                                      u32 *reformat_id);
+
 bool mlx5_fs_hws_is_supported(struct mlx5_core_dev *dev);
 
 const struct mlx5_flow_cmds *mlx5_fs_cmd_get_hws_cmds(void);
 
 #else
 
+static inline int
+mlx5_fs_hws_action_get_pkt_reformat_id(struct mlx5_pkt_reformat *pkt_reformat,
+                                      u32 *reformat_id)
+{
+       return -EOPNOTSUPP;
+}
+
 static inline bool mlx5_fs_hws_is_supported(struct mlx5_core_dev *dev)
 {
        return false;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h
index fbd63369da10fdfc317ab0b02810edcaf42a7fff..9bbadc4d8a0b680f4974220b281c993f14330ef1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/mlx5hws.h
@@ -503,6 +503,15 @@ int mlx5hws_rule_action_update(struct mlx5hws_rule *rule,
 enum mlx5hws_action_type
 mlx5hws_action_get_type(struct mlx5hws_action *action);
 
+/**
+ * mlx5hws_action_get_dev - Get mlx5 core device.
+ *
+ * @action: The action to get the device from.
+ *
+ * Return: mlx5 core device.
+ */
+struct mlx5_core_dev *mlx5hws_action_get_dev(struct mlx5hws_action *action);
+
 /**
  * mlx5hws_action_create_dest_drop - Create a direct rule drop action.
  *