svn commit: r347716 - in stable/12/sys/dev/mlx5: . mlx5_core

[Hans Petter Selasky]

Author: hselasky
Date: Thu May 16 15:45:10 2019
New Revision: 347716
URL: https://svnweb.freebsd.org/changeset/base/347716

Log:
  MFC r347252:
  Disable all MSIX interrupts before shutdown in mlx5.
  
  Make sure the interrupt handlers don't race with the fast unload one
  code in the shutdown handler.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/driver.h
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_eq.c
  stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/driver.h
==============================================================================
--- stable/12/sys/dev/mlx5/driver.h	Thu May 16 15:44:27 2019	(r347715)
+++ stable/12/sys/dev/mlx5/driver.h	Thu May 16 15:45:10 2019	(r347716)
@@ -606,6 +606,7 @@ struct mlx5_priv {
 	struct mlx5_irq_info	*irq_info;
 	struct mlx5_uuar_info	uuari;
 	MLX5_DECLARE_DOORBELL_LOCK(cq_uar_lock);
+	int			disable_irqs;
 
 	struct io_mapping	*bf_mapping;
 

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_cmd.c	Thu May 16 15:44:27 2019	(r347715)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_cmd.c	Thu May 16 15:45:10 2019	(r347716)
@@ -1143,6 +1143,9 @@ static void mlx5_cmd_change_mod(struct mlx5_core_dev *
 	struct mlx5_cmd *cmd = &dev->cmd;
 	int i;
 
+	if (cmd->mode == mode)
+		return;
+
 	for (i = 0; i < cmd->max_reg_cmds; i++)
 		down(&cmd->sem);
 

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_eq.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_eq.c	Thu May 16 15:44:27 2019	(r347715)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_eq.c	Thu May 16 15:45:10 2019	(r347716)
@@ -395,7 +395,9 @@ static irqreturn_t mlx5_msix_handler(int irq, void *eq
 	struct mlx5_eq *eq = eq_ptr;
 	struct mlx5_core_dev *dev = eq->dev;
 
-	mlx5_eq_int(dev, eq);
+	/* check if IRQs are not disabled */
+	if (likely(dev->priv.disable_irqs == 0))
+		mlx5_eq_int(dev, eq);
 
 	/* MSI-X vectors always belong to us */
 	return IRQ_HANDLED;

Modified: stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 15:44:27 2019	(r347715)
+++ stable/12/sys/dev/mlx5/mlx5_core/mlx5_main.c	Thu May 16 15:45:10 2019	(r347716)
@@ -35,6 +35,7 @@
 #include <linux/slab.h>
 #include <linux/io-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/hardirq.h>
 #include <dev/mlx5/driver.h>
 #include <dev/mlx5/cq.h>
 #include <dev/mlx5/qp.h>
@@ -1443,11 +1444,29 @@ static int mlx5_try_fast_unload(struct mlx5_core_dev *
 	return 0;
 }
 
+static void mlx5_disable_interrupts(struct mlx5_core_dev *mdev)
+{
+	int nvec = mdev->priv.eq_table.num_comp_vectors + MLX5_EQ_VEC_COMP_BASE;
+	int x;
+
+	mdev->priv.disable_irqs = 1;
+
+	/* wait for all IRQ handlers to finish processing */
+	for (x = 0; x != nvec; x++)
+		synchronize_irq(mdev->priv.msix_arr[x].vector);
+}
+
 static void shutdown_one(struct pci_dev *pdev)
 {
 	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);
 	struct mlx5_priv *priv = &dev->priv;
 	int err;
+
+	/* enter polling mode */
+	mlx5_cmd_use_polling(dev);
+
+	/* disable all interrupts */
+	mlx5_disable_interrupts(dev);
 
 	err = mlx5_try_fast_unload(dev);
 	if (err)