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

Commit 9039746c authored by Don Hiatt's avatar Don Hiatt Committed by Doug Ledford
Browse files

IB/hfi1: Setup common IB fields in hfi1_packet struct 



We move many common IB fields into the hfi1_packet structure and
set them up in a single function. This allows us to set the fields
in a single place and not deal with them throughout the driver.

Reviewed-by: default avatarBrian Welty <brian.welty@intel.com>
Reviewed-by: default avatarDasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDon Hiatt <don.hiatt@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 228d2af1

drivers/infiniband/hw/hfi1/chip.c

+0 −9
Original line number Diff line number Diff line
@@ -9810,15 +9810,6 @@ void hfi1_clear_tids(struct hfi1_ctxtdata *rcd) 
		hfi1_put_tid(dd, i, PT_INVALID, 0, 0);

}



struct ib_header *hfi1_get_msgheader(

	struct hfi1_devdata *dd, __le32 *rhf_addr)

{

	u32 offset = rhf_hdrq_offset(rhf_to_cpu(rhf_addr));



	return (struct ib_header *)

		(rhf_addr - dd->rhf_offset + offset);

}



static const char * const ib_cfg_name_strings[] = {

	"HFI1_IB_CFG_LIDLMC",

	"HFI1_IB_CFG_LWID_DG_ENB",

drivers/infiniband/hw/hfi1/chip.h

+0 −2
Original line number Diff line number Diff line
@@ -1347,8 +1347,6 @@ enum { 
u64 get_all_cpu_total(u64 __percpu *cntr);

void hfi1_start_cleanup(struct hfi1_devdata *dd);

void hfi1_clear_tids(struct hfi1_ctxtdata *rcd);

struct ib_header *hfi1_get_msgheader(

				struct hfi1_devdata *dd, __le32 *rhf_addr);

void hfi1_init_ctxt(struct send_context *sc);

void hfi1_put_tid(struct hfi1_devdata *dd, u32 index,

		  u32 type, unsigned long pa, u16 order);

drivers/infiniband/hw/hfi1/common.h

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ struct diag_pkt { 
#define HFI1_LRH_BTH 0x0002      /* 1. word of IB LRH - next header: BTH */



/* misc. */

#define SC15_PACKET 0xF

#define SIZE_OF_CRC 1



#define LIM_MGMT_P_KEY       0x7FFF

drivers/infiniband/hw/hfi1/driver.c

+111 −47
Original line number Diff line number Diff line
@@ -224,6 +224,20 @@ static inline void *get_egrbuf(const struct hfi1_ctxtdata *rcd, u64 rhf, 
			(offset * RCV_BUF_BLOCK_SIZE));

}



static inline void *hfi1_get_header(struct hfi1_devdata *dd,

				    __le32 *rhf_addr)

{

	u32 offset = rhf_hdrq_offset(rhf_to_cpu(rhf_addr));



	return (void *)(rhf_addr - dd->rhf_offset + offset);

}



static inline struct ib_header *hfi1_get_msgheader(struct hfi1_devdata *dd,

						   __le32 *rhf_addr)

{

	return (struct ib_header *)hfi1_get_header(dd, rhf_addr);

}



/*

 * Validate and encode the a given RcvArray Buffer size.

 * The function will check whether the given size falls within
@@ -249,7 +263,8 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
{

	struct ib_header *rhdr = packet->hdr;

	u32 rte = rhf_rcv_type_err(packet->rhf);

	int lnh = ib_get_lnh(rhdr);

	u8 lnh = ib_get_lnh(rhdr);

	bool has_grh = false;

	struct hfi1_ibport *ibp = rcd_to_iport(rcd);

	struct hfi1_devdata *dd = ppd->dd;

	struct rvt_dev_info *rdi = &dd->verbs_dev.rdi;
@@ -257,37 +272,42 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
	if (packet->rhf & (RHF_VCRC_ERR | RHF_ICRC_ERR))

		return;



	if (lnh == HFI1_LRH_BTH) {

		packet->ohdr = &rhdr->u.oth;

	} else if (lnh == HFI1_LRH_GRH) {

		has_grh = true;

		packet->ohdr = &rhdr->u.l.oth;

		packet->grh = &rhdr->u.l.grh;

	} else {

		goto drop;

	}



	if (packet->rhf & RHF_TID_ERR) {

		/* For TIDERR and RC QPs preemptively schedule a NAK */

		struct ib_other_headers *ohdr = NULL;

		u32 tlen = rhf_pkt_len(packet->rhf); /* in bytes */

		u16 lid  = ib_get_dlid(rhdr);

		u32 dlid = ib_get_dlid(rhdr);

		u32 qp_num;

		u32 rcv_flags = 0;

		u32 mlid_base = be16_to_cpu(IB_MULTICAST_LID_BASE);



		/* Sanity check packet */

		if (tlen < 24)

			goto drop;



		/* Check for GRH */

		if (lnh == HFI1_LRH_BTH) {

			ohdr = &rhdr->u.oth;

		} else if (lnh == HFI1_LRH_GRH) {

		if (has_grh) {

			u32 vtf;

			struct ib_grh *grh = packet->grh;



			ohdr = &rhdr->u.l.oth;

			if (rhdr->u.l.grh.next_hdr != IB_GRH_NEXT_HDR)

			if (grh->next_hdr != IB_GRH_NEXT_HDR)

				goto drop;

			vtf = be32_to_cpu(rhdr->u.l.grh.version_tclass_flow);

			vtf = be32_to_cpu(grh->version_tclass_flow);

			if ((vtf >> IB_GRH_VERSION_SHIFT) != IB_GRH_VERSION)

				goto drop;

			rcv_flags |= HFI1_HAS_GRH;

		} else {

			goto drop;

		}



		/* Get the destination QP number. */

		qp_num = ib_bth_get_qpn(ohdr);

		if (lid < be16_to_cpu(IB_MULTICAST_LID_BASE)) {

		qp_num = ib_bth_get_qpn(packet->ohdr);

		if (dlid < mlid_base) {

			struct rvt_qp *qp;

			unsigned long flags;
@@ -312,11 +332,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 


			switch (qp->ibqp.qp_type) {

			case IB_QPT_RC:

				hfi1_rc_hdrerr(

					rcd,

					rhdr,

					rcv_flags,

					qp);

				hfi1_rc_hdrerr(rcd, packet, qp);

				break;

			default:

				/* For now don't handle any other QP types */
@@ -332,9 +348,8 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
	switch (rte) {

	case RHF_RTE_ERROR_OP_CODE_ERR:

	{

		u32 opcode;

		void *ebuf = NULL;

		__be32 *bth = NULL;

		u8 opcode;



		if (rhf_use_egr_bfr(packet->rhf))

			ebuf = packet->ebuf;
@@ -342,16 +357,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
		if (!ebuf)

			goto drop; /* this should never happen */



		if (lnh == HFI1_LRH_BTH)

			bth = (__be32 *)ebuf;

		else if (lnh == HFI1_LRH_GRH)

			bth = (__be32 *)((char *)ebuf + sizeof(struct ib_grh));

		else

			goto drop;



		opcode = be32_to_cpu(bth[0]) >> 24;

		opcode &= 0xff;



		opcode = ib_bth_get_opcode(packet->ohdr);

		if (opcode == IB_OPCODE_CNP) {

			/*

			 * Only in pre-B0 h/w is the CNP_OPCODE handled
@@ -365,7 +371,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
			sc5 = hfi1_9B_get_sc5(rhdr, packet->rhf);

			sl = ibp->sc_to_sl[sc5];



			lqpn = be32_to_cpu(bth[1]) & RVT_QPN_MASK;

			lqpn = ib_bth_get_qpn(packet->ohdr);

			rcu_read_lock();

			qp = rvt_lookup_qpn(rdi, &ibp->rvp, lqpn);

			if (!qp) {
@@ -415,7 +421,6 @@ static inline void init_packet(struct hfi1_ctxtdata *rcd, 
	packet->rhf = rhf_to_cpu(packet->rhf_addr);

	packet->rhqoff = rcd->head;

	packet->numpkt = 0;

	packet->rcv_flags = 0;

}



void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt,
@@ -424,15 +429,12 @@ void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt, 
	struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num);

	struct ib_header *hdr = pkt->hdr;

	struct ib_other_headers *ohdr = pkt->ohdr;

	struct ib_grh *grh = NULL;

	struct ib_grh *grh = pkt->grh;

	u32 rqpn = 0, bth1;

	u16 rlid, dlid = ib_get_dlid(hdr);

	u8 sc, svc_type;

	bool is_mcast = false;



	if (pkt->rcv_flags & HFI1_HAS_GRH)

		grh = &hdr->u.l.grh;



	switch (qp->ibqp.qp_type) {

	case IB_QPT_SMI:

	case IB_QPT_GSI:
@@ -591,9 +593,10 @@ static void __prescan_rxq(struct hfi1_packet *packet) 


		if (lnh == HFI1_LRH_BTH) {

			packet->ohdr = &hdr->u.oth;

			packet->grh = NULL;

		} else if (lnh == HFI1_LRH_GRH) {

			packet->ohdr = &hdr->u.l.oth;

			packet->rcv_flags |= HFI1_HAS_GRH;

			packet->grh = &hdr->u.l.grh;

		} else {

			goto next; /* just in case */

		}
@@ -698,10 +701,9 @@ static inline int process_rcv_packet(struct hfi1_packet *packet, int thread) 
{

	int ret;



	packet->hdr = hfi1_get_msgheader(packet->rcd->dd,

					 packet->rhf_addr);

	packet->hlen = (u8 *)packet->rhf_addr - (u8 *)packet->hdr;

	packet->etype = rhf_rcv_type(packet->rhf);



	packet->hlen = (u8 *)packet->rhf_addr - (u8 *)packet->hdr;

	/* total length */

	packet->tlen = rhf_pkt_len(packet->rhf); /* in bytes */

	/* retrieve eager buffer details */
@@ -759,7 +761,7 @@ static inline void process_rcv_update(int last, struct hfi1_packet *packet) 
			       packet->etail, 0, 0);

		packet->updegr = 0;

	}

	packet->rcv_flags = 0;

	packet->grh = NULL;

}



static inline void finish_packet(struct hfi1_packet *packet)
@@ -896,12 +898,15 @@ static inline int set_armed_to_active(struct hfi1_ctxtdata *rcd, 
				      struct hfi1_devdata *dd)

{

	struct work_struct *lsaw = &rcd->ppd->linkstate_active_work;

	struct ib_header *hdr = hfi1_get_msgheader(packet->rcd->dd,

						   packet->rhf_addr);

	u8 etype = rhf_rcv_type(packet->rhf);

	u8 sc = SC15_PACKET;



	if (etype == RHF_RCV_TYPE_IB &&

	    hfi1_9B_get_sc5(hdr, packet->rhf) != 0xf) {

	if (etype == RHF_RCV_TYPE_IB) {

		struct ib_header *hdr = hfi1_get_msgheader(packet->rcd->dd,

							   packet->rhf_addr);

		sc = hfi1_9B_get_sc5(hdr, packet->rhf);

	}

	if (sc != SC15_PACKET) {

		int hwstate = read_logical_state(dd);



		if (hwstate != LSTATE_ACTIVE) {
@@ -1321,6 +1326,58 @@ int hfi1_reset_device(int unit) 
	return ret;

}



static inline void hfi1_setup_ib_header(struct hfi1_packet *packet)

{

	packet->hdr = (struct hfi1_ib_message_header *)

			hfi1_get_msgheader(packet->rcd->dd,

					   packet->rhf_addr);

	packet->hlen = (u8 *)packet->rhf_addr - (u8 *)packet->hdr;

}



static int hfi1_setup_9B_packet(struct hfi1_packet *packet)

{

	struct hfi1_ibport *ibp = rcd_to_iport(packet->rcd);

	struct ib_header *hdr;

	u8 lnh;



	hfi1_setup_ib_header(packet);

	hdr = packet->hdr;



	lnh = ib_get_lnh(hdr);

	if (lnh == HFI1_LRH_BTH) {

		packet->ohdr = &hdr->u.oth;

		packet->grh = NULL;

	} else if (lnh == HFI1_LRH_GRH) {

		u32 vtf;



		packet->ohdr = &hdr->u.l.oth;

		packet->grh = &hdr->u.l.grh;

		if (packet->grh->next_hdr != IB_GRH_NEXT_HDR)

			goto drop;

		vtf = be32_to_cpu(packet->grh->version_tclass_flow);

		if ((vtf >> IB_GRH_VERSION_SHIFT) != IB_GRH_VERSION)

			goto drop;

	} else {

		goto drop;

	}



	/* Query commonly used fields from packet header */

	packet->opcode = ib_bth_get_opcode(packet->ohdr);

	packet->slid = ib_get_slid(hdr);

	packet->dlid = ib_get_dlid(hdr);

	packet->sl = ib_get_sl(hdr);

	packet->sc = hfi1_9B_get_sc5(hdr, packet->rhf);

	packet->pad = ib_bth_get_pad(packet->ohdr);

	packet->extra_byte = 0;

	packet->fecn = ib_bth_get_fecn(packet->ohdr);

	packet->becn = ib_bth_get_becn(packet->ohdr);



	return 0;

drop:

	ibp->rvp.n_pkt_drops++;

	return -EINVAL;

}



void handle_eflags(struct hfi1_packet *packet)

{

	struct hfi1_ctxtdata *rcd = packet->rcd;
@@ -1351,6 +1408,9 @@ int process_receive_ib(struct hfi1_packet *packet) 
	if (unlikely(hfi1_dbg_fault_packet(packet)))

		return RHF_RCV_CONTINUE;



	if (hfi1_setup_9B_packet(packet))

		return RHF_RCV_CONTINUE;



	trace_hfi1_rcvhdr(packet->rcd->ppd->dd,

			  packet->rcd->ctxt,

			  rhf_err_flags(packet->rhf),
@@ -1422,6 +1482,7 @@ int process_receive_error(struct hfi1_packet *packet) 
		 rhf_rcv_type_err(packet->rhf) == 3))

		return RHF_RCV_CONTINUE;



	hfi1_setup_ib_header(packet);

	handle_eflags(packet);



	if (unlikely(rhf_err_flags(packet->rhf)))
@@ -1435,6 +1496,8 @@ int kdeth_process_expected(struct hfi1_packet *packet) 
{

	if (unlikely(hfi1_dbg_fault_packet(packet)))

		return RHF_RCV_CONTINUE;



	hfi1_setup_ib_header(packet);

	if (unlikely(rhf_err_flags(packet->rhf)))

		handle_eflags(packet);
@@ -1445,6 +1508,7 @@ int kdeth_process_expected(struct hfi1_packet *packet) 


int kdeth_process_eager(struct hfi1_packet *packet)

{

	hfi1_setup_ib_header(packet);

	if (unlikely(rhf_err_flags(packet->rhf)))

		handle_eflags(packet);

	if (unlikely(hfi1_dbg_fault_packet(packet)))

drivers/infiniband/hw/hfi1/hfi.h

+20 −1
Original line number Diff line number Diff line
@@ -356,17 +356,26 @@ struct hfi1_packet { 
	__le32 *rhf_addr;

	struct rvt_qp *qp;

	struct ib_other_headers *ohdr;

	struct ib_grh *grh;

	u64 rhf;

	u32 maxcnt;

	u32 rhqoff;

	u32 dlid;

	u32 slid;

	u16 tlen;

	s16 etail;

	u8 hlen;

	u8 numpkt;

	u8 rsize;

	u8 updegr;

	u8 rcv_flags;

	u8 etype;

	u8 extra_byte;

	u8 pad;

	u8 sc;

	u8 sl;

	u8 opcode;

	bool becn;

	bool fecn;

};



struct rvt_sge_state;
@@ -2086,4 +2095,14 @@ int hfi1_tempsense_rd(struct hfi1_devdata *dd, struct hfi1_temp *temp); 


#define DD_DEV_ENTRY(dd)       __string(dev, dev_name(&(dd)->pcidev->dev))

#define DD_DEV_ASSIGN(dd)      __assign_str(dev, dev_name(&(dd)->pcidev->dev))



/*

 * hfi1_check_mcast- Check if the given lid is

 * in the IB multicast range.

 */

static inline bool hfi1_check_mcast(u16 lid)

{

	return ((lid >= be16_to_cpu(IB_MULTICAST_LID_BASE)) &&

		(lid != be16_to_cpu(IB_LID_PERMISSIVE)));

}

#endif                          /* _HFI1_KERNEL_H */