Commit ec78b3bd authored Aug 24, 2020 by Mark Bloch Committed by Jason Gunthorpe Aug 27, 2020

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

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: 1901b91f ("IB/core: Fix potential NULL pointer dereference in pkey cache")
Fixes: fa417f7b ("IB/mlx4: Add support for IBoE")
Signed-off-by: Mark Bloch <markb@mellanox.com>
Reviewed-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

parent d862060a

drivers/infiniband/hw/mlx4/main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -784,6 +784,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;

Admin message