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

Commit aba46213 authored by Daniel Jurgens's avatar Daniel Jurgens Committed by Jason Gunthorpe
Browse files

{net, IB}/mlx5: Raise fatal IB event when sys error occurs 



All other mlx5_events report the port number as 1 based, which is how FW
reports it in the port event EQE. Reporting 0 for this event causes
mlx5_ib to not raise a fatal event notification to registered clients
due to a seemingly invalid port.

All switch cases in mlx5_ib_event that go through the port check are
supposed to set the port now, so just do it once at variable
declaration.

Fixes: 89d44f0a("net/mlx5_core: Add pci error handlers to mlx5_core driver")
Reviewed-by: default avatarMajd Dibbiny <majd@mellanox.com>
Signed-off-by: default avatarDaniel Jurgens <danielj@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent e7b169f3

drivers/infiniband/hw/mlx5/main.c

+2 −9
Original line number Diff line number Diff line
@@ -3263,7 +3263,7 @@ static void mlx5_ib_handle_event(struct work_struct *_work) 
	struct mlx5_ib_dev *ibdev;

	struct ib_event ibev;

	bool fatal = false;

	u8 port = 0;

	u8 port = (u8)work->param;



	if (mlx5_core_is_mp_slave(work->dev)) {

		ibdev = mlx5_ib_get_ibdev_from_mpi(work->context);
@@ -3283,8 +3283,6 @@ static void mlx5_ib_handle_event(struct work_struct *_work) 
	case MLX5_DEV_EVENT_PORT_UP:

	case MLX5_DEV_EVENT_PORT_DOWN:

	case MLX5_DEV_EVENT_PORT_INITIALIZED:

		port = (u8)work->param;



		/* In RoCE, port up/down events are handled in

		 * mlx5_netdev_event().

		 */
@@ -3298,24 +3296,19 @@ static void mlx5_ib_handle_event(struct work_struct *_work) 


	case MLX5_DEV_EVENT_LID_CHANGE:

		ibev.event = IB_EVENT_LID_CHANGE;

		port = (u8)work->param;

		break;



	case MLX5_DEV_EVENT_PKEY_CHANGE:

		ibev.event = IB_EVENT_PKEY_CHANGE;

		port = (u8)work->param;



		schedule_work(&ibdev->devr.ports[port - 1].pkey_change_work);

		break;



	case MLX5_DEV_EVENT_GUID_CHANGE:

		ibev.event = IB_EVENT_GID_CHANGE;

		port = (u8)work->param;

		break;



	case MLX5_DEV_EVENT_CLIENT_REREG:

		ibev.event = IB_EVENT_CLIENT_REREGISTER;

		port = (u8)work->param;

		break;

	case MLX5_DEV_EVENT_DELAY_DROP_TIMEOUT:

		schedule_work(&ibdev->delay_drop.delay_drop_work);
@@ -3327,7 +3320,7 @@ static void mlx5_ib_handle_event(struct work_struct *_work) 
	ibev.device	      = &ibdev->ib_dev;

	ibev.element.port_num = port;



	if (port < 1 || port > ibdev->num_ports) {

	if (!rdma_is_port_valid(&ibdev->ib_dev, port)) {

		mlx5_ib_warn(ibdev, "warning: event on port %d\n", port);

		goto out;

	}

drivers/net/ethernet/mellanox/mlx5/core/health.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void mlx5_enter_error_state(struct mlx5_core_dev *dev, bool force) 
		trigger_cmd_completions(dev);

	}



	mlx5_core_event(dev, MLX5_DEV_EVENT_SYS_ERROR, 0);

	mlx5_core_event(dev, MLX5_DEV_EVENT_SYS_ERROR, 1);

	mlx5_core_err(dev, "end\n");



unlock: