Commit 02b31360 authored by Yunxiang Li's avatar Yunxiang Li Committed by Wen Zhiwei
Browse files

drm/amdgpu: add lock in kfd_process_dequeue_from_device 

stable inclusion
from stable-v6.6.50
commit 381113ef01e28282f5f5a3267584b075427529f0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYKL6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=381113ef01e28282f5f5a3267584b075427529f0



--------------------------------

[ Upstream commit d225960c2330e102370815367b877baaf8bb8b5d ]

We need to take the reset domain lock before talking to MES. While in
this case we can take the lock inside the mes helper. We can't do so for
most other mes helpers since they are used during reset. So for
consistency sake we add the lock here.

Signed-off-by: default avatarYunxiang Li <Yunxiang.Li@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent cd6fc55f

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

+7 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "kfd_priv.h"

#include "kfd_kernel_queue.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_reset.h"



static inline struct process_queue_node *get_queue_by_qid(

			struct process_queue_manager *pqm, unsigned int qid)
@@ -87,8 +88,12 @@ void kfd_process_dequeue_from_device(struct kfd_process_device *pdd) 
		return;



	dev->dqm->ops.process_termination(dev->dqm, &pdd->qpd);

	if (dev->kfd->shared_resources.enable_mes)

		amdgpu_mes_flush_shader_debugger(dev->adev, pdd->proc_ctx_gpu_addr);

	if (dev->kfd->shared_resources.enable_mes &&

	    down_read_trylock(&dev->adev->reset_domain->sem)) {

		amdgpu_mes_flush_shader_debugger(dev->adev,

						 pdd->proc_ctx_gpu_addr);

		up_read(&dev->adev->reset_domain->sem);

	}

	pdd->already_dequeued = true;

}