xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdkfd: Walk through list with dqm lock hold

Browse Source 
[ Upstream commit 56f221b6389e7ab99c30bbf01c71998ae92fc584 ]

To avoid any list corruption.

Signed-off-by: xinhui pan <xinhui.pan@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
xinhui pan
2021-06-15 15:11:07 +08:00
committed by Greg Kroah-Hartman
parent a2122e0792
commit 4cd713e48c
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
View File

@@ -1712,7 +1712,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
struct qcm_process_device *qpd) struct qcm_process_device *qpd)
{ {
int retval; int retval;
struct queue *q, *next; struct queue *q;
struct kernel_queue *kq, *kq_next; struct kernel_queue *kq, *kq_next;
struct mqd_manager *mqd_mgr; struct mqd_manager *mqd_mgr;
struct device_process_node *cur, *next_dpn; struct device_process_node *cur, *next_dpn;
@@ -1769,6 +1769,19 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
qpd->reset_wavefronts = false; qpd->reset_wavefronts = false;
} }
/* Lastly, free mqd resources.
* Do free_mqd() after dqm_unlock to avoid circular locking.
*/
while (!list_empty(&qpd->queues_list)) {
q = list_first_entry(&qpd->queues_list, struct queue, list);
mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type(
q->properties.type)];
list_del(&q->list);
qpd->queue_count--;
dqm_unlock(dqm);
mqd_mgr->free_mqd(mqd_mgr, q->mqd, q->mqd_mem_obj);
dqm_lock(dqm);
}
dqm_unlock(dqm); dqm_unlock(dqm);
/* Outside the DQM lock because under the DQM lock we can't do /* Outside the DQM lock because under the DQM lock we can't do
@@ -1777,17 +1790,6 @@ static int process_termination_cpsch(struct device_queue_manager *dqm,
if (found) if (found)
kfd_dec_compute_active(dqm->dev); kfd_dec_compute_active(dqm->dev);
/* Lastly, free mqd resources.
* Do free_mqd() after dqm_unlock to avoid circular locking.
*/
list_for_each_entry_safe(q, next, &qpd->queues_list, list) {
mqd_mgr = dqm->mqd_mgrs[get_mqd_type_from_queue_type(
q->properties.type)];
list_del(&q->list);
qpd->queue_count--;
mqd_mgr->free_mqd(mqd_mgr, q->mqd, q->mqd_mem_obj);
}
return retval; return retval;
} }