| From 9568c3b802edd008b90bff80e097b4883b0b79c8 Mon Sep 17 00:00:00 2001 |
| From: Moshe Shemesh <moshe@mellanox.com> |
| Date: Thu, 6 Jul 2017 15:48:40 +0300 |
| Subject: net/mlx5: Fix command completion after timeout access invalid |
| structure |
| |
| [ Upstream commit 061870800efb4e3d1ad4082a2569363629bdfcfc ] |
| |
| 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: 73dd3a4839c1 ('net/mlx5: Avoid using pending command interface slots') |
| Signed-off-by: Moshe Shemesh <moshe@mellanox.com> |
| Cc: kernel-team@fb.com |
| Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 6 ++++-- |
| 1 file changed, 4 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c |
| index 9680c8805178..1d5263c46eee 100644 |
| --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c |
| +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c |
| @@ -965,7 +965,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); |
| @@ -1428,6 +1428,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; |
| } |
| @@ -1486,7 +1487,8 @@ void mlx5_cmd_comp_handler(struct mlx5_core_dev *dev, u64 vec, bool forced) |
| free_msg(dev, ent->in); |
| |
| err = err ? err : ent->status; |
| - free_cmd(ent); |
| + if (!forced) |
| + free_cmd(ent); |
| callback(err, context); |
| } else { |
| complete(&ent->done); |
| -- |
| 2.17.1 |
| |