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

Commit 80885456 authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/mthca: Factor out setting WQE data segment entries 



Factor code to set data segment entries out of the work request
posting functions into inline functions mthca_set_data_seg() and
mthca_set_data_seg_inval().  This makes the code more readable and
also allows the compiler to do a better job -- on x86_64:

add/remove: 0/0 grow/shrink: 0/6 up/down: 0/-69 (-69)
function                                     old     new   delta
mthca_arbel_post_srq_recv                    373     369      -4
mthca_arbel_post_receive                     570     562      -8
mthca_tavor_post_srq_recv                    520     508     -12
mthca_tavor_post_send                       1344    1330     -14
mthca_arbel_post_send                       1481    1467     -14
mthca_tavor_post_receive                     792     775     -17

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 7f5eb9bb

drivers/infiniband/hw/mthca/mthca_qp.c

+9 −32
Original line number Diff line number Diff line
@@ -1740,12 +1740,7 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		}



		for (i = 0; i < wr->num_sge; ++i) {

			((struct mthca_data_seg *) wqe)->byte_count =

				cpu_to_be32(wr->sg_list[i].length);

			((struct mthca_data_seg *) wqe)->lkey =

				cpu_to_be32(wr->sg_list[i].lkey);

			((struct mthca_data_seg *) wqe)->addr =

				cpu_to_be64(wr->sg_list[i].addr);

			mthca_set_data_seg(wqe, wr->sg_list + i);

			wqe  += sizeof (struct mthca_data_seg);

			size += sizeof (struct mthca_data_seg) / 16;

		}
@@ -1869,12 +1864,7 @@ int mthca_tavor_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr, 
		}



		for (i = 0; i < wr->num_sge; ++i) {

			((struct mthca_data_seg *) wqe)->byte_count =

				cpu_to_be32(wr->sg_list[i].length);

			((struct mthca_data_seg *) wqe)->lkey =

				cpu_to_be32(wr->sg_list[i].lkey);

			((struct mthca_data_seg *) wqe)->addr =

				cpu_to_be64(wr->sg_list[i].addr);

			mthca_set_data_seg(wqe, wr->sg_list + i);

			wqe  += sizeof (struct mthca_data_seg);

			size += sizeof (struct mthca_data_seg) / 16;

		}
@@ -2125,12 +2115,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		}



		for (i = 0; i < wr->num_sge; ++i) {

			((struct mthca_data_seg *) wqe)->byte_count =

				cpu_to_be32(wr->sg_list[i].length);

			((struct mthca_data_seg *) wqe)->lkey =

				cpu_to_be32(wr->sg_list[i].lkey);

			((struct mthca_data_seg *) wqe)->addr =

				cpu_to_be64(wr->sg_list[i].addr);

			mthca_set_data_seg(wqe, wr->sg_list + i);

			wqe  += sizeof (struct mthca_data_seg);

			size += sizeof (struct mthca_data_seg) / 16;

		}
@@ -2253,20 +2238,12 @@ int mthca_arbel_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr, 
		}



		for (i = 0; i < wr->num_sge; ++i) {

			((struct mthca_data_seg *) wqe)->byte_count =

				cpu_to_be32(wr->sg_list[i].length);

			((struct mthca_data_seg *) wqe)->lkey =

				cpu_to_be32(wr->sg_list[i].lkey);

			((struct mthca_data_seg *) wqe)->addr =

				cpu_to_be64(wr->sg_list[i].addr);

			mthca_set_data_seg(wqe, wr->sg_list + i);

			wqe += sizeof (struct mthca_data_seg);

		}



		if (i < qp->rq.max_gs) {

			((struct mthca_data_seg *) wqe)->byte_count = 0;

			((struct mthca_data_seg *) wqe)->lkey = cpu_to_be32(MTHCA_INVAL_LKEY);

			((struct mthca_data_seg *) wqe)->addr = 0;

		}

		if (i < qp->rq.max_gs)

			mthca_set_data_seg_inval(wqe);



		qp->wrid[ind] = wr->wr_id;

drivers/infiniband/hw/mthca/mthca_srq.c

+6 −22
Original line number Diff line number Diff line
@@ -543,20 +543,12 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 
		}



		for (i = 0; i < wr->num_sge; ++i) {

			((struct mthca_data_seg *) wqe)->byte_count =

				cpu_to_be32(wr->sg_list[i].length);

			((struct mthca_data_seg *) wqe)->lkey =

				cpu_to_be32(wr->sg_list[i].lkey);

			((struct mthca_data_seg *) wqe)->addr =

				cpu_to_be64(wr->sg_list[i].addr);

			mthca_set_data_seg(wqe, wr->sg_list + i);

			wqe += sizeof (struct mthca_data_seg);

		}



		if (i < srq->max_gs) {

			((struct mthca_data_seg *) wqe)->byte_count = 0;

			((struct mthca_data_seg *) wqe)->lkey = cpu_to_be32(MTHCA_INVAL_LKEY);

			((struct mthca_data_seg *) wqe)->addr = 0;

		}

		if (i < srq->max_gs)

			mthca_set_data_seg_inval(wqe);



		((struct mthca_next_seg *) prev_wqe)->nda_op =

			cpu_to_be32((ind << srq->wqe_shift) | 1);
@@ -662,20 +654,12 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, 
		}



		for (i = 0; i < wr->num_sge; ++i) {

			((struct mthca_data_seg *) wqe)->byte_count =

				cpu_to_be32(wr->sg_list[i].length);

			((struct mthca_data_seg *) wqe)->lkey =

				cpu_to_be32(wr->sg_list[i].lkey);

			((struct mthca_data_seg *) wqe)->addr =

				cpu_to_be64(wr->sg_list[i].addr);

			mthca_set_data_seg(wqe, wr->sg_list + i);

			wqe += sizeof (struct mthca_data_seg);

		}



		if (i < srq->max_gs) {

			((struct mthca_data_seg *) wqe)->byte_count = 0;

			((struct mthca_data_seg *) wqe)->lkey = cpu_to_be32(MTHCA_INVAL_LKEY);

			((struct mthca_data_seg *) wqe)->addr = 0;

		}

		if (i < srq->max_gs)

			mthca_set_data_seg_inval(wqe);



		srq->wrid[ind]  = wr->wr_id;

		srq->first_free = next_ind;

drivers/infiniband/hw/mthca/mthca_wqe.h

+15 −0
Original line number Diff line number Diff line
@@ -113,4 +113,19 @@ struct mthca_mlx_seg { 
	__be16 vcrc;

};



static __always_inline void mthca_set_data_seg(struct mthca_data_seg *dseg,

					       struct ib_sge *sg)

{

	dseg->byte_count = cpu_to_be32(sg->length);

	dseg->lkey       = cpu_to_be32(sg->lkey);

	dseg->addr       = cpu_to_be64(sg->addr);

}



static __always_inline void mthca_set_data_seg_inval(struct mthca_data_seg *dseg)

{

	dseg->byte_count = 0;

	dseg->lkey       = cpu_to_be32(MTHCA_INVAL_LKEY);

	dseg->addr       = 0;

}



#endif /* MTHCA_WQE_H */