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

Commit ca85bb1c authored by Sebastian Sanchez's avatar Sebastian Sanchez Committed by Jason Gunthorpe
Browse files

IB/hfi1: Remove unnecessary fecn and becn fields 



packet->fecn and packet->becn are calculated in the hot path
and are never used. Remove these fields as they show to be
costly in a profile. Also, remove initialization for
becn and fecn in process_ecn() as they're unconditionally
assigned in the function and ensure fecn and becn variables
use a boolean type.

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 avatarJason Gunthorpe <jgg@mellanox.com>
parent bdaf96f6

drivers/infiniband/hw/hfi1/driver.c

+0 −4
Original line number Diff line number Diff line
@@ -1440,8 +1440,6 @@ static int hfi1_setup_9B_packet(struct hfi1_packet *packet) 
	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);

	packet->pkey = ib_bth_get_pkey(packet->ohdr);

	packet->migrated = ib_bth_is_migration(packet->ohdr);
@@ -1508,8 +1506,6 @@ static int hfi1_setup_bypass_packet(struct hfi1_packet *packet) 
	packet->sl = ibp->sc_to_sl[packet->sc];

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

	packet->extra_byte = SIZE_OF_LT;

	packet->fecn = hfi1_16B_get_fecn(packet->hdr);

	packet->becn = hfi1_16B_get_becn(packet->hdr);

	packet->pkey = hfi1_16B_get_pkey(packet->hdr);

	packet->migrated = opa_bth_is_migration(packet->ohdr);

drivers/infiniband/hw/hfi1/hfi.h

+5 −11
Original line number Diff line number Diff line
@@ -352,8 +352,6 @@ struct hfi1_packet { 
	u8 sc;

	u8 sl;

	u8 opcode;

	bool becn;

	bool fecn;

	bool migrated;

};
@@ -1781,19 +1779,15 @@ void hfi1_process_ecn_slowpath(struct rvt_qp *qp, struct hfi1_packet *pkt, 
static inline bool process_ecn(struct rvt_qp *qp, struct hfi1_packet *pkt,

			       bool do_cnp)

{

	struct ib_other_headers *ohdr = pkt->ohdr;



	u32 bth1;

	bool becn = false;

	bool fecn = false;

	bool becn;

	bool fecn;



	if (pkt->etype == RHF_RCV_TYPE_BYPASS) {

		fecn = hfi1_16B_get_fecn(pkt->hdr);

		becn = hfi1_16B_get_becn(pkt->hdr);

	} else {

		bth1 = be32_to_cpu(ohdr->bth[1]);

		fecn = bth1 & IB_FECN_SMASK;

		becn = bth1 & IB_BECN_SMASK;

		fecn = ib_bth_get_fecn(pkt->ohdr);

		becn = ib_bth_get_becn(pkt->ohdr);

	}

	if (unlikely(fecn || becn)) {

		hfi1_process_ecn_slowpath(qp, pkt, do_cnp);
@@ -2419,7 +2413,7 @@ static inline void hfi1_make_ib_hdr(struct ib_header *hdr, 
static inline void hfi1_make_16b_hdr(struct hfi1_16b_header *hdr,

				     u32 slid, u32 dlid,

				     u16 len, u16 pkey,

				     u8 becn, u8 fecn, u8 l4,

				     bool becn, bool fecn, u8 l4,

				     u8 sc)

{

	u32 lrh0 = 0;

drivers/infiniband/hw/hfi1/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static inline void hfi1_make_rc_ack_16B(struct hfi1_packet *packet, 
	struct ib_other_headers *ohdr;

	u32 bth0, bth1 = 0;

	u16 len, pkey;

	u8 becn = !!is_fecn;

	bool becn = is_fecn;

	u8 l4 = OPA_16B_L4_IB_LOCAL;

	u8 extra_bytes;

drivers/infiniband/hw/hfi1/ruc.c

+2 −2
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static inline void hfi1_make_ruc_header_16B(struct rvt_qp *qp, 
				ps->s_txreq->s_cur_size);

	u32 nwords = SIZE_OF_CRC + ((ps->s_txreq->s_cur_size +

				 extra_bytes + SIZE_OF_LT) >> 2);

	u8 becn = 0;

	bool becn = false;



	if (unlikely(rdma_ah_get_ah_flags(&qp->remote_ah_attr) & IB_AH_GRH) &&

	    hfi1_check_mcast(rdma_ah_get_dlid(&qp->remote_ah_attr))) {
@@ -789,7 +789,7 @@ static inline void hfi1_make_ruc_header_16B(struct rvt_qp *qp, 
	if (qp->s_flags & RVT_S_ECN) {

		qp->s_flags &= ~RVT_S_ECN;

		/* we recently received a FECN, so return a BECN */

		becn = 1;

		becn = true;

	}

	hfi1_make_ruc_bth(qp, ohdr, bth0, bth1, bth2);

drivers/infiniband/hw/hfi1/trace.c

+4 −4
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static const char *parse_syndrome(u8 syndrome) 
}



void hfi1_trace_parse_9b_bth(struct ib_other_headers *ohdr,

			     u8 *ack, u8 *becn, u8 *fecn, u8 *mig,

			     u8 *ack, bool *becn, bool *fecn, u8 *mig,

			     u8 *se, u8 *pad, u8 *opcode, u8 *tver,

			     u16 *pkey, u32 *psn, u32 *qpn)

{
@@ -184,7 +184,7 @@ void hfi1_trace_parse_9b_hdr(struct ib_header *hdr, bool sc5, 
}



void hfi1_trace_parse_16b_hdr(struct hfi1_16b_header *hdr,

			      u8 *age, u8 *becn, u8 *fecn,

			      u8 *age, bool *becn, bool *fecn,

			      u8 *l4, u8 *rc, u8 *sc,

			      u16 *entropy, u16 *len, u16 *pkey,

			      u32 *dlid, u32 *slid)
@@ -207,7 +207,7 @@ void hfi1_trace_parse_16b_hdr(struct hfi1_16b_header *hdr, 
#define LRH_16B_PRN "age:%d becn:%d fecn:%d l4:%d " \

		    "rc:%d sc:%d pkey:0x%.4x entropy:0x%.4x"

const char *hfi1_trace_fmt_lrh(struct trace_seq *p, bool bypass,

			       u8 age, u8 becn, u8 fecn, u8 l4,

			       u8 age, bool becn, bool fecn, u8 l4,

			       u8 lnh, const char *lnh_name, u8 lver,

			       u8 rc, u8 sc, u8 sl, u16 entropy,

			       u16 len, u16 pkey, u32 dlid, u32 slid)
@@ -235,7 +235,7 @@ const char *hfi1_trace_fmt_lrh(struct trace_seq *p, bool bypass, 
	"op:0x%.2x,%s se:%d m:%d pad:%d tver:%d " \

	"qpn:0x%.6x a:%d psn:0x%.8x"

const char *hfi1_trace_fmt_bth(struct trace_seq *p, bool bypass,

			       u8 ack, u8 becn, u8 fecn, u8 mig,

			       u8 ack, bool becn, bool fecn, u8 mig,

			       u8 se, u8 pad, u8 opcode, const char *opname,

			       u8 tver, u16 pkey, u32 psn, u32 qpn)

{