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

Commit 116aa033 authored by Venkata Sandeep Dhanalakota's avatar Venkata Sandeep Dhanalakota Committed by Jason Gunthorpe
Browse files

IB/{hfi1, qib, rdmavt}: Move send completion logic to rdmavt 



Moving send completion code into rdmavt in order to have shared logic
between qib and hfi1 drivers.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: default avatarBrian Welty <brian.welty@intel.com>
Signed-off-by: default avatarVenkata Sandeep Dhanalakota <venkata.s.dhanalakota@intel.com>
Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 019f118b

drivers/infiniband/hw/hfi1/rc.c

+7 −7
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
		}

		clear_ahg(qp);

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

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

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

			IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);

		/* will get called again */

		goto done_free_tx;
@@ -378,7 +378,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
						wqe->wr.ex.invalidate_rkey);

					local_ops = 1;

				}

				hfi1_send_complete(qp, wqe,

				rvt_send_complete(qp, wqe,

						  err ? IB_WC_LOC_PROT_ERR

						      : IB_WC_SUCCESS);

				if (local_ops)
@@ -1043,7 +1043,7 @@ void hfi1_restart_rc(struct rvt_qp *qp, u32 psn, int wait) 
			hfi1_migrate_qp(qp);

			qp->s_retry = qp->s_retry_cnt;

		} else if (qp->s_last == qp->s_acked) {

			hfi1_send_complete(qp, wqe, IB_WC_RETRY_EXC_ERR);

			rvt_send_complete(qp, wqe, IB_WC_RETRY_EXC_ERR);

			rvt_error_qp(qp, IB_WC_WR_FLUSH_ERR);

			return;

		} else { /* need to handle delayed completion */
@@ -1468,7 +1468,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			ibp->rvp.n_other_naks++;

class_b:

			if (qp->s_last == qp->s_acked) {

				hfi1_send_complete(qp, wqe, status);

				rvt_send_complete(qp, wqe, status);

				rvt_error_qp(qp, IB_WC_WR_FLUSH_ERR);

			}

			break;
@@ -1706,7 +1706,7 @@ static void rc_rcv_resp(struct hfi1_packet *packet) 
	status = IB_WC_LOC_LEN_ERR;

ack_err:

	if (qp->s_last == qp->s_acked) {

		hfi1_send_complete(qp, wqe, status);

		rvt_send_complete(qp, wqe, status);

		rvt_error_qp(qp, IB_WC_WR_FLUSH_ERR);

	}

ack_done:

drivers/infiniband/hw/hfi1/ruc.c

+2 −43
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static void ruc_loopback(struct rvt_qp *sqp) 
	ibp->rvp.n_loop_pkts++;

flush_send:

	sqp->s_rnr_retry = sqp->s_rnr_retry_cnt;

	hfi1_send_complete(sqp, wqe, send_status);

	rvt_send_complete(sqp, wqe, send_status);

	if (local_ops) {

		atomic_dec(&sqp->local_ops_pending);

		local_ops = 0;
@@ -459,7 +459,7 @@ static void ruc_loopback(struct rvt_qp *sqp) 


serr:

	spin_lock_irqsave(&sqp->s_lock, flags);

	hfi1_send_complete(sqp, wqe, send_status);

	rvt_send_complete(sqp, wqe, send_status);

	if (sqp->ibqp.qp_type == IB_QPT_RC) {

		int lastwqe = rvt_error_qp(sqp, IB_WC_WR_FLUSH_ERR);
@@ -922,44 +922,3 @@ void hfi1_do_send(struct rvt_qp *qp, bool in_thread) 
	iowait_starve_clear(ps.pkts_sent, &priv->s_iowait);

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

}
 


/*

 * This should be called with s_lock held.

 */

void hfi1_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe,

			enum ib_wc_status status)

{

	u32 old_last, last;



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

		return;



	last = qp->s_last;

	old_last = last;

	trace_hfi1_qp_send_completion(qp, wqe, last);

	if (++last >= qp->s_size)

		last = 0;

	trace_hfi1_qp_send_completion(qp, wqe, last);

	qp->s_last = last;

	/* See post_send() */

	barrier();

	rvt_put_swqe(wqe);

	if (qp->ibqp.qp_type == IB_QPT_UD ||

	    qp->ibqp.qp_type == IB_QPT_SMI ||

	    qp->ibqp.qp_type == IB_QPT_GSI)

		atomic_dec(&ibah_to_rvtah(wqe->ud_wr.ah)->refcount);



	rvt_qp_swqe_complete(qp,

			     wqe,

			     ib_hfi1_wc_opcode[wqe->wr.opcode],

			     status);



	if (qp->s_acked == old_last)

		qp->s_acked = last;

	if (qp->s_cur == old_last)

		qp->s_cur = last;

	if (qp->s_tail == old_last)

		qp->s_tail = last;

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

		qp->s_draining = 0;

}

drivers/infiniband/hw/hfi1/uc.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
		}

		clear_ahg(qp);

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

		hfi1_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);

		rvt_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);

		goto done_free_tx;

	}
@@ -140,7 +140,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
					qp, wqe->wr.ex.invalidate_rkey);

				local_ops = 1;

			}

			hfi1_send_complete(qp, wqe, err ? IB_WC_LOC_PROT_ERR

			rvt_send_complete(qp, wqe, err ? IB_WC_LOC_PROT_ERR

							: IB_WC_SUCCESS);

			if (local_ops)

				atomic_dec(&qp->local_ops_pending);

drivers/infiniband/hw/hfi1/ud.c

+2 −2
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
			goto bail;

		}

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

		hfi1_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);

		rvt_send_complete(qp, wqe, IB_WC_WR_FLUSH_ERR);

		goto done_free_tx;

	}
@@ -560,7 +560,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
			ud_loopback(qp, wqe);

			spin_lock_irqsave(&qp->s_lock, tflags);

			ps->flags = tflags;

			hfi1_send_complete(qp, wqe, IB_WC_SUCCESS);

			rvt_send_complete(qp, wqe, IB_WC_SUCCESS);

			goto done_free_tx;

		}

	}

drivers/infiniband/hw/hfi1/verbs.c

+6 −3
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static void verbs_sdma_complete( 


	spin_lock(&qp->s_lock);

	if (tx->wqe) {

		hfi1_send_complete(qp, tx->wqe, IB_WC_SUCCESS);

		rvt_send_complete(qp, tx->wqe, IB_WC_SUCCESS);

	} else if (qp->ibqp.qp_type == IB_QPT_RC) {

		struct hfi1_opa_header *hdr;
@@ -938,7 +938,7 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps, 
pio_bail:

	if (qp->s_wqe) {

		spin_lock_irqsave(&qp->s_lock, flags);

		hfi1_send_complete(qp, qp->s_wqe, wc_status);

		rvt_send_complete(qp, qp->s_wqe, wc_status);

		spin_unlock_irqrestore(&qp->s_lock, flags);

	} else if (qp->ibqp.qp_type == IB_QPT_RC) {

		spin_lock_irqsave(&qp->s_lock, flags);
@@ -1145,7 +1145,7 @@ int hfi1_verbs_send(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
			hfi1_cdbg(PIO, "%s() Failed. Completing with err",

				  __func__);

			spin_lock_irqsave(&qp->s_lock, flags);

			hfi1_send_complete(qp, qp->s_wqe, IB_WC_GENERAL_ERR);

			rvt_send_complete(qp, qp->s_wqe, IB_WC_GENERAL_ERR);

			spin_unlock_irqrestore(&qp->s_lock, flags);

		}

		return -EINVAL;
@@ -1735,6 +1735,9 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	/* post send table */

	dd->verbs_dev.rdi.post_parms = hfi1_post_parms;



	/* opcode translation table */

	dd->verbs_dev.rdi.wc_opcode = ib_hfi1_wc_opcode;



	ppd = dd->pport;

	for (i = 0; i < dd->num_pports; i++, ppd++)

		rvt_init_port(&dd->verbs_dev.rdi,