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

Commit ab3964ad authored by Haggai Eran's avatar Haggai Eran Committed by Doug Ledford
Browse files

IB/cma: Use inner P_Key to determine netdev 



When discussing the patches to demux ids in rdma_cm instead of ib_cm, it
was decided that it is best to use the P_Key value in the packet headers.
However, the mlx5 and ipath drivers are currently unable to send correct
P_Key values in GMP headers. They always send using a single P_Key that is
set during the GSI QP initialization.

Change the rdma_cm code to look at the P_Key value that is part of the
packet payload as a workaround. Once the drivers are fixed this patch can
be reverted.

Fixes: 4c21b5bc ("IB/cma: Add net_dev and private data checks to
RDMA CM")
Signed-off-by: default avatarHaggai Eran <haggaie@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 0174b381

drivers/infiniband/core/cma.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1067,14 +1067,14 @@ static int cma_save_req_info(const struct ib_cm_event *ib_event, 
		       sizeof(req->local_gid));

		       sizeof(req->local_gid));

		req->has_gid	= true;

		req->has_gid	= true;

		req->service_id	= req_param->primary_path->service_id;

		req->service_id	= req_param->primary_path->service_id;

		req->pkey	= req_param->bth_pkey;

		req->pkey	= be16_to_cpu(req_param->primary_path->pkey);

		break;

		break;

	case IB_CM_SIDR_REQ_RECEIVED:

	case IB_CM_SIDR_REQ_RECEIVED:

		req->device	= sidr_param->listen_id->device;

		req->device	= sidr_param->listen_id->device;

		req->port	= sidr_param->port;

		req->port	= sidr_param->port;

		req->has_gid	= false;

		req->has_gid	= false;

		req->service_id	= sidr_param->service_id;

		req->service_id	= sidr_param->service_id;

		req->pkey	= sidr_param->bth_pkey;

		req->pkey	= sidr_param->pkey;

		break;

		break;

	default:

	default:

		return -EINVAL;

		return -EINVAL;