drm/amdkfd: Fix a concurrency issue during kfd recovery

Browse source

start_cpsch and stop_cpsch can be called during kfd device
initialization or during gpu reset/recovery. So they can
run concurrently. Currently in start_cpsch and stop_cpsch,
pm_init and pm_uninit is not protected by the dpm lock.
Imagine such a case that user use packet manager's function
to submit a pm4 packet to hang hws (ie through command
cat /sys/class/kfd/kfd/topology/nodes/1/gpu_id | sudo tee
/sys/kernel/debug/kfd/hang_hws), while kfd device is under
device reset/recovery so packet manager can be not initialized.
There will be unpredictable protection fault in such case.

This patch moves pm_init/uninit inside the dpm lock and check
packet manager is initialized before using packet manager
function.

Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
Acked-by: Christian Konig <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

...

This commit is contained in:

Oak Zeng 2021-07-15 18:34:25 -05:00 • committed by Alex Deucher

parent 78ccea9ff2

commit 4f942aaeb1

4 changed files with 14 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

drivers/gpu/drm/amd/amdkfd/kfd_device.c

View file

12

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

View file

3

drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c

View file

2

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

View file