| Message ID | 20190117204137.30826.50398.stgit@scvm10.sc.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | hfi1 and qib patches for rc | expand |
On Thu, Jan 17, 2019 at 12:41:43PM -0800, Dennis Dalessandro wrote: > From: Mike Marciniszyn <mike.marciniszyn@intel.com> > > These fields were missing from the trace. > Add them. > > Fixes: c6ad9482fcb8 ("IB/rdmavt: Add tracing for cq entry and poll") > Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com> > Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> > Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> > --- > drivers/infiniband/sw/rdmavt/trace_cq.h | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) This is not -rc material.. Jason
On 1/17/2019 4:09 PM, Jason Gunthorpe wrote: > On Thu, Jan 17, 2019 at 12:41:43PM -0800, Dennis Dalessandro wrote: >> From: Mike Marciniszyn <mike.marciniszyn@intel.com> >> >> These fields were missing from the trace. >> Add them. >> >> Fixes: c6ad9482fcb8 ("IB/rdmavt: Add tracing for cq entry and poll") >> Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com> >> Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> >> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> >> --- >> drivers/infiniband/sw/rdmavt/trace_cq.h | 10 ++++++++-- >> 1 files changed, 8 insertions(+), 2 deletions(-) > > This is not -rc material.. Can you apply to -next then, or do you want me to respin? It should apply to either branch. -Denny
On Thu, Jan 17, 2019 at 12:41:43PM -0800, Dennis Dalessandro wrote: > From: Mike Marciniszyn <mike.marciniszyn@intel.com> > > These fields were missing from the trace. > Add them. > > Fixes: c6ad9482fcb8 ("IB/rdmavt: Add tracing for cq entry and poll") > Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com> > Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> > Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> > --- > drivers/infiniband/sw/rdmavt/trace_cq.h | 10 ++++++++-- > 1 files changed, 8 insertions(+), 2 deletions(-) Applied to for-next Thanks Jason
diff --git a/drivers/infiniband/sw/rdmavt/trace_cq.h b/drivers/infiniband/sw/rdmavt/trace_cq.h index df8e1ad..e3c416c 100644 --- a/drivers/infiniband/sw/rdmavt/trace_cq.h +++ b/drivers/infiniband/sw/rdmavt/trace_cq.h @@ -105,7 +105,7 @@ TP_ARGS(cq, attr)); #define CQ_PRN \ -"[%s] idx %u wr_id %llx status %u opcode %u,%s length %u qpn %x" +"[%s] idx %u wr_id %llx status %u opcode %u,%s length %u qpn %x flags %x imm %x" DECLARE_EVENT_CLASS( rvt_cq_entry_template, @@ -119,6 +119,8 @@ __field(u32, qpn) __field(u32, length) __field(u32, idx) + __field(u32, flags) + __field(u32, imm) ), TP_fast_assign( RDI_DEV_ASSIGN(cq->rdi) @@ -128,6 +130,8 @@ __entry->length = wc->byte_len; __entry->qpn = wc->qp->qp_num; __entry->idx = idx; + __entry->flags = wc->wc_flags; + __entry->imm = be32_to_cpu(wc->ex.imm_data); ), TP_printk( CQ_PRN, @@ -137,7 +141,9 @@ __entry->status, __entry->opcode, show_wc_opcode(__entry->opcode), __entry->length, - __entry->qpn + __entry->qpn, + __entry->flags, + __entry->imm ) );