svn commit: r341954 - stable/11/sys/dev/mlx5/mlx5_ib

[Hans Petter Selasky]

Author: hselasky
Date: Wed Dec 12 12:34:35 2018
New Revision: 341954
URL: https://svnweb.freebsd.org/changeset/base/341954

Log:
  MFC r341570:
  mlx5ib: Make sure the congestion work timer does not escape the drain procedure.
  
  If the mlx5_ib_read_cong_stats() function was running when mlx5ib was unloaded,
  because this function unconditionally restarts the timer, the timer can still
  be pending after the delayed work has been cancelled. To fix this simply loop
  on the delayed work cancel procedure as long as it returns non-zero.
  
  Sponsored by:   Mellanox Technologies

Modified:
  stable/11/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
==============================================================================
--- stable/11/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c	Wed Dec 12 12:34:30 2018	(r341953)
+++ stable/11/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c	Wed Dec 12 12:34:35 2018	(r341954)
@@ -393,7 +393,8 @@ void
 mlx5_ib_cleanup_congestion(struct mlx5_ib_dev *dev)
 {
 
-	cancel_delayed_work_sync(&dev->congestion.dwork);
+	while (cancel_delayed_work_sync(&dev->congestion.dwork))
+		;
 	sysctl_ctx_free(&dev->congestion.ctx);
 	sx_destroy(&dev->congestion.lock);
 }