Commit a7691785 authored by André Almeida's avatar André Almeida Committed by Alex Deucher
Browse files

drm/amdgpu: Rework coredump to use memory dynamically 



Instead of storing coredump information inside amdgpu_device struct,
move if to a proper separated struct and allocate it dynamically. This
will make it easier to further expand the logged information.

Signed-off-by: default avatarAndré Almeida <andrealmeid@igalia.com>
Reviewed-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d834af4e

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+9 −5
Original line number Diff line number Diff line
@@ -1084,11 +1084,6 @@ struct amdgpu_device { 
	uint32_t                        *reset_dump_reg_list;

	uint32_t			*reset_dump_reg_value;

	int                             num_regs;

#ifdef CONFIG_DEV_COREDUMP

	struct amdgpu_task_info         reset_task_info;

	bool                            reset_vram_lost;

	struct timespec64               reset_time;

#endif



	bool                            scpm_enabled;

	uint32_t                        scpm_status;
@@ -1112,6 +1107,15 @@ static inline uint32_t amdgpu_ip_version(const struct amdgpu_device *adev, 
	return adev->ip_versions[ip][inst];

}



#ifdef CONFIG_DEV_COREDUMP

struct amdgpu_coredump_info {

	struct amdgpu_device		*adev;

	struct amdgpu_task_info         reset_task_info;

	struct timespec64               reset_time;

	bool                            reset_vram_lost;

};

#endif



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)

{

	return container_of(ddev, struct amdgpu_device, ddev);

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+40 −23
Original line number Diff line number Diff line
@@ -4949,12 +4949,17 @@ static int amdgpu_reset_reg_dumps(struct amdgpu_device *adev) 
	return 0;

}



#ifdef CONFIG_DEV_COREDUMP

#ifndef CONFIG_DEV_COREDUMP

static void amdgpu_coredump(struct amdgpu_device *adev, bool vram_lost,

			    struct amdgpu_reset_context *reset_context)

{

}

#else

static ssize_t amdgpu_devcoredump_read(char *buffer, loff_t offset,

		size_t count, void *data, size_t datalen)

{

	struct drm_printer p;

	struct amdgpu_device *adev = data;

	struct amdgpu_coredump_info *coredump = data;

	struct drm_print_iterator iter;

	int i;
@@ -4968,21 +4973,21 @@ static ssize_t amdgpu_devcoredump_read(char *buffer, loff_t offset, 
	drm_printf(&p, "**** AMDGPU Device Coredump ****\n");

	drm_printf(&p, "kernel: " UTS_RELEASE "\n");

	drm_printf(&p, "module: " KBUILD_MODNAME "\n");

	drm_printf(&p, "time: %lld.%09ld\n", adev->reset_time.tv_sec, adev->reset_time.tv_nsec);

	if (adev->reset_task_info.pid)

	drm_printf(&p, "time: %lld.%09ld\n", coredump->reset_time.tv_sec, coredump->reset_time.tv_nsec);

	if (coredump->reset_task_info.pid)

		drm_printf(&p, "process_name: %s PID: %d\n",

			   adev->reset_task_info.process_name,

			   adev->reset_task_info.pid);

			   coredump->reset_task_info.process_name,

			   coredump->reset_task_info.pid);



	if (adev->reset_vram_lost)

	if (coredump->reset_vram_lost)

		drm_printf(&p, "VRAM is lost due to GPU reset!\n");

	if (adev->num_regs) {

	if (coredump->adev->num_regs) {

		drm_printf(&p, "AMDGPU register dumps:\nOffset:     Value:\n");



		for (i = 0; i < adev->num_regs; i++)

		for (i = 0; i < coredump->adev->num_regs; i++)

			drm_printf(&p, "0x%08x: 0x%08x\n",

				   adev->reset_dump_reg_list[i],

				   adev->reset_dump_reg_value[i]);

				   coredump->adev->reset_dump_reg_list[i],

				   coredump->adev->reset_dump_reg_value[i]);

	}



	return count - iter.remain;
@@ -4990,14 +4995,32 @@ static ssize_t amdgpu_devcoredump_read(char *buffer, loff_t offset, 


static void amdgpu_devcoredump_free(void *data)

{

	kfree(data);

}



static void amdgpu_reset_capture_coredumpm(struct amdgpu_device *adev)

static void amdgpu_coredump(struct amdgpu_device *adev, bool vram_lost,

			    struct amdgpu_reset_context *reset_context)

{

	struct amdgpu_coredump_info *coredump;

	struct drm_device *dev = adev_to_drm(adev);



	ktime_get_ts64(&adev->reset_time);

	dev_coredumpm(dev->dev, THIS_MODULE, adev, 0, GFP_NOWAIT,

	coredump = kzalloc(sizeof(*coredump), GFP_NOWAIT);



	if (!coredump) {

		DRM_ERROR("%s: failed to allocate memory for coredump\n", __func__);

		return;

	}



	coredump->reset_vram_lost = vram_lost;



	if (reset_context->job && reset_context->job->vm)

		coredump->reset_task_info = reset_context->job->vm->task_info;



	coredump->adev = adev;



	ktime_get_ts64(&coredump->reset_time);



	dev_coredumpm(dev->dev, THIS_MODULE, coredump, 0, GFP_NOWAIT,

		      amdgpu_devcoredump_read, amdgpu_devcoredump_free);

}

#endif
@@ -5102,15 +5125,9 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle, 
					goto out;



				vram_lost = amdgpu_device_check_vram_lost(tmp_adev);

#ifdef CONFIG_DEV_COREDUMP

				tmp_adev->reset_vram_lost = vram_lost;

				memset(&tmp_adev->reset_task_info, 0,

						sizeof(tmp_adev->reset_task_info));

				if (reset_context->job && reset_context->job->vm)

					tmp_adev->reset_task_info =

						reset_context->job->vm->task_info;

				amdgpu_reset_capture_coredumpm(tmp_adev);

#endif



				amdgpu_coredump(tmp_adev, vram_lost, reset_context);



				if (vram_lost) {

					DRM_INFO("VRAM is lost due to GPU reset!\n");

					amdgpu_inc_vram_lost(tmp_adev);