Attachment 140849 Details for Bug 107367 – Possible fix

[patch] Possible fix

0001-drm-scheduler-only-kill-entity-if-last-user-is-kille.patch (text/plain), 2.36 KB, created by Christian König on 2018-07-27 07:55:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian König

Created: 2018-07-27 07:55:43 UTC

Size: 2.36 KB

patch

obsolete

>From 6ee1b609b2d25e1271f4c87668f3f909413b4ffb Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
>Date: Thu, 26 Jul 2018 13:43:49 +0200
>Subject: [PATCH] drm/scheduler: only kill entity if last user is killed
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Note which task is using the entity and only kill it if the last user of
>the entity is killed. This should prevent problems when entities are leaked to
>child processes.
>
>Signed-off-by: Christian KÃ¶nig <christian.koenig@amd.com>
>---
> drivers/gpu/drm/scheduler/gpu_scheduler.c | 6 +++++-
> include/drm/gpu_scheduler.h               | 1 +
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c
>index 3f2fc5e8242a..f563e4fbb4b6 100644
>--- a/drivers/gpu/drm/scheduler/gpu_scheduler.c
>+++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c
>@@ -275,6 +275,7 @@ static void drm_sched_entity_kill_jobs_cb(struct dma_fence *f,
> long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout)
> {
> 	struct drm_gpu_scheduler *sched;
>+	struct task_struct *last_user;
> 	long ret = timeout;
> 
> 	sched = entity->rq->sched;
>@@ -295,7 +296,9 @@ long drm_sched_entity_flush(struct drm_sched_entity *entity, long timeout)
> 
> 
> 	/* For killed process disable any more IBs enqueue right now */
>-	if ((current->flags & PF_EXITING) && (current->exit_code == SIGKILL))
>+	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))
> 		drm_sched_entity_set_rq(entity, NULL);
> 
> 	return ret;
>@@ -541,6 +544,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job,
> 
> 	trace_drm_sched_job(sched_job, entity);
> 
>+	WRITE_ONCE(entity->last_user, current->group_leader);
> 	first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node);
> 
> 	/* first job wakes up scheduler */
>diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
>index 091b9afcd184..64016446a103 100644
>--- a/include/drm/gpu_scheduler.h
>+++ b/include/drm/gpu_scheduler.h
>@@ -85,6 +85,7 @@ struct drm_sched_entity {
> 	struct dma_fence_cb		cb;
> 	atomic_t			*guilty;
> 	struct dma_fence                *last_scheduled;
>+	struct task_struct		*last_user;
> };
> 
> /**
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 107367: 140849 | 140866 | 140867 | 140889 | 140895

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.