From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from n169-113.mail.139.com (n169-113.mail.139.com [120.232.169.113]) (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 2B01B318146 for ; Mon, 13 Apr 2026 07:41:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=120.232.169.113 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776066094; cv=none; b=aU98cpholiltAfUso7lFSYoys0ZYWFP03drikKYbgo9X9WZFafkhpqA0eU0TFApSut5UecMzXdisAcNmwsI0SeMuwxrjRI+TxcjOLWiEnARyz9WVyhM5SXi5U7heb7AmawZp+p/BJ9UYcMB5IWdAKJNAKCzGS/s9a+GN1a+uDFQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776066094; c=relaxed/simple; bh=Ql89zuRDrqT1IbYdpqT9/C+78Rm+tZU1ijx7qpY+jEw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=p9kYNHz+gxiU/Mf0puNmFW0pP+jV2T+HXoPKiGKWNylmZhH12Ad/m9FB1WjwbsRTelql/WVljVne2HNjLGwx8MjAAdDGA2kh47E7tcqmbsOfQhSra3Aetf5n7bFZ704r8/j1YIJr/apLyXOdY0dQOw5M84l6rw41ZcE9homNJVw= 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=3FeC+dzV; arc=none smtp.client-ip=120.232.169.113 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="3FeC+dzV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=139.com; s=dkim; l=0; h=from:subject:message-id:to:cc:mime-version; bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=3FeC+dzVLCax7ef04CFljJ+wC+jTj6pvn7yNDEj9xYLYLbItiL22fY2q7wKBVTUVrMgAB+qxuRK+w J/EkybRb9OJVfae4av82vLlzEXR5FLF9OVXQlg1cRx5KP7HfkUCGaVmX9ZFJLrIFwSTGIsqKebgjwd 8919VwMP54oy3DnA= 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-33-12047 (RichMail) with SMTP id 2f0f69dc9e265ae-c271c; Mon, 13 Apr 2026 15:41:29 +0800 (CST) X-RM-TRANSID:2f0f69dc9e265ae-c271c From: Leon Chen To: leonchen.oss@139.com Cc: christian.koenig@amd.com, lincao12@amd.com, phasta@kernel.org, stable@vger.kernel.org Subject: [PATCH v2 6.1.y] drm/scheduler: signal scheduled fence when kill job Date: Mon, 13 Apr 2026 15:41:27 +0800 Message-Id: <20260413074127.8080-1-leonchen.oss@139.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20260413073323.7541-1-leonchen.oss@139.com> References: <20260413073323.7541-1-leonchen.oss@139.com> 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 --- v1 -> v2: Forgot to git commit after modifying drm_sched_fence_scheduled(job->s_fence, NULL) to drm_sched_fence_scheduled(job->s_fence) --- 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..3469ba0f990b 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); drm_sched_fence_finished(job->s_fence); WARN_ON(job->s_fence->parent); job->sched->ops->free_job(job); -- 2.35.3