FAILED: patch "[PATCH] drm/sched: Remove optimization that causes hang when killing" failed to apply to 5.10-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 15f77764e90a713ee3916ca424757688e4f565b9
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025072854-humbling-collector-aca6@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 15f77764e90a713ee3916ca424757688e4f565b9 Mon Sep 17 00:00:00 2001
From: "Lin.Cao" <[email protected]>
Date: Thu, 17 Jul 2025 16:44:53 +0800
Subject: [PATCH] drm/sched: Remove optimization that causes hang when killing
dependent jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When application A submits jobs and application B submits a job with a dependency on A's fence, the normal flow wakes up the scheduler after processing each job. However, the optimization in drm_sched_entity_add_dependency_cb() uses a callback that only clears dependencies without waking up the scheduler.
When application A is killed before its jobs can run, the callback gets triggered but only clears the dependency without waking up the scheduler, causing the scheduler to enter sleep state and application B to hang.
Remove the optimization by deleting drm_sched_entity_clear_dep() and its usage, ensuring the scheduler is always woken up when dependencies are cleared.
drivers/gpu/drm/scheduler/sched_entity.c +2 -19
@@ -355,17 +355,6 @@ void drm_sched_entity_destroy(struct drm_sched_entity *entity) }EXPORT_SYMBOL (drm_sched_entity_destroy); -/* drm_sched_entity_clear_dep - callback to clear the entities dependency */ -static void drm_sched_entity_clear_dep (struct dma_fence *f, -struct dma_fence_cb *cb) -{ -struct drm_sched_entity *entity = - container_of(cb, struct drm_sched_entity, cb); - - entity->dependency =NULL ; -dma_fence_put (f); -} -/* * drm_sched_entity_wakeup - callback to clear the entity's dependency and * wake up the scheduler
@@ -376,7 +365,8 @@ static void drm_sched_entity_wakeup(struct dma_fence *f,struct drm_sched_entity *entity = container_of(cb, struct drm_sched_entity, cb); -drm_sched_entity_clear_dep (f, cb); + entity->dependency =NULL ; +dma_fence_put (f);drm_sched_wakeup (entity->rq->sched); }
@@ -429,13 +419,6 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity) fence =dma_fence_get (&s_fence->scheduled);dma_fence_put (entity->dependency); entity->dependency = fence; -if (!dma_fence_add_callback (fence, &entity->cb, - drm_sched_entity_clear_dep)) -return true; - -/* Ignore it when it is already scheduled */ -dma_fence_put (fence); -return false; } if (!dma_fence_add_callback(entity->dependency, &entity->cb,
Sasha Levin
maintainerPATCH 1/1 drm/sched: Remove optimization that causes hang when killing dependent jobs
From: "Lin.Cao" <[email protected]>
[ Upstream commit 15f77764e90a713ee3916ca424757688e4f565b9 ]
When application A submits jobs and application B submits a job with a dependency on A's fence, the normal flow wakes up the scheduler after processing each job. However, the optimization in drm_sched_entity_add_dependency_cb() uses a callback that only clears dependencies without waking up the scheduler.
When application A is killed before its jobs can run, the callback gets triggered but only clears the dependency without waking up the scheduler, causing the scheduler to enter sleep state and application B to hang.
Remove the optimization by deleting drm_sched_entity_clear_dep() and its usage, ensuring the scheduler is always woken up when dependencies are cleared.
--- drivers/gpu/drm/scheduler/sched_entity.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-)
drivers/gpu/drm/scheduler/sched_entity.c +2 -21
@@ -313,19 +313,6 @@ void drm_sched_entity_destroy(struct drm_sched_entity *entity) }EXPORT_SYMBOL (drm_sched_entity_destroy); -/** -* drm_sched_entity_clear_dep - callback to clear the entities dependency -*/ -static void drm_sched_entity_clear_dep (struct dma_fence *f, -struct dma_fence_cb *cb) -{ -struct drm_sched_entity *entity = - container_of(cb, struct drm_sched_entity, cb); - - entity->dependency =NULL ; -dma_fence_put (f); -} -/** * drm_sched_entity_clear_dep - callback to clear the entities dependency and * wake up scheduler
@@ -336,7 +323,8 @@ static void drm_sched_entity_wakeup(struct dma_fence *f,struct drm_sched_entity *entity = container_of(cb, struct drm_sched_entity, cb); -drm_sched_entity_clear_dep (f, cb); + entity->dependency =NULL ; +dma_fence_put (f);drm_sched_wakeup (entity->rq->sched); }
@@ -392,13 +380,6 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity) fence =dma_fence_get (&s_fence->scheduled);dma_fence_put (entity->dependency); entity->dependency = fence; -if (!dma_fence_add_callback (fence, &entity->cb, - drm_sched_entity_clear_dep)) -return true; - -/* Ignore it when it is already scheduled */ -dma_fence_put (fence); -return false; } if (!dma_fence_add_callback(entity->dependency, &entity->cb,
Signature · 1 line
2.39.5