Discussion of previous revision of this patch series can be found at:

https://lore.kernel.org/dri-devel/20250327140845.105962-1-adrian.larumbe@collabora.com/

v4:

- Labelled all kernel BO's, not just heap chunks.

- Refactored DebugGFs GEMs list handling functions

- Added debugfs GEMS node mask to tell different kinds of BO's

drivers/gpu/drm/panthor/panthor_drv.c | 66 ++++++++

drivers/gpu/drm/panthor/panthor_fw.c | 8 +-

drivers/gpu/drm/panthor/panthor_gem.c | 190 ++++++++++++++++++++++-

drivers/gpu/drm/panthor/panthor_gem.h | 56 ++++++-

drivers/gpu/drm/panthor/panthor_heap.c | 6 +-

drivers/gpu/drm/panthor/panthor_sched.c | 9 +-

9 files changed, 360 insertions(+), 10 deletions(-)

drivers/gpu/drm/panthor/panthor_gem.c | 38 +++++++++++++++++++++++++++

drivers/gpu/drm/panthor/panthor_gem.h | 17 ++++++++++++

2 files changed, 55 insertions(+)

+    /*

+     * Label might have been allocated with kstrdup_const(),

+     * we need to take that into account when freeing the memory

+     */

+    kfree_const(bo->label.str);

+

+    const char *str;

+

+    str = kstrdup_const(label, GFP_KERNEL);

+    if (!str) {

+        /* Failing to allocate memory for a label isn't a fatal condition */

+        drm_warn(bo->obj->dev, "Not enough memory to allocate BO label");

+        return;

+    }

+

+    panthor_gem_bo_set_label(bo->obj, kstrdup_const(str, GFP_KERNEL));

drivers/gpu/drm/panthor/panthor_drv.c | 40 +++++++++++++++++++++++++++

drivers/gpu/drm/panthor/panthor_gem.h | 2 ++

include/uapi/drm/panthor_drm.h | 19 +++++++++++++

3 files changed, 61 insertions(+)

+        if (args->size > PANTHOR_BO_LABEL_MAXLEN) {

+            ret = -E2BIG;

+            goto err_label;

+        }

+

+        label = strndup_user(u64_to_user_ptr(args->label), args->size);

Kernel BO's aren't exposed to UM, so labelling them is the responsibility

of the driver itself. This kind of tagging will prove useful in further

commits when want to expose these objects through DebugFS.

Expand panthor_kernel_bo_create() interface to take a NULL-terminated

string. No bounds checking is done because all label strings are given

as statically-allocated literals, but if a more complex kernel BO naming

scheme with explicit memory allocation and formatting was desired in the

future, this would have to change.

drivers/gpu/drm/panthor/panthor_fw.c | 8 +++++---

drivers/gpu/drm/panthor/panthor_gem.c | 3 ++-

drivers/gpu/drm/panthor/panthor_gem.h | 2 +-

drivers/gpu/drm/panthor/panthor_heap.c | 6 ++++--

drivers/gpu/drm/panthor/panthor_sched.c | 9 ++++++---

5 files changed, 18 insertions(+), 10 deletions(-)

@@ -XXX,XX +XXX,XX @@ void panthor_kernel_bo_destroy(struct panthor_kernel_bo *bo)

struct panthor_kernel_bo *

panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *vm,

             size_t size, u32 bo_flags, u32 vm_map_flags,

-             u64 gpu_va)

+             u64 gpu_va, const char *name)

    struct drm_gem_shmem_object *obj;

    struct panthor_kernel_bo *kbo;

@@ -XXX,XX +XXX,XX @@ panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *vm,

    kbo->obj = &obj->base;

    bo->flags = bo_flags;

+    panthor_gem_kernel_bo_set_label(kbo, name);

    /* The system and GPU MMU page size might differ, which becomes a

     * problem for FW sections that need to be mapped at explicit address

     * since our PAGE_SIZE alignment might cover a VA range that's

@@ -XXX,XX +XXX,XX @@ panthor_kernel_bo_vunmap(struct panthor_kernel_bo *bo)

struct panthor_kernel_bo *

panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *vm,

             size_t size, u32 bo_flags, u32 vm_map_flags,

-             u64 gpu_va);

+             u64 gpu_va, const char *name);

void panthor_kernel_bo_destroy(struct panthor_kernel_bo *bo);

    chunk->bo = panthor_kernel_bo_create(ptdev, vm, heap->chunk_size,

                     DRM_PANTHOR_BO_NO_MMAP,

                     DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC,

-                     PANTHOR_VM_KERNEL_AUTO_VA);

+                     PANTHOR_VM_KERNEL_AUTO_VA,

+                     "Tiler heap chunk");

    if (IS_ERR(chunk->bo)) {

        ret = PTR_ERR(chunk->bo);

        goto err_free_chunk;

@@ -XXX,XX +XXX,XX @@ panthor_heap_pool_create(struct panthor_device *ptdev, struct panthor_vm *vm)

    pool->gpu_contexts = panthor_kernel_bo_create(ptdev, vm, bosize,

                         DRM_PANTHOR_BO_NO_MMAP,

                         DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC,

-                         PANTHOR_VM_KERNEL_AUTO_VA);

+                         PANTHOR_VM_KERNEL_AUTO_VA,

+                         "Heap pool");

    if (IS_ERR(pool->gpu_contexts)) {

        ret = PTR_ERR(pool->gpu_contexts);

        goto err_destroy_pool;

diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c

index XXXXXXX..XXXXXXX 100644

--- a/drivers/gpu/drm/panthor/panthor_sched.c

+++ b/drivers/gpu/drm/panthor/panthor_sched.c

@@ -XXX,XX +XXX,XX @@ group_create_queue(struct panthor_group *group,

                         DRM_PANTHOR_BO_NO_MMAP,

                         DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC |

                         DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED,

-                         PANTHOR_VM_KERNEL_AUTO_VA);

+                         PANTHOR_VM_KERNEL_AUTO_VA,

+                         "Ring buffer");

    if (IS_ERR(queue->ringbuf)) {

        ret = PTR_ERR(queue->ringbuf);

        goto err_free_queue;

@@ -XXX,XX +XXX,XX @@ group_create_queue(struct panthor_group *group,

                     DRM_PANTHOR_BO_NO_MMAP,

                     DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC |

                     DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED,

-                     PANTHOR_VM_KERNEL_AUTO_VA);

+                     PANTHOR_VM_KERNEL_AUTO_VA,

+                     "fdinfo slots");

    if (IS_ERR(queue->profiling.slots)) {

        ret = PTR_ERR(queue->profiling.slots);

@@ -XXX,XX +XXX,XX @@ int panthor_group_create(struct panthor_file *pfile,

                         DRM_PANTHOR_BO_NO_MMAP,

                         DRM_PANTHOR_VM_BIND_OP_MAP_NOEXEC |

                         DRM_PANTHOR_VM_BIND_OP_MAP_UNCACHED,

-                         PANTHOR_VM_KERNEL_AUTO_VA);

+                         PANTHOR_VM_KERNEL_AUTO_VA,

+                         "Group sync objects");

    if (IS_ERR(group->syncobjs)) {

        ret = PTR_ERR(group->syncobjs);

        goto err_put_group;

Add a device DebugFS file that displays a complete list of all the DRM

GEM objects that are exposed to UM through a DRM handle.

fields: Client PID, BO's global name, reference count, BO virtual size,

BO resize size, VM address in its DRM-managed range, BO label and a flag

drivers/gpu/drm/panthor/panthor_drv.c | 26 ++++

drivers/gpu/drm/panthor/panthor_gem.c | 149 +++++++++++++++++++++++

drivers/gpu/drm/panthor/panthor_gem.h | 35 ++++++

5 files changed, 226 insertions(+)

    if (ret)

        return ret;

    atomic_set(&ptdev->pm.state, PANTHOR_DEVICE_PM_STATE_SUSPENDED);

    p = alloc_page(GFP_KERNEL | __GFP_ZERO);

    if (!p)

+static void panthor_gem_debugfs_bo_init(struct panthor_gem_object *bo, u32 type_mask)

+{

+    INIT_LIST_HEAD(&bo->debugfs.node);

+

+    if (!(type_mask & PANTHOR_BO_FW_MAPPED)) {

+        bo->debugfs.creator.tgid = current->group_leader->pid;

+        get_task_comm(bo->debugfs.creator.process_name, current->group_leader);

+    } else {

+        bo->debugfs.creator.tgid = 0;

+        snprintf(bo->debugfs.creator.process_name,

+             sizeof(bo->debugfs.creator.process_name),

+             "kernel");

+    }

+

+    bo->debugfs.bo_mask = type_mask;

+}

+

+static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo, u32 type_mask)

+    list_add_tail(&bo->debugfs.node, &ptdev->gems.node);

+    if (list_empty(&bo->debugfs.node))

+    list_del_init(&bo->debugfs.node);

+static void panthor_gem_debugfs_bo_add(struct panthor_gem_object *bo, u32 type_mask) {}

    /*

     * Label might have been allocated with kstrdup_const(),

     * we need to take that into account when freeing the memory

@@ -XXX,XX +XXX,XX @@ panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *vm,

    struct drm_gem_shmem_object *obj;

    struct panthor_kernel_bo *kbo;

    struct panthor_gem_object *bo;

+    u32 type_mask = PANTHOR_BO_KERNEL;

    int ret;

    if (drm_WARN_ON(&ptdev->base, !vm))

@@ -XXX,XX +XXX,XX @@ panthor_kernel_bo_create(struct panthor_device *ptdev, struct panthor_vm *vm,

    kbo->obj = &obj->base;

    bo->flags = bo_flags;

+    if (vm == panthor_fw_vm(ptdev))

+        type_mask |= PANTHOR_BO_FW_MAPPED;

+

    panthor_gem_kernel_bo_set_label(kbo, name);

+    panthor_gem_debugfs_bo_add(to_panthor_bo(kbo->obj), type_mask);

+

    /* The system and GPU MMU page size might differ, which becomes a

     * problem for FW sections that need to be mapped at explicit address

     * since our PAGE_SIZE alignment might cover a VA range that's

+    panthor_gem_debugfs_bo_add(bo, 0);

    panthor_gem_bo_set_label(bo->obj, kstrdup_const(str, GFP_KERNEL));

+         "%s/%d", bo->debugfs.creator.process_name, bo->debugfs.creator.tgid);

+    seq_printf(m, "%-6s%-60s", "", bo->label.str ? : NULL);

+    seq_puts(m, "created-by global-name refcount size resident-size file-offset flags kflags label\n");

+        list_for_each_entry(bo, &ptdev->gems.node, debugfs.node)

+    seq_puts(m, "==========================================================================================================================================================\n");

@@ -XXX,XX +XXX,XX @@ struct panthor_vm;

#define PANTHOR_BO_LABEL_MAXLEN    PAGE_SIZE

+#define PANTHOR_BO_KERNEL    BIT(0)

+#define PANTHOR_BO_FW_MAPPED    BIT(1)

+

+    struct panthor_gem_debugfs debugfs;