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

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

IB/core: Use rdma_ah_attr accessor functions 



Modify core and driver components to use accessor functions
introduced to access individual fields of rdma_ah_attr

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDon Hiatt <don.hiatt@intel.com>
Reviewed-by: default avatarSean Hefty <sean.hefty@intel.com>
Reviewed-by: default avatarNiranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 2224c47a

drivers/infiniband/core/cm.c

+6 −4
Original line number Diff line number Diff line
@@ -1722,6 +1722,7 @@ static int cm_req_handler(struct cm_work *work) 
	struct cm_req_msg *req_msg;

	union ib_gid gid;

	struct ib_gid_attr gid_attr;

	const struct ib_global_route *grh;

	int ret;



	req_msg = (struct cm_req_msg *)work->mad_recv_wc->recv_buf.mad;
@@ -1761,10 +1762,11 @@ static int cm_req_handler(struct cm_work *work) 
	cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);



	memcpy(work->path[0].dmac, cm_id_priv->av.ah_attr.dmac, ETH_ALEN);

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

	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,

				cm_id_priv->av.ah_attr.grh.sgid_index,

				grh->sgid_index,

				&gid, &gid_attr);

	if (!ret) {

		if (gid_attr.ndev) {
@@ -3800,7 +3802,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv, 
					cm_id_priv->responder_resources;

			qp_attr->min_rnr_timer = 0;

		}

		if (cm_id_priv->alt_av.ah_attr.dlid) {

		if (rdma_ah_get_dlid(&cm_id_priv->alt_av.ah_attr)) {

			*qp_attr_mask |= IB_QP_ALT_PATH;

			qp_attr->alt_port_num = cm_id_priv->alt_av.port->port_num;

			qp_attr->alt_pkey_index = cm_id_priv->alt_av.pkey_index;
@@ -3854,7 +3856,7 @@ static int cm_init_qp_rts_attr(struct cm_id_private *cm_id_priv, 
			default:

				break;

			}

			if (cm_id_priv->alt_av.ah_attr.dlid) {

			if (rdma_ah_get_dlid(&cm_id_priv->alt_av.ah_attr)) {

				*qp_attr_mask |= IB_QP_PATH_MIG_STATE;

				qp_attr->path_mig_state = IB_MIG_REARM;

			}

drivers/infiniband/core/cma.c

+2 −1
Original line number Diff line number Diff line
@@ -929,7 +929,8 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv, 
		goto out;



	ret = ib_query_gid(id_priv->id.device, id_priv->id.port_num,

			   qp_attr.ah_attr.grh.sgid_index, &sgid, NULL);

			   rdma_ah_read_grh(&qp_attr.ah_attr)->sgid_index,

			   &sgid, NULL);

	if (ret)

		goto out;

drivers/infiniband/core/mad.c

+13 −8
Original line number Diff line number Diff line
@@ -1839,6 +1839,7 @@ static inline int rcv_has_same_gid(const struct ib_mad_agent_private *mad_agent_ 
	struct ib_device *device = mad_agent_priv->agent.device;

	u8 port_num = mad_agent_priv->agent.port_num;

	u8 lmc;

	bool has_grh;



	send_resp = ib_response_mad((struct ib_mad_hdr *)wr->send_buf.mad);

	rcv_resp = ib_response_mad(&rwc->recv_buf.mad->mad_hdr);
@@ -1851,32 +1852,36 @@ static inline int rcv_has_same_gid(const struct ib_mad_agent_private *mad_agent_ 
		/* Assume not equal, to avoid false positives. */

		return 0;



	if (!!(attr.ah_flags & IB_AH_GRH) !=

	    !!(rwc->wc->wc_flags & IB_WC_GRH))

	has_grh = !!(rdma_ah_get_ah_flags(&attr) & IB_AH_GRH);

	if (has_grh != !!(rwc->wc->wc_flags & IB_WC_GRH))

		/* one has GID, other does not.  Assume different */

		return 0;



	if (!send_resp && rcv_resp) {

		/* is request/response. */

		if (!(attr.ah_flags & IB_AH_GRH)) {

		if (!has_grh) {

			if (ib_get_cached_lmc(device, port_num, &lmc))

				return 0;

			return (!lmc || !((attr.src_path_bits ^

			return (!lmc || !((rdma_ah_get_path_bits(&attr) ^

					   rwc->wc->dlid_path_bits) &

					  ((1 << lmc) - 1)));

		} else {

			const struct ib_global_route *grh =

					rdma_ah_read_grh(&attr);



			if (ib_get_cached_gid(device, port_num,

					      attr.grh.sgid_index, &sgid, NULL))

					      grh->sgid_index, &sgid, NULL))

				return 0;

			return !memcmp(sgid.raw, rwc->recv_buf.grh->dgid.raw,

				       16);

		}

	}



	if (!(attr.ah_flags & IB_AH_GRH))

		return attr.dlid == rwc->wc->slid;

	if (!has_grh)

		return rdma_ah_get_dlid(&attr) == rwc->wc->slid;

	else

		return !memcmp(attr.grh.dgid.raw, rwc->recv_buf.grh->sgid.raw,

		return !memcmp(rdma_ah_read_grh(&attr)->dgid.raw,

			       rwc->recv_buf.grh->sgid.raw,

			       16);

}

drivers/infiniband/core/mad_rmpp.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static int init_newwin(struct ib_mad_send_wr_private *mad_send_wr) 
		if (rdma_query_ah(mad_send_wr->send_buf.ah, &ah_attr))

			continue;



		if (rmpp_recv->slid == ah_attr.dlid) {

		if (rmpp_recv->slid == rdma_ah_get_dlid(&ah_attr)) {

			newwin = rmpp_recv->repwin;

			break;

		}

drivers/infiniband/core/multicast.c

+9 −11
Original line number Diff line number Diff line
@@ -743,19 +743,17 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num, 
		return ret;



	memset(ah_attr, 0, sizeof *ah_attr);

	ah_attr->dlid = be16_to_cpu(rec->mlid);

	ah_attr->sl = rec->sl;

	ah_attr->port_num = port_num;

	ah_attr->static_rate = rec->rate;



	ah_attr->ah_flags = IB_AH_GRH;

	ah_attr->grh.dgid = rec->mgid;



	ah_attr->grh.sgid_index = (u8) gid_index;

	ah_attr->grh.flow_label = be32_to_cpu(rec->flow_label);

	ah_attr->grh.hop_limit = rec->hop_limit;

	ah_attr->grh.traffic_class = rec->traffic_class;

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

	rdma_ah_set_sl(ah_attr, rec->sl);

	rdma_ah_set_port_num(ah_attr, port_num);

	rdma_ah_set_static_rate(ah_attr, rec->rate);



	rdma_ah_set_grh(ah_attr, &rec->mgid,

			be32_to_cpu(rec->flow_label),

			(u8)gid_index,

			rec->hop_limit,

			rec->traffic_class);

	return 0;

}

EXPORT_SYMBOL(ib_init_ah_from_mcmember);