Commit a0026026 authored Jun 10, 2025 by Vlad Dogaru Committed by Jakub Kicinski Jun 11, 2025

net/mlx5: HWS, Init mutex on the correct path



The newly introduced mutex is only used for reformat actions, but it was
initialized for modify header instead.

The struct that contains the mutex is zero-initialized and an all-zero
mutex is valid, so the issue only shows up with CONFIG_DEBUG_MUTEXES.

Fixes: b206d9ec ("net/mlx5: HWS, register reformat actions with fw")
Signed-off-by: Vlad Dogaru <vdogaru@nvidia.com>
Reviewed-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Link: https://patch.msgid.link/20250610151514.1094735-5-mbloch@nvidia.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 8ec40e3f

drivers/net/ethernet/mellanox/mlx5/core/steering/hws/fs_hws.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1357,6 +1357,7 @@ mlx5_cmd_hws_packet_reformat_alloc(struct mlx5_flow_root_namespace *ns,
		pkt_reformat->fs_hws_action.pr_data = pr_data;
		}

		mutex_init(&pkt_reformat->fs_hws_action.lock);
		pkt_reformat->owner = MLX5_FLOW_RESOURCE_OWNER_HWS;
		pkt_reformat->fs_hws_action.hws_action = hws_action;
		return 0;
		@@ -1503,7 +1504,6 @@ 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;