niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/scheduler: improve job distribution with multiple queues

Browse source 
This patch uses score to select a new drm scheduler for better
loadbalance between multiple drm schedulers instead of num_jobs.

Below are test results after running amdgpu_test for ~10 times.

Before this patch:

sched_name     num of many times it got schedule
=========      ==================================
sdma0          1463
sdma1          198
comp_1.0.1     280

After this patch:

sched_name     num of many times it got schedule
=========      ==================================
sdma0          925
sdma1          928
comp_1.0.1     177
comp_1.1.1     44
comp_1.2.1     43
comp_1.3.1     44

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/373000/
Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Nirmoy Das 2020-06-25 14:07:23 +02:00 • committed by Christian König
parent 0dc9b286b8
commit d41a39dda1
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/scheduler/sched_entity.c
View file

@ -486,7 +486,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job,
bool first; bool first;
trace_drm_sched_job(sched_job, entity); trace_drm_sched_job(sched_job, entity);
atomic_inc(&entity->rq->sched->num_jobs); atomic_inc(&entity->rq->sched->score);
WRITE_ONCE(entity->last_user, current->group_leader); WRITE_ONCE(entity->last_user, current->group_leader);
first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node); first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node);

14
drivers/gpu/drm/scheduler/sched_main.c
View file

@ -92,6 +92,7 @@ void drm_sched_rq_add_entity(struct drm_sched_rq *rq,
if (!list_empty(&entity->list)) if (!list_empty(&entity->list))
return; return;
spin_lock(&rq->lock); spin_lock(&rq->lock);
atomic_inc(&rq->sched->score);
list_add_tail(&entity->list, &rq->entities); list_add_tail(&entity->list, &rq->entities);
spin_unlock(&rq->lock); spin_unlock(&rq->lock);
} }
@ -110,6 +111,7 @@ void drm_sched_rq_remove_entity(struct drm_sched_rq *rq,
if (list_empty(&entity->list)) if (list_empty(&entity->list))
return; return;
spin_lock(&rq->lock); spin_lock(&rq->lock);
atomic_dec(&rq->sched->score);
list_del_init(&entity->list); list_del_init(&entity->list);
if (rq->current_entity == entity) if (rq->current_entity == entity)
rq->current_entity = NULL; rq->current_entity = NULL;
@ -647,7 +649,7 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb)
struct drm_gpu_scheduler *sched = s_fence->sched; struct drm_gpu_scheduler *sched = s_fence->sched;
atomic_dec(&sched->hw_rq_count); atomic_dec(&sched->hw_rq_count);
atomic_dec(&sched->num_jobs); atomic_dec(&sched->score);
trace_drm_sched_process_job(s_fence); trace_drm_sched_process_job(s_fence);
@ -712,7 +714,7 @@ drm_sched_pick_best(struct drm_gpu_scheduler **sched_list,
{ {
struct drm_gpu_scheduler *sched, *picked_sched = NULL; struct drm_gpu_scheduler *sched, *picked_sched = NULL;
int i; int i;
unsigned int min_jobs = UINT_MAX, num_jobs; unsigned int min_score = UINT_MAX, num_score;
for (i = 0; i < num_sched_list; ++i) { for (i = 0; i < num_sched_list; ++i) {
sched = sched_list[i]; sched = sched_list[i];
@ -723,9 +725,9 @@ drm_sched_pick_best(struct drm_gpu_scheduler **sched_list,
continue; continue;
} }
num_jobs = atomic_read(&sched->num_jobs); num_score = atomic_read(&sched->score);
if (num_jobs < min_jobs) { if (num_score < min_score) {
min_jobs = num_jobs; min_score = num_score;
picked_sched = sched; picked_sched = sched;
} }
} }
@ -860,7 +862,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
spin_lock_init(&sched->job_list_lock); spin_lock_init(&sched->job_list_lock);
atomic_set(&sched->hw_rq_count, 0); atomic_set(&sched->hw_rq_count, 0);
INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout); INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout);
atomic_set(&sched->num_jobs, 0); atomic_set(&sched->score, 0);
atomic64_set(&sched->job_id_count, 0); atomic64_set(&sched->job_id_count, 0);
/* Each scheduler will run on a seperate kernel thread */ /* Each scheduler will run on a seperate kernel thread */

6
include/drm/gpu_scheduler.h
View file

@ -263,7 +263,7 @@ struct drm_sched_backend_ops {
* @job_list_lock: lock to protect the ring_mirror_list. * @job_list_lock: lock to protect the ring_mirror_list.
* @hang_limit: once the hangs by a job crosses this limit then it is marked * @hang_limit: once the hangs by a job crosses this limit then it is marked
* guilty and it will be considered for scheduling further. * guilty and it will be considered for scheduling further.
* @num_jobs: the number of jobs in queue in the scheduler * @score: score to help loadbalancer pick a idle sched
* @ready: marks if the underlying HW is ready to work * @ready: marks if the underlying HW is ready to work
* @free_guilty: A hit to time out handler to free the guilty job. * @free_guilty: A hit to time out handler to free the guilty job.
* *
@ -284,8 +284,8 @@ struct drm_gpu_scheduler {
struct list_head ring_mirror_list; struct list_head ring_mirror_list;
spinlock_t job_list_lock; spinlock_t job_list_lock;
int hang_limit; int hang_limit;
atomic_t num_jobs; atomic_t score;
bool ready; bool ready;
bool free_guilty; bool free_guilty;
}; };