Commit bf890910 authored by Jesse Zhang's avatar Jesse Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: flush coredump work before HW teardown 



In amdgpu_device_fini_hw(), deferred coredump formatting work may still
be pending when hardware and IP components are being torn down. Since
the work may access device registers and memory that will be freed or
powered off, it must be completed before proceeding.

Add a flush_work() call for adev->coredump_work, guarded by
CONFIG_DEV_COREDUMP, to ensure any pending coredump work finishes
before the device enters the early IP fini stage.

This avoids potential use-after-free or accessing hardware resources
that are no longer available.

Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Suggested-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarJesse Zhang <jesse.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 557fa5a4

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

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ void amdgpu_coredump(struct amdgpu_device *adev, bool skip_vram_check, 
void amdgpu_coredump_init(struct amdgpu_device *adev)

{

}

void amdgpu_coredump_fini(struct amdgpu_device *adev)

{

}

#else



#define AMDGPU_CORE_DUMP_SIZE_MAX (256 * 1024 * 1024)
@@ -440,4 +443,10 @@ void amdgpu_coredump_init(struct amdgpu_device *adev) 
{

	INIT_WORK(&adev->coredump_work, amdgpu_devcoredump_deferred_work);

}



void amdgpu_coredump_fini(struct amdgpu_device *adev)

{

	/* Finish deferred coredump formatting before HW/IP teardown. */

	flush_work(&adev->coredump_work);

}

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -50,4 +50,5 @@ struct amdgpu_coredump_info { 
void amdgpu_coredump(struct amdgpu_device *adev, bool skip_vram_check,

		     bool vram_lost, struct amdgpu_job *job);

void amdgpu_coredump_init(struct amdgpu_device *adev);

void amdgpu_coredump_fini(struct amdgpu_device *adev);

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -4225,6 +4225,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
	if (pci_dev_is_disconnected(adev->pdev))

		amdgpu_amdkfd_device_fini_sw(adev);



	amdgpu_coredump_fini(adev);

	amdgpu_device_ip_fini_early(adev);



	amdgpu_irq_fini_hw(adev);