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

Commit 83693bd1 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Use rdmavt version of post_send 



This patch removes the post_send and post_one_send from the hfi1 driver.
The "posting" of sends will be done by rdmavt which will walk a WQE and
queue work. This patch will still provide the capability to schedule that
work as well as kick the progress. These are provided to the rdmavt layer.

Reviewed-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarEdward Mascarenhas <edward.mascarenhas@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 6366dfa6

drivers/staging/rdma/hfi1/driver.c

+4 −4
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
			spin_lock_irqsave(&qp->r_lock, flags);



			/* Check for valid receive state. */

			if (!(ib_hfi1_state_ops[qp->state] &

			      HFI1_PROCESS_RECV_OK)) {

			if (!(ib_rvt_state_ops[qp->state] &

			      RVT_PROCESS_RECV_OK)) {

				ibp->rvp.n_pkt_drops++;

			}
@@ -790,8 +790,8 @@ static inline void process_rcv_qp_work(struct hfi1_packet *packet) 


			qp->r_flags &= ~RVT_R_RSP_SEND;

			spin_lock_irqsave(&qp->s_lock, flags);

			if (ib_hfi1_state_ops[qp->state] &

					HFI1_PROCESS_OR_FLUSH_SEND)

			if (ib_rvt_state_ops[qp->state] &

					RVT_PROCESS_OR_FLUSH_SEND)

				hfi1_schedule_send(qp);

			spin_unlock_irqrestore(&qp->s_lock, flags);

		}

drivers/staging/rdma/hfi1/qp.c

+7 −7
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static void clear_mr_refs(struct rvt_qp *qp, int clr_sends) 


	if (clr_sends) {

		while (qp->s_last != qp->s_head) {

			struct rvt_swqe *wqe = get_swqe_ptr(qp, qp->s_last);

			struct rvt_swqe *wqe = rvt_get_swqe_ptr(qp, qp->s_last);

			unsigned i;



			for (i = 0; i < wqe->wr.num_sge; i++) {
@@ -411,7 +411,7 @@ int hfi1_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
		   int attr_mask, struct ib_udata *udata)

{

	struct hfi1_ibdev *dev = to_idev(ibqp->device);

	struct rvt_qp *qp = to_iqp(ibqp);

	struct rvt_qp *qp = ibqp_to_rvtqp(ibqp);

	struct hfi1_qp_priv *priv = qp->priv;

	enum ib_qp_state cur_state, new_state;

	struct ib_event ev;
@@ -710,7 +710,7 @@ int hfi1_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
int hfi1_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,

		  int attr_mask, struct ib_qp_init_attr *init_attr)

{

	struct rvt_qp *qp = to_iqp(ibqp);

	struct rvt_qp *qp = ibqp_to_rvtqp(ibqp);



	attr->qp_state = qp->state;

	attr->cur_qp_state = attr->qp_state;
@@ -829,7 +829,7 @@ __be32 hfi1_compute_aeth(struct rvt_qp *qp) 
 */

int hfi1_destroy_qp(struct ib_qp *ibqp)

{

	struct rvt_qp *qp = to_iqp(ibqp);

	struct rvt_qp *qp = ibqp_to_rvtqp(ibqp);

	struct hfi1_ibdev *dev = to_idev(ibqp->device);

	struct hfi1_qp_priv *priv = qp->priv;
@@ -943,7 +943,7 @@ static int iowait_sleep( 
	priv = qp->priv;



	spin_lock_irqsave(&qp->s_lock, flags);

	if (ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_RECV_OK) {

	if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) {



		/*

		 * If we couldn't queue the DMA request, save the info
@@ -1117,7 +1117,7 @@ void qp_iter_print(struct seq_file *s, struct qp_iter *iter) 
	struct sdma_engine *sde;



	sde = qp_to_sdma_engine(qp, priv->s_sc);

	wqe = get_swqe_ptr(qp, qp->s_last);

	wqe = rvt_get_swqe_ptr(qp, qp->s_last);

	seq_printf(s,

		   "N %d %s QP%u R %u %s %u %u %u f=%x %u %u %u %u %u PSN %x %x %x %x %x (%u %u %u %u %u %u) QP%u LID %x SL %u MTU %d %u %u %u SDE %p,%u\n",

		   iter->n,
@@ -1225,7 +1225,7 @@ void notify_qp_reset(struct rvt_qp *qp) 
	iowait_init(

		&priv->s_iowait,

		1,

		hfi1_do_send,

		_hfi1_do_send,

		iowait_sleep,

		iowait_wakeup);

	priv->r_adefered = 0;

drivers/staging/rdma/hfi1/rc.c

+20 −20
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
	int middle = 0;



	/* Don't send an ACK if we aren't supposed to. */

	if (!(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_RECV_OK))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK))

		goto bail;



	/* header size in 32-bit words LRH+BTH = (8+12)/4. */
@@ -291,8 +291,8 @@ int hfi1_make_rc_req(struct rvt_qp *qp) 
	    make_rc_ack(dev, qp, ohdr, pmtu))

		goto done;



	if (!(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_SEND_OK)) {

		if (!(ib_hfi1_state_ops[qp->state] & HFI1_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_SEND_OK)) {

		if (!(ib_rvt_state_ops[qp->state] & RVT_FLUSH_SEND))

			goto bail;

		/* We are in the error state, flush the work request. */

		if (qp->s_last == qp->s_head)
@@ -303,7 +303,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp) 
			goto bail;

		}

		clear_ahg(qp);

		wqe = get_swqe_ptr(qp, qp->s_last);

		wqe = rvt_get_swqe_ptr(qp, qp->s_last);

		hfi1_send_complete(qp, wqe, qp->s_last != qp->s_acked ?

			IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);

		/* will get called again */
@@ -323,10 +323,10 @@ int hfi1_make_rc_req(struct rvt_qp *qp) 
	}



	/* Send a request. */

	wqe = get_swqe_ptr(qp, qp->s_cur);

	wqe = rvt_get_swqe_ptr(qp, qp->s_cur);

	switch (qp->s_state) {

	default:

		if (!(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_NEXT_SEND_OK))

		if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_NEXT_SEND_OK))

			goto bail;

		/*

		 * Resend an old request or start a new one.
@@ -797,7 +797,7 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp, 
static void reset_psn(struct rvt_qp *qp, u32 psn)

{

	u32 n = qp->s_acked;

	struct rvt_swqe *wqe = get_swqe_ptr(qp, n);

	struct rvt_swqe *wqe = rvt_get_swqe_ptr(qp, n);

	u32 opcode;



	qp->s_cur = n;
@@ -820,7 +820,7 @@ static void reset_psn(struct rvt_qp *qp, u32 psn) 
			n = 0;

		if (n == qp->s_tail)

			break;

		wqe = get_swqe_ptr(qp, n);

		wqe = rvt_get_swqe_ptr(qp, n);

		diff = cmp_psn(psn, wqe->psn);

		if (diff < 0)

			break;
@@ -882,7 +882,7 @@ static void reset_psn(struct rvt_qp *qp, u32 psn) 
 */

static void restart_rc(struct rvt_qp *qp, u32 psn, int wait)

{

	struct rvt_swqe *wqe = get_swqe_ptr(qp, qp->s_acked);

	struct rvt_swqe *wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	struct hfi1_ibport *ibp;



	if (qp->s_retry == 0) {
@@ -964,7 +964,7 @@ static void reset_sending_psn(struct rvt_qp *qp, u32 psn) 


	/* Find the work request corresponding to the given PSN. */

	for (;;) {

		wqe = get_swqe_ptr(qp, n);

		wqe = rvt_get_swqe_ptr(qp, n);

		if (cmp_psn(psn, wqe->lpsn) <= 0) {

			if (wqe->wr.opcode == IB_WR_RDMA_READ)

				qp->s_sending_psn = wqe->lpsn + 1;
@@ -991,7 +991,7 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_ib_header *hdr) 
	u32 opcode;

	u32 psn;



	if (!(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_OR_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_OR_FLUSH_SEND))

		return;



	/* Find out where the BTH is */
@@ -1018,11 +1018,11 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_ib_header *hdr) 
	if ((psn & IB_BTH_REQ_ACK) && qp->s_acked != qp->s_tail &&

	    !(qp->s_flags &

		(RVT_S_TIMER | RVT_S_WAIT_RNR | RVT_S_WAIT_PSN)) &&

		(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_RECV_OK))

		(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK))

		start_timer(qp);



	while (qp->s_last != qp->s_acked) {

		wqe = get_swqe_ptr(qp, qp->s_last);

		wqe = rvt_get_swqe_ptr(qp, qp->s_last);

		if (cmp_psn(wqe->lpsn, qp->s_sending_psn) >= 0 &&

		    cmp_psn(qp->s_sending_psn, qp->s_sending_hpsn) <= 0)

			break;
@@ -1132,7 +1132,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, 
		if (++qp->s_cur >= qp->s_size)

			qp->s_cur = 0;

		qp->s_acked = qp->s_cur;

		wqe = get_swqe_ptr(qp, qp->s_cur);

		wqe = rvt_get_swqe_ptr(qp, qp->s_cur);

		if (qp->s_acked != qp->s_tail) {

			qp->s_state = OP(SEND_LAST);

			qp->s_psn = wqe->psn;
@@ -1142,7 +1142,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, 
			qp->s_acked = 0;

		if (qp->state == IB_QPS_SQD && qp->s_acked == qp->s_cur)

			qp->s_draining = 0;

		wqe = get_swqe_ptr(qp, qp->s_acked);

		wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	}

	return wqe;

}
@@ -1183,7 +1183,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
	ack_psn = psn;

	if (aeth >> 29)

		ack_psn--;

	wqe = get_swqe_ptr(qp, qp->s_acked);

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	ibp = to_iport(qp->ibqp.device, qp->port_num);



	/*
@@ -1392,7 +1392,7 @@ static void rdma_seq_err(struct rvt_qp *qp, struct hfi1_ibport *ibp, u32 psn, 
		del_timer(&qp->s_timer);

	}



	wqe = get_swqe_ptr(qp, qp->s_acked);

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);



	while (cmp_psn(psn, wqe->lpsn) > 0) {

		if (wqe->wr.opcode == IB_WR_RDMA_READ ||
@@ -1474,7 +1474,7 @@ static void rc_rcv_resp(struct hfi1_ibport *ibp, 


	if (unlikely(qp->s_acked == qp->s_tail))

		goto ack_done;

	wqe = get_swqe_ptr(qp, qp->s_acked);

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	status = IB_WC_SUCCESS;



	switch (opcode) {
@@ -1492,7 +1492,7 @@ static void rc_rcv_resp(struct hfi1_ibport *ibp, 
		if (!do_rc_ack(qp, aeth, psn, opcode, val, rcd) ||

		    opcode != OP(RDMA_READ_RESPONSE_FIRST))

			goto ack_done;

		wqe = get_swqe_ptr(qp, qp->s_acked);

		wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

		if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))

			goto ack_op_err;

		/*
@@ -1557,7 +1557,7 @@ static void rc_rcv_resp(struct hfi1_ibport *ibp, 
		 * have to be careful to copy the data to the right

		 * location.

		 */

		wqe = get_swqe_ptr(qp, qp->s_acked);

		wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

		qp->s_rdma_read_len = restart_sge(&qp->s_rdma_read_sge,

						  wqe, psn, pmtu);

		goto read_last;

drivers/staging/rdma/hfi1/ruc.c

+17 −11
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ int hfi1_get_rwqe(struct rvt_qp *qp, int wr_id_only) 
	}



	spin_lock_irqsave(&rq->lock, flags);

	if (!(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_RECV_OK)) {

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK)) {

		ret = 0;

		goto unlock;

	}
@@ -383,7 +383,7 @@ static void ruc_loopback(struct rvt_qp *sqp) 


	/* Return if we are already busy processing a work request. */

	if ((sqp->s_flags & (RVT_S_BUSY | RVT_S_ANY_WAIT)) ||

	    !(ib_hfi1_state_ops[sqp->state] & HFI1_PROCESS_OR_FLUSH_SEND))

	    !(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_OR_FLUSH_SEND))

		goto unlock;



	sqp->s_flags |= RVT_S_BUSY;
@@ -391,11 +391,11 @@ static void ruc_loopback(struct rvt_qp *sqp) 
again:

	if (sqp->s_last == sqp->s_head)

		goto clr_busy;

	wqe = get_swqe_ptr(sqp, sqp->s_last);

	wqe = rvt_get_swqe_ptr(sqp, sqp->s_last);



	/* Return if it is not OK to start a new work request. */

	if (!(ib_hfi1_state_ops[sqp->state] & HFI1_PROCESS_NEXT_SEND_OK)) {

		if (!(ib_hfi1_state_ops[sqp->state] & HFI1_FLUSH_SEND))

	if (!(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_NEXT_SEND_OK)) {

		if (!(ib_rvt_state_ops[sqp->state] & RVT_FLUSH_SEND))

			goto clr_busy;

		/* We are in the error state, flush the work request. */

		send_status = IB_WC_WR_FLUSH_ERR;
@@ -413,7 +413,7 @@ static void ruc_loopback(struct rvt_qp *sqp) 
	}

	spin_unlock_irqrestore(&sqp->s_lock, flags);



	if (!qp || !(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_RECV_OK) ||

	if (!qp || !(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) ||

	    qp->ibqp.qp_type != sqp->ibqp.qp_type) {

		ibp->rvp.n_pkt_drops++;

		/*
@@ -593,7 +593,7 @@ static void ruc_loopback(struct rvt_qp *sqp) 
	if (sqp->s_rnr_retry_cnt < 7)

		sqp->s_rnr_retry--;

	spin_lock_irqsave(&sqp->s_lock, flags);

	if (!(ib_hfi1_state_ops[sqp->state] & HFI1_PROCESS_RECV_OK))

	if (!(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_RECV_OK))

		goto clr_busy;

	sqp->s_flags |= RVT_S_WAIT_RNR;

	sqp->s_timer.function = hfi1_rc_rnr_retry;
@@ -802,6 +802,14 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct hfi1_other_headers *ohdr, 
/* when sending, force a reschedule every one of these periods */

#define SEND_RESCHED_TIMEOUT (5 * HZ)  /* 5s in jiffies */



void _hfi1_do_send(struct work_struct *work)

{

	struct iowait *wait = container_of(work, struct iowait, iowork);

	struct rvt_qp *qp = iowait_to_qp(wait);



	hfi1_do_send(qp);

}



/**

 * hfi1_do_send - perform a send on a QP

 * @work: contains a pointer to the QP
@@ -810,10 +818,8 @@ void hfi1_make_ruc_header(struct rvt_qp *qp, struct hfi1_other_headers *ohdr, 
 * exhausted.  Only allow one CPU to send a packet per QP (tasklet).

 * Otherwise, two threads could send packets out of order.

 */

void hfi1_do_send(struct work_struct *work)

void hfi1_do_send(struct rvt_qp *qp)

{

	struct iowait *wait = container_of(work, struct iowait, iowork);

	struct rvt_qp *qp = iowait_to_qp(wait);

	struct hfi1_pkt_state ps;

	int (*make_req)(struct rvt_qp *qp);

	unsigned long flags;
@@ -883,7 +889,7 @@ void hfi1_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe, 
	u32 old_last, last;

	unsigned i;



	if (!(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_OR_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_OR_FLUSH_SEND))

		return;



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

drivers/staging/rdma/hfi1/uc.c

+6 −6
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ int hfi1_make_uc_req(struct rvt_qp *qp) 


	spin_lock_irqsave(&qp->s_lock, flags);



	if (!(ib_hfi1_state_ops[qp->state] & HFI1_PROCESS_SEND_OK)) {

		if (!(ib_hfi1_state_ops[qp->state] & HFI1_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_SEND_OK)) {

		if (!(ib_rvt_state_ops[qp->state] & RVT_FLUSH_SEND))

			goto bail;

		/* We are in the error state, flush the work request. */

		if (qp->s_last == qp->s_head)
@@ -88,7 +88,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp) 
			goto bail;

		}

		clear_ahg(qp);

		wqe = get_swqe_ptr(qp, qp->s_last);

		wqe = rvt_get_swqe_ptr(qp, qp->s_last);

		hfi1_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);

		goto done;

	}
@@ -98,12 +98,12 @@ int hfi1_make_uc_req(struct rvt_qp *qp) 
		ohdr = &priv->s_hdr->ibh.u.l.oth;



	/* Get the next send request. */

	wqe = get_swqe_ptr(qp, qp->s_cur);

	wqe = rvt_get_swqe_ptr(qp, qp->s_cur);

	qp->s_wqe = NULL;

	switch (qp->s_state) {

	default:

		if (!(ib_hfi1_state_ops[qp->state] &

		    HFI1_PROCESS_NEXT_SEND_OK))

		if (!(ib_rvt_state_ops[qp->state] &

		    RVT_PROCESS_NEXT_SEND_OK))

			goto bail;

		/* Check if send work queue is empty. */

		if (qp->s_cur == qp->s_head) {