aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTal Gilboa <talgi@mellanox.com>2018-11-22 14:20:45 +0200
committerSaeed Mahameed <saeedm@mellanox.com>2018-12-13 01:24:44 -0800
commitfa2bf86bab4bbc61e5678a42a14e40075093a98f (patch)
treece6446cfd72d74652a861a8f7f169ec93ca0982b
parentnet/mlx5e: Remove unused UDP GSO remaining counter (diff)
downloadlinux-dev-fa2bf86bab4bbc61e5678a42a14e40075093a98f.tar.xz
linux-dev-fa2bf86bab4bbc61e5678a42a14e40075093a98f.zip
net/mlx5e: Cancel DIM work on close SQ
TXQ SQ closure is followed by closing the corresponding CQ. A pending DIM work would try to modify the now non-existing CQ. This would trigger an error: [85535.835926] mlx5_core 0000:af:00.0: mlx5_cmd_check:769:(pid 124399): MODIFY_CQ(0x403) op_mod(0x0) failed, status bad resource state(0x9), syndrome (0x1d7771) Fix by making sure to cancel any pending DIM work before destroying the SQ. Fixes: cbce4f444798 ("net/mlx5e: Enable adaptive-TX moderation") Signed-off-by: Tal Gilboa <talgi@mellanox.com> Reviewed-by: Tariq Toukan <tariqt@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/en_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index c17de6a990ff..b70cb6fd164c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -1401,6 +1401,7 @@ static void mlx5e_close_txqsq(struct mlx5e_txqsq *sq)
struct mlx5_core_dev *mdev = c->mdev;
struct mlx5_rate_limit rl = {0};
+ cancel_work_sync(&sq->dim.work);
mlx5e_destroy_sq(mdev, sq->sqn);
if (sq->rate_limit) {
rl.rate = sq->rate_limit;