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

Commit 9636258f authored by Mitko Haralanov's avatar Mitko Haralanov Committed by Jason Gunthorpe
Browse files

IB/hfi1: Remove dependence on qp->s_hdrwords 



The s_hdrwords variable was used to indicate whether a
packet was already built on a previous iteration of the
send engine. This variable assumed the protection of the
QP's RVT_S_BUSY flag, which was required since the the
QP's s_lock was dropped just prior to the packet being
queued on the one of the egress mechanisms.

Support for multiple send engine instantiations require
that the field not be used due to concurency issues.
The ps.txreq signals the "already built" without the
potential concurency issues.

Fix by getting rid of all s_hdrword usage.   A wrapper
is added to test for the already built case that used to
use s_hdrwords.

What used to be stored in s_hdrwords is now in the txreq.
The PBC is not counted, but is added in the pio/sdma code
paths prior to posting the packet.

Reviewed-by: default avatarDon Hiatt <don.hiatt@intel.com>
Signed-off-by: default avatarMitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 2b1e7fe1

drivers/infiniband/hw/hfi1/iowait.h

+9 −0
Original line number Diff line number Diff line
@@ -371,4 +371,13 @@ static inline void iowait_starve_find_max(struct iowait *w, u8 *max, 
	}

}



/**

 * iowait_packet_queued() - determine if a packet is already built

 * @wait: the wait structure

 */

static inline bool iowait_packet_queued(struct iowait *wait)

{

	return !list_empty(&wait->tx_head);

}



#endif

drivers/infiniband/hw/hfi1/qp.c

+1 −3
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ void qp_iter_print(struct seq_file *s, struct rvt_qp_iter *iter) 
	if (qp->s_ack_queue)

		e = &qp->s_ack_queue[qp->s_tail_ack_queue];

	seq_printf(s,

		   "N %d %s QP %x R %u %s %u %u %u f=%x %u %u %u %u %u %u SPSN %x %x %x %x %x RPSN %x S(%u %u %u %u %u %u %u) R(%u %u %u) RQP %x LID %x SL %u MTU %u %u %u %u %u SDE %p,%u SC %p,%u SCQ %u %u PID %d OS %x %x E %x %x %x RNR %d %s %d\n",

		   "N %d %s QP %x R %u %s %u %u f=%x %u %u %u %u %u %u SPSN %x %x %x %x %x RPSN %x S(%u %u %u %u %u %u %u) R(%u %u %u) RQP %x LID %x SL %u MTU %u %u %u %u %u SDE %p,%u SC %p,%u SCQ %u %u PID %d OS %x %x E %x %x %x RNR %d %s %d\n",

		   iter->n,

		   qp_idle(qp) ? "I" : "B",

		   qp->ibqp.qp_num,
@@ -573,7 +573,6 @@ void qp_iter_print(struct seq_file *s, struct rvt_qp_iter *iter) 
		   qp_type_str[qp->ibqp.qp_type],

		   qp->state,

		   wqe ? wqe->wr.opcode : 0,

		   qp->s_hdrwords,

		   qp->s_flags,

		   iowait_sdma_pending(&priv->s_iowait),

		   iowait_pio_pending(&priv->s_iowait),
@@ -795,7 +794,6 @@ void notify_error_qp(struct rvt_qp *qp) 
	}



	if (!(qp->s_flags & RVT_S_BUSY)) {

		qp->s_hdrwords = 0;

		if (qp->s_rdma_mr) {

			rvt_put_mr(qp->s_rdma_mr);

			qp->s_rdma_mr = NULL;

drivers/infiniband/hw/hfi1/qp.h

+13 −0
Original line number Diff line number Diff line
@@ -51,11 +51,24 @@ 
#include <rdma/rdmavt_qp.h>

#include "verbs.h"

#include "sdma.h"

#include "verbs_txreq.h"



extern unsigned int hfi1_qp_table_size;



extern const struct rvt_operation_params hfi1_post_parms[];



/*

 * Send if not busy or waiting for I/O and either

 * a RC response is pending or we can process send work requests.

 */

static inline int hfi1_send_ok(struct rvt_qp *qp)

{

	return !(qp->s_flags & (RVT_S_BUSY | RVT_S_ANY_WAIT_IO)) &&

		(verbs_txreq_queued(qp) ||

		(qp->s_flags & RVT_S_RESP_PENDING) ||

		 !(qp->s_flags & RVT_S_ANY_WAIT_SEND));

}



/*

 * free_ahg - clear ahg from QP

 */

drivers/infiniband/hw/hfi1/rc.c

+2 −8
Original line number Diff line number Diff line
@@ -226,12 +226,10 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
		bth2 = mask_psn(qp->s_ack_psn);

	}

	qp->s_rdma_ack_cnt++;

	qp->s_hdrwords = hwords;

	ps->s_txreq->sde = priv->s_sde;

	ps->s_txreq->s_cur_size = len;

	ps->s_txreq->hdr_dwords = hwords;

	hfi1_make_ruc_header(qp, ohdr, bth0, bth2, middle, ps);

	/* pbc */

	ps->s_txreq->hdr_dwords = qp->s_hdrwords + 2;

	return 1;



bail:
@@ -387,7 +385,6 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
						       : IB_WC_SUCCESS);

				if (local_ops)

					atomic_dec(&qp->local_ops_pending);

				qp->s_hdrwords = 0;

				goto done_free_tx;

			}
@@ -690,7 +687,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
		bth2 |= IB_BTH_REQ_ACK;

	}

	qp->s_len -= len;

	qp->s_hdrwords = hwords;

	ps->s_txreq->hdr_dwords = hwords;

	ps->s_txreq->sde = priv->s_sde;

	ps->s_txreq->ss = ss;

	ps->s_txreq->s_cur_size = len;
@@ -701,8 +698,6 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
		bth2,

		middle,

		ps);

	/* pbc */

	ps->s_txreq->hdr_dwords = qp->s_hdrwords + 2;

	return 1;



done_free_tx:
@@ -716,7 +711,6 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
bail_no_tx:

	ps->s_txreq = NULL;

	qp->s_flags &= ~RVT_S_BUSY;

	qp->s_hdrwords = 0;

	return 0;

}

drivers/infiniband/hw/hfi1/ruc.c

+11 −12
Original line number Diff line number Diff line
@@ -757,7 +757,8 @@ static inline void hfi1_make_ruc_header_16B(struct rvt_qp *qp, 
	u32 slid;

	u16 pkey = hfi1_get_pkey(ibp, qp->s_pkey_index);

	u8 l4 = OPA_16B_L4_IB_LOCAL;

	u8 extra_bytes = hfi1_get_16b_padding((qp->s_hdrwords << 2),

	u8 extra_bytes = hfi1_get_16b_padding(

				(ps->s_txreq->hdr_dwords << 2),

				ps->s_txreq->s_cur_size);

	u32 nwords = SIZE_OF_CRC + ((ps->s_txreq->s_cur_size +

				 extra_bytes + SIZE_OF_LT) >> 2);
@@ -778,8 +779,8 @@ static inline void hfi1_make_ruc_header_16B(struct rvt_qp *qp, 
			grd->sgid_index = 0;

		grh = &ps->s_txreq->phdr.hdr.opah.u.l.grh;

		l4 = OPA_16B_L4_IB_GLOBAL;

		hdrwords = qp->s_hdrwords - 4;

		qp->s_hdrwords += hfi1_make_grh(ibp, grh, grd,

		hdrwords = ps->s_txreq->hdr_dwords - 4;

		ps->s_txreq->hdr_dwords += hfi1_make_grh(ibp, grh, grd,

							 hdrwords, nwords);

		middle = 0;

	}
@@ -814,7 +815,7 @@ static inline void hfi1_make_ruc_header_16B(struct rvt_qp *qp, 
			  slid,

			  opa_get_lid(rdma_ah_get_dlid(&qp->remote_ah_attr),

				      16B),

			  (qp->s_hdrwords + nwords) >> 1,

			  (ps->s_txreq->hdr_dwords + nwords) >> 1,

			  pkey, becn, 0, l4, priv->s_sc);

}
@@ -834,10 +835,10 @@ static inline void hfi1_make_ruc_header_9B(struct rvt_qp *qp, 


	if (unlikely(rdma_ah_get_ah_flags(&qp->remote_ah_attr) & IB_AH_GRH)) {

		struct ib_grh *grh = &ps->s_txreq->phdr.hdr.ibh.u.l.grh;

		int hdrwords = qp->s_hdrwords - 2;

		int hdrwords = ps->s_txreq->hdr_dwords - 2;



		lrh0 = HFI1_LRH_GRH;

		qp->s_hdrwords +=

		ps->s_txreq->hdr_dwords +=

			hfi1_make_grh(ibp, grh,

				      rdma_ah_read_grh(&qp->remote_ah_attr),

				      hdrwords, nwords);
@@ -866,7 +867,7 @@ static inline void hfi1_make_ruc_header_9B(struct rvt_qp *qp, 
	hfi1_make_ruc_bth(qp, ohdr, bth0, bth1, bth2);

	hfi1_make_ib_hdr(&ps->s_txreq->phdr.hdr.ibh,

			 lrh0,

			 qp->s_hdrwords + nwords,

			 ps->s_txreq->hdr_dwords + nwords,

			 opa_get_lid(rdma_ah_get_dlid(&qp->remote_ah_attr), 9B),

			 ppd_from_ibp(ibp)->lid |

				rdma_ah_get_path_bits(&qp->remote_ah_attr));
@@ -1031,7 +1032,7 @@ void hfi1_do_send(struct rvt_qp *qp, bool in_thread) 
	ps.s_txreq = get_waiting_verbs_txreq(qp);

	do {

		/* Check for a constructed packet to be sent. */

		if (qp->s_hdrwords != 0) {

		if (ps.s_txreq) {

			spin_unlock_irqrestore(&qp->s_lock, ps.flags);

			/*

			 * If the packet cannot be sent now, return and
@@ -1039,8 +1040,6 @@ void hfi1_do_send(struct rvt_qp *qp, bool in_thread) 
			 */

			if (hfi1_verbs_send(qp, &ps))

				return;

			/* Record that s_ahg is empty. */

			qp->s_hdrwords = 0;

			/* allow other tasks to run */

			if (schedule_send_yield(qp, &ps))

				return;