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

Commit b4353708 authored by Tariq Toukan's avatar Tariq Toukan Committed by David S. Miller
Browse files

Revert "net/mlx4_en: Avoid unregister_netdev at shutdown flow" 



This reverts commit 9d769311.

Using unregister_netdev at shutdown flow prevents calling
the netdev's ndos or trying to access its freed resources.

This fixes crashes like the following:
 Call Trace:
  [<ffffffff81587a6e>] dev_get_phys_port_id+0x1e/0x30
  [<ffffffff815a36ce>] rtnl_fill_ifinfo+0x4be/0xff0
  [<ffffffff815a53f3>] rtmsg_ifinfo_build_skb+0x73/0xe0
  [<ffffffff815a5476>] rtmsg_ifinfo.part.27+0x16/0x50
  [<ffffffff815a54c8>] rtmsg_ifinfo+0x18/0x20
  [<ffffffff8158a6c6>] netdev_state_change+0x46/0x50
  [<ffffffff815a5e78>] linkwatch_do_dev+0x38/0x50
  [<ffffffff815a6165>] __linkwatch_run_queue+0xf5/0x170
  [<ffffffff815a6205>] linkwatch_event+0x25/0x30
  [<ffffffff81099a82>] process_one_work+0x152/0x400
  [<ffffffff8109a325>] worker_thread+0x125/0x4b0
  [<ffffffff8109a200>] ? rescuer_thread+0x350/0x350
  [<ffffffff8109fc6a>] kthread+0xca/0xe0
  [<ffffffff8109fba0>] ? kthread_park+0x60/0x60
  [<ffffffff816a1285>] ret_from_fork+0x25/0x30

Fixes: 9d769311 ("net/mlx4_en: Avoid unregister_netdev at shutdown flow")
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Reported-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reported-by: default avatarSteve Wise <swise@opengridcomputing.com>
Cc: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent faa1fa54

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+2 −15
Original line number Diff line number Diff line
@@ -2079,13 +2079,6 @@ static int mlx4_en_alloc_resources(struct mlx4_en_priv *priv) 
	return -ENOMEM;

}



static void mlx4_en_shutdown(struct net_device *dev)

{

	rtnl_lock();

	netif_device_detach(dev);

	mlx4_en_close(dev);

	rtnl_unlock();

}



static int mlx4_en_copy_priv(struct mlx4_en_priv *dst,

			     struct mlx4_en_priv *src,
@@ -2162,8 +2155,6 @@ void mlx4_en_destroy_netdev(struct net_device *dev) 
{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = priv->mdev;

	bool shutdown = mdev->dev->persist->interface_state &

					    MLX4_INTERFACE_STATE_SHUTDOWN;



	en_dbg(DRV, priv, "Destroying netdev on port:%d\n", priv->port);
@@ -2171,9 +2162,6 @@ void mlx4_en_destroy_netdev(struct net_device *dev) 
	if (priv->registered) {

		devlink_port_type_clear(mlx4_get_devlink_port(mdev->dev,

							      priv->port));

		if (shutdown)

			mlx4_en_shutdown(dev);

		else

		unregister_netdev(dev);

	}
@@ -2203,7 +2191,6 @@ void mlx4_en_destroy_netdev(struct net_device *dev) 
	kfree(priv->tx_ring);

	kfree(priv->tx_cq);



	if (!shutdown)

	free_netdev(dev);

}

drivers/net/ethernet/mellanox/mlx4/main.c

+1 −4
Original line number Diff line number Diff line
@@ -4147,11 +4147,8 @@ static void mlx4_shutdown(struct pci_dev *pdev) 


	mlx4_info(persist->dev, "mlx4_shutdown was called\n");

	mutex_lock(&persist->interface_state_mutex);

	if (persist->interface_state & MLX4_INTERFACE_STATE_UP) {

		/* Notify mlx4 clients that the kernel is being shut down */

		persist->interface_state |= MLX4_INTERFACE_STATE_SHUTDOWN;

	if (persist->interface_state & MLX4_INTERFACE_STATE_UP)

		mlx4_unload_one(pdev);

	}

	mutex_unlock(&persist->interface_state_mutex);

}

include/linux/mlx4/device.h

+0 −1
Original line number Diff line number Diff line
@@ -476,7 +476,6 @@ enum { 
enum {

	MLX4_INTERFACE_STATE_UP		= 1 << 0,

	MLX4_INTERFACE_STATE_DELETION	= 1 << 1,

	MLX4_INTERFACE_STATE_SHUTDOWN	= 1 << 2,

};



#define MSTR_SM_CHANGE_MASK (MLX4_EQ_PORT_INFO_MSTR_SM_SL_CHANGE_MASK | \