From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from n169-112.mail.139.com (n169-112.mail.139.com [120.232.169.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 36DC7366055 for ; Mon, 13 Apr 2026 07:33:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=120.232.169.112 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776065621; cv=none; b=i8Wp0y0UqvHCOQA/mu+WcNw1lsKA0osCnNtz4koPsUjjVFAbWvpju/gWAXJQxTiCOdHVSoFFmgk1cgssfi+Id7HZnqCLL4GEeFupKXTqolSVrrdv+u2V+thqXHKW7t0SHaaRp5RrwhbaGts1zPHUHL8OgXOU06eviJpBlUXp9+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776065621; c=relaxed/simple; bh=n69w6rLScSwCCr1HV9wYvatYzWr3FsxDX7udJtq1lK4=; h=From:To:Subject:Date:Message-Id:MIME-Version:Content-Type; b=dLGvffIuqcXMftdHssc50KjfuLCYHvOpCcxEWOcFcE0fhnfA1/WN4GLWkoTFLMCNmqPSsg9Tj5TCcvWC+Kb+N9CFdDq+YpBdU8e8o1JWdKPyQDb5ZsTLbkPBuXTJq9ZkqMDcnW18iCieylGK5r/cgFoeCQJHboLWk15wzXLOGUI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=139.com; spf=pass smtp.mailfrom=139.com; dkim=pass (1024-bit key) header.d=139.com header.i=@139.com header.b=N4AOvUkP; arc=none smtp.client-ip=120.232.169.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=139.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=139.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=139.com header.i=@139.com header.b="N4AOvUkP" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=139.com; s=dkim; l=0; h=from:subject:message-id:to:mime-version; bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=N4AOvUkPjan3tRJBDkwK62/MDc03XlbUZVEIjs8EI6OQlNKg1kD/3aU400YIrJgG/xYO2ia4GLNy/ r2Eyq3ThgOq3wR2APVH8oSiCMjC3dLzsDQfS6AwFIw5CoUmbixIPUlLrN5uEjarLPNssGo4ghqeHl9 p+Uhg0sEDXSeiql4= X-RM-TagInfo: emlType=0 X-RM-SPAM: X-RM-SPAM-FLAG:00000000 Received:from China-Mobile-Kernel-Team (unknown[223.104.41.220]) by rmsmtp-lg-appmail-23-12026 (RichMail) with SMTP id 2efa69dc9c41163-c214a; Mon, 13 Apr 2026 15:33:26 +0800 (CST) X-RM-TRANSID:2efa69dc9c41163-c214a From: Leon Chen To: lincao12@amd.com, phasta@kernel.org, christian.koenig@amd.com, stable@vger.kernel.org Subject: [PATCH 6.1.y] drm/scheduler: signal scheduled fence when kill job Date: Mon, 13 Apr 2026 15:33:23 +0800 Message-Id: <20260413073323.7541-1-leonchen.oss@139.com> X-Mailer: git-send-email 2.35.3 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: "Lin.Cao" [ Upstream commit 471db2c2d4f80ee94225a1ef246e4f5011733e50 ] When an entity from application B is killed, drm_sched_entity_kill() removes all jobs belonging to that entity through drm_sched_entity_kill_jobs_work(). If application A's job depends on a scheduled fence from application B's job, and that fence is not properly signaled during the killing process, application A's dependency cannot be cleared. This leads to application A hanging indefinitely while waiting for a dependency that will never be resolved. Fix this issue by ensuring that scheduled fences are properly signaled when an entity is killed, allowing dependent applications to continue execution. Signed-off-by: Lin.Cao Reviewed-by: Philipp Stanner Signed-off-by: Christian König Link: https://lore.kernel.org/r/20250515020713.1110476-1-lincao12@amd.com [ Modified drm_sched_fence_scheduled(job->s_fence, NULL) to drm_sched_fence_scheduled(job->s_fence) for kernel 6.1.y ] Signed-off-by: Leon Chen --- drivers/gpu/drm/scheduler/sched_entity.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 3f68a47e3406..3af74eac83b6 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -196,6 +196,7 @@ static void drm_sched_entity_kill_jobs_work(struct work_struct *wrk) { struct drm_sched_job *job = container_of(wrk, typeof(*job), work); + drm_sched_fence_scheduled(job->s_fence, NULL); drm_sched_fence_finished(job->s_fence); WARN_ON(job->s_fence->parent); job->sched->ops->free_job(job); -- 2.35.3