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

Commit a0f6bdaf authored by Mark Bloch's avatar Mark Bloch Committed by Greg Kroah-Hartman
Browse files

RDMA/mlx4: Read pkey table length instead of hardcoded value 

commit ec78b3bd66bc9a015505df0ef0eb153d9e64b03b upstream.

If the pkey_table is not available (which is the case when RoCE is not
supported), the cited commit caused a regression where mlx4_devices
without RoCE are not created.

Fix this by returning a pkey table length of zero in procedure
eth_link_query_port() if the pkey-table length reported by the device is
zero.

Link: https://lore.kernel.org/r/20200824110229.1094376-1-leon@kernel.org


Cc: <stable@vger.kernel.org>
Fixes: 1901b91f9982 ("IB/core: Fix potential NULL pointer dereference in pkey cache")
Fixes: fa417f7b ("IB/mlx4: Add support for IBoE")
Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 616a0c13

drivers/infiniband/hw/mlx4/main.c

+2 −1
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ static int eth_link_query_port(struct ib_device *ibdev, u8 port, 
	props->ip_gids = true;

	props->gid_tbl_len	= mdev->dev->caps.gid_table_len[port];

	props->max_msg_sz	= mdev->dev->caps.max_msg_sz;

	if (mdev->dev->caps.pkey_table_len[port])

		props->pkey_tbl_len = 1;

	props->max_mtu		= IB_MTU_4096;

	props->max_vl_num	= 2;