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

Commit f68194ca authored by Sean Hefty's avatar Sean Hefty Committed by Roland Dreier
Browse files

RDMA/cma: Add support for AF_IB to rdma_resolve_route() 



Allow rdma_resolve_route() to handle the case where the user specified
the source and destination addresses using AF_IB.

Signed-off-by: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent f17df3b0

drivers/infiniband/core/cma.c

+11 −2
Original line number Diff line number Diff line
@@ -1743,6 +1743,7 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, 
	struct ib_sa_path_rec path_rec;

	ib_sa_comp_mask comp_mask;

	struct sockaddr_in6 *sin6;

	struct sockaddr_ib *sib;



	memset(&path_rec, 0, sizeof path_rec);

	rdma_addr_get_sgid(dev_addr, &path_rec.sgid);
@@ -1756,13 +1757,21 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, 
		    IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH |

		    IB_SA_PATH_REC_REVERSIBLE | IB_SA_PATH_REC_SERVICE_ID;



	if (cma_family(id_priv) == AF_INET) {

	switch (cma_family(id_priv)) {

	case AF_INET:

		path_rec.qos_class = cpu_to_be16((u16) id_priv->tos);

		comp_mask |= IB_SA_PATH_REC_QOS_CLASS;

	} else {

		break;

	case AF_INET6:

		sin6 = (struct sockaddr_in6 *) cma_src_addr(id_priv);

		path_rec.traffic_class = (u8) (be32_to_cpu(sin6->sin6_flowinfo) >> 20);

		comp_mask |= IB_SA_PATH_REC_TRAFFIC_CLASS;

		break;

	case AF_IB:

		sib = (struct sockaddr_ib *) cma_src_addr(id_priv);

		path_rec.traffic_class = (u8) (be32_to_cpu(sib->sib_flowinfo) >> 20);

		comp_mask |= IB_SA_PATH_REC_TRAFFIC_CLASS;

		break;

	}



	id_priv->query_id = ib_sa_path_rec_get(&sa_client, id_priv->id.device,