xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB/hfi1: Look up ibport using a pointer in receive path

Browse Source 
In the receive path, hfi1_ibport is looked up by indexing into an
array. A profile shows this to be expensive. The receive context
data has a pointer to the ibport data, use that pointer instead.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Sebastian Sanchez <sebastian.sanchez@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Sebastian Sanchez
2018-02-01 10:46:31 -08:00
committed by Jason Gunthorpe
parent 6d6b8848c8
commit bdaf96f650
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/infiniband/hw/hfi1/driver.c
View File

@@ -634,9 +634,10 @@ next:
} }
} }
static void process_rcv_qp_work(struct hfi1_ctxtdata *rcd) static void process_rcv_qp_work(struct hfi1_packet *packet)
{ {
struct rvt_qp *qp, *nqp; struct rvt_qp *qp, *nqp;
struct hfi1_ctxtdata *rcd = packet->rcd;
/* /*
* Iterate over all QPs waiting to respond. * Iterate over all QPs waiting to respond.
@@ -646,7 +647,8 @@ static void process_rcv_qp_work(struct hfi1_ctxtdata *rcd)
list_del_init(&qp->rspwait); list_del_init(&qp->rspwait);
if (qp->r_flags & RVT_R_RSP_NAK) { if (qp->r_flags & RVT_R_RSP_NAK) {
qp->r_flags &= ~RVT_R_RSP_NAK; qp->r_flags &= ~RVT_R_RSP_NAK;
hfi1_send_rc_ack(rcd, qp, 0); packet->qp = qp;
hfi1_send_rc_ack(packet, 0);
} }
if (qp->r_flags & RVT_R_RSP_SEND) { if (qp->r_flags & RVT_R_RSP_SEND) {
unsigned long flags; unsigned long flags;
@@ -667,7 +669,7 @@ static noinline int max_packet_exceeded(struct hfi1_packet *packet, int thread)
if (thread) { if (thread) {
if ((packet->numpkt & (MAX_PKT_RECV_THREAD - 1)) == 0) if ((packet->numpkt & (MAX_PKT_RECV_THREAD - 1)) == 0)
/* allow defered processing */ /* allow defered processing */
process_rcv_qp_work(packet->rcd); process_rcv_qp_work(packet);
cond_resched(); cond_resched();
return RCV_PKT_OK; return RCV_PKT_OK;
} else { } else {
@@ -809,7 +811,7 @@ int handle_receive_interrupt_nodma_rtail(struct hfi1_ctxtdata *rcd, int thread)
last = RCV_PKT_DONE; last = RCV_PKT_DONE;
process_rcv_update(last, &packet); process_rcv_update(last, &packet);
} }
process_rcv_qp_work(rcd); process_rcv_qp_work(&packet);
rcd->head = packet.rhqoff; rcd->head = packet.rhqoff;
bail: bail:
finish_packet(&packet); finish_packet(&packet);
@@ -838,7 +840,7 @@ int handle_receive_interrupt_dma_rtail(struct hfi1_ctxtdata *rcd, int thread)
last = RCV_PKT_DONE; last = RCV_PKT_DONE;
process_rcv_update(last, &packet); process_rcv_update(last, &packet);
} }
process_rcv_qp_work(rcd); process_rcv_qp_work(&packet);
rcd->head = packet.rhqoff; rcd->head = packet.rhqoff;
bail: bail:
finish_packet(&packet); finish_packet(&packet);
@@ -1068,7 +1070,7 @@ int handle_receive_interrupt(struct hfi1_ctxtdata *rcd, int thread)
process_rcv_update(last, &packet); process_rcv_update(last, &packet);
} }
process_rcv_qp_work(rcd); process_rcv_qp_work(&packet);
rcd->head = packet.rhqoff; rcd->head = packet.rhqoff;
bail: bail:

36
drivers/infiniband/hw/hfi1/rc.c
View File

@@ -730,14 +730,16 @@ static inline void hfi1_make_bth_aeth(struct rvt_qp *qp,
ohdr->bth[2] = cpu_to_be32(mask_psn(qp->r_ack_psn)); ohdr->bth[2] = cpu_to_be32(mask_psn(qp->r_ack_psn));
} }
static inline void hfi1_queue_rc_ack(struct rvt_qp *qp, bool is_fecn) static inline void hfi1_queue_rc_ack(struct hfi1_packet *packet, bool is_fecn)
{ {
struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num); struct rvt_qp *qp = packet->qp;
struct hfi1_ibport *ibp;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&qp->s_lock, flags); spin_lock_irqsave(&qp->s_lock, flags);
if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK)) if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK))
goto unlock; goto unlock;
ibp = rcd_to_iport(packet->rcd);
this_cpu_inc(*ibp->rvp.rc_qacks); this_cpu_inc(*ibp->rvp.rc_qacks);
qp->s_flags |= RVT_S_ACK_PENDING | RVT_S_RESP_PENDING; qp->s_flags |= RVT_S_ACK_PENDING | RVT_S_RESP_PENDING;
qp->s_nak_state = qp->r_nak_state; qp->s_nak_state = qp->r_nak_state;
@@ -751,13 +753,14 @@ unlock:
spin_unlock_irqrestore(&qp->s_lock, flags); spin_unlock_irqrestore(&qp->s_lock, flags);
} }
static inline void hfi1_make_rc_ack_9B(struct rvt_qp *qp, static inline void hfi1_make_rc_ack_9B(struct hfi1_packet *packet,
struct hfi1_opa_header *opa_hdr, struct hfi1_opa_header *opa_hdr,
u8 sc5, bool is_fecn, u8 sc5, bool is_fecn,
u64 *pbc_flags, u32 *hwords, u64 *pbc_flags, u32 *hwords,
u32 *nwords) u32 *nwords)
{ {
struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num); struct rvt_qp *qp = packet->qp;
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 = &opa_hdr->ibh; struct ib_header *hdr = &opa_hdr->ibh;
struct ib_other_headers *ohdr; struct ib_other_headers *ohdr;
@@ -798,13 +801,14 @@ static inline void hfi1_make_rc_ack_9B(struct rvt_qp *qp,
hfi1_make_bth_aeth(qp, ohdr, bth0, bth1); hfi1_make_bth_aeth(qp, ohdr, bth0, bth1);
} }
static inline void hfi1_make_rc_ack_16B(struct rvt_qp *qp, static inline void hfi1_make_rc_ack_16B(struct hfi1_packet *packet,
struct hfi1_opa_header *opa_hdr, struct hfi1_opa_header *opa_hdr,
u8 sc5, bool is_fecn, u8 sc5, bool is_fecn,
u64 *pbc_flags, u32 *hwords, u64 *pbc_flags, u32 *hwords,
u32 *nwords) u32 *nwords)
{ {
struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num); struct rvt_qp *qp = packet->qp;
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 hfi1_16b_header *hdr = &opa_hdr->opah; struct hfi1_16b_header *hdr = &opa_hdr->opah;
struct ib_other_headers *ohdr; struct ib_other_headers *ohdr;
@@ -850,7 +854,7 @@ static inline void hfi1_make_rc_ack_16B(struct rvt_qp *qp,
hfi1_make_bth_aeth(qp, ohdr, bth0, bth1); hfi1_make_bth_aeth(qp, ohdr, bth0, bth1);
} }
typedef void (*hfi1_make_rc_ack)(struct rvt_qp *qp, typedef void (*hfi1_make_rc_ack)(struct hfi1_packet *packet,
struct hfi1_opa_header *opa_hdr, struct hfi1_opa_header *opa_hdr,
u8 sc5, bool is_fecn, u8 sc5, bool is_fecn,
u64 *pbc_flags, u32 *hwords, u64 *pbc_flags, u32 *hwords,
@@ -870,9 +874,10 @@ static const hfi1_make_rc_ack hfi1_make_rc_ack_tbl[2] = {
* Note that RDMA reads and atomics are handled in the * Note that RDMA reads and atomics are handled in the
* send side QP state and send engine. * send side QP state and send engine.
*/ */
void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, void hfi1_send_rc_ack(struct hfi1_packet *packet, bool is_fecn)
struct rvt_qp *qp, bool is_fecn)
{ {
struct hfi1_ctxtdata *rcd = packet->rcd;
struct rvt_qp *qp = packet->qp;
struct hfi1_ibport *ibp = rcd_to_iport(rcd); struct hfi1_ibport *ibp = rcd_to_iport(rcd);
struct hfi1_qp_priv *priv = qp->priv; struct hfi1_qp_priv *priv = qp->priv;
struct hfi1_pportdata *ppd = ppd_from_ibp(ibp); struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);
@@ -889,14 +894,14 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd,
/* Don't send ACK or NAK if a RDMA read or atomic is pending. */ /* Don't send ACK or NAK if a RDMA read or atomic is pending. */
if (qp->s_flags & RVT_S_RESP_PENDING) { if (qp->s_flags & RVT_S_RESP_PENDING) {
hfi1_queue_rc_ack(qp, is_fecn); hfi1_queue_rc_ack(packet, is_fecn);
return; return;
} }
/* Ensure s_rdma_ack_cnt changes are committed */ /* Ensure s_rdma_ack_cnt changes are committed */
smp_read_barrier_depends(); smp_read_barrier_depends();
if (qp->s_rdma_ack_cnt) { if (qp->s_rdma_ack_cnt) {
hfi1_queue_rc_ack(qp, is_fecn); hfi1_queue_rc_ack(packet, is_fecn);
return; return;
} }
@@ -905,7 +910,7 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd,
return; return;
/* Make the appropriate header */ /* Make the appropriate header */
hfi1_make_rc_ack_tbl[priv->hdr_type](qp, &opa_hdr, sc5, is_fecn, hfi1_make_rc_ack_tbl[priv->hdr_type](packet, &opa_hdr, sc5, is_fecn,
&pbc_flags, &hwords, &nwords); &pbc_flags, &hwords, &nwords);
plen = 2 /* PBC */ + hwords + nwords; plen = 2 /* PBC */ + hwords + nwords;
@@ -919,7 +924,7 @@ void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd,
* so that when enough buffer space becomes available, * so that when enough buffer space becomes available,
* the ACK is sent ahead of other outgoing packets. * the ACK is sent ahead of other outgoing packets.
*/ */
hfi1_queue_rc_ack(qp, is_fecn); hfi1_queue_rc_ack(packet, is_fecn);
return; return;
} }
trace_ack_output_ibhdr(dd_from_ibdev(qp->ibqp.device), trace_ack_output_ibhdr(dd_from_ibdev(qp->ibqp.device),
@@ -1537,7 +1542,7 @@ static void rc_rcv_resp(struct hfi1_packet *packet)
void *data = packet->payload; void *data = packet->payload;
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;
struct ib_other_headers *ohdr = packet->ohdr; struct ib_other_headers *ohdr = packet->ohdr;
struct rvt_swqe *wqe; struct rvt_swqe *wqe;
enum ib_wc_status status; enum ib_wc_status status;
@@ -1695,6 +1700,7 @@ ack_op_err:
goto ack_err; goto ack_err;
ack_seq_err: ack_seq_err:
ibp = rcd_to_iport(rcd);
rdma_seq_err(qp, ibp, psn, rcd); rdma_seq_err(qp, ibp, psn, rcd);
goto ack_done; goto ack_done;
@@ -2476,7 +2482,7 @@ nack_acc:
qp->r_nak_state = IB_NAK_REMOTE_ACCESS_ERROR; qp->r_nak_state = IB_NAK_REMOTE_ACCESS_ERROR;
qp->r_ack_psn = qp->r_psn; qp->r_ack_psn = qp->r_psn;
send_ack: send_ack:
hfi1_send_rc_ack(rcd, qp, is_fecn); hfi1_send_rc_ack(packet, is_fecn);
} }
void hfi1_rc_hdrerr( void hfi1_rc_hdrerr(

3
drivers/infiniband/hw/hfi1/verbs.h
View File

@@ -358,8 +358,7 @@ void hfi1_do_send(struct rvt_qp *qp, bool in_thread);
void hfi1_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe, void hfi1_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe,
enum ib_wc_status status); enum ib_wc_status status);
void hfi1_send_rc_ack(struct hfi1_ctxtdata *rcd, struct rvt_qp *qp, void hfi1_send_rc_ack(struct hfi1_packet *packet, bool is_fecn);
bool is_fecn);
int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps); int hfi1_make_rc_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps);