Commit d84607e3 authored by Shashank Sharma's avatar Shashank Sharma Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup leftover queues 



This patch adds code to cleanup any leftover userqueues which
a user might have missed to destroy due to a crash or any other
programming error.

V7:  Added Alex's R-B
V8:  Rebase
V9:  Rebase
V10: Rebase
V11: Rebase

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian Koenig <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Suggested-by: default avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: default avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: default avatarShashank Sharma <shashank.sharma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f09c1e60

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

+20 −7
Original line number Diff line number Diff line
@@ -26,6 +26,19 @@ 
#include "amdgpu_vm.h"

#include "amdgpu_userqueue.h"



static void

amdgpu_userqueue_cleanup(struct amdgpu_userq_mgr *uq_mgr,

			 struct amdgpu_usermode_queue *queue,

			 int queue_id)

{

	struct amdgpu_device *adev = uq_mgr->adev;

	const struct amdgpu_userq_funcs *uq_funcs = adev->userq_funcs[queue->queue_type];



	uq_funcs->mqd_destroy(uq_mgr, queue);

	idr_remove(&uq_mgr->userq_idr, queue_id);

	kfree(queue);

}



static struct amdgpu_usermode_queue *

amdgpu_userqueue_find(struct amdgpu_userq_mgr *uq_mgr, int qid)

{
@@ -146,8 +159,6 @@ amdgpu_userqueue_destroy(struct drm_file *filp, int queue_id) 
{

	struct amdgpu_fpriv *fpriv = filp->driver_priv;

	struct amdgpu_userq_mgr *uq_mgr = &fpriv->userq_mgr;

	struct amdgpu_device *adev = uq_mgr->adev;

	const struct amdgpu_userq_funcs *uq_funcs;

	struct amdgpu_usermode_queue *queue;



	mutex_lock(&uq_mgr->userq_mutex);
@@ -159,13 +170,9 @@ amdgpu_userqueue_destroy(struct drm_file *filp, int queue_id) 
		return -EINVAL;

	}



	uq_funcs = adev->userq_funcs[queue->queue_type];

	uq_funcs->mqd_destroy(uq_mgr, queue);

	amdgpu_bo_unpin(queue->db_obj.obj);

	amdgpu_bo_unref(&queue->db_obj.obj);

	idr_remove(&uq_mgr->userq_idr, queue_id);

	kfree(queue);



	amdgpu_userqueue_cleanup(uq_mgr, queue, queue_id);

	mutex_unlock(&uq_mgr->userq_mutex);

	return 0;

}
@@ -276,6 +283,12 @@ int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct amdgpu_devi 


void amdgpu_userq_mgr_fini(struct amdgpu_userq_mgr *userq_mgr)

{

	uint32_t queue_id;

	struct amdgpu_usermode_queue *queue;



	idr_for_each_entry(&userq_mgr->userq_idr, queue, queue_id)

		amdgpu_userqueue_cleanup(userq_mgr, queue, queue_id);



	idr_destroy(&userq_mgr->userq_idr);

	mutex_destroy(&userq_mgr->userq_mutex);

}