Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06187080 authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Saeed Mahameed
Browse files

net/mlx5: Fix command completion after timeout access invalid structure 



Completion on timeout should not free the driver command entry structure
as it will need to access it again once real completion event from FW
will occur.

Fixes: 73dd3a48 ('net/mlx5: Avoid using pending command interface slots')
Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Cc: kernel-team@fb.com
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent dc798b4c

drivers/net/ethernet/mellanox/mlx5/core/cmd.c

+4 −2
Original line number Diff line number Diff line
@@ -967,7 +967,7 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in, 


	err = wait_func(dev, ent);

	if (err == -ETIMEDOUT)

		goto out_free;

		goto out;



	ds = ent->ts2 - ent->ts1;

	op = MLX5_GET(mbox_in, in->first.data, opcode);
@@ -1430,6 +1430,7 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool forced) 
					mlx5_core_err(dev, "Command completion arrived after timeout (entry idx = %d).\n",

						      ent->idx);

					free_ent(cmd, ent->idx);

					free_cmd(ent);

				}

				continue;

			}
@@ -1488,6 +1489,7 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool forced) 
				free_msg(dev, ent->in);



				err = err ? err : ent->status;

				if (!forced)

					free_cmd(ent);

				callback(err, context);

			} else {