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

Commit c43f1112 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Doug Ledford
Browse files

IB/mlx5: Add additional checks before processing MADs 



Check the has_smi bit in vport context and class version of MADs
before allowing MADs processing to take place.
MAD_IFC SMI commands can be executed only if smi bit is set.

Fixes: e126ba97 ('mlx5: Add driver for Mellanox Connect-IB adapters')
Signed-off-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarParvi Kaustubhi <parvik@mellanox.com>
Reviewed-by: default avatarEli Cohen <eli@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 45bded2c

drivers/infiniband/hw/mlx5/mad.c

+12 −0
Original line number Diff line number Diff line
@@ -42,12 +42,24 @@ enum { 
	MLX5_IB_VENDOR_CLASS2 = 0xa

};



static bool can_do_mad_ifc(struct mlx5_ib_dev *dev, u8 port_num,

			   struct ib_mad *in_mad)

{

	if (in_mad->mad_hdr.mgmt_class != IB_MGMT_CLASS_SUBN_LID_ROUTED &&

	    in_mad->mad_hdr.mgmt_class != IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE)

		return true;

	return dev->mdev->port_caps[port_num - 1].has_smi;

}



int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,

		 u8 port, const struct ib_wc *in_wc, const struct ib_grh *in_grh,

		 const void *in_mad, void *response_mad)

{

	u8 op_modifier = 0;



	if (!can_do_mad_ifc(dev, port, (struct ib_mad *)in_mad))

		return -EPERM;



	/* Key check traps can't be generated unless we have in_wc to

	 * tell us where to send the trap.

	 */

drivers/infiniband/hw/mlx5/main.c

+33 −0
Original line number Diff line number Diff line
@@ -2533,6 +2533,35 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context, 
		ibdev->ib_active = false;

}



static int set_has_smi_cap(struct mlx5_ib_dev *dev)

{

	struct mlx5_hca_vport_context vport_ctx;

	int err;

	int port;



	for (port = 1; port <= MLX5_CAP_GEN(dev->mdev, num_ports); port++) {

		dev->mdev->port_caps[port - 1].has_smi = false;

		if (MLX5_CAP_GEN(dev->mdev, port_type) ==

		    MLX5_CAP_PORT_TYPE_IB) {

			if (MLX5_CAP_GEN(dev->mdev, ib_virt)) {

				err = mlx5_query_hca_vport_context(dev->mdev, 0,

								   port, 0,

								   &vport_ctx);

				if (err) {

					mlx5_ib_err(dev, "query_hca_vport_context for port=%d failed %d\n",

						    port, err);

					return err;

				}

				dev->mdev->port_caps[port - 1].has_smi =

					vport_ctx.has_smi;

			} else {

				dev->mdev->port_caps[port - 1].has_smi = true;

			}

		}

	}

	return 0;

}



static void get_ext_port_caps(struct mlx5_ib_dev *dev)

{

	int port;
@@ -2557,6 +2586,10 @@ static int get_port_caps(struct mlx5_ib_dev *dev) 
	if (!dprops)

		goto out;



	err = set_has_smi_cap(dev);

	if (err)

		goto out;



	err = mlx5_ib_query_device(&dev->ib_dev, dprops, &uhw);

	if (err) {

		mlx5_ib_warn(dev, "query_device failed %d\n", err);

include/linux/mlx5/driver.h

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ struct mlx5_port_caps { 
	int	gid_table_len;

	int	pkey_table_len;

	u8	ext_port_cap;

	bool	has_smi;

};



struct mlx5_cmd_mailbox {