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

Commit f3e862cb authored by Sebastian Sanchez's avatar Sebastian Sanchez Committed by Doug Ledford
Browse files

IB/hfi1: Access hfi1_ibport through rcd pointer 



Receive code paths use the QP's device and port
number to access the struct hfi1_ibport. When an
instance of struct hfi1_ctxtdata is present, it can
be used to access struct hfi1_ibport through a pointer.
This makes struct hfi1_ibport lookup time faster as an
array doesn't have to be indexed and access fields in
other cache-lines.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarSebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a8715b97

drivers/infiniband/hw/hfi1/driver.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -284,7 +284,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 
	struct ib_header *rhdr = packet->hdr;

	struct ib_header *rhdr = packet->hdr;

	u32 rte = rhf_rcv_type_err(packet->rhf);

	u32 rte = rhf_rcv_type_err(packet->rhf);

	int lnh = be16_to_cpu(rhdr->lrh[0]) & 3;

	int lnh = be16_to_cpu(rhdr->lrh[0]) & 3;

	struct hfi1_ibport *ibp = &ppd->ibport_data;

	struct hfi1_ibport *ibp = rcd_to_iport(rcd);

	struct hfi1_devdata *dd = ppd->dd;

	struct hfi1_devdata *dd = ppd->dd;

	struct rvt_dev_info *rdi = &dd->verbs_dev.rdi;

	struct rvt_dev_info *rdi = &dd->verbs_dev.rdi;
@@ -599,7 +599,7 @@ static void __prescan_rxq(struct hfi1_packet *packet) 




	while (1) {

	while (1) {

		struct hfi1_devdata *dd = rcd->dd;

		struct hfi1_devdata *dd = rcd->dd;

		struct hfi1_ibport *ibp = &rcd->ppd->ibport_data;

		struct hfi1_ibport *ibp = rcd_to_iport(rcd);

		__le32 *rhf_addr = (__le32 *)rcd->rcvhdrq + mdata.ps_head +

		__le32 *rhf_addr = (__le32 *)rcd->rcvhdrq + mdata.ps_head +

					 dd->rhf_offset;

					 dd->rhf_offset;

		struct rvt_qp *qp;

		struct rvt_qp *qp;

drivers/infiniband/hw/hfi1/hfi.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -1584,6 +1584,11 @@ static inline struct hfi1_ibport *to_iport(struct ib_device *ibdev, u8 port) 
	return &dd->pport[pidx].ibport_data;

	return &dd->pport[pidx].ibport_data;

}

}





static inline struct hfi1_ibport *rcd_to_iport(struct hfi1_ctxtdata *rcd)

{

	return &rcd->ppd->ibport_data;

}



void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt,

void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt,

			       bool do_cnp);

			       bool do_cnp);

static inline bool process_ecn(struct rvt_qp *qp, struct hfi1_packet *pkt,

static inline bool process_ecn(struct rvt_qp *qp, struct hfi1_packet *pkt,

drivers/infiniband/hw/hfi1/rc.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -841,7 +841,7 @@ int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp,

void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp,

		      int is_fecn)

		      int is_fecn)

{

{

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

	struct hfi1_ibport *ibp = rcd_to_iport(rcd);

	struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);

	struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);

	u64 pbc, pbc_flags = 0;

	u64 pbc, pbc_flags = 0;

	u16 lrh0;

	u16 lrh0;
@@ -1326,7 +1326,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
	if (aeth >> 29)

	if (aeth >> 29)

		ack_psn--;

		ack_psn--;

	wqe = rvt_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);

	ibp = rcd_to_iport(rcd);





	/*

	/*

	 * The MSN might be for a later WQE than the PSN indicates so

	 * The MSN might be for a later WQE than the PSN indicates so
@@ -1791,7 +1791,7 @@ static noinline int rc_rcv_error(struct ib_other_headers *ohdr, void *data, 
				 struct rvt_qp *qp, u32 opcode, u32 psn,

				 struct rvt_qp *qp, u32 opcode, u32 psn,

				 int diff, struct hfi1_ctxtdata *rcd)

				 int diff, struct hfi1_ctxtdata *rcd)

{

{

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

	struct hfi1_ibport *ibp = rcd_to_iport(rcd);

	struct rvt_ack_entry *e;

	struct rvt_ack_entry *e;

	unsigned long flags;

	unsigned long flags;

	u8 i, prev;

	u8 i, prev;
@@ -2100,7 +2100,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet) 
	void *data = packet->ebuf;

	void *data = packet->ebuf;

	u32 tlen = packet->tlen;

	u32 tlen = packet->tlen;

	struct rvt_qp *qp = packet->qp;

	struct rvt_qp *qp = packet->qp;

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

	struct hfi1_ibport *ibp = rcd_to_iport(rcd);

	struct ib_other_headers *ohdr = packet->ohdr;

	struct ib_other_headers *ohdr = packet->ohdr;

	u32 bth0, opcode;

	u32 bth0, opcode;

	u32 hdrsize = packet->hlen;

	u32 hdrsize = packet->hlen;
@@ -2552,7 +2552,7 @@ void hfi1_rc_hdrerr( 
{

{

	int has_grh = rcv_flags & HFI1_HAS_GRH;

	int has_grh = rcv_flags & HFI1_HAS_GRH;

	struct ib_other_headers *ohdr;

	struct ib_other_headers *ohdr;

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

	struct hfi1_ibport *ibp = rcd_to_iport(rcd);

	int diff;

	int diff;

	u32 opcode;

	u32 opcode;

	u32 psn, bth0;

	u32 psn, bth0;

drivers/infiniband/hw/hfi1/uc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,7 @@ int hfi1_make_uc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps) 
 */

 */

void hfi1_uc_rcv(struct hfi1_packet *packet)

void hfi1_uc_rcv(struct hfi1_packet *packet)

{

{

	struct hfi1_ibport *ibp = &packet->rcd->ppd->ibport_data;

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

	struct ib_header *hdr = packet->hdr;

	struct ib_header *hdr = packet->hdr;

	u32 rcv_flags = packet->rcv_flags;

	u32 rcv_flags = packet->rcv_flags;

	void *data = packet->ebuf;

	void *data = packet->ebuf;

drivers/infiniband/hw/hfi1/ud.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -672,7 +672,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet) 
	u32 src_qp;

	u32 src_qp;

	u16 dlid, pkey;

	u16 dlid, pkey;

	int mgmt_pkey_idx = -1;

	int mgmt_pkey_idx = -1;

	struct hfi1_ibport *ibp = &packet->rcd->ppd->ibport_data;

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

	struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);

	struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);

	struct ib_header *hdr = packet->hdr;

	struct ib_header *hdr = packet->hdr;

	u32 rcv_flags = packet->rcv_flags;

	u32 rcv_flags = packet->rcv_flags;