Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 356bb941 authored by xinhui pan's avatar xinhui pan Committed by Greg Kroah-Hartman
Browse files

drm/amdkfd: Walk through list with dqm lock hold 



[ Upstream commit 56f221b6389e7ab99c30bbf01c71998ae92fc584 ]

To avoid any list corruption.

Signed-off-by: default avatarxinhui pan <xinhui.pan@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>
parent 995c3fc3

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

+12 −10
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ static int process_termination_cpsch(struct device_queue_manager *dqm, 
		struct qcm_process_device *qpd)

{

	int retval;

	struct queue *q, *next;

	struct queue *q;

	struct kernel_queue *kq, *kq_next;

	struct mqd_manager *mqd_mgr;

	struct device_process_node *cur, *next_dpn;
@@ -1639,24 +1639,26 @@ static int process_termination_cpsch(struct device_queue_manager *dqm, 
		qpd->reset_wavefronts = false;

	}



	dqm_unlock(dqm);



	/* Outside the DQM lock because under the DQM lock we can't do

	 * reclaim or take other locks that others hold while reclaiming.

	 */

	if (found)

		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) {

	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);



	/* Outside the DQM lock because under the DQM lock we can't do

	 * reclaim or take other locks that others hold while reclaiming.

	 */

	if (found)

		kfd_dec_compute_active(dqm->dev);



	return retval;

}