[RFC PATCH] drm/i915: rework the i915_gem_object debugfs

[Nikunj A. Dadhania]

Iterate the files in the outerloop and then context array in
the inner loop.

Signed-off-by: Nikunj A. Dadhania <nikunj.dadhania at linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
Cc: Daniel Vetter <daniel.vetter at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 75 ++++++++++++++---------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index ea469168cd44..a888222f31fe 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -300,61 +300,56 @@ static void print_context_stats(struct seq_file *m,
 				struct drm_i915_private *i915)
 {
 	struct file_stats kstats = {};
-	struct i915_gem_context *ctx, *cn;
-
-	spin_lock(&i915->gem.contexts.lock);
-	list_for_each_entry_safe(ctx, cn, &i915->gem.contexts.list, link) {
-		struct i915_gem_engines_iter it;
-		struct intel_context *ce;
-
-		if (!kref_get_unless_zero(&ctx->ref))
-			continue;
-
-		spin_unlock(&i915->gem.contexts.lock);
-
-		for_each_gem_engine(ce,
-				    i915_gem_context_lock_engines(ctx), it) {
-			if (intel_context_pin_if_active(ce)) {
-				rcu_read_lock();
-				if (ce->state)
-					per_file_stats(0,
-						       ce->state->obj, &kstats);
-				per_file_stats(0, ce->ring->vma->obj, &kstats);
-				rcu_read_unlock();
-				intel_context_unpin(ce);
-			}
-		}
-		i915_gem_context_unlock_engines(ctx);
-
-		mutex_lock(&ctx->mutex);
-		if (!IS_ERR_OR_NULL(ctx->file_priv)) {
+	struct i915_gem_context *ctx;
+	struct drm_device *dev = &i915->drm;
+	struct drm_file *file;
+
+	mutex_lock(&dev->filelist_mutex);
+	list_for_each_entry(file, &dev->filelist, lhead) {
+		struct drm_i915_file_private *file_priv = file->driver_priv;
+		unsigned long idx;
+
+		rcu_read_lock();
+		xa_for_each(&file_priv->context_xa, idx, ctx) {
+			struct i915_gem_engines_iter it;
+			struct intel_context *ce;
 			struct file_stats stats = {
 				.vm = rcu_access_pointer(ctx->vm),
 			};
-			struct drm_file *file = ctx->file_priv->file;
 			struct task_struct *task;
 			char name[80];
 
-			rcu_read_lock();
-			idr_for_each(&file->object_idr, per_file_stats, &stats);
+			if (!kref_get_unless_zero(&ctx->ref))
+				continue;
+
 			rcu_read_unlock();
 
+			for_each_gem_engine(ce,
+					i915_gem_context_lock_engines(ctx), it) {
+				if (intel_context_pin_if_active(ce)) {
+					rcu_read_lock();
+					if (ce->state)
+						per_file_stats(0,
+							ce->state->obj, &kstats);
+					per_file_stats(0, ce->ring->vma->obj, &kstats);
+					rcu_read_unlock();
+					intel_context_unpin(ce);
+				}
+			}
+			i915_gem_context_unlock_engines(ctx);
+
 			rcu_read_lock();
+			idr_for_each(&file->object_idr, per_file_stats, &stats);
 			task = pid_task(ctx->pid ?: file->pid, PIDTYPE_PID);
 			snprintf(name, sizeof(name), "%s",
 				 task ? task->comm : "<unknown>");
-			rcu_read_unlock();
 
 			print_file_stats(m, name, stats);
+			i915_gem_context_put(ctx);
 		}
-		mutex_unlock(&ctx->mutex);
-
-		spin_lock(&i915->gem.contexts.lock);
-		list_safe_reset_next(ctx, cn, link);
-		i915_gem_context_put(ctx);
-	}
-	spin_unlock(&i915->gem.contexts.lock);
-
+		rcu_read_unlock();
+        }
+        mutex_unlock(&dev->filelist_mutex);
 	print_file_stats(m, "[k]contexts", kstats);
 }
 
-- 
2.17.1