IB/qib: Convert qp_stats debugfs interface to use new iterator API

Continue porting copy/paste code into rdmavt from qib.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/qib/qib_debugfs.c b/drivers/infiniband/hw/qib/qib_debugfs.c
index 5bad8e3..5ed1ed9 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_debugfs.c
+++ b/drivers/infiniband/hw/qib/qib_debugfs.c
@@ -1,6 +1,5 @@
-#ifdef CONFIG_DEBUG_FS
 /*
- * Copyright (c) 2013 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2013 - 2017 Intel Corporation.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -191,10 +190,10 @@ DEBUGFS_FILE(ctx_stats)
 static void *_qp_stats_seq_start(struct seq_file *s, loff_t *pos)
        __acquires(RCU)
 {
-       struct qib_qp_iter *iter;
+       struct rvt_qp_iter *iter;
        loff_t n = *pos;
 
-       iter = qib_qp_iter_init(s->private);
+       iter = rvt_qp_iter_init(s->private, 0, NULL);
 
        /* stop calls rcu_read_unlock */
        rcu_read_lock();
@@ -203,7 +202,7 @@ static void *_qp_stats_seq_start(struct seq_file *s, loff_t *pos)
                return NULL;
 
        do {
-               if (qib_qp_iter_next(iter)) {
+               if (rvt_qp_iter_next(iter)) {
                        kfree(iter);
                        return NULL;
                }
@@ -216,11 +215,11 @@ static void *_qp_stats_seq_next(struct seq_file *s, void *iter_ptr,
                                   loff_t *pos)
        __must_hold(RCU)
 {
-       struct qib_qp_iter *iter = iter_ptr;
+       struct rvt_qp_iter *iter = iter_ptr;
 
        (*pos)++;
 
-       if (qib_qp_iter_next(iter)) {
+       if (rvt_qp_iter_next(iter)) {
                kfree(iter);
                return NULL;
        }
@@ -236,7 +235,7 @@ static void _qp_stats_seq_stop(struct seq_file *s, void *iter_ptr)
 
 static int _qp_stats_seq_show(struct seq_file *s, void *iter_ptr)
 {
-       struct qib_qp_iter *iter = iter_ptr;
+       struct rvt_qp_iter *iter = iter_ptr;
 
        if (!iter)
                return 0;
@@ -284,6 +283,3 @@ void qib_dbg_exit(void)
        debugfs_remove_recursive(qib_dbg_root);
        qib_dbg_root = NULL;
 }
-
-#endif
-

diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index a343e3b..344e401 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2012 - 2017 Intel Corporation.  All rights reserved.
  * Copyright (c) 2006 - 2012 QLogic Corporation.  * All rights reserved.
  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
  *
@@ -415,53 +415,16 @@ int qib_check_send_wqe(struct rvt_qp *qp,
 
 #ifdef CONFIG_DEBUG_FS
 
-struct qib_qp_iter {
-       struct qib_ibdev *dev;
-       struct rvt_qp *qp;
-       int n;
-};
-
-struct qib_qp_iter *qib_qp_iter_init(struct qib_ibdev *dev)
-{
-       struct qib_qp_iter *iter;
-
-       iter = kzalloc(sizeof(*iter), GFP_KERNEL);
-       if (!iter)
-               return NULL;
-
-       iter->dev = dev;
-
-       return iter;
-}
-
-int qib_qp_iter_next(struct qib_qp_iter *iter)
-{
-       struct qib_ibdev *dev = iter->dev;
-       int n = iter->n;
-       int ret = 1;
-       struct rvt_qp *pqp = iter->qp;
-       struct rvt_qp *qp;
-
-       for (; n < dev->rdi.qp_dev->qp_table_size; n++) {
-               if (pqp)
-                       qp = rcu_dereference(pqp->next);
-               else
-                       qp = rcu_dereference(dev->rdi.qp_dev->qp_table[n]);
-               pqp = qp;
-               if (qp) {
-                       iter->qp = qp;
-                       iter->n = n;
-                       return 0;
-               }
-       }
-       return ret;
-}
-
 static const char * const qp_type_str[] = {
        "SMI", "GSI", "RC", "UC", "UD",
 };
 
-void qib_qp_iter_print(struct seq_file *s, struct qib_qp_iter *iter)
+/**
+ * qib_qp_iter_print - print information to seq_file
+ * @s - the seq_file
+ * @iter - the iterator
+ */
+void qib_qp_iter_print(struct seq_file *s, struct rvt_qp_iter *iter)
 {
        struct rvt_swqe *wqe;
        struct rvt_qp *qp = iter->qp;

diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h
index 95e3701..f887737 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.h
+++ b/drivers/infiniband/hw/qib/qib_verbs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2012 - 2017 Intel Corporation.  All rights reserved.
  * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.
  * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
  *
@@ -282,13 +282,7 @@ int qib_alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt,
 void qib_restart_rc(struct rvt_qp *qp, u32 psn, int wait);
 #ifdef CONFIG_DEBUG_FS
 
-struct qib_qp_iter;
-
-struct qib_qp_iter *qib_qp_iter_init(struct qib_ibdev *dev);
-
-int qib_qp_iter_next(struct qib_qp_iter *iter);
-
-void qib_qp_iter_print(struct seq_file *s, struct qib_qp_iter *iter);
+void qib_qp_iter_print(struct seq_file *s, struct rvt_qp_iter *iter);
 
 #endif