sif: dfs: Add number of entries and extent to debugfs report headers

This is a simple enhancement to make memory usage of the sif driver
more easy to explore/trace.

Also fix a few printout alignment issues in the eq file
and remove some invalid information.

Orabug: 23141108

Signed-off-by: Knut Omang <knut.omang@oracle.com>
Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>

diff --git a/drivers/infiniband/hw/sif/sif_debug.c b/drivers/infiniband/hw/sif/sif_debug.c
index 56ed015b3ee719e7043c1374cef704c8bdd54af8..67db215c069695bbdb1b830bcd5c431efc7d5404 100644 (file)
--- a/drivers/infiniband/hw/sif/sif_debug.c
+++ b/drivers/infiniband/hw/sif/sif_debug.c
@@ -106,7 +106,11 @@ static int sif_seq_show(struct seq_file *s, void *v)
 
        sif_log(sd->sdev, SIF_DFS, "%lld", it->pos);
        if (!it->pos || !it->started) {
-               seq_printf(s, "# %s state:\n", sif_table_name(sd->type));
+               if (!sd->is_eq)
+                       seq_printf(s, "# %s state (entries %d, extent %d):\n",
+                               sif_table_name(sd->type),
+                               sd->sdev->ba[sd->type].entry_cnt,
+                               sd->sdev->ba[sd->type].ext_sz);
                if (sd->dfs_print)
                        sd->dfs_print(s, sd->sdev, -1);
                else

diff --git a/drivers/infiniband/hw/sif/sif_eq.c b/drivers/infiniband/hw/sif/sif_eq.c
index bf1bc691d9762c713b0e3b98566757eb3f60b888..4ae0c40fe289de01ecc10c8d99bae5faa6a5865c 100644 (file)
--- a/drivers/infiniband/hw/sif/sif_eq.c
+++ b/drivers/infiniband/hw/sif/sif_eq.c
@@ -1094,14 +1094,14 @@ void sif_dfs_print_eq(struct seq_file *s, struct sif_dev *sdev,
                        "#   niu = (index of) next software index update\n#\n"
                        "#   ni = Number of events seen\n"
                        "#   wi = Number of events handled in work queue\n"
-                       "# Name\tindex\tentries\textent\tn.seq\tvector#\tIRQ#\t"
-                       "#ni\t#wi\tsii\tniu\n");
+                       "# Name    index   entries  ext.%9s vec# IRQ# %9s %9s %9s %9s\n",
+                       "n.seq", "#ni", "#wi", "sii", "niu");
                return;
        }
 
        eq = &sdev->es[sdev->mbox_epsc].eqs.eq[pos];
 
-       seq_printf(s, "%-12s%u\t%u\t%u\t%u\t%d\t%d\t%u\t%u\t%u\t%u\n",
+       seq_printf(s, "%-12s%3u %9u %4u %9u %4d %4d %9u %9u %9u %9u\n",
                eq->name, eq->index, eq->entries, eq->extent, eq->next_seq, eq->intr_vec,
                sdev->msix_entries[eq->intr_vec].vector,
                atomic_read(&eq->intr_cnt), atomic_read(&eq->work_cnt),