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

Commit 696513e8 authored by Brian Welty's avatar Brian Welty Committed by Doug Ledford
Browse files

IB/hfi1, qib, rdmavt: Move AETH credit functions into rdmavt 



Add rvt_compute_aeth() and rvt_get_credit() as shared functions in
rdmavt, moved from hfi1/qib logic.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarBrian Welty <brian.welty@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent beb5a042

drivers/infiniband/hw/hfi1/common.h

+0 −4
Original line number Diff line number Diff line
@@ -331,10 +331,6 @@ struct diag_pkt { 
#define FULL_MGMT_P_KEY      0xFFFF



#define DEFAULT_P_KEY LIM_MGMT_P_KEY

#define HFI1_AETH_CREDIT_SHIFT 24

#define HFI1_AETH_CREDIT_MASK 0x1F

#define HFI1_AETH_CREDIT_INVAL 0x1F

#define HFI1_MSN_MASK 0xFFFFFF

#define HFI1_FECN_SHIFT 31

#define HFI1_FECN_MASK 1

#define HFI1_FECN_SMASK BIT(HFI1_FECN_SHIFT)

drivers/infiniband/hw/hfi1/qp.c

+0 −137
Original line number Diff line number Diff line
@@ -79,43 +79,6 @@ static inline unsigned mk_qpn(struct rvt_qpn_table *qpt, 
	return (map - qpt->map) * RVT_BITS_PER_PAGE + off;

}



/*

 * Convert the AETH credit code into the number of credits.

 */

static const u16 credit_table[31] = {

	0,                      /* 0 */

	1,                      /* 1 */

	2,                      /* 2 */

	3,                      /* 3 */

	4,                      /* 4 */

	6,                      /* 5 */

	8,                      /* 6 */

	12,                     /* 7 */

	16,                     /* 8 */

	24,                     /* 9 */

	32,                     /* A */

	48,                     /* B */

	64,                     /* C */

	96,                     /* D */

	128,                    /* E */

	192,                    /* F */

	256,                    /* 10 */

	384,                    /* 11 */

	512,                    /* 12 */

	768,                    /* 13 */

	1024,                   /* 14 */

	1536,                   /* 15 */

	2048,                   /* 16 */

	3072,                   /* 17 */

	4096,                   /* 18 */

	6144,                   /* 19 */

	8192,                   /* 1A */

	12288,                  /* 1B */

	16384,                  /* 1C */

	24576,                  /* 1D */

	32768                   /* 1E */

};



const struct rvt_operation_params hfi1_post_parms[RVT_OPERATION_MAX] = {

[IB_WR_RDMA_WRITE] = {

	.length = sizeof(struct ib_rdma_wr),
@@ -339,68 +302,6 @@ int hfi1_check_send_wqe(struct rvt_qp *qp, 
	return wqe->length <= piothreshold;

}



/**

 * hfi1_compute_aeth - compute the AETH (syndrome + MSN)

 * @qp: the queue pair to compute the AETH for

 *

 * Returns the AETH.

 */

__be32 hfi1_compute_aeth(struct rvt_qp *qp)

{

	u32 aeth = qp->r_msn & HFI1_MSN_MASK;



	if (qp->ibqp.srq) {

		/*

		 * Shared receive queues don't generate credits.

		 * Set the credit field to the invalid value.

		 */

		aeth |= HFI1_AETH_CREDIT_INVAL << HFI1_AETH_CREDIT_SHIFT;

	} else {

		u32 min, max, x;

		u32 credits;

		struct rvt_rwq *wq = qp->r_rq.wq;

		u32 head;

		u32 tail;



		/* sanity check pointers before trusting them */

		head = wq->head;

		if (head >= qp->r_rq.size)

			head = 0;

		tail = wq->tail;

		if (tail >= qp->r_rq.size)

			tail = 0;

		/*

		 * Compute the number of credits available (RWQEs).

		 * There is a small chance that the pair of reads are

		 * not atomic, which is OK, since the fuzziness is

		 * resolved as further ACKs go out.

		 */

		credits = head - tail;

		if ((int)credits < 0)

			credits += qp->r_rq.size;

		/*

		 * Binary search the credit table to find the code to

		 * use.

		 */

		min = 0;

		max = 31;

		for (;;) {

			x = (min + max) / 2;

			if (credit_table[x] == credits)

				break;

			if (credit_table[x] > credits) {

				max = x;

			} else {

				if (min == x)

					break;

				min = x;

			}

		}

		aeth |= x << HFI1_AETH_CREDIT_SHIFT;

	}

	return cpu_to_be32(aeth);

}



/**

 * _hfi1_schedule_send - schedule progress

 * @qp: the QP
@@ -457,44 +358,6 @@ void hfi1_schedule_send(struct rvt_qp *qp) 
		_hfi1_schedule_send(qp);

}



/**

 * hfi1_get_credit - handle credit in aeth

 * @qp: the qp

 * @aeth: the Acknowledge Extended Transport Header

 *

 * The QP s_lock should be held.

 */

void hfi1_get_credit(struct rvt_qp *qp, u32 aeth)

{

	u32 credit = (aeth >> HFI1_AETH_CREDIT_SHIFT) & HFI1_AETH_CREDIT_MASK;



	lockdep_assert_held(&qp->s_lock);

	/*

	 * If the credit is invalid, we can send

	 * as many packets as we like.  Otherwise, we have to

	 * honor the credit field.

	 */

	if (credit == HFI1_AETH_CREDIT_INVAL) {

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

			qp->s_flags |= RVT_S_UNLIMITED_CREDIT;

			if (qp->s_flags & RVT_S_WAIT_SSN_CREDIT) {

				qp->s_flags &= ~RVT_S_WAIT_SSN_CREDIT;

				hfi1_schedule_send(qp);

			}

		}

	} else if (!(qp->s_flags & RVT_S_UNLIMITED_CREDIT)) {

		/* Compute new LSN (i.e., MSN + credit) */

		credit = (aeth + credit_table[credit]) & HFI1_MSN_MASK;

		if (cmp_msn(credit, qp->s_lsn) > 0) {

			qp->s_lsn = credit;

			if (qp->s_flags & RVT_S_WAIT_SSN_CREDIT) {

				qp->s_flags &= ~RVT_S_WAIT_SSN_CREDIT;

				hfi1_schedule_send(qp);

			}

		}

	}

}



void hfi1_qp_wakeup(struct rvt_qp *qp, u32 flag)

{

	unsigned long flags;

drivers/infiniband/hw/hfi1/qp.h

+0 −16
Original line number Diff line number Diff line
@@ -70,14 +70,6 @@ static inline void clear_ahg(struct rvt_qp *qp) 
	qp->s_ahgidx = -1;

}



/**

 * hfi1_compute_aeth - compute the AETH (syndrome + MSN)

 * @qp: the queue pair to compute the AETH for

 *

 * Returns the AETH.

 */

__be32 hfi1_compute_aeth(struct rvt_qp *qp);



/**

 * hfi1_create_qp - create a queue pair for a device

 * @ibpd: the protection domain who's device we create the queue pair for
@@ -91,14 +83,6 @@ __be32 hfi1_compute_aeth(struct rvt_qp *qp); 
struct ib_qp *hfi1_create_qp(struct ib_pd *ibpd,

			     struct ib_qp_init_attr *init_attr,

			     struct ib_udata *udata);

/**

 * hfi1_get_credit - flush the send work queue of a QP

 * @qp: the qp who's send work queue to flush

 * @aeth: the Acknowledge Extended Transport Header

 *

 * The QP s_lock should be held.

 */

void hfi1_get_credit(struct rvt_qp *qp, u32 aeth);



/**

 * hfi1_qp_wakeup - wake up on the indicated event

drivers/infiniband/hw/hfi1/rc.c

+20 −20
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
				qp->s_ack_state = OP(RDMA_READ_RESPONSE_ONLY);

				e->sent = 1;

			}

			ohdr->u.aeth = hfi1_compute_aeth(qp);

			ohdr->u.aeth = rvt_compute_aeth(qp);

			hwords++;

			qp->s_ack_rdma_psn = e->psn;

			bth2 = mask_psn(qp->s_ack_rdma_psn++);
@@ -293,7 +293,7 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
			ps->s_txreq->ss = NULL;

			len = 0;

			qp->s_ack_state = OP(ATOMIC_ACKNOWLEDGE);

			ohdr->u.at.aeth = hfi1_compute_aeth(qp);

			ohdr->u.at.aeth = rvt_compute_aeth(qp);

			ib_u64_put(e->atomic_data, &ohdr->u.at.atomic_ack_eth);

			hwords += sizeof(ohdr->u.at) / sizeof(u32);

			bth2 = mask_psn(e->psn);
@@ -315,7 +315,7 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
			len = pmtu;

			middle = HFI1_CAP_IS_KSET(SDMA_AHG);

		} else {

			ohdr->u.aeth = hfi1_compute_aeth(qp);

			ohdr->u.aeth = rvt_compute_aeth(qp);

			hwords++;

			qp->s_ack_state = OP(RDMA_READ_RESPONSE_LAST);

			e = &qp->s_ack_queue[qp->s_tail_ack_queue];
@@ -338,11 +338,11 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
		ps->s_txreq->ss = NULL;

		if (qp->s_nak_state)

			ohdr->u.aeth =

				cpu_to_be32((qp->r_msn & HFI1_MSN_MASK) |

				cpu_to_be32((qp->r_msn & RVT_MSN_MASK) |

					    (qp->s_nak_state <<

					     HFI1_AETH_CREDIT_SHIFT));

					     RVT_AETH_CREDIT_SHIFT));

		else

			ohdr->u.aeth = hfi1_compute_aeth(qp);

			ohdr->u.aeth = rvt_compute_aeth(qp);

		hwords++;

		len = 0;

		bth0 = OP(ACKNOWLEDGE) << 24;
@@ -519,7 +519,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
		case IB_WR_SEND_WITH_INV:

			/* If no credit, return. */

			if (!(qp->s_flags & RVT_S_UNLIMITED_CREDIT) &&

			    cmp_msn(wqe->ssn, qp->s_lsn + 1) > 0) {

			    rvt_cmp_msn(wqe->ssn, qp->s_lsn + 1) > 0) {

				qp->s_flags |= RVT_S_WAIT_SSN_CREDIT;

				goto bail;

			}
@@ -556,7 +556,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
		case IB_WR_RDMA_WRITE_WITH_IMM:

			/* If no credit, return. */

			if (!(qp->s_flags & RVT_S_UNLIMITED_CREDIT) &&

			    cmp_msn(wqe->ssn, qp->s_lsn + 1) > 0) {

			    rvt_cmp_msn(wqe->ssn, qp->s_lsn + 1) > 0) {

				qp->s_flags |= RVT_S_WAIT_SSN_CREDIT;

				goto bail;

			}
@@ -885,11 +885,11 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp, 
	if (qp->s_mig_state == IB_MIG_MIGRATED)

		bth0 |= IB_BTH_MIG_REQ;

	if (qp->r_nak_state)

		ohdr->u.aeth = cpu_to_be32((qp->r_msn & HFI1_MSN_MASK) |

		ohdr->u.aeth = cpu_to_be32((qp->r_msn & RVT_MSN_MASK) |

					    (qp->r_nak_state <<

					     HFI1_AETH_CREDIT_SHIFT));

					     RVT_AETH_CREDIT_SHIFT));

	else

		ohdr->u.aeth = hfi1_compute_aeth(qp);

		ohdr->u.aeth = rvt_compute_aeth(qp);

	sc5 = ibp->sl_to_sc[qp->remote_ah_attr.sl];

	/* set PBC_DC_INFO bit (aka SC[4]) in pbc_flags */

	pbc_flags |= ((!!(sc5 & 0x10)) << PBC_DC_INFO_SHIFT);
@@ -1323,7 +1323,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
	 * request but will include an ACK'ed request(s).

	 */

	ack_psn = psn;

	if (aeth >> 29)

	if (aeth >> RVT_AETH_NAK_SHIFT)

		ack_psn--;

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

	ibp = rcd_to_iport(rcd);
@@ -1403,7 +1403,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			break;

	}



	switch (aeth >> 29) {

	switch (aeth >> RVT_AETH_NAK_SHIFT) {

	case 0:         /* ACK */

		this_cpu_inc(*ibp->rvp.rc_acks);

		if (qp->s_acked != qp->s_tail) {
@@ -1430,7 +1430,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			qp->s_flags &= ~RVT_S_WAIT_ACK;

			hfi1_schedule_send(qp);

		}

		hfi1_get_credit(qp, aeth);

		rvt_get_credit(qp, aeth);

		qp->s_rnr_retry = qp->s_rnr_retry_cnt;

		qp->s_retry = qp->s_retry_cnt;

		update_last_psn(qp, psn);
@@ -1459,8 +1459,8 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
		qp->s_flags &= ~(RVT_S_WAIT_SSN_CREDIT | RVT_S_WAIT_ACK);

		hfi1_stop_rc_timers(qp);

		to =

			ib_hfi1_rnr_table[(aeth >> HFI1_AETH_CREDIT_SHIFT) &

					   HFI1_AETH_CREDIT_MASK];

			ib_hfi1_rnr_table[(aeth >> RVT_AETH_CREDIT_SHIFT) &

					   RVT_AETH_CREDIT_MASK];

		hfi1_add_rnr_timer(qp, to);

		return 0;
@@ -1469,8 +1469,8 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
			goto bail_stop;

		/* The last valid PSN is the previous PSN. */

		update_last_psn(qp, psn - 1);

		switch ((aeth >> HFI1_AETH_CREDIT_SHIFT) &

			HFI1_AETH_CREDIT_MASK) {

		switch ((aeth >> RVT_AETH_CREDIT_SHIFT) &

			RVT_AETH_CREDIT_MASK) {

		case 0: /* PSN sequence error */

			ibp->rvp.n_seq_naks++;

			/*
@@ -1600,8 +1600,8 @@ static void rc_rcv_resp(struct hfi1_ibport *ibp, 
		/* Update credits for "ghost" ACKs */

		if (diff == 0 && opcode == OP(ACKNOWLEDGE)) {

			aeth = be32_to_cpu(ohdr->u.aeth);

			if ((aeth >> 29) == 0)

				hfi1_get_credit(qp, aeth);

			if ((aeth >> RVT_AETH_NAK_SHIFT) == 0)

				rvt_get_credit(qp, aeth);

		}

		goto ack_done;

	}

drivers/infiniband/hw/hfi1/trace.c

+2 −2
Original line number Diff line number Diff line
@@ -130,14 +130,14 @@ const char *parse_everbs_hdrs( 
	case OP(RC, ACKNOWLEDGE):

		trace_seq_printf(p, AETH_PRN, be32_to_cpu(eh->aeth) >> 24,

				 parse_syndrome(be32_to_cpu(eh->aeth) >> 24),

				 be32_to_cpu(eh->aeth) & HFI1_MSN_MASK);

				 be32_to_cpu(eh->aeth) & RVT_MSN_MASK);

		break;

	/* aeth + atomicacketh */

	case OP(RC, ATOMIC_ACKNOWLEDGE):

		trace_seq_printf(p, AETH_PRN " " ATOMICACKETH_PRN,

				 be32_to_cpu(eh->at.aeth) >> 24,

				 parse_syndrome(be32_to_cpu(eh->at.aeth) >> 24),

				 be32_to_cpu(eh->at.aeth) & HFI1_MSN_MASK,

				 be32_to_cpu(eh->at.aeth) & RVT_MSN_MASK,

				 ib_u64_get(&eh->at.atomic_ack_eth));

		break;

	/* atomiceth */