drm/xe/guc: Refactor GuC debugfs initialization

We don't have to drmm_kmalloc() local copy of debugfs_list to
write there our pointer to the struct xe_guc as we can extract
pointer to the struct xe_gt from the grandparent debugfs entry,
in similar way to what we did for GT debugfs files.

Note that there is no change in file/directory structure, just
refactored how files are created and how functions are called.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20250403142635.1821-2-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/xe/xe_guc_debugfs.c b/drivers/gpu/drm/xe/xe_guc_debugfs.c
index c569ff456e7416772e3e1a74e4ee49ff927ec492..9a1c78b89f457cd6f47e9a04e13e633bbf3baaea 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_guc_debugfs.c
@@ -17,101 +17,105 @@
 #include "xe_macros.h"
 #include "xe_pm.h"
 
-static struct xe_guc *node_to_guc(struct drm_info_node *node)
-{
-       return node->info_ent->data;
-}
-
-static int guc_info(struct seq_file *m, void *data)
+/*
+ * guc_debugfs_show - A show callback for struct drm_info_list
+ * @m: the &seq_file
+ * @data: data used by the drm debugfs helpers
+ *
+ * This callback can be used in struct drm_info_list to describe debugfs
+ * files that are &xe_guc specific in similar way how we handle &xe_gt
+ * specific files using &xe_gt_debugfs_simple_show.
+ *
+ * It is assumed that those debugfs files will be created on directory entry
+ * which grandparent struct dentry d_inode->i_private points to &xe_gt.
+ *
+ *      /sys/kernel/debug/dri/0/
+ *      ├── gt0                  # dent->d_parent->d_parent (d_inode->i_private == gt)
+ *      │   ├── uc           # dent->d_parent
+ *      │   │   ├── guc_info     # dent
+ *      │   │   ├── guc_...
+ *
+ * This function assumes that &m->private will be set to the &struct
+ * drm_info_node corresponding to the instance of the info on a given &struct
+ * drm_minor (see struct drm_info_list.show for details).
+ *
+ * This function also assumes that struct drm_info_list.data will point to the
+ * function code that will actually print a file content::
+ *
+ *    int (*print)(struct xe_guc *, struct drm_printer *)
+ *
+ * Example::
+ *
+ *    int foo(struct xe_guc *guc, struct drm_printer *p)
+ *    {
+ *        drm_printf(p, "enabled %d\n", guc->submission_state.enabled);
+ *        return 0;
+ *    }
+ *
+ *    static const struct drm_info_list bar[] = {
+ *        { name = "foo", .show = guc_debugfs_show, .data = foo },
+ *    };
+ *
+ *    parent = debugfs_create_dir("uc", gtdir);
+ *    drm_debugfs_create_files(bar, ARRAY_SIZE(bar), parent, minor);
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
+static int guc_debugfs_show(struct seq_file *m, void *data)
 {
-       struct xe_guc *guc = node_to_guc(m->private);
-       struct xe_device *xe = guc_to_xe(guc);
        struct drm_printer p = drm_seq_file_printer(m);
+       struct drm_info_node *node = m->private;
+       struct dentry *parent = node->dent->d_parent;
+       struct dentry *grandparent = parent->d_parent;
+       struct xe_gt *gt = grandparent->d_inode->i_private;
+       struct xe_device *xe = gt_to_xe(gt);
+       int (*print)(struct xe_guc *, struct drm_printer *) = node->info_ent->data;
+       int ret;
 
        xe_pm_runtime_get(xe);
-       xe_guc_print_info(guc, &p);
+       ret = print(&gt->uc.guc, &p);
        xe_pm_runtime_put(xe);
 
-       return 0;
+       return ret;
 }
 
-static int guc_log(struct seq_file *m, void *data)
+static int guc_log(struct xe_guc *guc, struct drm_printer *p)
 {
-       struct xe_guc *guc = node_to_guc(m->private);
-       struct xe_device *xe = guc_to_xe(guc);
-       struct drm_printer p = drm_seq_file_printer(m);
-
-       xe_pm_runtime_get(xe);
-       xe_guc_log_print(&guc->log, &p);
-       xe_pm_runtime_put(xe);
-
+       xe_guc_log_print(&guc->log, p);
        return 0;
 }
 
-static int guc_log_dmesg(struct seq_file *m, void *data)
+static int guc_log_dmesg(struct xe_guc *guc, struct drm_printer *p)
 {
-       struct xe_guc *guc = node_to_guc(m->private);
-       struct xe_device *xe = guc_to_xe(guc);
-
-       xe_pm_runtime_get(xe);
        xe_guc_log_print_dmesg(&guc->log);
-       xe_pm_runtime_put(xe);
-
        return 0;
 }
 
-static int guc_ctb(struct seq_file *m, void *data)
+static int guc_ctb(struct xe_guc *guc, struct drm_printer *p)
 {
-       struct xe_guc *guc = node_to_guc(m->private);
-       struct xe_device *xe = guc_to_xe(guc);
-       struct drm_printer p = drm_seq_file_printer(m);
-
-       xe_pm_runtime_get(xe);
-       xe_guc_ct_print(&guc->ct, &p, true);
-       xe_pm_runtime_put(xe);
-
+       xe_guc_ct_print(&guc->ct, p, true);
        return 0;
 }
 
-static int guc_pc(struct seq_file *m, void *data)
+static int guc_pc(struct xe_guc *guc, struct drm_printer *p)
 {
-       struct xe_guc *guc = node_to_guc(m->private);
-       struct xe_device *xe = guc_to_xe(guc);
-       struct drm_printer p = drm_seq_file_printer(m);
-
-       xe_pm_runtime_get(xe);
-       xe_guc_pc_print(&guc->pc, &p);
-       xe_pm_runtime_put(xe);
-
+       xe_guc_pc_print(&guc->pc, p);
        return 0;
 }
 
 static const struct drm_info_list debugfs_list[] = {
-       {"guc_info", guc_info, 0},
-       {"guc_log", guc_log, 0},
-       {"guc_log_dmesg", guc_log_dmesg, 0},
-       {"guc_ctb", guc_ctb, 0},
-       {"guc_pc", guc_pc, 0},
+       { "guc_info", .show = guc_debugfs_show, .data = xe_guc_print_info },
+       { "guc_log", .show = guc_debugfs_show, .data = guc_log },
+       { "guc_log_dmesg", .show = guc_debugfs_show, .data = guc_log_dmesg },
+       { "guc_ctb", .show = guc_debugfs_show, .data = guc_ctb },
+       { "guc_pc", .show = guc_debugfs_show, .data = guc_pc },
 };
 
 void xe_guc_debugfs_register(struct xe_guc *guc, struct dentry *parent)
 {
        struct drm_minor *minor = guc_to_xe(guc)->drm.primary;
-       struct drm_info_list *local;
-       int i;
-
-#define DEBUGFS_SIZE   (ARRAY_SIZE(debugfs_list) * sizeof(struct drm_info_list))
-       local = drmm_kmalloc(&guc_to_xe(guc)->drm, DEBUGFS_SIZE, GFP_KERNEL);
-       if (!local)
-               return;
-
-       memcpy(local, debugfs_list, DEBUGFS_SIZE);
-#undef DEBUGFS_SIZE
-
-       for (i = 0; i < ARRAY_SIZE(debugfs_list); ++i)
-               local[i].data = guc;
 
-       drm_debugfs_create_files(local,
+       drm_debugfs_create_files(debugfs_list,
                                 ARRAY_SIZE(debugfs_list),
                                 parent, minor);
 }