Skip to contentSkip to conversation

drm/i915/gt: allow setting generic data pointer

PATCH Superseded Andi Shyti 3 participants 3 messages Mar 6, 2020

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Andi Shyti

author
#0 lore raw

PATCH v2 1/1 drm/i915/gt: allow setting generic data pointer

From: Andi Shyti <[email protected]>

When registering debugfs files the intel gt debugfs library forces a 'struct *gt' private data on the caller.

There might be different needs, therefore make it generic by adding one more argument to the "debugfs_register_files()" function which gets the generic void private data as argument.

Still keep it simple by defining a wrapper where struct *gt is the chosen private data to be stored.

I take the chance to rename the functions by using "intel_gt_" as prefix instead of "debugfs_".

---
Changelog:
v2:
- the eval function is made generic as suggested by Daniele.

 drivers/gpu/drm/i915/gt/debugfs_engines.c |  2 +-
 drivers/gpu/drm/i915/gt/debugfs_gt.c      | 11 +++++------
 drivers/gpu/drm/i915/gt/debugfs_gt.h      | 12 +++++++-----
 drivers/gpu/drm/i915/gt/debugfs_gt_pm.c   | 14 +++++++++-----
 4 files changed, 22 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gt/debugfs_engines.c +1 -1
index 6a5e9ab20b94..3434df10d58c 100644
@@ -32,5 +32,5 @@ void debugfs_engines_register(struct intel_gt *gt, struct dentry *root)
 		{ "engines", &engines_fops },
 	};
 
-	debugfs_gt_register_files(gt, root, files, ARRAY_SIZE(files));
+	intel_gt_debugfs_register_file(gt, root, files, ARRAY_SIZE(files));
 }
drivers/gpu/drm/i915/gt/debugfs_gt.c +5 -6
index 75255aaacaed..24099fb157be 100644
@@ -26,15 +26,14 @@ void debugfs_gt_register(struct intel_gt *gt)
 	debugfs_gt_pm_register(gt, root);
 }
 
-void debugfs_gt_register_files(struct intel_gt *gt,
-			       struct dentry *root,
-			       const struct debugfs_gt_file *files,
-			       unsigned long count)
+void __intel_gt_debugfs_register_files(struct intel_gt *gt, struct dentry *root,
+				       const struct debugfs_gt_file *files,
+				       unsigned long count, void *data)
 {
 	while (count--) {
-		if (!files->eval || files->eval(gt))
+		if (!files->eval || files->eval(data))
 			debugfs_create_file(files->name,
-					    0444, root, gt,
+					    0444, root, data,
 					    files->fops);
 
 		files++;
drivers/gpu/drm/i915/gt/debugfs_gt.h +7 -5
index 4ea0f06cda8f..f498fe75c79a 100644
@@ -28,12 +28,14 @@ void debugfs_gt_register(struct intel_gt *gt);
 struct debugfs_gt_file {
 	const char *name;
 	const struct file_operations *fops;
-	bool (*eval)(const struct intel_gt *gt);
+	bool (*eval)(void *data);
 };
 
-void debugfs_gt_register_files(struct intel_gt *gt,
-			       struct dentry *root,
-			       const struct debugfs_gt_file *files,
-			       unsigned long count);
+void __intel_gt_debugfs_register_files(struct intel_gt *gt, struct dentry *root,
+				       const struct debugfs_gt_file *files,
+				       unsigned long count, void *data);
+
+#define intel_gt_debugfs_register_file(g, r, f, c)	\
+	__intel_gt_debugfs_register_files(g, r, f, c, g)
 
 #endif /* DEBUGFS_GT_H */
drivers/gpu/drm/i915/gt/debugfs_gt_pm.c +9 -5
index 059c9e5c002e..a233b97a9294 100644
@@ -506,9 +506,11 @@ static int llc_show(struct seq_file *m, void *data)
 	return 0;
 }
 
-static bool llc_eval(const struct intel_gt *gt)
+static bool llc_eval(void *data)
 {
-	return HAS_LLC(gt->i915);
+	struct intel_gt *gt = data;
+
+	return !gt ? false : HAS_LLC(gt->i915);
 }
 
 DEFINE_GT_DEBUGFS_ATTRIBUTE(llc);
@@ -580,9 +582,11 @@ static int rps_boost_show(struct seq_file *m, void *data)
 	return 0;
 }
 
-static bool rps_eval(const struct intel_gt *gt)
+static bool rps_eval(void *data)
 {
-	return HAS_RPS(gt->i915);
+	struct intel_gt *gt = data;
+
+	return !gt ? false : HAS_RPS(gt->i915);
 }
 
 DEFINE_GT_DEBUGFS_ATTRIBUTE(rps_boost);
@@ -597,5 +601,5 @@ void debugfs_gt_pm_register(struct intel_gt *gt, struct dentry *root)
 		{ "rps_boost", &rps_boost_fops, rps_eval },
 	};
 
-	debugfs_gt_register_files(gt, root, files, ARRAY_SIZE(files));
+	intel_gt_debugfs_register_file(gt, root, files, ARRAY_SIZE(files));
 }
Signature · 6 lines
2.25.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 43 lines · Andi Shyti

From: Andi Shyti <[email protected]>

When registering debugfs files the intel gt debugfs library forces a 'struct *gt' private data on the caller.

There might be different needs, therefore make it generic by adding one more argument to the "debugfs_register_files()" function which gets the generic void private data as argument.

Still keep it simple by defining a wrapper where struct *gt is the chosen private data to be stored.

I take the chance to rename the functions by using "intel_gt_" as prefix instead of "debugfs_".

---
Changelog:
v2:
- the eval function is made generic as suggested by Daniele.

  drivers/gpu/drm/i915/gt/debugfs_engines.c |  2 +-
  drivers/gpu/drm/i915/gt/debugfs_gt.c      | 11 +++++------
  drivers/gpu/drm/i915/gt/debugfs_gt.h      | 12 +++++++-----
  drivers/gpu/drm/i915/gt/debugfs_gt_pm.c   | 14 +++++++++-----
  4 files changed, 22 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/gt/debugfs_engines.c +1 -1
index 6a5e9ab20b94..3434df10d58c 100644
@@ -32,5 +32,5 @@ void debugfs_engines_register(struct intel_gt *gt, struct dentry *root)
  		{ "engines", &engines_fops },
  	};
 
-	debugfs_gt_register_files(gt, root, files, ARRAY_SIZE(files));
+	intel_gt_debugfs_register_file(gt, root, files, ARRAY_SIZE(files));
  }
drivers/gpu/drm/i915/gt/debugfs_gt.c +0 -0
index 75255aaacaed..24099fb157be 100644

drivers/gpu/drm/i915/gt/debugfs_gt.c void debugfs_gt_register(struct intel_gt *gt) · line 29

Quoted 8 lines
drivers/gpu/drm/i915/gt/debugfs_gt.c +1 -4
@@ -26,15 +26,14 @@ void debugfs_gt_register(struct intel_gt *gt)
  	debugfs_gt_pm_register(gt, root);
  }
 
-void debugfs_gt_register_files(struct intel_gt *gt,
-			       struct dentry *root,
-			       const struct debugfs_gt_file *files,
-			       unsigned long count)
+void __intel_gt_debugfs_register_files(struct intel_gt *gt, struct dentry *root,

The gt variable is now unused in this function, so you can get rid of it, which means you can also drop the macro wrapper you have defined below.

Quoted 41 lines
drivers/gpu/drm/i915/gt/debugfs_gt.c +4 -2
+				       const struct debugfs_gt_file *files,
+				       unsigned long count, void *data)
  {
  	while (count--) {
-		if (!files->eval || files->eval(gt))
+		if (!files->eval || files->eval(data))
  			debugfs_create_file(files->name,
-					    0444, root, gt,
+					    0444, root, data,
  					    files->fops);
 
  		files++;
drivers/gpu/drm/i915/gt/debugfs_gt.h +7 -5
index 4ea0f06cda8f..f498fe75c79a 100644
@@ -28,12 +28,14 @@ void debugfs_gt_register(struct intel_gt *gt);
  struct debugfs_gt_file {
  	const char *name;
  	const struct file_operations *fops;
-	bool (*eval)(const struct intel_gt *gt);
+	bool (*eval)(void *data);
  };
 
-void debugfs_gt_register_files(struct intel_gt *gt,
-			       struct dentry *root,
-			       const struct debugfs_gt_file *files,
-			       unsigned long count);
+void __intel_gt_debugfs_register_files(struct intel_gt *gt, struct dentry *root,
+				       const struct debugfs_gt_file *files,
+				       unsigned long count, void *data);
+
+#define intel_gt_debugfs_register_file(g, r, f, c)	\
+	__intel_gt_debugfs_register_files(g, r, f, c, g)
 
  #endif /* DEBUGFS_GT_H */
drivers/gpu/drm/i915/gt/debugfs_gt_pm.c +0 -0
index 059c9e5c002e..a233b97a9294 100644

drivers/gpu/drm/i915/gt/debugfs_gt_pm.c static int llc_show(struct seq_file *m, void *data) · line 513

Quoted 10 lines
drivers/gpu/drm/i915/gt/debugfs_gt_pm.c +4 -2
@@ -506,9 +506,11 @@ static int llc_show(struct seq_file *m, void *data)
  	return 0;
  }
 
-static bool llc_eval(const struct intel_gt *gt)
+static bool llc_eval(void *data)
  {
-	return HAS_LLC(gt->i915);
+	struct intel_gt *gt = data;
+
+	return !gt ? false : HAS_LLC(gt->i915);

Is there a case where gt can be NULL?
BTW, you can also have this condition as:

	return gt && HAS_LLC(gt->i915);

Daniele

Quoted 19 lines
drivers/gpu/drm/i915/gt/debugfs_gt_pm.c +4 -2
  }
 
  DEFINE_GT_DEBUGFS_ATTRIBUTE(llc);
@@ -580,9 +582,11 @@ static int rps_boost_show(struct seq_file *m, void *data)
  	return 0;
  }
 
-static bool rps_eval(const struct intel_gt *gt)
+static bool rps_eval(void *data)
  {
-	return HAS_RPS(gt->i915);
+	struct intel_gt *gt = data;
+
+	return !gt ? false : HAS_RPS(gt->i915);
  }
 
  DEFINE_GT_DEBUGFS_ATTRIBUTE(rps_boost);

drivers/gpu/drm/i915/gt/debugfs_gt_pm.c void debugfs_gt_pm_register(struct intel_gt *gt, struct dentry *root) · line 605

Quoted 6 lines
drivers/gpu/drm/i915/gt/debugfs_gt_pm.c +1 -1
@@ -597,5 +601,5 @@ void debugfs_gt_pm_register(struct intel_gt *gt, struct dentry *root)
  		{ "rps_boost", &rps_boost_fops, rps_eval },
  	};
 
-	debugfs_gt_register_files(gt, root, files, ARRAY_SIZE(files));
+	intel_gt_debugfs_register_file(gt, root, files, ARRAY_SIZE(files));
  }

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

Hi Daniele,

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/gt/debugfs_gt.c +0 -0
index 75255aaacaed..24099fb157be 100644
@@ -26,15 +26,14 @@ void debugfs_gt_register(struct intel_gt *gt)
  	debugfs_gt_pm_register(gt, root);
  }
Quoted 8 lines

drivers/gpu/drm/i915/gt/debugfs_gt.c void debugfs_gt_register(struct intel_gt *gt) · line 29

Quoted 5 lines
drivers/gpu/drm/i915/gt/debugfs_gt.c +1 -4
-void debugfs_gt_register_files(struct intel_gt *gt,
-			       struct dentry *root,
-			       const struct debugfs_gt_file *files,
-			       unsigned long count)
+void __intel_gt_debugfs_register_files(struct intel_gt *gt, struct dentry *root,

The gt variable is now unused in this function, so you can get rid of it, which means you can also drop the macro wrapper you have defined below.

uh, yes, right! I forgot to remove it :)

Quoted 11 lines

drivers/gpu/drm/i915/gt/debugfs_gt.c void debugfs_gt_register(struct intel_gt *gt) · line 33

Quoted 7 lines
drivers/gpu/drm/i915/gt/debugfs_gt.c +4 -2
-static bool llc_eval(const struct intel_gt *gt)
+static bool llc_eval(void *data)
  {
-	return HAS_LLC(gt->i915);
+	struct intel_gt *gt = data;
+
+	return !gt ? false : HAS_LLC(gt->i915);

Is there a case where gt can be NULL?
BTW, you can also have this condition as:

Quoted 1 line
	return gt && HAS_LLC(gt->i915);

Thanks,
Andi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx