IB/hfi1: List all receive contexts from debugfs

The current debugfs output for receive contexts (rcds), stops after the
kernel receive contexts have been displayed.  This is not enough
information to fully diagnose packet drops.

Display all of the receive contexts.

Augment the output with some more context information.

Limit the ring buffer header output to 5 entries to avoid overextending
the sequential file output.

Fixes: bf808b5039c ("IB/hfi1: Add kernel receive context info to debugfs")
Link: https://lore.kernel.org/r/20191219211928.58387.20737.stgit@awfm-01.aw.intel.com
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hfi1/debugfs.c b/drivers/infiniband/hw/hfi1/debugfs.c
index d268bf9c42eef0087c4cbff7bb47c93e210713c6..4633a0ce1a8c0fdeadf10af7bd42f32b0819709e 100644 (file)
--- a/drivers/infiniband/hw/hfi1/debugfs.c
+++ b/drivers/infiniband/hw/hfi1/debugfs.c
@@ -379,7 +379,7 @@ static void *_rcds_seq_next(struct seq_file *s, void *v, loff_t *pos)
        struct hfi1_devdata *dd = dd_from_dev(ibd);
 
        ++*pos;
-       if (!dd->rcd || *pos >= dd->n_krcv_queues)
+       if (!dd->rcd || *pos >= dd->num_rcv_contexts)
                return NULL;
        return pos;
 }

diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index cbc52193090095cd92a8b570db88832699245638..8374922ea6e59a1ff3348860f20416e2e5af1627 100644 (file)
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -1726,23 +1726,29 @@ static int process_receive_invalid(struct hfi1_packet *packet)
        return RHF_RCV_CONTINUE;
 }
 
+#define HFI1_RCVHDR_DUMP_MAX   5
+
 void seqfile_dump_rcd(struct seq_file *s, struct hfi1_ctxtdata *rcd)
 {
        struct hfi1_packet packet;
        struct ps_mdata mdata;
+       int i;
 
-       seq_printf(s, "Rcd %u: RcvHdr cnt %u entsize %u %s head %llu tail %llu\n",
+       seq_printf(s, "Rcd %u: RcvHdr cnt %u entsize %u %s ctrl 0x%08llx status 0x%08llx, head %llu tail %llu  sw head %u\n",
                   rcd->ctxt, get_hdrq_cnt(rcd), get_hdrqentsize(rcd),
                   get_dma_rtail_setting(rcd) ?
                   "dma_rtail" : "nodma_rtail",
+                  read_kctxt_csr(rcd->dd, rcd->ctxt, RCV_CTXT_CTRL),
+                  read_kctxt_csr(rcd->dd, rcd->ctxt, RCV_CTXT_STATUS),
                   read_uctxt_csr(rcd->dd, rcd->ctxt, RCV_HDR_HEAD) &
                   RCV_HDR_HEAD_HEAD_MASK,
-                  read_uctxt_csr(rcd->dd, rcd->ctxt, RCV_HDR_TAIL));
+                  read_uctxt_csr(rcd->dd, rcd->ctxt, RCV_HDR_TAIL),
+                  rcd->head);
 
        init_packet(rcd, &packet);
        init_ps_mdata(&mdata, &packet);
 
-       while (1) {
+       for (i = 0; i < HFI1_RCVHDR_DUMP_MAX; i++) {
                __le32 *rhf_addr = (__le32 *)rcd->rcvhdrq + mdata.ps_head +
                                         rcd->rhf_offset;
                struct ib_header *hdr;