diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0708-drm-scheduler-Add-stopped-flag-to-drm_sched_entity.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0708-drm-scheduler-Add-stopped-flag-to-drm_sched_entity.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0708-drm-scheduler-Add-stopped-flag-to-drm_sched_entity.patch b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0708-drm-scheduler-Add-stopped-flag-to-drm_sched_entity.patch new file mode 100644 index 00000000..8418f64b --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux-4.19/linux-yocto-4.19.8/0708-drm-scheduler-Add-stopped-flag-to-drm_sched_entity.patch @@ -0,0 +1,71 @@ +From 333410c7d01927c8ac5e3c66e68b38856e44580e Mon Sep 17 00:00:00 2001 +From: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Date: Fri, 17 Aug 2018 10:32:50 -0400 +Subject: [PATCH 0708/2940] drm/scheduler: Add stopped flag to drm_sched_entity + +The flag will prevent another thread from same process to +reinsert the entity queue into scheduler's rq after it was already +removewd from there by another thread during drm_sched_entity_flush. + +Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> +Reviewed-by: Chunming Zhou <david1.zhou@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/scheduler/sched_entity.c | 12 +++++++++++- + include/drm/gpu_scheduler.h | 2 ++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c +index 1416edb2642a..812e3530ea25 100644 +--- a/drivers/gpu/drm/scheduler/sched_entity.c ++++ b/drivers/gpu/drm/scheduler/sched_entity.c +@@ -177,8 +177,12 @@ long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout) + /* For killed process disable any more IBs enqueue right now */ + last_user = cmpxchg(&entity->last_user, current->group_leader, NULL); + if ((!last_user || last_user == current->group_leader) && +- (current->flags & PF_EXITING) && (current->exit_code == SIGKILL)) ++ (current->flags & PF_EXITING) && (current->exit_code == SIGKILL)) { ++ spin_lock(&entity->rq_lock); ++ entity->stopped = true; + drm_sched_rq_remove_entity(entity->rq, entity); ++ spin_unlock(&entity->rq_lock); ++ } + + return ret; + } +@@ -504,6 +508,12 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job, + if (first) { + /* Add the entity to the run queue */ + spin_lock(&entity->rq_lock); ++ if (entity->stopped) { ++ spin_unlock(&entity->rq_lock); ++ ++ DRM_ERROR("Trying to push to a killed entity\n"); ++ return; ++ } + drm_sched_rq_add_entity(entity->rq, entity); + spin_unlock(&entity->rq_lock); + drm_sched_wakeup(entity->rq->sched); +diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h +index fa7ea410b63c..bc6a2a1f00fc 100644 +--- a/include/drm/gpu_scheduler.h ++++ b/include/drm/gpu_scheduler.h +@@ -67,6 +67,7 @@ enum drm_sched_priority { + * @fini_status: contains the exit status in case the process was signalled. + * @last_scheduled: points to the finished fence of the last scheduled job. + * @last_user: last group leader pushing a job into the entity. ++ * @stopped: Marks the enity as removed from rq and destined for termination. + * + * Entities will emit jobs in order to their corresponding hardware + * ring, and the scheduler will alternate between entities based on +@@ -89,6 +90,7 @@ struct drm_sched_entity { + atomic_t *guilty; + struct dma_fence *last_scheduled; + struct task_struct *last_user; ++ bool stopped; + }; + + /** +-- +2.17.1 + |