Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging/rdma/hfi1: Reduce number of parameters passed to send handlers

Browse Source 
The current send function handlers are passed a bunch of parameters that are
already part of the data structure that is passed in first (qp). This patch
removes all of this and just passes the QP.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dennis Dalessandro 2015-11-11 00:34:37 -05:00 committed by Greg Kroah-Hartman
parent 7c091e5c06
commit d46e51448a
5 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/rdma/hfi1/diag.c
View File

@ -1618,14 +1618,12 @@ int snoop_recv_handler(struct hfi1_packet *packet)
/* /*
* Handle snooping and capturing packets when sdma is being used. * Handle snooping and capturing packets when sdma is being used.
*/ */
int snoop_send_dma_handler(struct hfi1_qp *qp, struct ahg_ib_header *ibhdr, int snoop_send_dma_handler(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u32 len, u64 pbc)
u32 plen, u32 dwords, u64 pbc)
{ {
pr_alert("Snooping/Capture of Send DMA Packets Is Not Supported!\n"); pr_alert("Snooping/Capture of Send DMA Packets Is Not Supported!\n");
snoop_dbg("Unsupported Operation"); snoop_dbg("Unsupported Operation");
return hfi1_verbs_send_dma(qp, ibhdr, hdrwords, ss, len, plen, dwords, return hfi1_verbs_send_dma(qp, ps, 0);
0);
} }
/* /*
@ -1633,12 +1631,16 @@ int snoop_send_dma_handler(struct hfi1_qp *qp, struct ahg_ib_header *ibhdr,
* bypass packets. The only way to send a bypass packet currently is to use the * bypass packets. The only way to send a bypass packet currently is to use the
* diagpkt interface. When that interface is enable snoop/capture is not. * diagpkt interface. When that interface is enable snoop/capture is not.
*/ */
int snoop_send_pio_handler(struct hfi1_qp *qp, struct ahg_ib_header *ahdr, int snoop_send_pio_handler(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u32 len, u64 pbc)
u32 plen, u32 dwords, u64 pbc)
{ {
struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num); struct ahg_ib_header *ahdr = qp->s_hdr;
struct hfi1_pportdata *ppd = ppd_from_ibp(ibp); u32 hdrwords = qp->s_hdrwords;
struct hfi1_sge_state *ss = qp->s_cur_sge;
u32 len = qp->s_cur_size;
u32 dwords = (len + 3) >> 2;
u32 plen = hdrwords + dwords + 2; /* includes pbc */
struct hfi1_pportdata *ppd = ps->ppd;
struct snoop_packet *s_packet = NULL; struct snoop_packet *s_packet = NULL;
u32 *hdr = (u32 *)&ahdr->ibh; u32 *hdr = (u32 *)&ahdr->ibh;
u32 length = 0; u32 length = 0;
@ -1783,8 +1785,7 @@ int snoop_send_pio_handler(struct hfi1_qp *qp, struct ahg_ib_header *ahdr,
break; break;
} }
out: out:
return hfi1_verbs_send_pio(qp, ahdr, hdrwords, ss, len, plen, dwords, return hfi1_verbs_send_pio(qp, ps, md.u.pbc);
md.u.pbc);
} }
/* /*

20
drivers/staging/rdma/hfi1/hfi.h
View File

@ -1048,12 +1048,10 @@ struct hfi1_devdata {
* Handlers for outgoing data so that snoop/capture does not * Handlers for outgoing data so that snoop/capture does not
* have to have its hooks in the send path * have to have its hooks in the send path
*/ */
int (*process_pio_send)(struct hfi1_qp *qp, struct ahg_ib_header *ibhdr, int (*process_pio_send)(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u64 pbc);
u32 len, u32 plen, u32 dwords, u64 pbc); int (*process_dma_send)(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
int (*process_dma_send)(struct hfi1_qp *qp, struct ahg_ib_header *ibhdr, u64 pbc);
u32 hdrwords, struct hfi1_sge_state *ss,
u32 len, u32 plen, u32 dwords, u64 pbc);
void (*pio_inline_send)(struct hfi1_devdata *dd, struct pio_buf *pbuf, void (*pio_inline_send)(struct hfi1_devdata *dd, struct pio_buf *pbuf,
u64 pbc, const void *from, size_t count); u64 pbc, const void *from, size_t count);
@ -1405,12 +1403,10 @@ void reset_link_credits(struct hfi1_devdata *dd);
void assign_remote_cm_au_table(struct hfi1_devdata *dd, u8 vcu); void assign_remote_cm_au_table(struct hfi1_devdata *dd, u8 vcu);
int snoop_recv_handler(struct hfi1_packet *packet); int snoop_recv_handler(struct hfi1_packet *packet);
int snoop_send_dma_handler(struct hfi1_qp *qp, struct ahg_ib_header *ibhdr, int snoop_send_dma_handler(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u32 len, u64 pbc);
u32 plen, u32 dwords, u64 pbc); int snoop_send_pio_handler(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
int snoop_send_pio_handler(struct hfi1_qp *qp, struct ahg_ib_header *ibhdr, u64 pbc);
u32 hdrwords, struct hfi1_sge_state *ss, u32 len,
u32 plen, u32 dwords, u64 pbc);
void snoop_inline_pio_send(struct hfi1_devdata *dd, struct pio_buf *pbuf, void snoop_inline_pio_send(struct hfi1_devdata *dd, struct pio_buf *pbuf,
u64 pbc, const void *from, size_t count); u64 pbc, const void *from, size_t count);

15
drivers/staging/rdma/hfi1/ruc.c
View File

@ -809,16 +809,20 @@ void hfi1_do_send(struct work_struct *work)
{ {
struct iowait *wait = container_of(work, struct iowait, iowork); struct iowait *wait = container_of(work, struct iowait, iowork);
struct hfi1_qp *qp = container_of(wait, struct hfi1_qp, s_iowait); struct hfi1_qp *qp = container_of(wait, struct hfi1_qp, s_iowait);
struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num); struct hfi1_pkt_state ps;
struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);
int (*make_req)(struct hfi1_qp *qp); int (*make_req)(struct hfi1_qp *qp);
unsigned long flags; unsigned long flags;
unsigned long timeout; unsigned long timeout;
ps.dev = to_idev(qp->ibqp.device);
ps.ibp = to_iport(qp->ibqp.device, qp->port_num);
ps.ppd = ppd_from_ibp(ps.ibp);
if ((qp->ibqp.qp_type == IB_QPT_RC || if ((qp->ibqp.qp_type == IB_QPT_RC ||
qp->ibqp.qp_type == IB_QPT_UC) && qp->ibqp.qp_type == IB_QPT_UC) &&
!loopback && !loopback &&
(qp->remote_ah_attr.dlid & ~((1 << ppd->lmc) - 1)) == ppd->lid) { (qp->remote_ah_attr.dlid & ~((1 << ps.ppd->lmc) - 1)) ==
ps.ppd->lid) {
ruc_loopback(qp); ruc_loopback(qp);
return; return;
} }
@ -850,8 +854,7 @@ void hfi1_do_send(struct work_struct *work)
* If the packet cannot be sent now, return and * If the packet cannot be sent now, return and
* the send tasklet will be woken up later. * the send tasklet will be woken up later.
*/ */
if (hfi1_verbs_send(qp, qp->s_hdr, qp->s_hdrwords, if (hfi1_verbs_send(qp, &ps))
qp->s_cur_sge, qp->s_cur_size))
break; break;
/* Record that s_hdr is empty. */ /* Record that s_hdr is empty. */
qp->s_hdrwords = 0; qp->s_hdrwords = 0;
@ -860,7 +863,7 @@ void hfi1_do_send(struct work_struct *work)
/* allow other tasks to run */ /* allow other tasks to run */
if (unlikely(time_after(jiffies, timeout))) { if (unlikely(time_after(jiffies, timeout))) {
cond_resched(); cond_resched();
ppd->dd->verbs_dev.n_send_schedule++; ps.ppd->dd->verbs_dev.n_send_schedule++;
timeout = jiffies + SEND_RESCHED_TIMEOUT; timeout = jiffies + SEND_RESCHED_TIMEOUT;
} }
} while (make_req(qp)); } while (make_req(qp));

55
drivers/staging/rdma/hfi1/verbs.c
View File

@ -1001,13 +1001,16 @@ bail_txadd:
return ret; return ret;
} }
int hfi1_verbs_send_dma(struct hfi1_qp *qp, struct ahg_ib_header *ahdr, int hfi1_verbs_send_dma(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u32 len, u64 pbc)
u32 plen, u32 dwords, u64 pbc)
{ {
struct hfi1_ibdev *dev = to_idev(qp->ibqp.device); struct ahg_ib_header *ahdr = qp->s_hdr;
struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num); u32 hdrwords = qp->s_hdrwords;
struct hfi1_pportdata *ppd = ppd_from_ibp(ibp); struct hfi1_sge_state *ss = qp->s_cur_sge;
u32 len = qp->s_cur_size;
u32 plen = hdrwords + ((len + 3) >> 2) + 2; /* includes pbc */
struct hfi1_ibdev *dev = ps->dev;
struct hfi1_pportdata *ppd = ps->ppd;
struct verbs_txreq *tx; struct verbs_txreq *tx;
struct sdma_txreq *stx; struct sdma_txreq *stx;
u64 pbc_flags = 0; u64 pbc_flags = 0;
@ -1120,12 +1123,16 @@ struct send_context *qp_to_send_context(struct hfi1_qp *qp, u8 sc5)
return dd->vld[vl].sc; return dd->vld[vl].sc;
} }
int hfi1_verbs_send_pio(struct hfi1_qp *qp, struct ahg_ib_header *ahdr, int hfi1_verbs_send_pio(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u32 len, u64 pbc)
u32 plen, u32 dwords, u64 pbc)
{ {
struct hfi1_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num); struct ahg_ib_header *ahdr = qp->s_hdr;
struct hfi1_pportdata *ppd = ppd_from_ibp(ibp); u32 hdrwords = qp->s_hdrwords;
struct hfi1_sge_state *ss = qp->s_cur_sge;
u32 len = qp->s_cur_size;
u32 dwords = (len + 3) >> 2;
u32 plen = hdrwords + dwords + 2; /* includes pbc */
struct hfi1_pportdata *ppd = ps->ppd;
u32 *hdr = (u32 *)&ahdr->ibh; u32 *hdr = (u32 *)&ahdr->ibh;
u64 pbc_flags = 0; u64 pbc_flags = 0;
u32 sc5; u32 sc5;
@ -1297,23 +1304,18 @@ bad:
/** /**
* hfi1_verbs_send - send a packet * hfi1_verbs_send - send a packet
* @qp: the QP to send on * @qp: the QP to send on
* @ahdr: the packet header * @ps: the state of the packet to send
* @hdrwords: the number of 32-bit words in the header
* @ss: the SGE to send
* @len: the length of the packet in bytes
* *
* Return zero if packet is sent or queued OK. * Return zero if packet is sent or queued OK.
* Return non-zero and clear qp->s_flags HFI1_S_BUSY otherwise. * Return non-zero and clear qp->s_flags HFI1_S_BUSY otherwise.
*/ */
int hfi1_verbs_send(struct hfi1_qp *qp, struct ahg_ib_header *ahdr, int hfi1_verbs_send(struct hfi1_qp *qp, struct hfi1_pkt_state *ps)
u32 hdrwords, struct hfi1_sge_state *ss, u32 len)
{ {
struct hfi1_devdata *dd = dd_from_ibdev(qp->ibqp.device); struct hfi1_devdata *dd = dd_from_ibdev(qp->ibqp.device);
u32 plen; struct ahg_ib_header *ahdr = qp->s_hdr;
int ret; int ret;
int pio = 0; int pio = 0;
unsigned long flags = 0; unsigned long flags = 0;
u32 dwords = (len + 3) >> 2;
/* /*
* VL15 packets (IB_QPT_SMI) will always use PIO, so we * VL15 packets (IB_QPT_SMI) will always use PIO, so we
@ -1344,23 +1346,16 @@ int hfi1_verbs_send(struct hfi1_qp *qp, struct ahg_ib_header *ahdr,
return -EINVAL; return -EINVAL;
} }
/*
* Calculate the send buffer trigger address.
* The +2 counts for the pbc control qword
*/
plen = hdrwords + dwords + 2;
if (pio) { if (pio) {
ret = dd->process_pio_send( ret = dd->process_pio_send(qp, ps, 0);
qp, ahdr, hdrwords, ss, len, plen, dwords, 0);
} else { } else {
#ifdef CONFIG_SDMA_VERBOSITY #ifdef CONFIG_SDMA_VERBOSITY
dd_dev_err(dd, "CONFIG SDMA %s:%d %s()\n", dd_dev_err(dd, "CONFIG SDMA %s:%d %s()\n",
slashstrip(__FILE__), __LINE__, __func__); slashstrip(__FILE__), __LINE__, __func__);
dd_dev_err(dd, "SDMA hdrwords = %u, len = %u\n", hdrwords, len); dd_dev_err(dd, "SDMA hdrwords = %u, len = %u\n", qp->s_hdrwords,
qp->s_cur_size);
#endif #endif
ret = dd->process_dma_send( ret = dd->process_dma_send(qp, ps, 0);
qp, ahdr, hdrwords, ss, len, plen, dwords, 0);
} }
return ret; return ret;

23
drivers/staging/rdma/hfi1/verbs.h
View File

@ -545,6 +545,16 @@ struct hfi1_qp {
____cacheline_aligned_in_smp; ____cacheline_aligned_in_smp;
}; };
/*
* This structure is used to hold commonly lookedup and computed values during
* the send engine progress.
*/
struct hfi1_pkt_state {
struct hfi1_ibdev *dev;
struct hfi1_ibport *ibp;
struct hfi1_pportdata *ppd;
};
/* /*
* Atomic bit definitions for r_aflags. * Atomic bit definitions for r_aflags.
*/ */
@ -930,8 +940,7 @@ int hfi1_mcast_tree_empty(struct hfi1_ibport *ibp);
struct verbs_txreq; struct verbs_txreq;
void hfi1_put_txreq(struct verbs_txreq *tx); void hfi1_put_txreq(struct verbs_txreq *tx);
int hfi1_verbs_send(struct hfi1_qp *qp, struct ahg_ib_header *ahdr, int hfi1_verbs_send(struct hfi1_qp *qp, struct hfi1_pkt_state *ps);
u32 hdrwords, struct hfi1_sge_state *ss, u32 len);
void hfi1_copy_sge(struct hfi1_sge_state *ss, void *data, u32 length, void hfi1_copy_sge(struct hfi1_sge_state *ss, void *data, u32 length,
int release); int release);
@ -1102,13 +1111,11 @@ void hfi1_ib_rcv(struct hfi1_packet *packet);
unsigned hfi1_get_npkeys(struct hfi1_devdata *); unsigned hfi1_get_npkeys(struct hfi1_devdata *);
int hfi1_verbs_send_dma(struct hfi1_qp *qp, struct ahg_ib_header *hdr, int hfi1_verbs_send_dma(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u32 len, u64 pbc);
u32 plen, u32 dwords, u64 pbc);
int hfi1_verbs_send_pio(struct hfi1_qp *qp, struct ahg_ib_header *hdr, int hfi1_verbs_send_pio(struct hfi1_qp *qp, struct hfi1_pkt_state *ps,
u32 hdrwords, struct hfi1_sge_state *ss, u32 len, u64 pbc);
u32 plen, u32 dwords, u64 pbc);
struct send_context *qp_to_send_context(struct hfi1_qp *qp, u8 sc5); struct send_context *qp_to_send_context(struct hfi1_qp *qp, u8 sc5);