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

Commit 9fdca4da authored by Dasaratharaman Chandramouli's avatar Dasaratharaman Chandramouli Committed by Doug Ledford
Browse files

IB/SA: Split struct sa_path_rec based on IB and ROCE specific fields 



sa_path_rec now contains a union of sa_path_rec_ib and sa_path_rec_roce
based on the type of the path record. Note that fields applicable to
path record type ROCE v1 and ROCE v2 fall under sa_path_rec_roce.
Accessor functions are added to these fields so the caller doesn't have
to know the type.

Reviewed-by: default avatarDon Hiatt <don.hiatt@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent dfa834e1

drivers/infiniband/core/cm.c

+35 −27
Original line number Diff line number Diff line
@@ -1203,8 +1203,8 @@ static void cm_format_req(struct cm_req_msg *req_msg, 
	}



	if (pri_path->hop_limit <= 1) {

		req_msg->primary_local_lid = pri_path->slid;

		req_msg->primary_remote_lid = pri_path->dlid;

		req_msg->primary_local_lid = sa_path_get_slid(pri_path);

		req_msg->primary_remote_lid = sa_path_get_dlid(pri_path);

	} else {

		/* Work-around until there's a way to obtain remote LID info */

		req_msg->primary_local_lid = IB_LID_PERMISSIVE;
@@ -1224,8 +1224,8 @@ static void cm_format_req(struct cm_req_msg *req_msg, 


	if (alt_path) {

		if (alt_path->hop_limit <= 1) {

			req_msg->alt_local_lid = alt_path->slid;

			req_msg->alt_remote_lid = alt_path->dlid;

			req_msg->alt_local_lid = sa_path_get_slid(alt_path);

			req_msg->alt_remote_lid = sa_path_get_dlid(alt_path);

		} else {

			req_msg->alt_local_lid = IB_LID_PERMISSIVE;

			req_msg->alt_remote_lid = IB_LID_PERMISSIVE;
@@ -1405,11 +1405,10 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, 
				     struct sa_path_rec *primary_path,

				     struct sa_path_rec *alt_path)

{

	memset(primary_path, 0, sizeof(*primary_path));

	primary_path->dgid = req_msg->primary_local_gid;

	primary_path->sgid = req_msg->primary_remote_gid;

	primary_path->dlid = req_msg->primary_local_lid;

	primary_path->slid = req_msg->primary_remote_lid;

	sa_path_set_dlid(primary_path, req_msg->primary_local_lid);

	sa_path_set_slid(primary_path, req_msg->primary_remote_lid);

	primary_path->flow_label = cm_req_get_primary_flow_label(req_msg);

	primary_path->hop_limit = req_msg->primary_hop_limit;

	primary_path->traffic_class = req_msg->primary_traffic_class;
@@ -1424,14 +1423,13 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, 
	primary_path->packet_life_time =

		cm_req_get_primary_local_ack_timeout(req_msg);

	primary_path->packet_life_time -= (primary_path->packet_life_time > 0);

	primary_path->service_id = req_msg->service_id;

	sa_path_set_service_id(primary_path, req_msg->service_id);



	if (req_msg->alt_local_lid) {

		memset(alt_path, 0, sizeof(*alt_path));

		alt_path->dgid = req_msg->alt_local_gid;

		alt_path->sgid = req_msg->alt_remote_gid;

		alt_path->dlid = req_msg->alt_local_lid;

		alt_path->slid = req_msg->alt_remote_lid;

		sa_path_set_dlid(alt_path, req_msg->alt_local_lid);

		sa_path_set_slid(alt_path, req_msg->alt_remote_lid);

		alt_path->flow_label = cm_req_get_alt_flow_label(req_msg);

		alt_path->hop_limit = req_msg->alt_hop_limit;

		alt_path->traffic_class = req_msg->alt_traffic_class;
@@ -1446,7 +1444,7 @@ static void cm_format_paths_from_req(struct cm_req_msg *req_msg, 
		alt_path->packet_life_time =

			cm_req_get_alt_local_ack_timeout(req_msg);

		alt_path->packet_life_time -= (alt_path->packet_life_time > 0);

		alt_path->service_id = req_msg->service_id;

		sa_path_set_service_id(alt_path, req_msg->service_id);

	}

}
@@ -1760,27 +1758,34 @@ static int cm_req_handler(struct cm_work *work) 
	cm_id_priv->id.service_mask = ~cpu_to_be64(0);



	cm_process_routed_req(req_msg, work->mad_recv_wc->wc);

	cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);



	if (cm_id_priv->av.ah_attr.type == RDMA_AH_ATTR_TYPE_ROCE)

		memcpy(work->path[0].dmac, cm_id_priv->av.ah_attr.roce.dmac,

		       ETH_ALEN);

	memset(&work->path[0], 0, sizeof(work->path[0]));

	memset(&work->path[1], 0, sizeof(work->path[1]));

	grh = rdma_ah_read_grh(&cm_id_priv->av.ah_attr);

	work->path[0].hop_limit = grh->hop_limit;

	ret = ib_get_cached_gid(work->port->cm_dev->ib_device,

				work->port->port_num,

				grh->sgid_index,

				&gid, &gid_attr);

	if (!ret) {

		if (gid_attr.ndev) {

			work->path[0].ifindex = gid_attr.ndev->ifindex;

			work->path[0].net = dev_net(gid_attr.ndev);

			dev_put(gid_attr.ndev);

			work->path[0].rec_type =

				sa_conv_gid_to_pathrec_type(gid_attr.gid_type);

			sa_path_set_ifindex(&work->path[0],

					    gid_attr.ndev->ifindex);

			sa_path_set_ndev(&work->path[0],

					 dev_net(gid_attr.ndev));

			dev_put(gid_attr.ndev);

		} else {

			work->path[0].rec_type = SA_PATH_REC_TYPE_IB;

		}

		if (req_msg->alt_local_lid)

			work->path[1].rec_type = work->path[0].rec_type;

		cm_format_paths_from_req(req_msg, &work->path[0],

					 &work->path[1]);

		if (cm_id_priv->av.ah_attr.type == RDMA_AH_ATTR_TYPE_ROCE)

			sa_path_set_dmac(&work->path[0],

					 cm_id_priv->av.ah_attr.roce.dmac);

		work->path[0].hop_limit = grh->hop_limit;

		ret = cm_init_av_by_path(&work->path[0], &cm_id_priv->av,

					 cm_id_priv);

	}
@@ -1790,11 +1795,13 @@ static int cm_req_handler(struct cm_work *work) 
					    &work->path[0].sgid,

					    &gid_attr);

		if (!err && gid_attr.ndev) {

			work->path[0].ifindex = gid_attr.ndev->ifindex;

			work->path[0].net = dev_net(gid_attr.ndev);

			dev_put(gid_attr.ndev);

			work->path[0].rec_type =

				sa_conv_gid_to_pathrec_type(gid_attr.gid_type);

			sa_path_set_ifindex(&work->path[0],

					    gid_attr.ndev->ifindex);

			sa_path_set_ndev(&work->path[0],

					 dev_net(gid_attr.ndev));

			dev_put(gid_attr.ndev);

		} else {

			work->path[0].rec_type = SA_PATH_REC_TYPE_IB;

		}
@@ -2835,8 +2842,8 @@ static void cm_format_lap(struct cm_lap_msg *lap_msg, 
	cm_lap_set_remote_qpn(lap_msg, cm_id_priv->remote_qpn);

	/* todo: need remote CM response timeout */

	cm_lap_set_remote_resp_timeout(lap_msg, 0x1F);

	lap_msg->alt_local_lid = alternate_path->slid;

	lap_msg->alt_remote_lid = alternate_path->dlid;

	lap_msg->alt_local_lid = sa_path_get_slid(alternate_path);

	lap_msg->alt_remote_lid = sa_path_get_dlid(alternate_path);

	lap_msg->alt_local_gid = alternate_path->sgid;

	lap_msg->alt_remote_gid = alternate_path->dgid;

	cm_lap_set_flow_label(lap_msg, alternate_path->flow_label);
@@ -2912,10 +2919,11 @@ static void cm_format_path_from_lap(struct cm_id_private *cm_id_priv, 
				    struct cm_lap_msg *lap_msg)

{

	memset(path, 0, sizeof *path);

	path->rec_type = SA_PATH_REC_TYPE_IB;

	path->dgid = lap_msg->alt_local_gid;

	path->sgid = lap_msg->alt_remote_gid;

	path->dlid = lap_msg->alt_local_lid;

	path->slid = lap_msg->alt_remote_lid;

	sa_path_set_dlid(path, lap_msg->alt_local_lid);

	sa_path_set_slid(path, lap_msg->alt_remote_lid);

	path->flow_label = cm_lap_get_flow_label(lap_msg);

	path->hop_limit = lap_msg->alt_hop_limit;

	path->traffic_class = cm_lap_get_traffic_class(lap_msg);

drivers/infiniband/core/cma.c

+13 −9
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ static void cma_save_ib_info(struct sockaddr *src_addr, 
			ib->sib_pkey = path->pkey;

			ib->sib_flowinfo = path->flow_label;

			memcpy(&ib->sib_addr, &path->sgid, 16);

			ib->sib_sid = path->service_id;

			ib->sib_sid = sa_path_get_service_id(path);

			ib->sib_scope_id = 0;

		} else {

			ib->sib_pkey = listen_ib->sib_pkey;
@@ -1274,7 +1274,8 @@ static int cma_save_req_info(const struct ib_cm_event *ib_event, 
		memcpy(&req->local_gid, &req_param->primary_path->sgid,

		       sizeof(req->local_gid));

		req->has_gid	= true;

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

		req->service_id	=

			sa_path_get_service_id(req_param->primary_path);

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

		if (req->pkey != req_param->bth_pkey)

			pr_warn_ratelimited("RDMA CMA: got different BTH P_Key (0x%x) and primary path P_Key (0x%x)\n"
@@ -1825,8 +1826,8 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id, 
	struct rdma_cm_id *id;

	struct rdma_route *rt;

	const sa_family_t ss_family = listen_id->route.addr.src_addr.ss_family;

	const __be64 service_id =

		      ib_event->param.req_rcvd.primary_path->service_id;

	struct sa_path_rec *path = ib_event->param.req_rcvd.primary_path;

	const __be64 service_id = sa_path_get_service_id(path);

	int ret;



	id = rdma_create_id(listen_id->route.addr.dev_addr.net,
@@ -1848,7 +1849,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id, 
	if (!rt->path_rec)

		goto err;



	rt->path_rec[0] = *ib_event->param.req_rcvd.primary_path;

	rt->path_rec[0] = *path;

	if (rt->num_paths == 2)

		rt->path_rec[1] = *ib_event->param.req_rcvd.alternate_path;
@@ -2334,12 +2335,15 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, 
	struct sockaddr_ib *sib;



	memset(&path_rec, 0, sizeof path_rec);

	path_rec.rec_type = SA_PATH_REC_TYPE_IB;

	rdma_addr_get_sgid(dev_addr, &path_rec.sgid);

	rdma_addr_get_dgid(dev_addr, &path_rec.dgid);

	path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr));

	path_rec.numb_path = 1;

	path_rec.reversible = 1;

	path_rec.service_id = rdma_get_service_id(&id_priv->id, cma_dst_addr(id_priv));

	sa_path_set_service_id(&path_rec,

			       rdma_get_service_id(&id_priv->id,

						   cma_dst_addr(id_priv)));



	comp_mask = IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID |

		    IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH |
@@ -2577,8 +2581,6 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) 
			}

		}



		route->path_rec->net = &init_net;

		route->path_rec->ifindex = ndev->ifindex;

		supported_gids = roce_gid_type_mask_support(id_priv->id.device,

							    id_priv->id.port_num);

		gid_type = cma_route_gid_type(addr->dev_addr.network,
@@ -2586,13 +2588,15 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) 
					      id_priv->gid_type);

		route->path_rec->rec_type =

			sa_conv_gid_to_pathrec_type(gid_type);

		sa_path_set_ndev(route->path_rec, &init_net);

		sa_path_set_ifindex(route->path_rec, ndev->ifindex);

	}

	if (!ndev) {

		ret = -ENODEV;

		goto err2;

	}



	memcpy(route->path_rec->dmac, addr->dev_addr.dst_dev_addr, ETH_ALEN);

	sa_path_set_dmac(route->path_rec, addr->dev_addr.dst_dev_addr);



	rdma_ip2gid((struct sockaddr *)&id_priv->id.route.addr.src_addr,

		    &route->path_rec->sgid);

drivers/infiniband/core/sa_query.c

+24 −15
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static u32 tid; 
	.field_name          = "sa_path_rec:" #field



static const struct ib_field path_rec_table[] = {

	{ PATH_REC_FIELD(service_id),

	{ PATH_REC_FIELD(ib.service_id),

	  .offset_words = 0,

	  .offset_bits  = 0,

	  .size_bits    = 64 },
@@ -205,15 +205,15 @@ static const struct ib_field path_rec_table[] = { 
	  .offset_words = 6,

	  .offset_bits  = 0,

	  .size_bits    = 128 },

	{ PATH_REC_FIELD(dlid),

	{ PATH_REC_FIELD(ib.dlid),

	  .offset_words = 10,

	  .offset_bits  = 0,

	  .size_bits    = 16 },

	{ PATH_REC_FIELD(slid),

	{ PATH_REC_FIELD(ib.slid),

	  .offset_words = 10,

	  .offset_bits  = 16,

	  .size_bits    = 16 },

	{ PATH_REC_FIELD(raw_traffic),

	{ PATH_REC_FIELD(ib.raw_traffic),

	  .offset_words = 11,

	  .offset_bits  = 0,

	  .size_bits    = 1 },
@@ -643,7 +643,7 @@ static void ib_nl_set_path_rec_attrs(struct sk_buff *skb, 


	/* Now build the attributes */

	if (comp_mask & IB_SA_PATH_REC_SERVICE_ID) {

		val64 = be64_to_cpu(sa_rec->service_id);

		val64 = be64_to_cpu(sa_path_get_service_id(sa_rec));

		nla_put(skb, RDMA_NLA_F_MANDATORY | LS_NLA_TYPE_SERVICE_ID,

			sizeof(val64), &val64);

	}
@@ -1110,9 +1110,9 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, 
	memset(ah_attr, 0, sizeof *ah_attr);

	ah_attr->type = rdma_ah_find_type(device, port_num);



	rdma_ah_set_dlid(ah_attr, be16_to_cpu(rec->dlid));

	rdma_ah_set_dlid(ah_attr, be16_to_cpu(sa_path_get_dlid(rec)));

	rdma_ah_set_sl(ah_attr, rec->sl);

	rdma_ah_set_path_bits(ah_attr, be16_to_cpu(rec->slid) &

	rdma_ah_set_path_bits(ah_attr, be16_to_cpu(sa_path_get_slid(rec)) &

			      get_src_path_mask(device, port_num));

	rdma_ah_set_port_num(ah_attr, port_num);

	rdma_ah_set_static_rate(ah_attr, rec->rate);
@@ -1121,9 +1121,13 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, 
	if (use_roce) {

		struct net_device *idev;

		struct net_device *resolved_dev;

		struct rdma_dev_addr dev_addr = {.bound_dev_if = rec->ifindex,

						 .net = rec->net ? rec->net :

							 &init_net};

		struct rdma_dev_addr dev_addr = {

			.bound_dev_if = ((sa_path_get_ifindex(rec) >= 0) ?

					 sa_path_get_ifindex(rec) : 0),

			.net = sa_path_get_ndev(rec) ?

				sa_path_get_ndev(rec) :

				&init_net

		};

		union {

			struct sockaddr     _sockaddr;

			struct sockaddr_in  _sockaddr_in;
@@ -1193,8 +1197,13 @@ int ib_init_ah_from_path(struct ib_device *device, u8 port_num, 
			dev_put(ndev);

	}



	if (use_roce)

		memcpy(ah_attr->roce.dmac, rec->dmac, ETH_ALEN);

	if (use_roce) {

		u8 *dmac = sa_path_get_dmac(rec);



		if (!dmac)

			return -EINVAL;

		memcpy(ah_attr->roce.dmac, dmac, ETH_ALEN);

	}



	return 0;

}
@@ -1326,10 +1335,10 @@ static void ib_sa_path_rec_callback(struct ib_sa_query *sa_query, 


		ib_unpack(path_rec_table, ARRAY_SIZE(path_rec_table),

			  mad->data, &rec);

		rec.net = NULL;

		rec.ifindex = 0;

		rec.rec_type = SA_PATH_REC_TYPE_IB;

		eth_zero_addr(rec.dmac);

		sa_path_set_ndev(&rec, NULL);

		sa_path_set_ifindex(&rec, 0);

		sa_path_set_dmac_zero(&rec);

		query->callback(status, &rec, query->context);

	} else

		query->callback(status, NULL, query->context);

drivers/infiniband/core/uverbs_marshall.c

+10 −10
Original line number Diff line number Diff line
@@ -102,9 +102,9 @@ void ib_copy_path_rec_to_user(struct ib_user_path_rec *dst, 
	memcpy(dst->dgid, src->dgid.raw, sizeof src->dgid);

	memcpy(dst->sgid, src->sgid.raw, sizeof src->sgid);



	dst->dlid		= src->dlid;

	dst->slid		= src->slid;

	dst->raw_traffic	= src->raw_traffic;

	dst->dlid		= sa_path_get_dlid(src);

	dst->slid		= sa_path_get_slid(src);

	dst->raw_traffic	= sa_path_get_raw_traffic(src);

	dst->flow_label		= src->flow_label;

	dst->hop_limit		= src->hop_limit;

	dst->traffic_class	= src->traffic_class;
@@ -128,9 +128,10 @@ void ib_copy_path_rec_from_user(struct sa_path_rec *dst, 
	memcpy(dst->dgid.raw, src->dgid, sizeof dst->dgid);

	memcpy(dst->sgid.raw, src->sgid, sizeof dst->sgid);



	dst->dlid		= src->dlid;

	dst->slid		= src->slid;

	dst->raw_traffic	= src->raw_traffic;

	dst->rec_type = SA_PATH_REC_TYPE_IB;

	sa_path_set_dlid(dst, src->dlid);

	sa_path_set_slid(dst, src->slid);

	sa_path_set_raw_traffic(dst, src->raw_traffic);

	dst->flow_label		= src->flow_label;

	dst->hop_limit		= src->hop_limit;

	dst->traffic_class	= src->traffic_class;
@@ -146,9 +147,8 @@ void ib_copy_path_rec_from_user(struct sa_path_rec *dst, 
	dst->preference		= src->preference;

	dst->packet_life_time_selector = src->packet_life_time_selector;



	memset(dst->dmac, 0, sizeof(dst->dmac));

	dst->net = NULL;

	dst->ifindex = 0;

	dst->rec_type = SA_PATH_REC_TYPE_IB;

	sa_path_set_dmac_zero(dst);

	sa_path_set_ndev(dst, NULL);

	sa_path_set_ifindex(dst, 0);

}

EXPORT_SYMBOL(ib_copy_path_rec_from_user);

drivers/infiniband/ulp/ipoib/ipoib_fs.c

+3 −3
Original line number Diff line number Diff line
@@ -210,16 +210,16 @@ static int ipoib_path_seq_show(struct seq_file *file, void *iter_ptr) 
	seq_printf(file,

		   "GID: %s\n"

		   "  complete: %6s\n",

		   gid_buf, path.pathrec.dlid ? "yes" : "no");

		   gid_buf, sa_path_get_dlid(&path.pathrec) ? "yes" : "no");



	if (path.pathrec.dlid) {

	if (sa_path_get_dlid(&path.pathrec)) {

		rate = ib_rate_to_mbps(path.pathrec.rate);



		seq_printf(file,

			   "  DLID:     0x%04x\n"

			   "  SL: %12d\n"

			   "  rate: %8d.%d Gb/sec\n",

			   be16_to_cpu(path.pathrec.dlid),

			   be16_to_cpu(sa_path_get_dlid(&path.pathrec)),

			   path.pathrec.sl,

			   rate / 1000, rate % 1000);

	}