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

Commit 5ab2d89b authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

IB/cma: Fix erroneous validation of supported default GID type 



When rdma_cm is initializing a cma_device it checks if this device
supports the preferred default GID type. This check was done in a wrong way
and therefore sometimes rdma_cm is coming up with default GID type that is
not supported by the device.

Fix that by checking for supported GID type properly.

Fixes: 3c7f67d1 ("IB/cma: Fix default RoCE type setting")
Signed-off-by: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 732912c7

drivers/infiniband/core/cma.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ MODULE_LICENSE("Dual BSD/GPL"); 
#define CMA_MAX_CM_RETRIES 15

#define CMA_CM_MRA_SETTING (IB_CM_MRA_FLAG_DELAY | 24)

#define CMA_IBOE_PACKET_LIFETIME 18

#define CMA_PREFERRED_ROCE_GID_TYPE (1 << IB_GID_TYPE_ROCE_UDP_ENCAP)

#define CMA_PREFERRED_ROCE_GID_TYPE IB_GID_TYPE_ROCE_UDP_ENCAP



static const char * const cma_events[] = {

	[RDMA_CM_EVENT_ADDR_RESOLVED]	 = "address resolved",
@@ -4282,7 +4282,7 @@ static void cma_add_one(struct ib_device *device) 
	for (i = rdma_start_port(device); i <= rdma_end_port(device); i++) {

		supported_gids = roce_gid_type_mask_support(device, i);

		WARN_ON(!supported_gids);

		if (supported_gids & CMA_PREFERRED_ROCE_GID_TYPE)

		if (supported_gids & (1 << CMA_PREFERRED_ROCE_GID_TYPE))

			cma_dev->default_gid_type[i - rdma_start_port(device)] =

				CMA_PREFERRED_ROCE_GID_TYPE;

		else