drm/amdkfd: Clean up the data structure in kfd_process

A list of per-process queues is maintained in the
kfd_process_queue_manager, so the queues array in kfd_process is
redundant and in fact unused.

Signed-off-by: Yong Zhao <yong.zhao@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 6a91a60c64cf1754344cf48682f01e4f62605c89..78b5d61780cbde3cc3d4b4c80501e848bae0c95a 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -527,12 +527,6 @@ struct kfd_process {
 
        struct process_queue_manager pqm;
 
-       /* The process's queues. */
-       size_t queue_array_size;
-
-       /* Size is queue_array_size, up to MAX_PROCESS_QUEUES. */
-       struct kfd_queue **queues;
-
        /*Is the user space process 32 bit?*/
        bool is_32bit_user_mode;
 

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index 695fa2ae8e5bb70c25e302bb56861ab7d1acde67..946f4d68947f98f6d4b98133d7f685cc581ffdbe 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -34,13 +34,6 @@ struct mm_struct;
 #include "kfd_priv.h"
 #include "kfd_dbgmgr.h"
 
-/*
- * Initial size for the array of queues.
- * The allocated size is doubled each time
- * it is exceeded up to MAX_PROCESS_QUEUES.
- */
-#define INITIAL_QUEUE_ARRAY_SIZE 16
-
 /*
  * List of struct kfd_process (field kfd_process).
  * Unique/indexed by mm_struct*
@@ -187,8 +180,6 @@ static void kfd_process_wq_release(struct work_struct *work)
 
        mutex_destroy(&p->mutex);
 
-       kfree(p->queues);
-
        kfree(p);
 
        kfree(work);
@@ -270,11 +261,6 @@ static struct kfd_process *create_process(const struct task_struct *thread)
        if (!process)
                goto err_alloc_process;
 
-       process->queues = kmalloc_array(INITIAL_QUEUE_ARRAY_SIZE,
-                                       sizeof(process->queues[0]), GFP_KERNEL);
-       if (!process->queues)
-               goto err_alloc_queues;
-
        process->pasid = kfd_pasid_alloc();
        if (process->pasid == 0)
                goto err_alloc_pasid;
@@ -297,8 +283,6 @@ static struct kfd_process *create_process(const struct task_struct *thread)
 
        process->lead_thread = thread->group_leader;
 
-       process->queue_array_size = INITIAL_QUEUE_ARRAY_SIZE;
-
        INIT_LIST_HEAD(&process->per_device_data);
 
        kfd_event_init_process(process);
@@ -327,8 +311,6 @@ static struct kfd_process *create_process(const struct task_struct *thread)
 err_alloc_doorbells:
        kfd_pasid_free(process->pasid);
 err_alloc_pasid:
-       kfree(process->queues);
-err_alloc_queues:
        kfree(process);
 err_alloc_process:
        return ERR_PTR(err);