mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chia-I Wu <olvaffe@gmail.com>
To: Boris Brezillon <boris.brezillon@collabora.com>,
	Steven Price <steven.price@arm.com>,
	Liviu Dudau <liviu.dudau@arm.com>,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Maxime Ripard <mripard@kernel.org>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH 7/9] drm/panthor: capture VMA state for devcoredump
Date: Sat, 19 Jul 2025 17:01:44 -0700	[thread overview]
Message-ID: <20250720000146.1405060-8-olvaffe@gmail.com> (raw)
In-Reply-To: <20250720000146.1405060-1-olvaffe@gmail.com>

Capture interesting panthor_vma fields for devcoredump.

Because bo->label can change at anytime, we cap it to 32 chars to
simplify size estimation.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
---
 drivers/gpu/drm/panthor/panthor_coredump.c | 78 ++++++++++++++++++++--
 drivers/gpu/drm/panthor/panthor_coredump.h | 15 +++++
 drivers/gpu/drm/panthor/panthor_mmu.c      | 43 ++++++++++++
 drivers/gpu/drm/panthor/panthor_mmu.h      |  4 ++
 4 files changed, 135 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/panthor/panthor_coredump.c b/drivers/gpu/drm/panthor/panthor_coredump.c
index acc8ad4cc498..5502452a5baa 100644
--- a/drivers/gpu/drm/panthor/panthor_coredump.c
+++ b/drivers/gpu/drm/panthor/panthor_coredump.c
@@ -14,6 +14,7 @@
 #include "panthor_coredump.h"
 #include "panthor_device.h"
 #include "panthor_fw.h"
+#include "panthor_gem.h"
 #include "panthor_mmu.h"
 #include "panthor_regs.h"
 #include "panthor_sched.h"
@@ -28,6 +29,7 @@ enum panthor_coredump_mask {
 	PANTHOR_COREDUMP_CSG = BIT(3),
 	PANTHOR_COREDUMP_CS = BIT(4),
 	PANTHOR_COREDUMP_AS = BIT(5),
+	PANTHOR_COREDUMP_VMA = BIT(6),
 };
 
 /**
@@ -45,6 +47,9 @@ struct panthor_coredump {
 	/** @ptdev: Device. */
 	struct panthor_device *ptdev;
 
+	/** @gfp: Allocation flags for panthor_coredump_capture. */
+	gfp_t gfp;
+
 	/** @work: Bottom half of panthor_coredump_capture. */
 	struct work_struct work;
 
@@ -60,6 +65,8 @@ struct panthor_coredump {
 	struct panthor_coredump_csg_state csg;
 	struct panthor_coredump_cs_state cs[MAX_CS_PER_CSG];
 	struct panthor_coredump_as_state as;
+	struct panthor_coredump_vma_state *vma;
+	u32 vma_count;
 
 	/* @data: Serialized coredump data. */
 	void *data;
@@ -92,6 +99,38 @@ static const char *reason_str(enum panthor_coredump_reason reason)
 	}
 }
 
+static void print_vma(struct drm_printer *p,
+		      const struct panthor_coredump_vma_state *vma, u32 vma_id,
+		      size_t *max_dyn_size)
+{
+	struct panthor_gem_object *bo = vma->bo;
+
+	if (!vma_id)
+		drm_puts(p, "vma:\n");
+
+	drm_printf(p, "  - flags: 0x%x\n", vma->flags);
+	drm_printf(p, "    iova: 0x%llx\n", vma->iova);
+	drm_printf(p, "    size: 0x%llx\n", vma->size);
+
+	if (!bo)
+		return;
+
+	/* bo->label is dynamic */
+	if (max_dyn_size) {
+		drm_puts(p, "    label: |\n");
+		drm_puts(p, "      \n");
+		*max_dyn_size += 32;
+	} else {
+		scoped_guard(mutex, &bo->label.lock)
+		{
+			if (bo->label.str) {
+				drm_puts(p, "    label: |\n");
+				drm_printf(p, "      %.32s\n", bo->label.str);
+			}
+		}
+	}
+}
+
 static void print_as(struct drm_printer *p,
 		     const struct panthor_coredump_as_state *as, u32 as_id)
 {
@@ -247,7 +286,8 @@ static void print_header(struct drm_printer *p,
 	drm_printf(p, "  timestamp: %lld\n", ktime_to_ns(header->timestamp));
 }
 
-static void print_cd(struct drm_printer *p, const struct panthor_coredump *cd)
+static void print_cd(struct drm_printer *p, const struct panthor_coredump *cd,
+		     size_t *max_dyn_size)
 {
 	/* in YAML format */
 	drm_puts(p, "---\n");
@@ -277,6 +317,11 @@ static void print_cd(struct drm_printer *p, const struct panthor_coredump *cd)
 
 		print_as(p, &cd->as, as_id);
 	}
+
+	if (cd->mask & PANTHOR_COREDUMP_VMA) {
+		for (u32 i = 0; i < cd->vma_count; i++)
+			print_vma(p, &cd->vma[i], i, max_dyn_size);
+	}
 }
 
 static void process_cd(struct panthor_device *ptdev,
@@ -286,10 +331,13 @@ static void process_cd(struct panthor_device *ptdev,
 		.remain = SSIZE_MAX,
 	};
 	struct drm_printer p = drm_coredump_printer(&iter);
+	size_t max_dyn_size = 0;
 
-	print_cd(&p, cd);
+	print_cd(&p, cd, &max_dyn_size);
+	if (max_dyn_size > iter.remain)
+		return;
 
-	iter.remain = SSIZE_MAX - iter.remain;
+	iter.remain = SSIZE_MAX - iter.remain + max_dyn_size;
 	iter.data = kvmalloc(iter.remain, GFP_USER);
 	if (!iter.data)
 		return;
@@ -297,10 +345,25 @@ static void process_cd(struct panthor_device *ptdev,
 	cd->data = iter.data;
 	cd->size = iter.remain;
 
-	drm_info(&ptdev->base, "generating coredump of size %zu\n", cd->size);
+	drm_info(&ptdev->base, "generating coredump of estimated size %zu\n",
+		 cd->size);
 
 	p = drm_coredump_printer(&iter);
-	print_cd(&p, cd);
+	print_cd(&p, cd, NULL);
+
+	cd->size -= iter.remain;
+
+	/* free vma now */
+	if (cd->mask & PANTHOR_COREDUMP_VMA) {
+		for (u32 i = 0; i < cd->vma_count; i++) {
+			struct panthor_coredump_vma_state *vma = &cd->vma[i];
+
+			drm_gem_object_put(&vma->bo->base.base);
+		}
+		kfree(cd->vma);
+
+		cd->mask &= ~PANTHOR_COREDUMP_VMA;
+	}
 }
 
 static void capture_as(struct panthor_device *ptdev,
@@ -434,6 +497,10 @@ static void capture_cd(struct panthor_device *ptdev,
 
 	capture_as(ptdev, &cd->as, panthor_vm_as(vm));
 	cd->mask |= PANTHOR_COREDUMP_AS;
+
+	cd->vma = panthor_vm_capture_coredump(vm, &cd->vma_count, cd->gfp);
+	if (cd->vma_count)
+		cd->mask |= PANTHOR_COREDUMP_VMA;
 }
 
 static void panthor_coredump_free(void *data)
@@ -504,6 +571,7 @@ panthor_coredump_alloc(struct panthor_device *ptdev,
 	}
 
 	cd->ptdev = ptdev;
+	cd->gfp = gfp;
 	INIT_WORK(&cd->work, panthor_coredump_process_work);
 
 	cd->header.reason = reason;
diff --git a/drivers/gpu/drm/panthor/panthor_coredump.h b/drivers/gpu/drm/panthor/panthor_coredump.h
index 8aceb0c7d0d4..8a89c39cf2f5 100644
--- a/drivers/gpu/drm/panthor/panthor_coredump.h
+++ b/drivers/gpu/drm/panthor/panthor_coredump.h
@@ -10,6 +10,7 @@
 
 struct panthor_coredump;
 struct panthor_device;
+struct panthor_gem_object;
 struct panthor_group;
 
 /**
@@ -135,6 +136,20 @@ struct panthor_coredump_as_state {
 	u64 faultextra;
 };
 
+/**
+ * struct panthor_coredump_vma_state - Coredump VMA state
+ *
+ * Interesting panthor_vma fields.
+ */
+struct panthor_coredump_vma_state {
+	u32 flags;
+	u64 iova;
+	u64 size;
+
+	struct panthor_gem_object *bo;
+	u64 bo_offset;
+};
+
 #ifdef CONFIG_DEV_COREDUMP
 
 struct panthor_coredump *
diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
index b39ea6acc6a9..a857a0dd1099 100644
--- a/drivers/gpu/drm/panthor/panthor_mmu.c
+++ b/drivers/gpu/drm/panthor/panthor_mmu.c
@@ -27,6 +27,7 @@
 #include <linux/shmem_fs.h>
 #include <linux/sizes.h>
 
+#include "panthor_coredump.h"
 #include "panthor_device.h"
 #include "panthor_gem.h"
 #include "panthor_heap.h"
@@ -2694,6 +2695,48 @@ int panthor_vm_prepare_mapped_bos_resvs(struct drm_exec *exec, struct panthor_vm
 	return drm_gpuvm_prepare_objects(&vm->base, exec, slot_count);
 }
 
+struct panthor_coredump_vma_state *
+panthor_vm_capture_coredump(struct panthor_vm *vm, u32 *vma_count, gfp_t gfp)
+{
+	struct drm_gpuva *gpuva;
+	u32 count;
+
+	guard(mutex)(&vm->op_lock);
+
+	count = 0;
+	drm_gpuvm_for_each_va(gpuva, &vm->base)
+		count++;
+
+	struct panthor_coredump_vma_state *states =
+		kcalloc(count, sizeof(*states), gfp);
+	if (!states) {
+		*vma_count = 0;
+		return NULL;
+	}
+
+	count = 0;
+	drm_gpuvm_for_each_va(gpuva, &vm->base) {
+		const struct panthor_vma *vma =
+			container_of(gpuva, struct panthor_vma, base);
+		struct panthor_coredump_vma_state *state = &states[count];
+
+		state->flags = vma->flags;
+		state->iova = vma->base.va.addr;
+		state->size = vma->base.va.range;
+		if (vma->base.gem.obj) {
+			state->bo = to_panthor_bo(vma->base.gem.obj);
+			state->bo_offset = vma->base.gem.offset;
+			drm_gem_object_get(&state->bo->base.base);
+		}
+
+		count++;
+	}
+
+	*vma_count = count;
+
+	return states;
+}
+
 /**
  * panthor_mmu_unplug() - Unplug the MMU logic
  * @ptdev: Device.
diff --git a/drivers/gpu/drm/panthor/panthor_mmu.h b/drivers/gpu/drm/panthor/panthor_mmu.h
index fc274637114e..c775b92d0502 100644
--- a/drivers/gpu/drm/panthor/panthor_mmu.h
+++ b/drivers/gpu/drm/panthor/panthor_mmu.h
@@ -10,6 +10,7 @@
 struct drm_exec;
 struct drm_sched_job;
 struct drm_memory_stats;
+struct panthor_coredump_vma_state;
 struct panthor_gem_object;
 struct panthor_heap_pool;
 struct panthor_vm;
@@ -97,6 +98,9 @@ void panthor_vm_update_resvs(struct panthor_vm *vm, struct drm_exec *exec,
 			     enum dma_resv_usage private_usage,
 			     enum dma_resv_usage extobj_usage);
 
+struct panthor_coredump_vma_state *
+panthor_vm_capture_coredump(struct panthor_vm *vm, u32 *vma_count, gfp_t gfp);
+
 int panthor_mmu_pt_cache_init(void);
 void panthor_mmu_pt_cache_fini(void);
 
-- 
2.50.0.727.gbf7dc18ff4-goog


  parent reply	other threads:[~2025-07-20  0:02 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-20  0:01 [PATCH 0/9] drm/panthor: add devcoredump support Chia-I Wu
2025-07-20  0:01 ` [PATCH 1/9] " Chia-I Wu
2025-07-20  3:17   ` kernel test robot
2025-07-28 11:24   ` Steven Price
2025-08-21  8:16     ` Boris Brezillon
2025-07-20  0:01 ` [PATCH 2/9] drm/panthor: capture GPU state for devcoredump Chia-I Wu
2025-07-20  4:29   ` kernel test robot
2025-07-20  0:01 ` [PATCH 3/9] drm/panthor: capture GLB " Chia-I Wu
2025-07-20  5:41   ` kernel test robot
2025-07-20  0:01 ` [PATCH 4/9] drm/panthor: capture CSG " Chia-I Wu
2025-07-20  0:01 ` [PATCH 5/9] drm/panthor: capture CS " Chia-I Wu
2025-07-20  0:01 ` [PATCH 6/9] drm/panthor: capture AS " Chia-I Wu
2025-07-20  0:01 ` Chia-I Wu [this message]
2025-07-20  0:01 ` [PATCH 8/9] drm/panthor: check bo offset alignment in vm bind Chia-I Wu
2025-08-21  7:33   ` Boris Brezillon
2025-07-20  0:01 ` [PATCH 9/9] drm/panthor: add DRM_PANTHOR_VM_BIND_OP_MAP_DUMPABLE Chia-I Wu
2025-08-21  7:55   ` Boris Brezillon
2025-07-20  0:41 ` [PATCH 0/9] drm/panthor: add devcoredump support Daniel Almeida
2025-07-20  1:13   ` Chia-I Wu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250720000146.1405060-8-olvaffe@gmail.com \
    --to=olvaffe@gmail.com \
    --cc=airlied@gmail.com \
    --cc=boris.brezillon@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=liviu.dudau@arm.com \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=simona@ffwll.ch \
    --cc=steven.price@arm.com \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®