Commit 9d187177 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/core: Simplify sa_path_set_[sd]lid() calls 



Instead of making every caller convert the second argument of
sa_path_set_slid() and sa_path_set_dlid() to big endian format,
make these two functions accept LIDs in CPU endian format.
This patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Cc: Don Hiatt <don.hiatt@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 9cc12ad6

drivers/infiniband/core/cm.c

+12 −14
Original line number Diff line number Diff line
@@ -1472,31 +1472,29 @@ static void cm_format_path_lid_from_req(struct cm_req_msg *req_msg, 


	if (primary_path->rec_type != SA_PATH_REC_TYPE_OPA) {

		sa_path_set_dlid(primary_path,

				 htonl(ntohs(req_msg->primary_local_lid)));

				 ntohs(req_msg->primary_local_lid));

		sa_path_set_slid(primary_path,

				 htonl(ntohs(req_msg->primary_remote_lid)));

				 ntohs(req_msg->primary_remote_lid));

	} else {

		lid = opa_get_lid_from_gid(&req_msg->primary_local_gid);

		sa_path_set_dlid(primary_path, cpu_to_be32(lid));

		sa_path_set_dlid(primary_path, lid);



		lid = opa_get_lid_from_gid(&req_msg->primary_remote_gid);

		sa_path_set_slid(primary_path, cpu_to_be32(lid));

		sa_path_set_slid(primary_path, lid);

	}



	if (!cm_req_has_alt_path(req_msg))

		return;



	if (alt_path->rec_type != SA_PATH_REC_TYPE_OPA) {

		sa_path_set_dlid(alt_path,

				 htonl(ntohs(req_msg->alt_local_lid)));

		sa_path_set_slid(alt_path,

				 htonl(ntohs(req_msg->alt_remote_lid)));

		sa_path_set_dlid(alt_path, ntohs(req_msg->alt_local_lid));

		sa_path_set_slid(alt_path, ntohs(req_msg->alt_remote_lid));

	} else {

		lid = opa_get_lid_from_gid(&req_msg->alt_local_gid);

		sa_path_set_dlid(alt_path, cpu_to_be32(lid));

		sa_path_set_dlid(alt_path, lid);



		lid = opa_get_lid_from_gid(&req_msg->alt_remote_gid);

		sa_path_set_slid(alt_path, cpu_to_be32(lid));

		sa_path_set_slid(alt_path, lid);

	}

}
@@ -3037,14 +3035,14 @@ static void cm_format_path_lid_from_lap(struct cm_lap_msg *lap_msg, 
	u32 lid;



	if (path->rec_type != SA_PATH_REC_TYPE_OPA) {

		sa_path_set_dlid(path, htonl(ntohs(lap_msg->alt_local_lid)));

		sa_path_set_slid(path, htonl(ntohs(lap_msg->alt_remote_lid)));

		sa_path_set_dlid(path, ntohs(lap_msg->alt_local_lid));

		sa_path_set_slid(path, ntohs(lap_msg->alt_remote_lid));

	} else {

		lid = opa_get_lid_from_gid(&lap_msg->alt_local_gid);

		sa_path_set_dlid(path, cpu_to_be32(lid));

		sa_path_set_dlid(path, lid);



		lid = opa_get_lid_from_gid(&lap_msg->alt_remote_gid);

		sa_path_set_slid(path, cpu_to_be32(lid));

		sa_path_set_slid(path, lid);

	}

}

drivers/infiniband/core/uverbs_marshall.c

+5 −5
Original line number Diff line number Diff line
@@ -176,18 +176,18 @@ EXPORT_SYMBOL(ib_copy_path_rec_to_user); 
void ib_copy_path_rec_from_user(struct sa_path_rec *dst,

				struct ib_user_path_rec *src)

{

	__be32 slid, dlid;

	u32 slid, dlid;



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

	if ((ib_is_opa_gid((union ib_gid *)src->sgid)) ||

	    (ib_is_opa_gid((union ib_gid *)src->dgid))) {

		dst->rec_type = SA_PATH_REC_TYPE_OPA;

		slid = htonl(opa_get_lid_from_gid((union ib_gid *)src->sgid));

		dlid = htonl(opa_get_lid_from_gid((union ib_gid *)src->dgid));

		slid = opa_get_lid_from_gid((union ib_gid *)src->sgid);

		dlid = opa_get_lid_from_gid((union ib_gid *)src->dgid);

	} else {

		dst->rec_type = SA_PATH_REC_TYPE_IB;

		slid = htonl(ntohs(src->slid));

		dlid = htonl(ntohs(src->dlid));

		slid = ntohs(src->slid);

		dlid = ntohs(src->dlid);

	}

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

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

drivers/infiniband/ulp/srp/ib_srp.c

+1 −1
Original line number Diff line number Diff line
@@ -2403,7 +2403,7 @@ static void srp_cm_rej_handler(struct ib_cm_id *cm_id, 
	switch (event->param.rej_rcvd.reason) {

	case IB_CM_REJ_PORT_CM_REDIRECT:

		cpi = event->param.rej_rcvd.ari;

		sa_path_set_dlid(&ch->path, htonl(ntohs(cpi->redirect_lid)));

		sa_path_set_dlid(&ch->path, ntohs(cpi->redirect_lid));

		ch->path.pkey = cpi->redirect_pkey;

		cm_id->remote_cm_qpn = be32_to_cpu(cpi->redirect_qp) & 0x00ffffff;

		memcpy(ch->path.dgid.raw, cpi->redirect_gid, 16);

include/rdma/ib_sa.h

+6 −6
Original line number Diff line number Diff line
@@ -590,20 +590,20 @@ static inline bool sa_path_is_roce(struct sa_path_rec *rec) 
		(rec->rec_type == SA_PATH_REC_TYPE_ROCE_V2));

}



static inline void sa_path_set_slid(struct sa_path_rec *rec, __be32 slid)

static inline void sa_path_set_slid(struct sa_path_rec *rec, u32 slid)

{

	if (rec->rec_type == SA_PATH_REC_TYPE_IB)

		rec->ib.slid = htons(ntohl(slid));

		rec->ib.slid = cpu_to_be16(slid);

	else if (rec->rec_type == SA_PATH_REC_TYPE_OPA)

		rec->opa.slid = slid;

		rec->opa.slid = cpu_to_be32(slid);

}



static inline void sa_path_set_dlid(struct sa_path_rec *rec, __be32 dlid)

static inline void sa_path_set_dlid(struct sa_path_rec *rec, u32 dlid)

{

	if (rec->rec_type == SA_PATH_REC_TYPE_IB)

		rec->ib.dlid = htons(ntohl(dlid));

		rec->ib.dlid = cpu_to_be16(dlid);

	else if (rec->rec_type == SA_PATH_REC_TYPE_OPA)

		rec->opa.dlid = dlid;

		rec->opa.dlid = cpu_to_be32(dlid);

}



static inline void sa_path_set_raw_traffic(struct sa_path_rec *rec,

CRA Git | Maintained and supported by SUSTech CRA and CCSE